mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
7961ad6508
The 'connection' accessor in collections and models actually refered to a subclassed instance of Fog::Service which creates confusion in the code. References to 'connection' could have meant the service or the Fog::Connection held within that service. This deprecates the connection accessor and replaces it with `#service` as a read only value. When a collection or model is initalised then service should be passed. This commit also updates all the changes to @connection made by providers in model initialisers since these depending on the presence of the 'connection' key. The key is still accepted by outputs a warning.
79 lines
2.2 KiB
Ruby
79 lines
2.2 KiB
Ruby
require "fog/core/deprecated_connection_accessors"
|
|
|
|
module Fog
|
|
class Model
|
|
|
|
extend Fog::Attributes::ClassMethods
|
|
include Fog::Attributes::InstanceMethods
|
|
include Fog::Core::DeprecatedConnectionAccessors
|
|
|
|
attr_accessor :collection
|
|
attr_reader :service
|
|
|
|
def initialize(new_attributes = {})
|
|
# TODO Remove compatibility with old connection option
|
|
@service = @service || new_attributes.delete(:service)
|
|
if @service.nil? && new_attributes[:connection]
|
|
Fog::Logger.deprecation("Passing :connection option is deprecated, use :service instead [light_black](#{caller.first})[/]")
|
|
@service = new_attributes[:connection]
|
|
end
|
|
merge_attributes(new_attributes)
|
|
end
|
|
|
|
def inspect
|
|
Thread.current[:formatador] ||= Formatador.new
|
|
data = "#{Thread.current[:formatador].indentation}<#{self.class.name}"
|
|
Thread.current[:formatador].indent do
|
|
unless self.class.attributes.empty?
|
|
data << "\n#{Thread.current[:formatador].indentation}"
|
|
data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
|
|
end
|
|
end
|
|
data << "\n#{Thread.current[:formatador].indentation}>"
|
|
data
|
|
end
|
|
|
|
def reload
|
|
requires :identity
|
|
|
|
return unless data = begin
|
|
collection.get(identity)
|
|
rescue Excon::Errors::SocketError
|
|
nil
|
|
end
|
|
|
|
new_attributes = data.attributes
|
|
merge_attributes(new_attributes)
|
|
self
|
|
end
|
|
|
|
def to_json(options = {})
|
|
Fog::JSON.encode(attributes)
|
|
end
|
|
|
|
def symbolize_keys(hash)
|
|
return nil if hash.nil?
|
|
hash.inject({}) do |options, (key, value)|
|
|
options[(key.to_sym rescue key) || key] = value
|
|
options
|
|
end
|
|
end
|
|
|
|
def wait_for(timeout=Fog.timeout, interval=1, &block)
|
|
reload
|
|
retries = 3
|
|
Fog.wait_for(timeout, interval) do
|
|
if reload
|
|
retries = 3
|
|
elsif retries > 0
|
|
retries -= 1
|
|
sleep(1)
|
|
elsif retries == 0
|
|
raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} went away.")
|
|
end
|
|
instance_eval(&block)
|
|
end
|
|
end
|
|
|
|
end
|
|
end
|