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.
145 lines
3.4 KiB
Ruby
145 lines
3.4 KiB
Ruby
require "fog/core/deprecated_connection_accessors"
|
|
|
|
module Fog
|
|
class Collection < Array
|
|
extend Fog::Attributes::ClassMethods
|
|
include Fog::Attributes::InstanceMethods
|
|
include Fog::Core::DeprecatedConnectionAccessors
|
|
|
|
attr_reader :service
|
|
|
|
Array.public_instance_methods(false).each do |method|
|
|
unless [:reject, :select, :slice].include?(method.to_sym)
|
|
class_eval <<-EOS, __FILE__, __LINE__
|
|
def #{method}(*args)
|
|
unless @loaded
|
|
lazy_load
|
|
end
|
|
super
|
|
end
|
|
EOS
|
|
end
|
|
end
|
|
|
|
%w[reject select slice].each do |method|
|
|
class_eval <<-EOS, __FILE__, __LINE__
|
|
def #{method}(*args)
|
|
unless @loaded
|
|
lazy_load
|
|
end
|
|
data = super
|
|
self.clone.clear.concat(data)
|
|
end
|
|
EOS
|
|
end
|
|
|
|
def self.model(new_model=nil)
|
|
if new_model == nil
|
|
@model
|
|
else
|
|
@model = new_model
|
|
end
|
|
end
|
|
|
|
remove_method :clear
|
|
def clear
|
|
@loaded = true
|
|
super
|
|
end
|
|
|
|
def create(attributes = {})
|
|
object = new(attributes)
|
|
object.save
|
|
object
|
|
end
|
|
|
|
def destroy(identity)
|
|
object = new(:identity => identity)
|
|
object.destroy
|
|
end
|
|
|
|
# Creates a new Fog::Collection based around the passed service
|
|
#
|
|
# @param [Hash] attributes
|
|
# @option attributes [Fog::Service] service Instance of a service
|
|
#
|
|
# @return [Fog::Collection]
|
|
#
|
|
def initialize(attributes = {})
|
|
@service = attributes.delete(:service)
|
|
@loaded = false
|
|
merge_attributes(attributes)
|
|
end
|
|
|
|
|
|
remove_method :inspect
|
|
def inspect
|
|
Thread.current[:formatador] ||= Formatador.new
|
|
data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"
|
|
Thread.current[:formatador].indent do
|
|
unless self.class.attributes.empty?
|
|
data << "#{Thread.current[:formatador].indentation}"
|
|
data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
|
|
data << "\n"
|
|
end
|
|
data << "#{Thread.current[:formatador].indentation}["
|
|
unless self.empty?
|
|
data << "\n"
|
|
Thread.current[:formatador].indent do
|
|
data << self.map {|member| member.inspect}.join(",\n")
|
|
data << "\n"
|
|
end
|
|
data << Thread.current[:formatador].indentation
|
|
end
|
|
data << "]\n"
|
|
end
|
|
data << "#{Thread.current[:formatador].indentation}>"
|
|
data
|
|
end
|
|
|
|
def load(objects)
|
|
clear
|
|
for object in objects
|
|
self << new(object)
|
|
end
|
|
self
|
|
end
|
|
|
|
def model
|
|
self.class.instance_variable_get('@model')
|
|
end
|
|
|
|
def new(attributes = {})
|
|
unless attributes.is_a?(::Hash)
|
|
raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
|
|
end
|
|
model.new(
|
|
{
|
|
:collection => self,
|
|
:service => service
|
|
}.merge(attributes)
|
|
)
|
|
end
|
|
|
|
def reload
|
|
clear
|
|
lazy_load
|
|
self
|
|
end
|
|
|
|
def table(attributes = nil)
|
|
Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
|
|
end
|
|
|
|
def to_json(options = {})
|
|
Fog::JSON.encode(self.map {|member| member.attributes})
|
|
end
|
|
|
|
private
|
|
|
|
def lazy_load
|
|
self.all
|
|
end
|
|
|
|
end
|
|
end
|