mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
share the attributes logic between collectio and model
This commit is contained in:
geemus
parent
f445d78935
commit
b03c2d811c
4 changed files with 103 additions and 145 deletions
|
|
@ -18,6 +18,7 @@ $LOAD_PATH.unshift __DIR__ unless
|
|||
$LOAD_PATH.include?(__DIR__) ||
|
||||
$LOAD_PATH.include?(File.expand_path(__DIR__))
|
||||
|
||||
require 'fog/attributes'
|
||||
require 'fog/collection'
|
||||
require 'fog/connection'
|
||||
require 'fog/deprecation'
|
||||
|
|
|
|||
96
lib/fog/attributes.rb
Normal file
96
lib/fog/attributes.rb
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
module Attributes
|
||||
module ClassMethods
|
||||
|
||||
def _load(marshalled)
|
||||
new(Marshal.load(marshalled))
|
||||
end
|
||||
|
||||
def aliases
|
||||
@aliases ||= {}
|
||||
end
|
||||
|
||||
def attributes
|
||||
@attributes ||= []
|
||||
end
|
||||
|
||||
def attribute(name, other_names = [])
|
||||
class_eval <<-EOS, __FILE__, __LINE__
|
||||
attr_accessor :#{name}
|
||||
EOS
|
||||
@attributes ||= []
|
||||
@attributes |= [name]
|
||||
for other_name in [*other_names]
|
||||
aliases[other_name] = name
|
||||
end
|
||||
end
|
||||
|
||||
def identity(name, other_names = [])
|
||||
@identity = name
|
||||
self.attribute(name, other_names)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
|
||||
def _dump
|
||||
Marshal.dump(attributes)
|
||||
end
|
||||
|
||||
def attributes
|
||||
attributes = {}
|
||||
for attribute in self.class.attributes
|
||||
attributes[attribute] = send("#{attribute}")
|
||||
end
|
||||
attributes
|
||||
end
|
||||
|
||||
def identity
|
||||
send(self.class.instance_variable_get('@identity'))
|
||||
end
|
||||
|
||||
def identity=(new_identity)
|
||||
send("#{self.class.instance_variable_get('@identity')}=", new_identity)
|
||||
end
|
||||
|
||||
def merge_attributes(new_attributes = {})
|
||||
for key, value in new_attributes
|
||||
if aliased_key = self.class.aliases[key]
|
||||
send("#{aliased_key}=", value)
|
||||
else
|
||||
send("#{key}=", value)
|
||||
end
|
||||
end
|
||||
self
|
||||
end
|
||||
|
||||
def new_record?
|
||||
!identity
|
||||
end
|
||||
|
||||
def requires(*args)
|
||||
missing = []
|
||||
for arg in [:connection] | args
|
||||
missing << arg unless send("#{arg}")
|
||||
end
|
||||
unless missing.empty?
|
||||
if missing.length == 1
|
||||
raise(ArgumentError, "#{missing.first} is required for this operation")
|
||||
else
|
||||
raise(ArgumentError, "#{missing[0...-1].join(", ")} and #{missing[-1]} are required for this operation")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def remap_attributes(attributes, mapping)
|
||||
for key, value in mapping
|
||||
if attributes.key?(key)
|
||||
attributes[value] = attributes.delete(key)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
module Fog
|
||||
class Collection < Array
|
||||
|
||||
extend Attributes::ClassMethods
|
||||
include Attributes::InstanceMethods
|
||||
|
||||
Array.public_instance_methods(false).each do |method|
|
||||
class_eval <<-RUBY
|
||||
def #{method}(*args)
|
||||
|
|
@ -20,21 +23,6 @@ module Fog
|
|||
RUBY
|
||||
end
|
||||
|
||||
def self._load(marshalled)
|
||||
new(Marshal.load(marshalled))
|
||||
end
|
||||
|
||||
def self.attribute(name, other_names = [])
|
||||
class_eval <<-EOS, __FILE__, __LINE__
|
||||
attr_accessor :#{name}
|
||||
EOS
|
||||
@attributes ||= []
|
||||
@attributes |= [name]
|
||||
for other_name in [*other_names]
|
||||
aliases[other_name] = name
|
||||
end
|
||||
end
|
||||
|
||||
def self.model(new_model=nil)
|
||||
if new_model == nil
|
||||
@model
|
||||
|
|
@ -43,33 +31,7 @@ module Fog
|
|||
end
|
||||
end
|
||||
|
||||
def self.aliases
|
||||
@aliases ||= {}
|
||||
end
|
||||
|
||||
def self.attributes
|
||||
@attributes ||= []
|
||||
end
|
||||
|
||||
def _dump
|
||||
Marshal.dump(attributes)
|
||||
end
|
||||
|
||||
def attributes
|
||||
attributes = {}
|
||||
for attribute in self.class.attributes
|
||||
attributes[attribute] = send("#{attribute}")
|
||||
end
|
||||
attributes
|
||||
end
|
||||
|
||||
def connection=(new_connection)
|
||||
@connection = new_connection
|
||||
end
|
||||
|
||||
def connection
|
||||
@connection
|
||||
end
|
||||
attr_accessor :connection
|
||||
|
||||
def create(attributes = {})
|
||||
object = new(attributes)
|
||||
|
|
@ -121,17 +83,6 @@ module Fog
|
|||
self.class.instance_variable_get('@model')
|
||||
end
|
||||
|
||||
def merge_attributes(new_attributes = {})
|
||||
for key, value in new_attributes
|
||||
if aliased_key = self.class.aliases[key]
|
||||
send("#{aliased_key}=", value)
|
||||
else
|
||||
send("#{key}=", value)
|
||||
end
|
||||
end
|
||||
self
|
||||
end
|
||||
|
||||
def new(attributes = {})
|
||||
model.new(
|
||||
attributes.merge(
|
||||
|
|
@ -161,13 +112,5 @@ module Fog
|
|||
end
|
||||
end
|
||||
|
||||
def remap_attributes(attributes, mapping)
|
||||
for key, value in mapping
|
||||
if attributes.key?(key)
|
||||
attributes[value] = attributes.delete(key)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,60 +1,15 @@
|
|||
module Fog
|
||||
class Model
|
||||
|
||||
def self._load(marshalled)
|
||||
new(Marshal.load(marshalled))
|
||||
end
|
||||
|
||||
def self.aliases
|
||||
@aliases ||= {}
|
||||
end
|
||||
|
||||
def self.attributes
|
||||
@attributes ||= []
|
||||
end
|
||||
|
||||
def self.attribute(name, other_names = [])
|
||||
class_eval <<-EOS, __FILE__, __LINE__
|
||||
attr_accessor :#{name}
|
||||
EOS
|
||||
@attributes ||= []
|
||||
@attributes |= [name]
|
||||
for other_name in [*other_names]
|
||||
aliases[other_name] = name
|
||||
end
|
||||
end
|
||||
|
||||
def self.identity(name, other_names = [])
|
||||
@identity = name
|
||||
self.attribute(name, other_names)
|
||||
end
|
||||
|
||||
def _dump
|
||||
Marshal.dump(attributes)
|
||||
end
|
||||
extend Attributes::ClassMethods
|
||||
include Attributes::InstanceMethods
|
||||
|
||||
attr_accessor :connection
|
||||
|
||||
def attributes
|
||||
attributes = {}
|
||||
for attribute in self.class.attributes
|
||||
attributes[attribute] = send("#{attribute}")
|
||||
end
|
||||
attributes
|
||||
end
|
||||
|
||||
def collection
|
||||
@collection
|
||||
end
|
||||
|
||||
def identity
|
||||
send(self.class.instance_variable_get('@identity'))
|
||||
end
|
||||
|
||||
def identity=(new_identity)
|
||||
send("#{identity}=", new_identity)
|
||||
end
|
||||
|
||||
def initialize(new_attributes = {})
|
||||
merge_attributes(new_attributes)
|
||||
end
|
||||
|
|
@ -72,21 +27,6 @@ module Fog
|
|||
data
|
||||
end
|
||||
|
||||
def merge_attributes(new_attributes = {})
|
||||
for key, value in new_attributes
|
||||
if aliased_key = self.class.aliases[key]
|
||||
send("#{aliased_key}=", value)
|
||||
else
|
||||
send("#{key}=", value)
|
||||
end
|
||||
end
|
||||
self
|
||||
end
|
||||
|
||||
def new_record?
|
||||
!identity
|
||||
end
|
||||
|
||||
def reload
|
||||
if data = collection.get(identity)
|
||||
new_attributes = data.attributes
|
||||
|
|
@ -95,20 +35,6 @@ module Fog
|
|||
end
|
||||
end
|
||||
|
||||
def requires(*args)
|
||||
missing = []
|
||||
for arg in [:connection] | args
|
||||
missing << arg unless send("#{arg}")
|
||||
end
|
||||
unless missing.empty?
|
||||
if missing.length == 1
|
||||
raise(ArgumentError, "#{missing.first} is required for this operation")
|
||||
else
|
||||
raise(ArgumentError, "#{missing[0...-1].join(", ")} and #{missing[-1]} are required for this operation")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def to_json
|
||||
attributes.to_json
|
||||
end
|
||||
|
|
@ -127,13 +53,5 @@ module Fog
|
|||
@collection = new_collection
|
||||
end
|
||||
|
||||
def remap_attributes(attributes, mapping)
|
||||
for key, value in mapping
|
||||
if attributes.key?(key)
|
||||
attributes[value] = attributes.delete(key)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue