fog 0.1.6 → 0.1.7

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.1.6'
-  s.date              = '2010-06-06'
+  s.version           = '0.1.7'
+  s.date              = '2010-06-07'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     examples/bluebox_create.rb
     fog.gemspec
     lib/fog.rb
+    lib/fog/attributes.rb
     lib/fog/aws.rb
     lib/fog/aws/bin.rb
     lib/fog/aws/ec2.rb

data/lib/fog.rb

@@ -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'
@@ -48,7 +49,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 
   module Mock

data/lib/fog/attributes.rb

@@ -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

data/lib/fog/aws/s3.rb

@@ -209,7 +209,7 @@ DATA
           end
           canonical_resource << "#{params[:path]}"
           canonical_resource << '?'
-          for key in params[:query].keys
+          for key in (params[:query] || {}).keys
             if ['acl', 'location', 'logging', 'requestPayment', 'torrent', 'versions', 'versioning'].include?(key)
               canonical_resource << "#{key}&"
             end

data/lib/fog/collection.rb

@@ -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

data/lib/fog/model.rb

@@ -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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,6 +149,7 @@ files:
 - examples/bluebox_create.rb
 - fog.gemspec
 - lib/fog.rb
+- lib/fog/attributes.rb
 - lib/fog/aws.rb
 - lib/fog/aws/bin.rb
 - lib/fog/aws/ec2.rb