namespace attributes logic

lib/fog/attributes.rb

@@ -1,96 +1,98 @@
-module Attributes
+module Fog
-  module ClassMethods
+  module Attributes
+    module ClassMethods
 
-    def _load(marshalled)
+      def _load(marshalled)
-      new(Marshal.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 = [])
+      def aliases
-      @identity = name
+        @aliases ||= {}
-      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
+      def attributes
-      send(self.class.instance_variable_get('@identity'))
+        @attributes ||= []
-    end
+      end
 
-    def identity=(new_identity)
+      def attribute(name, other_names = [])
-      send("#{self.class.instance_variable_get('@identity')}=", new_identity)
+        class_eval <<-EOS, __FILE__, __LINE__
-    end
+          attr_accessor :#{name}
-
+        EOS
-    def merge_attributes(new_attributes = {})
+        @attributes ||= []
-      for key, value in new_attributes
+        @attributes |= [name]
-        if aliased_key = self.class.aliases[key]
+        for other_name in [*other_names]
-          send("#{aliased_key}=", value)
+          aliases[other_name] = name
-        else
-          send("#{key}=", value)
         end
       end
-      self
-    end
 
-    def new_record?
+      def identity(name, other_names = [])
-      !identity
+        @identity = name
-    end
+        self.attribute(name, other_names)
-
-    def requires(*args)
-      missing = []
-      for arg in [:connection] | args
-        missing << arg unless send("#{arg}")
       end
-      unless missing.empty?
+
-        if missing.length == 1
+    end
-          raise(ArgumentError, "#{missing.first} is required for this operation")
+
-        else
+    module InstanceMethods
-          raise(ArgumentError, "#{missing[0...-1].join(", ")} and #{missing[-1]} are required for this operation")
+
+      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
-    end
 
-    private
+      private
 
-    def remap_attributes(attributes, mapping)
+      def remap_attributes(attributes, mapping)
-      for key, value in mapping
+        for key, value in mapping
-        if attributes.key?(key)
+          if attributes.key?(key)
-          attributes[value] = attributes.delete(key)
+            attributes[value] = attributes.delete(key)
+          end
         end
       end
-    end
 
+    end
   end
 end

lib/fog/collection.rb

@@ -1,8 +1,8 @@
 module Fog
   class Collection < Array
 
-    extend Attributes::ClassMethods
+    extend Fog::Attributes::ClassMethods
-    include Attributes::InstanceMethods
+    include Fog::Attributes::InstanceMethods
 
     Array.public_instance_methods(false).each do |method|
       class_eval <<-RUBY

lib/fog/model.rb

@@ -1,8 +1,8 @@
 module Fog
   class Model
 
-    extend Attributes::ClassMethods
+    extend Fog::Attributes::ClassMethods
-    include Attributes::InstanceMethods
+    include Fog::Attributes::InstanceMethods
 
     attr_accessor :connection