fog 0.1.9 → 0.1.10

data/Gemfile

@@ -9,5 +9,5 @@ gem 'net-ssh', ">= 0"
 gem 'nokogiri', ">= 0"
 gem 'rspec', '>= 0'
 gem 'ruby-hmac', '>= 0'
-gem 'shindo', '>= 0.1.5'
+gem 'shindo', '>= 0.1.6'
 gem 'builder', '>= 0'

data/Gemfile.lock

@@ -39,7 +39,7 @@ dependencies:
   shindo: 
     group: 
     - :default
-    version: ">= 0.1.5"
+    version: ">= 0.1.6"
   nokogiri: 
     group: 
     - :default
@@ -68,8 +68,8 @@ specs:
 - ruby-hmac: 
     version: 0.4.0
 - shindo: 
-    version: 0.1.5
-hash: 12012795f07111bf764cef89d9ba91f521c54956
+    version: 0.1.6
+hash: 83b7c53965ec61f532d9a504fcd8f5f67a285293
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

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.9'
-  s.date              = '2010-06-15'
+  s.version           = '0.1.10'
+  s.date              = '2010-06-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -38,7 +38,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 
   module Mock

data/lib/fog/attributes.rb

@@ -14,14 +14,59 @@ module Fog
         @attributes ||= []
       end
 
-      def attribute(name, other_names = [])
+      def attribute(name, options = {})
+        # FIXME: handle legacy where options would have been one or more aliases
+        if !options.is_a?(Hash)
+          options = {:aliases => options}
+        end
         class_eval <<-EOS, __FILE__, __LINE__
-          attr_accessor :#{name}
+          attr_reader :#{name}
         EOS
+        case options[:type]
+        when :boolean
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              @#{name} = case new_#{name}
+              when 'true'
+                true
+              when 'false'
+                false
+              end
+            end
+          EOS
+        when :float
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              @#{name} = new_#{name}.to_f
+            end
+          EOS
+        when :integer
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              @#{name} = new_#{name}.to_i
+            end
+          EOS
+        when :string
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              @#{name} = new_#{name}.to_s
+            end
+          EOS
+        when :time
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{name}=(new_#{name})
+              @#{name} = Time.parse(new_#{name})
+            end
+          EOS
+        else
+          class_eval <<-EOS, __FILE__, __LINE__
+            attr_writer :#{name}
+          EOS
+        end
         @attributes ||= []
         @attributes |= [name]
-        for other_name in [*other_names]
-          aliases[other_name] = name
+        for new_alias in [*options[:aliases]]
+          aliases[new_alias] = name
         end
       end
 

data/lib/fog/aws/models/s3/directories.rb

@@ -30,9 +30,9 @@ module Fog
           data = connection.get_bucket(key, options).body
           directory = new(:key => data['Name'])
           options = {}
-          for key, value in data
-            if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(key)
-              options[key] = value
+          for k, v in data
+            if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
+              options[k] = v
             end
           end
           directory.files.merge_attributes(options)

data/lib/fog/vcloud/collection.rb

@@ -65,7 +65,14 @@ module Fog
 
       def each
         super do |item|
-          item.reload
+          item.reload unless item.loaded?
+          yield(item)
+        end
+      end
+
+      def map
+        super do |item|
+          item.reload unless item.loaded?
           yield(item)
         end
       end

data/spec/aws/models/ec2/volume_spec.rb

@@ -61,7 +61,7 @@ describe 'Fog::AWS::EC2::Volume' do
 
     after(:each) do
       if @volume.id
-        @volume.wait_for { state == 'attached' }
+        @volume.wait_for { state == 'in-use' }
         @volume.server = nil
         @volume.wait_for { ready? }
         @volume.destroy

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -07:00
+date: 2010-06-18 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency