fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/aws/models/glacier/archive.rb

@@ -22,15 +22,15 @@ module Fog
           if multipart_chunk_size && body.respond_to?(:read)
             self.id = multipart_save
           else
-            data = connection.create_archive(vault.id, body, 'description' => description)
+            data = service.create_archive(vault.id, body, 'description' => description)
             self.id = data.headers['x-amz-archive-id']
           end
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_archive(vault.id,id)
+          service.delete_archive(vault.id,id)
         end
 
         private
@@ -41,7 +41,7 @@ module Fog
 
         def multipart_save
           # Initiate the upload
-          res = connection.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
+          res = service.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
           upload_id = res.headers["x-amz-multipart-upload-id"]
 
           hash = Fog::AWS::Glacier::TreeHash.new
@@ -50,17 +50,17 @@ module Fog
           offset = 0
           while (chunk = body.read(multipart_chunk_size)) do
             part_hash = hash.add_part(chunk)
-            part_upload = connection.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
+            part_upload = service.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
             offset += chunk.bytesize
           end
 
         rescue
           # Abort the upload & reraise
-          connection.abort_multipart_upload(vault.id, upload_id) if upload_id
+          service.abort_multipart_upload(vault.id, upload_id) if upload_id
           raise
         else
           # Complete the upload
-          connection.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
+          service.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
         end
 
       end

data/lib/fog/aws/models/glacier/job.rb

@@ -35,7 +35,7 @@ module Fog
           requires :vault, :type
           specification = {'Type' => type, 'ArchiveId' => archive_id, 'Format' => format, 'Description' => description, 'SNSTopic' => sns_topic}.reject{|k,v| v.nil?}
 
-          data = connection.initiate_job(vault.id, specification)
+          data = service.initiate_job(vault.id, specification)
           self.id = data.headers['x-amz-job-id']
           reload
         end
@@ -51,7 +51,7 @@ module Fog
             options = options.merge :response_block => lambda {|chunk, remaining_bytes, total_bytes| io.write chunk}
           end
           options['Range'] = options.delete :range
-          connection.get_job_output(vault.id, id, options)
+          service.get_job_output(vault.id, id, options)
         end
 
         private

data/lib/fog/aws/models/glacier/jobs.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::AWS::Glacier::Job
         attribute :vault
         attribute :filters
-        
+
         def initialize(attributes)
           self.filters = {}
           super
@@ -21,12 +21,12 @@ module Fog
         # completed (true/false)
         def all(filters = self.filters)
           self.filters = filters
-          data = connection.list_jobs(vault.id, self.filters).body['JobList']
+          data = service.list_jobs(vault.id, self.filters).body['JobList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_job(vault.id, key).body
+          data = service.describe_job(vault.id, key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/models/glacier/vault.rb

@@ -21,30 +21,30 @@ module Fog
         end
 
         def archives
-          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :connection => connection)
+          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :service => service)
         end
 
         def jobs(filters={})
-          Fog::AWS::Glacier::Jobs.new(:vault => self, :connection => connection, :filters => filters)
+          Fog::AWS::Glacier::Jobs.new(:vault => self, :service => service, :filters => filters)
         end
 
         def set_notification_configuration(topic, events)
-          connection.set_vault_notification_configuration(id, topic, events)
+          service.set_vault_notification_configuration(id, topic, events)
         end
 
         def delete_notification_configuration
-          connection.delete_vault_notification_configuration
+          service.delete_vault_notification_configuration
         end
-        
+
         def save
           requires :id
-          connection.create_vault(id)
+          service.create_vault(id)
           reload
         end
 
         def destroy
           requires :id
-          connection.delete_vault(id)
+          service.delete_vault(id)
         end
 
       end

data/lib/fog/aws/models/glacier/vaults.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::Glacier::Vault
 
         def all
-          data = connection.list_vaults.body['VaultList']
+          data = service.list_vaults.body['VaultList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_vault(key).body
+          data = service.describe_vault(key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/models/iam/access_key.rb

@@ -10,29 +10,29 @@ module Fog
         attribute :username, :aliases => 'UserName'
         attribute :secret_access_key, :aliases => 'SecretAccessKey'
         attribute :status, :aliases => 'Status'
-        
+
         def save
           requires :username
 
-          data = connection.create_access_key('UserName'=> username).body["AccessKey"]
+          data = service.create_access_key('UserName'=> username).body["AccessKey"]
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_access_key(id,'UserName'=> username)
+          service.delete_access_key(id,'UserName'=> username)
           true
         end
-        
+
         def user
           requires :username
-          connection.users.get(username)
+          service.users.get(username)
         end
-        
+
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/access_keys.rb

@@ -6,17 +6,17 @@ module Fog
     class IAM
 
       class AccessKeys < Fog::Collection
-    
+
         model Fog::AWS::IAM::AccessKey
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get an access_key's user without a username") unless @username
           super
         end
-        
-        def all 
-          data = connection.list_access_keys('UserName'=> @username).body['AccessKeys']
+
+        def all
+          data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
           # AWS response doesn't contain the UserName, this injects it
           data.each {|access_key| access_key['UserName'] = @username }
           load(data)
@@ -25,7 +25,7 @@ module Fog
         def get(identity)
           self.all.select {|access_key| access_key.id == identity}.first
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
@@ -33,4 +33,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/policies.rb

@@ -6,39 +6,39 @@ module Fog
     class IAM
 
       class Policies < Fog::Collection
-                
+
         model Fog::AWS::IAM::Policy
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get a policy's user without a username") unless @username
           super
         end
-        
+
 
         def all
-          # AWS method get_user_policy only returns an array of policy names, this is kind of useless, 
+          # AWS method get_user_policy only returns an array of policy names, this is kind of useless,
           # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow
-          policy_names = connection.list_user_policies(@username).body['PolicyNames'] # it returns an array
+          policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array
           policies = []
           policy_names.each do |policy_name|
-            policies << connection.get_user_policy(policy_name,@username).body['Policy']
+            policies << service.get_user_policy(policy_name,@username).body['Policy']
           end
           load(policies) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user_policy(identity,@username).body['Policy']
+          data = service.get_user_policy(identity,@username).body['Policy']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
-        
+
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/policy.rb

@@ -9,31 +9,31 @@ module Fog
         identity  :id, :aliases => 'PolicyName'
         attribute :username, :aliases => 'UserName'
         attribute :document, :aliases => 'PolicyDocument'
-        
+
         def save
           requires :id
           requires :username
           requires :document
 
-          data = connection.put_user_policy(username, id, document).body
+          data = service.put_user_policy(username, id, document).body
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_user_policy(username, id)
+          service.delete_user_policy(username, id)
           true
         end
-        
+
         def user
           requires :username
-          connection.users.get(username)
+          service.users.get(username)
         end
-        
+
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/user.rb

@@ -10,31 +10,31 @@ module Fog
         attribute :path, :aliases => 'Path'
         attribute :arn, :aliases => 'Arn'
         attribute :user_id, :aliases => 'UserId'
-        
+
         def save
           requires :id
-          data = connection.create_user(id).body['User']
+          data = service.create_user(id, path || '/').body['User']
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_user(id)
+          service.delete_user(id)
           true
         end
-        
+
         def policies
           requires :id
-          connection.policies(:username => id)
+          service.policies(:username => id)
         end
-        
+
         def access_keys
           requires :id
-          connection.access_keys(:username => id)
+          service.access_keys(:username => id)
         end
-        
+
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/users.rb

@@ -14,13 +14,13 @@ module Fog
 
         def all(options = {})
           merge_attributes(options)
-          data = connection.list_users(options).body
+          data = service.list_users(options).body
           merge_attributes('IsTruncated' => data['IsTruncated'], 'Marker' => data['Marker'])
           load(data['Users']) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user(identity).body['User']
+          data = service.get_user(identity).body['User']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil

data/lib/fog/aws/models/rds/parameter.rb

@@ -3,7 +3,7 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class Parameter < Fog::Model
 
         attribute  :name, :aliases => ['ParameterName']
@@ -14,7 +14,7 @@ module Fog
         attribute  :modifiable, :aliases => 'IsModifiable'
         attribute  :apply_type, :aliases => 'ApplyType'
         attribute  :value, :aliases => 'ParameterValue'
-        
+
       end
     end
   end

data/lib/fog/aws/models/rds/parameter_group.rb

@@ -3,34 +3,34 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class ParameterGroup < Fog::Model
 
         identity  :id, :aliases => ['DBParameterGroupName', :name]
         attribute  :family, :aliases => 'DBParameterGroupFamily'
         attribute  :description, :aliases => 'Description'
-        
+
         def save
           requires :family
           requires :description
           requires :id
-          connection.create_db_parameter_group(id, family, description)
+          service.create_db_parameter_group(id, family, description)
         end
-        
+
         def modify(changes)
-          connection.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
+          service.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
         end
-        
+
         def destroy
           requires :id
-          connection.delete_db_parameter_group(id)
+          service.delete_db_parameter_group(id)
           true
         end
-        
+
         def parameters(filters={})
-          connection.parameters({:group => self}.merge(filters))
+          service.parameters({:group => self}.merge(filters))
         end
       end
     end
   end
-end
+end

data/lib/fog/aws/models/rds/parameter_groups.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::ParameterGroup
 
         def all
-          data = connection.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
+          data = service.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
+          data = service.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
       end
     end
   end
-end
+end