fog 0.3.22 → 0.3.23

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

@@ -36,7 +36,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.grid_server_delete(@id)
+          connection.grid_server_delete(id)
           true
         end
 
@@ -48,7 +48,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :server_id
 
-          data = connection.grid_server_add(@server_id, 'name' => name)
+          data = connection.grid_server_add(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end

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

@@ -24,13 +24,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_destroy(@id)
+          connection.grid_server_destroy(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(@image_id)
+          connection.grid_image_get(image_id)
         end
 
         def ready?

data/lib/fog/google/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/google/models/storage/file.rb

@@ -11,7 +11,6 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_writer :body
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'
         attribute :content_encoding,    :aliases => 'Content-Encoding'
@@ -33,20 +32,24 @@ 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
@@ -54,7 +57,7 @@ module Fog
         def destroy
           requires :directory, :key
           begin
-            connection.delete_object(directory.key, @key)
+            connection.delete_object(directory.key, key)
           rescue Excon::Errors::NotFound
           end
           true
@@ -63,7 +66,7 @@ module Fog
         remove_method :owner=
         def owner=(new_owner)
           if new_owner
-            @owner = {
+            attributes[:owner] = {
               :display_name => new_owner['DisplayName'],
               :id           => new_owner['ID']
             }
@@ -105,7 +108,7 @@ module Fog
           options['Content-Type'] = content_type if content_type
           options['Expires'] = expires if expires
 
-          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/google/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::Google::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/google/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/google/requests/storage/get_bucket.rb

@@ -27,6 +27,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/local/models/storage/file.rb

@@ -8,19 +8,22 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_writer :body
         attribute :content_length,  :aliases => 'Content-Length'
         # attribute :content_type,    :aliases => 'Content-Type'
         attribute :last_modified,   :aliases => 'Last-Modified'
 
         def body
-          @body ||= if last_modified
+          attributes[:body] ||= if last_modified
             collection.get(identity).body
           else
             ''
           end
         end
 
+        def body=(new_body)
+          attributes[:body] = new_body
+        end
+
         def directory
           @directory
         end

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

@@ -18,13 +18,13 @@ module Fog
         def server=(new_server)
           requires :id
 
-          @server_id = new_server.id
+          self.server_id = new_server.id
         end
 
         def destroy
           requires :id
 
-          connection.delete_image(@id)
+          connection.delete_image(id)
           true
         end
 
@@ -36,7 +36,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :server_id
 
-          data = connection.create_image(@server_id, 'name' => name)
+          data = connection.create_image(server_id, 'name' => name)
           merge_attributes(data.body['image'])
           true
         end

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

@@ -22,24 +22,24 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          @flavor_id ||= 1
+          self.flavor_id ||= 1
           super
         end
 
         def destroy
           requires :id
-          connection.delete_server(@id)
+          connection.delete_server(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 images
@@ -66,12 +66,12 @@ module Fog
         end
 
         def ready?
-          @status == 'ACTIVE'
+          status == 'ACTIVE'
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(@id, type)
+          connection.reboot_server(id, type)
           true
         end
 
@@ -79,12 +79,12 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :flavor_id, :image_id, :name
           options = {
-            'metadata'    => @metadata,
-            'name'        => @name,
-            'personality' => @personality
+            'metadata'    => metadata,
+            'name'        => name,
+            'personality' => personality
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(@flavor_id, @image_id, options)
+          data = connection.create_server(flavor_id, image_id, options)
           merge_attributes(data.body['server'])
           true
         end

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

@@ -8,33 +8,36 @@ module Fog
 
         identity  :key,             :aliases => 'name'
 
-        attr_writer :body
         attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
         attribute :etag,            :aliases => ['hash', 'Etag']
         attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
 
         def body
-          @body ||= if last_modified
+          attributes[:body] ||= if last_modified
             collection.get(identity).body
           else
             ''
           end
         end
 
+        def body=(new_body)
+          attributes[:body] = new_body
+        end
+
         def directory
           @directory
         end
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.key, @key)
+          connection.delete_object(directory.key, key)
           true
         end
 
         def owner=(new_owner)
           if new_owner
-            @owner = {
+            attributes[:owner] = {
               :display_name => new_owner['DisplayName'],
               :id           => new_owner['ID']
             }
@@ -54,7 +57,7 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
-          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/rackspace/models/storage/files.rb

@@ -18,10 +18,10 @@ module Fog
         def all(options = {})
           requires :directory
           options = {
-            'limit'   => @limit,
-            'marker'  => @marker,
-            'path'    => @path,
-            'prefix'  => @prefix
+            'limit'   => limit,
+            'marker'  => marker,
+            'path'    => path,
+            'prefix'  => prefix
           }.merge!(options)
           merge_attributes(options)
           parent = directory.collection.get(

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

@@ -23,24 +23,24 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          @flavor_id ||= 1
+          self.flavor_id ||= 1
           super
         end
 
         def destroy
           requires :id
-          connection.delete_slice(@id)
+          connection.delete_slice(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
@@ -62,12 +62,12 @@ module Fog
         end
 
         def ready?
-          @status == 'active'
+          status == 'active'
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_slice(@id, type)
+          connection.reboot_slice(id, type)
           true
         end
 
@@ -75,7 +75,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :flavor_id, :image_id, :name
 
-          data = connection.create_slice(@flavor_id, @image_id, @name)
+          data = connection.create_slice(flavor_id, image_id, name)
           merge_attributes(data.body)
           true
         end

data/lib/fog/terremark/models/shared/address.rb

@@ -12,14 +12,14 @@ module Fog
 
         def destroy
          requires :id
-         connection.delete_public_ip(@id)
+         connection.delete_public_ip(id)
          true
         end
 
         private
 
         def href=(new_href)
-          @id = new_href.split('/').last.to_i
+          self.id = new_href.split('/').last.to_i
         end
 
       end

data/lib/fog/terremark/models/shared/network.rb

@@ -17,13 +17,13 @@ module Fog
 
         def ips
           #Until there is a real model for these ?
-          connection.get_network_ips(@id).body['IpAddresses']
+          connection.get_network_ips(id).body['IpAddresses']
         end
 
         private
 
         def href=(new_href)
-          @id = new_href.split('/').last.to_i
+          self.id = new_href.split('/').last.to_i
         end
 
         def type=(new_type); end