fog 0.3.22 → 0.3.23

data/lib/fog/aws/models/compute/snapshots.rb

@@ -13,16 +13,16 @@ module Fog
         model Fog::AWS::Compute::Snapshot
 
         def initialize(attributes)
-          @filters ||= { 'RestorableBy' => 'self' }
+          self.filters ||= { 'RestorableBy' => 'self' }
           super
         end
 
-        def all(filters = @filters, options = {})
+        def all(filters = filters, options = {})
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'snapshot-id' => [*filters]}
           end
-          @filters = filters
+          self.filters = filters
           data = connection.describe_snapshots(filters.merge!(options)).body
           load(data['snapshotSet'])
           if volume

data/lib/fog/aws/models/compute/tags.rb

@@ -12,13 +12,13 @@ module Fog
         model Fog::AWS::Compute::Tag
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
-          @filters = filters
-          data = connection.describe_tags(@filters).body
+        def all(filters = filters)
+          self.filters = filters
+          data = connection.describe_tags(filters).body
           load(data['tagSet'])
         end
 

data/lib/fog/aws/models/compute/volume.rb

@@ -30,7 +30,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_volume(@id)
+          connection.delete_volume(id)
           true
         end
 
@@ -42,7 +42,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :availability_zone, :size
 
-          data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
+          data = connection.create_volume(availability_zone, size, snapshot_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           if @server
@@ -73,19 +73,19 @@ module Fog
         def attach(new_server)
           if new_record?
             @server = new_server
-            @availability_zone = new_server.availability_zone
+            self.availability_zone = new_server.availability_zone
           elsif new_server
             requires :device
             @server = nil
-            @server_id = new_server.id
-            connection.attach_volume(@server_id, @id, @device)
+            self.server_id = new_server.id
+            connection.attach_volume(server_id, id, device)
             reload
           end
         end
 
         def detach
           @server = nil
-          @server_id = nil
+          self.server_id = nil
           unless new_record?
             connection.detach_volume(@id)
             reload
@@ -94,7 +94,7 @@ module Fog
 
         def force_detach
           @server = nil
-          @server_id = nil
+          self.server_id = nil
           unless new_record?
             connection.detach_volume(@id, 'Force' => true)
             reload

data/lib/fog/aws/models/compute/volumes.rb

@@ -13,17 +13,17 @@ module Fog
         model Fog::AWS::Compute::Volume
 
         def initialize(attributes)
-          @filters ||= {}
+          self.filters ||= {}
           super
         end
 
-        def all(filters = @filters)
+        def all(filters = filters)
           unless filters.is_a?(Hash)
             Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
-          @filters = filters
-          data = connection.describe_volumes(@filters).body
+          self.filters = filters
+          data = connection.describe_volumes(filters).body
           load(data['volumeSet'])
           if server
             self.replace(self.select {|volume| volume.server_id == server.id})

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

@@ -25,7 +25,7 @@ module Fog
           directory = new(:key => data['Name'])
           options = {}
           for k, v in data
-            if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
+            if ['CommonPrefixes', 'Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
               options[k] = v
             end
           end

data/lib/fog/aws/models/storage/file.rb

@@ -33,34 +33,38 @@ module Fog
         end
 
         def body
-          @body ||= if last_modified && (file = collection.get(identity))
+          attributes[:body] ||= if last_modified && (file = collection.get(identity))
             file.body
           else
             ''
           end
         end
 
+        def body=(new_body)
+          attributes[:body] = new_body
+        end
+
         def directory
           @directory
         end
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          connection.copy_object(directory.key, @key, target_directory_key, target_file_key)
+          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
           target_directory = connection.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.key, @key)
+          connection.delete_object(directory.key, key)
           true
         end
 
         remove_method :owner=
         def owner=(new_owner)
           if new_owner
-            @owner = {
+            attributes[:owner] = {
               :display_name => new_owner['DisplayName'],
               :id           => new_owner['ID']
             }
@@ -103,7 +107,7 @@ module Fog
           options['Expires'] = expires if expires
           options['x-amz-storage-class'] = storage_class if storage_class
 
-          data = connection.put_object(directory.key, @key, @body, options)
+          data = connection.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
           if body.is_a?(String)
             self.content_length = body.size

data/lib/fog/aws/models/storage/files.rb

@@ -7,22 +7,23 @@ module Fog
 
       class Files < Fog::Collection
 
-        attribute :delimiter,     :aliases => 'Delimiter'
+        attribute :common_prefixes, :aliases => 'CommonPrefixes'
+        attribute :delimiter,       :aliases => 'Delimiter'
         attribute :directory
-        attribute :is_truncated,  :aliases => 'IsTruncated'
-        attribute :marker,        :aliases => 'Marker'
-        attribute :max_keys,      :aliases => ['MaxKeys', 'max-keys']
-        attribute :prefix,        :aliases => 'Prefix'
+        attribute :is_truncated,    :aliases => 'IsTruncated'
+        attribute :marker,          :aliases => 'Marker'
+        attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
+        attribute :prefix,          :aliases => 'Prefix'
 
         model Fog::AWS::Storage::File
 
         def all(options = {})
           requires :directory
           options = {
-            'delimiter'   => @delimiter,
-            'marker'      => @marker,
-            'max-keys'    => @max_keys,
-            'prefix'      => @prefix
+            'delimiter'   => delimiter,
+            'marker'      => marker,
+            'max-keys'    => max_keys,
+            'prefix'      => prefix
           }.merge!(options)
           options = options.reject {|key,value| value.nil? || value.to_s.empty?}
           merge_attributes(options)

data/lib/fog/aws/parsers/storage/get_bucket.rb

@@ -7,11 +7,21 @@ module Fog
 
           def reset
             @object = { 'Owner' => {} }
-            @response = { 'Contents' => [] }
+            @response = { 'Contents' => [], 'CommonPrefixes' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = true
+            end
           end
 
           def end_element(name)
             case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = false
             when 'Contents'
               @response['Contents'] << @object
               @object = { 'Owner' => {} }
@@ -27,13 +37,19 @@ module Fog
               end
             when 'LastModified'
               @object['LastModified'] = Time.parse(@value)
-            when 'Marker', 'Name', 'Prefix'
+            when 'Marker', 'Name'
               @response[name] = @value
             when 'MaxKeys'
               @response['MaxKeys'] = @value.to_i
+            when 'Prefix'
+              if @in_common_prefixes
+                @response['CommonPrefixes'] << @value
+              else
+                @response[name] = @value
+              end
             when 'Size'
               @object['Size'] = @value.to_i
-            when 'Delimeter', 'Key', 'StorageClass'
+            when 'Delimiter', 'Key', 'StorageClass'
               @object[name] = @value
             end
           end

data/lib/fog/aws/requests/storage/get_bucket.rb

@@ -26,6 +26,7 @@ module Fog
         #     * 'MaxKeys'<~Integer> - Maximum number of keys specified for query
         #     * 'Name'<~String> - Name of the bucket
         #     * 'Prefix'<~String> - Prefix specified for query
+        #     * 'CommonPrefixes'<~Array> - Array of strings for common prefixes
         #     * 'Contents'<~Array>:
         #       * 'ETag'<~String>: Etag of object
         #       * 'Key'<~String>: Name of object

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

@@ -17,7 +17,7 @@ module Fog
 
         attribute :cpu
         attribute :description
-        attribute :flavor_id
+        attribute :flavor_id,   :aliases => :product, :squash => 'id'
         attribute :hostname
         attribute :image_id
         attribute :ips
@@ -30,24 +30,24 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          @flavor_id ||= '94fd37a7-2606-47f7-84d5-9000deda52ae'
+          self.flavor_id ||= '94fd37a7-2606-47f7-84d5-9000deda52ae'
           super
         end
 
         def destroy
           requires :id
-          connection.destroy_block(@id)
+          connection.destroy_block(id)
           true
         end
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(@flavor_id)
+          connection.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(@image_id)
+          connection.images.get(image_id)
         end
 
         def private_key_path
@@ -69,12 +69,12 @@ module Fog
         end
 
         def ready?
-          @status == 'running'
+          status == 'running'
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_block(@id, type)
+          connection.reboot_block(id, type)
           true
         end
 
@@ -116,12 +116,6 @@ module Fog
           @username ||= 'deploy'
         end
 
-        private
-
-        def product=(new_product)
-          @flavor_id = new_product['id']
-        end
-
       end
 
     end

data/lib/fog/brightbox/models/compute/image.rb

@@ -29,10 +29,10 @@ module Fog
         def save
           requires :source, :arch
           options = {
-            :source => @source,
-            :arch => @arch,
-            :name => @name,
-            :description => @description
+            :source => source,
+            :arch => arch,
+            :name => name,
+            :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
           data = connection.create_image(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/server.rb

@@ -63,12 +63,12 @@ module Fog
 
         def flavor
           requires :flavor_id
-          connection.flavors.get(@flavor_id)
+          connection.flavors.get(flavor_id)
         end
 
         def image
           requires :image_id
-          connection.images.get(@image_id)
+          connection.images.get(image_id)
         end
 
         def ready?
@@ -78,11 +78,11 @@ module Fog
         def save
           requires :image_id
           options = {
-            :image => @image_id,
-            :server_type => @flavor_id,
-            :name => @name,
-            :zone => @zone_id,
-            :user_data => @user_data
+            :image => image_id,
+            :server_type => flavor_id,
+            :name => name,
+            :zone => zone_id,
+            :user_data => user_data
           }.delete_if {|k,v| v.nil? || v == "" }
           data = connection.create_server(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/user.rb

@@ -22,9 +22,9 @@ module Fog
           requires :identity
 
           options = {
-            :email_address => @email_address,
-            :ssh_key => @ssh_key,
-            :name => @name
+            :email_address => email_address,
+            :ssh_key => ssh_key,
+            :name => name
           }
 
           data = connection.update_user(identity, options)

data/lib/fog/core/attributes.rb

@@ -16,13 +16,15 @@ module Fog
 
       def attribute(name, options = {})
         class_eval <<-EOS, __FILE__, __LINE__
-          attr_reader :#{name}
+          def #{name}
+            attributes[:#{name}]
+          end
         EOS
         case options[:type]
         when :boolean
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              @#{name} = case new_#{name}
+              attributes[:#{name}] = case new_#{name}
               when 'true'
                 true
               when 'false'
@@ -33,39 +35,35 @@ module Fog
         when :float
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              @#{name} = new_#{name}.to_f
+              attributes[:#{name}] = new_#{name}.to_f
             end
           EOS
         when :integer
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              @#{name} = new_#{name}.to_i
+              attributes[:#{name}] = new_#{name}.to_i
             end
           EOS
         when :string
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              @#{name} = new_#{name}.to_s
+              attributes[:#{name}] = new_#{name}.to_s
             end
           EOS
         when :time
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              if new_#{name}.nil? || new_#{name} == "" || new_#{name}.is_a?(Time)
-                @#{name} = new_#{name}
+              attributes[:#{name}] = if new_#{name}.nil? || new_#{name} == "" || new_#{name}.is_a?(Time)
+                new_#{name}
               else
-                @#{name} = Time.parse(new_#{name})
+                Time.parse(new_#{name})
               end
             end
           EOS
         when :array
           class_eval <<-EOS, __FILE__, __LINE__
           def #{name}=(new_#{name})
-            @#{name} = if new_#{name}.is_a?(Array)
-              new_#{name}
-            else
-              @#{name} = [ new_#{name} ]
-            end
+            attributes[:#{name}] = [*new_#{name}]
           end
           EOS
         else
@@ -74,18 +72,20 @@ module Fog
               def #{name}=(new_data)
                 if new_data.is_a?(Hash)
                   if new_data[:#{squash}] || new_data["#{squash}"]
-                    @#{name} = new_data[:#{squash}] || new_data["#{squash}"]
+                    attributes[:#{name}] = new_data[:#{squash}] || new_data["#{squash}"]
                   else
-                    @#{name} = [ new_data ]
+                    attributes[:#{name}] = [ new_data ]
                   end
                 else
-                  @#{name} = new_data
+                  attributes[:#{name}] = new_data
                 end
               end
             EOS
           else
             class_eval <<-EOS, __FILE__, __LINE__
-              attr_writer :#{name}
+              def #{name}=(new_#{name})
+                attributes[:#{name}] = new_#{name}
+              end
             EOS
           end
         end
@@ -118,13 +118,7 @@ module Fog
       end
 
       def attributes
-        @attributes ||= begin
-          attributes = {}
-          for attribute in self.class.attributes
-            attributes[attribute] = send("#{attribute}")
-          end
-          attributes
-        end
+        @attributes ||= {}
       end
 
       def identity
@@ -139,10 +133,8 @@ module Fog
         for key, value in new_attributes
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
-              attributes[aliased_key] = value
               send("#{aliased_key}=", value)
             elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
-              attributes[key.to_sym] = value
               send("#{key}=", value)
             else
               attributes[key] = value