fog 0.1.7 → 0.1.8

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon', '>= 0.0.25'
+gem 'excon', '>= 0.0.26'
 gem 'formatador', ">= 0.0.10"
 gem 'json', ">= 0"
 gem 'mime-types', ">= 0"

data/Gemfile.lock

@@ -31,7 +31,7 @@ dependencies:
   excon: 
     group: 
     - :default
-    version: ">= 0.0.25"
+    version: ">= 0.0.26"
   builder: 
     group: 
     - :default
@@ -50,7 +50,7 @@ specs:
 - builder: 
     version: 2.1.2
 - excon: 
-    version: 0.0.25
+    version: 0.0.26
 - formatador: 
     version: 0.0.14
 - gestalt: 
@@ -69,7 +69,7 @@ specs:
     version: 0.4.0
 - shindo: 
     version: 0.1.4
-hash: 47be4240cdce9d626cc1834c503ca8e275e76307
+hash: da3f548f91388bc9e002c42ee2a4488bc8db9991
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/fog.gemspec

@@ -7,7 +7,7 @@ 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.7'
+  s.version           = '0.1.8'
   s.date              = '2010-06-07'
   s.rubyforge_project = 'fog'
 

data/lib/fog.rb

@@ -49,7 +49,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 
   module Mock

data/lib/fog/attributes.rb

@@ -1,96 +1,98 @@
-module Attributes
-  module ClassMethods
+module Fog
+  module Attributes
+    module ClassMethods
 
-    def _load(marshalled)
-      new(Marshal.load(marshalled))
-    end
+      def _load(marshalled)
+        new(Marshal.load(marshalled))
+      end
 
-    def aliases
-      @aliases ||= {}
-    end
+      def aliases
+        @aliases ||= {}
+      end
 
-    def attributes
-      @attributes ||= []
-    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 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
+      def identity(name, other_names = [])
+        @identity = name
+        self.attribute(name, other_names)
       end
-    end
 
-    def identity(name, other_names = [])
-      @identity = name
-      self.attribute(name, other_names)
     end
 
-  end
+    module InstanceMethods
 
-  module InstanceMethods
-
-    def _dump
-      Marshal.dump(attributes)
-    end
+      def _dump
+        Marshal.dump(attributes)
+      end
 
-    def attributes
-      attributes = {}
-      for attribute in self.class.attributes
-        attributes[attribute] = send("#{attribute}")
+      def attributes
+        attributes = {}
+        for attribute in self.class.attributes
+          attributes[attribute] = send("#{attribute}")
+        end
+        attributes
       end
-      attributes
-    end
 
-    def identity
-      send(self.class.instance_variable_get('@identity'))
-    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 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)
+      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
-      self
-    end
 
-    def new_record?
-      !identity
-    end
-
-    def requires(*args)
-      missing = []
-      for arg in [:connection] | args
-        missing << arg unless send("#{arg}")
+      def new_record?
+        !identity
       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")
+
+      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)
-      for key, value in mapping
-        if attributes.key?(key)
-          attributes[value] = attributes.delete(key)
+      def remap_attributes(attributes, mapping)
+        for key, value in mapping
+          if attributes.key?(key)
+            attributes[value] = attributes.delete(key)
+          end
         end
       end
-    end
 
+    end
   end
-end
+end

data/lib/fog/bluebox/models/server.rb

@@ -51,7 +51,7 @@ module Fog
       end
 
       def save
-        requires :flavor_id, :image_id, :name
+        requires :flavor_id, :image_id
         options = if !@password && !@ssh_key
           raise(ArgumentError, "password or ssh_key is required for this operation")
         elsif @ssh_key

data/lib/fog/bluebox/requests/create_block.rb

@@ -22,7 +22,7 @@ module Fog
           :expects  => 200,
           :method   => 'POST',
           :path     => '/api/blocks.json',
-          :query    => {'product' => product_id, 'template' => templated_id}.merge!(query)
+          :query    => {'product' => product_id, 'template' => template_id}.merge!(options)
         )
       end
 

data/lib/fog/collection.rb

@@ -1,13 +1,15 @@
 module Fog
   class Collection < Array
 
-    extend Attributes::ClassMethods
-    include Attributes::InstanceMethods
+    extend Fog::Attributes::ClassMethods
+    include Fog::Attributes::InstanceMethods
 
     Array.public_instance_methods(false).each do |method|
       class_eval <<-RUBY
         def #{method}(*args)
-          lazy_load
+          unless @loaded
+            lazy_load
+          end
           super
         end
       RUBY
@@ -16,9 +18,11 @@ module Fog
     %w[reject select].each do |method|
       class_eval <<-RUBY
         def #{method}(*args)
-          lazy_load
+          unless @loaded
+            lazy_load
+          end
           data = super
-          self.class.new(:connection => self.connection).load(data.map {|member| member.attributes})
+          result = self.clone.clear.concat(data)
         end
       RUBY
     end
@@ -33,6 +37,11 @@ module Fog
 
     attr_accessor :connection
 
+    def clear
+      @loaded = true
+      super
+    end
+
     def create(attributes = {})
       object = new(attributes)
       object.save
@@ -41,7 +50,6 @@ module Fog
 
     def initialize(attributes = {})
       merge_attributes(attributes)
-      @loaded = false
     end
 
     def inspect
@@ -69,10 +77,7 @@ module Fog
     end
 
     def load(objects)
-      if @loaded
-        clear
-      end
-      @loaded = true
+      clear
       for object in objects
         self << new(object)
       end
@@ -93,7 +98,9 @@ module Fog
     end
 
     def reload
-      self.clear.concat(all)
+      clear
+      lazy_load
+      self
     end
 
     def table(attributes = nil)
@@ -107,9 +114,7 @@ module Fog
     private
 
     def lazy_load
-      unless @loaded
-        self.all
-      end
+      self.all
     end
 
   end

data/lib/fog/model.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - geemus (Wesley Beary)