fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/aws/models/beanstalk/events.rb

@@ -9,7 +9,7 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Event
 
         def all(options={})
-          data = connection.describe_events(options).body['DescribeEventsResult']['Events']
+          data = service.describe_events(options).body['DescribeEventsResult']['Events']
           load(data) # data is an array of attribute hashes
         end
 

data/lib/fog/aws/models/beanstalk/template.rb

@@ -24,7 +24,7 @@ module Fog
         # Returns an array of options that may be set on this template
         def options
           requires :name, :application_name
-          data = connection.describe_configuration_options({
+          data = service.describe_configuration_options({
               'ApplicationName' => application_name,
               'TemplateName' => name
                                                     })
@@ -33,7 +33,7 @@ module Fog
 
         def destroy
           requires :name, :application_name
-          connection.delete_configuration_template(application_name, name)
+          service.delete_configuration_template(application_name, name)
           true
         end
 
@@ -51,7 +51,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_configuration_template(options).body['CreateConfigurationTemplateResult']
+          data = service.create_configuration_template(options).body['CreateConfigurationTemplateResult']
           merge_attributes(data)
           true
         end
@@ -67,7 +67,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.update_configuration_template(options).body['UpdateConfigurationTemplateResult']
+          data = service.update_configuration_template(options).body['UpdateConfigurationTemplateResult']
           merge_attributes(data)
           true
         end
@@ -75,4 +75,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/aws/models/beanstalk/templates.rb

@@ -21,7 +21,7 @@ module Fog
           # Initialize with empty array
           data = []
 
-          applications = connection.describe_applications(application_filter).body['DescribeApplicationsResult']['Applications']
+          applications = service.describe_applications(application_filter).body['DescribeApplicationsResult']['Applications']
           applications.each { |application|
             application['ConfigurationTemplates'].each { |template_name|
               begin
@@ -29,7 +29,7 @@ module Fog
                     'ApplicationName' => application['ApplicationName'],
                     'TemplateName' => template_name
                 }
-                settings = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+                settings = service.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
                 if settings.length == 1
                   # Add to data
                   data << settings.first
@@ -54,7 +54,7 @@ module Fog
           # There is no describe call for templates, so we must use describe_configuration_settings.  Unfortunately,
           # it throws an exception if template name doesn't exist, which is inconsistent, catch and return nil
           begin
-            data = connection.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
+            data = service.describe_configuration_settings(options).body['DescribeConfigurationSettingsResult']['ConfigurationSettings']
             if data.length == 1
               result = new(data.first)
             end

data/lib/fog/aws/models/beanstalk/version.rb

@@ -20,7 +20,7 @@ module Fog
         # Return events related to this version
         def events
           requires :label, :application_name
-          connection.events.all({
+          service.events.all({
                                     'ApplicationName' => application_name,
                                     'VersionLabel' => label
                                 })
@@ -29,7 +29,7 @@ module Fog
         # Returns environments running this version
         def environments
           requires :label, :application_name
-          connection.environments.all({
+          service.environments.all({
                                     'ApplicationName' => application_name,
                                     'VersionLabel' => label
                                 })
@@ -37,7 +37,7 @@ module Fog
 
         def destroy(delete_source_bundle = nil)
           requires :label, :application_name
-          connection.delete_application_version(application_name, label, delete_source_bundle)
+          service.delete_application_version(application_name, label, delete_source_bundle)
           true
         end
 
@@ -53,7 +53,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_application_version(options).body['CreateApplicationVersionResult']['ApplicationVersion']
+          data = service.create_application_version(options).body['CreateApplicationVersionResult']['ApplicationVersion']
           merge_attributes(data)
           true
         end
@@ -69,11 +69,11 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.update_application_version(options).body['UpdateApplicationVersionResult']['ApplicationVersion']
+          data = service.update_application_version(options).body['UpdateApplicationVersionResult']['ApplicationVersion']
           merge_attributes(data)
         end
       end
 
     end
   end
-end
+end

data/lib/fog/aws/models/beanstalk/versions.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Version
 
         def all(options={})
-          data = connection.describe_application_versions(options).body['DescribeApplicationVersionsResult']['ApplicationVersions']
+          data = service.describe_application_versions(options).body['DescribeApplicationVersionsResult']['ApplicationVersions']
           load(data) # data is an array of attribute hashes
         end
 
         def get(application_name, version_label)
-          if data = connection.describe_application_versions({
+          if data = service.describe_application_versions({
                                                                  'ApplicationName' => application_name,
                                                                  'VersionLabels' => [version_label]
                                                              }).body['DescribeApplicationVersionsResult']['ApplicationVersions']

data/lib/fog/aws/models/cdn/distribution.rb

@@ -37,7 +37,7 @@ module Fog
           @invalidations ||= begin
             Fog::CDN::AWS::Invalidations.new(
               :distribution => self,
-              :connection => connection
+              :service => service
             )
           end
         end
@@ -54,15 +54,15 @@ module Fog
         private
 
         def delete_distribution(identity, etag)
-          connection.delete_distribution(identity, etag)
+          service.delete_distribution(identity, etag)
         end
 
         def put_distribution_config(identity, etag, options)
-          connection.put_distribution_config(identity, etag, options)
+          service.put_distribution_config(identity, etag, options)
         end
 
         def post_distribution(options = {})
-          connection.post_distribution(options)
+          service.post_distribution(options)
         end
 
         def attributes_to_options

data/lib/fog/aws/models/cdn/distributions.rb

@@ -16,11 +16,11 @@ module Fog
         attribute :is_truncated,    :aliases => 'IsTruncated'
 
         def get_distribution(dist_id)
-          connection.get_distribution(dist_id)
+          service.get_distribution(dist_id)
         end
 
         def list_distributions(options = {})
-          connection.get_distribution_list(options)
+          service.get_distribution_list(options)
         end
 
         alias :each_distribution_this_page :each

data/lib/fog/aws/models/cdn/invalidation.rb

@@ -29,8 +29,8 @@ module Fog
 
         def save
           requires :paths, :caller_reference
-          raise "Submitted invalidation cannot be submitted again" if identity
-          response = connection.post_invalidation(distribution.identity, paths, caller_reference)
+          raise "Submitted invalidation cannot be submitted again" if persisted?
+          response = service.post_invalidation(distribution.identity, paths, caller_reference)
           merge_attributes(invalidation_to_attributes(response.body))
           true
         end

data/lib/fog/aws/models/cdn/invalidations.rb

@@ -21,7 +21,7 @@ module Fog
           options[:max_items]  ||= max_items
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.get_invalidation_list(distribution.identity, options).body
+          data = service.get_invalidation_list(distribution.identity, options).body
 
           merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextMarker', 'Marker'].include?(key)})
 
@@ -31,7 +31,7 @@ module Fog
         def get(invalidation_id)
           requires :distribution
 
-          data = connection.get_invalidation(distribution.identity, invalidation_id).body
+          data = service.get_invalidation(distribution.identity, invalidation_id).body
 
           if data
             invalidation = new(data)

data/lib/fog/aws/models/cdn/streaming_distribution.rb

@@ -41,15 +41,15 @@ module Fog
         private
 
         def delete_distribution(identity, etag)
-          connection.delete_streaming_distribution(identity, etag)
+          service.delete_streaming_distribution(identity, etag)
         end
 
         def put_distribution_config(identity, etag, options)
-          connection.put_streaming_distribution_config(identity, etag, options)
+          service.put_streaming_distribution_config(identity, etag, options)
         end
 
         def post_distribution(options = {})
-          connection.post_streaming_distribution(options)
+          service.post_streaming_distribution(options)
         end
 
         def attributes_to_options

data/lib/fog/aws/models/cdn/streaming_distributions.rb

@@ -16,11 +16,11 @@ module Fog
         attribute :is_truncated,    :aliases => 'IsTruncated'
 
         def get_distribution(dist_id)
-          connection.get_streaming_distribution(dist_id)
+          service.get_streaming_distribution(dist_id)
         end
 
         def list_distributions(options = {})
-          connection.get_streaming_distribution_list(options)
+          service.get_streaming_distribution_list(options)
         end
 
         alias :each_distribution_this_page :each

data/lib/fog/aws/models/cloud_watch/alarm.rb

@@ -46,13 +46,13 @@ module Fog
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
 
-          connection.put_metric_alarm(options)
+          service.put_metric_alarm(options)
           reload
         end
 
         def destroy
           requires :id
-          connection.delete_alarms(id)
+          service.delete_alarms(id)
         end
       end
     end

data/lib/fog/aws/models/cloud_watch/alarm_data.rb

@@ -6,33 +6,33 @@ module Fog
     class CloudWatch
       class AlarmData < Fog::Collection
         model Fog::AWS::CloudWatch::AlarmDatum
-        
+
         def all(conditions={})
-          data = connection.describe_alarms(conditions).body['DescribeAlarmsResult']['MetricAlarms']
+          data = service.describe_alarms(conditions).body['DescribeAlarmsResult']['MetricAlarms']
           load(data) # data is an array of attribute hashes
         end
-        
+
         def get(namespace, metric_name, dimensions=nil, period=nil, statistic=nil, unit=nil)
           list_opts = {'Namespace' => namespace, 'MetricName' => metric_name}
           if dimensions
             dimensions_array = dimensions.collect do |name, value|
               {'Name' => name, 'Value' => value}
             end
-            list_opts.merge!('Dimensions' => dimensions_array) 
+            list_opts.merge!('Dimensions' => dimensions_array)
           end
           if period
-            list_opts.merge!('Period' => period) 
+            list_opts.merge!('Period' => period)
           end
           if statistic
-          list_opts.merge!('Statistic' => statistic) 
+          list_opts.merge!('Statistic' => statistic)
           end
           if unit
-            list_opts.merge!('Unit' => unit) 
+            list_opts.merge!('Unit' => unit)
           end
-          data = connection.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms']
+          data = service.describe_alarms_for_metric(list_opts).body['DescribeAlarmsForMetricResult']['MetricAlarms']
           load(data)
         end
-        
+
       end
     end
   end

data/lib/fog/aws/models/cloud_watch/alarm_datum.rb

@@ -16,7 +16,7 @@ module Fog
         attribute :comparison_operator, :aliases => 'ComparisonOperator'
         attribute :state_reason, :aliases => 'StateReason'
         attribute :action_enabled, :aliases => 'ActionsEnabled'
-        attribute :period, :aliases => 'Period' 
+        attribute :period, :aliases => 'Period'
         attribute :evaluation_periods, :aliases => 'EvaluationPeriods'
         attribute :threshold, :aliases => 'Threshold'
         attribute :alarm_actions, :aliases => 'AlarmActions'
@@ -40,7 +40,7 @@ module Fog
               'AlarmName' => alarm_name,
               'ComparisonOperator' => comparison_operator,
               'EvaluationPeriods' => evaluation_periods,
-              'MetricName' => metric_name, 
+              'MetricName' => metric_name,
               'Namespace' => namespace,
               'Period' => period,
               'Statistic' => statistic,
@@ -57,7 +57,7 @@ module Fog
           alarm_definition.merge!('OKActions' => ok_actions) if ok_actions
           alarm_definition.merge!('Unit' => unit) if unit
 
-          connection.put_metric_alarm(alarm_definition)
+          service.put_metric_alarm(alarm_definition)
           true
         end
       end

data/lib/fog/aws/models/cloud_watch/alarm_histories.rb

@@ -8,7 +8,7 @@ module Fog
         model Fog::AWS::CloudWatch::AlarmHistory
 
         def all(conditions={})
-          data = connection.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems']
+          data = service.describe_alarm_history(conditions).body['DescribeAlarmHistoryResult']['AlarmHistoryItems']
           load(data) # data is an array of attribute hashes
         end
 

data/lib/fog/aws/models/cloud_watch/alarms.rb

@@ -12,32 +12,32 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_alarms('NextToken' => next_token).body['DescribeAlarmsResult']
-            data += result['MetricAlarms']
-            next_token = result['NextToken']
+            body = service.describe_alarms('NextToken' => next_token).body
+            data += body['DescribeAlarmsResult']['MetricAlarms']
+            next_token = body['ResponseMetadata']['NextToken']
             break if next_token.nil?
           end
           load(data)
         end
 
         def get(identity)
-          data = connection.describe_alarms('AlarmNames' => identity).body['DescribeAlarmsResult']['MetricAlarms'].first
+          data = service.describe_alarms('AlarmNames' => identity).body['DescribeAlarmsResult']['MetricAlarms'].first
           new(data) unless data.nil?
         end
 
         #alarm_names is an array of alarm names
         def delete(alarm_names)
-          connection.delete_alarms(alarm_names)
+          service.delete_alarms(alarm_names)
           true
         end
 
         def disable(alarm_names)
-          connection.disable_alarm_actions(alarm_names)
+          service.disable_alarm_actions(alarm_names)
           true
         end
 
         def enable(alarm_names)
-          connection.enable_alarm_actions(alarm_names)
+          service.enable_alarm_actions(alarm_names)
           true
         end
 

data/lib/fog/aws/models/cloud_watch/metric_statistic.rb

@@ -17,7 +17,7 @@ module Fog
         attribute :namespace, :aliases => 'Namespace'
         attribute :dimensions, :aliases => 'Dimensions'
         attribute :value
-        
+
         def save
           requires :metric_name
           requires :namespace
@@ -36,7 +36,7 @@ module Fog
               'SampleCount' => sample_count
             })
           end
-          connection.put_metric_data(namespace, [put_opts])
+          service.put_metric_data(namespace, [put_opts])
           true
         end
       end

data/lib/fog/aws/models/cloud_watch/metric_statistics.rb

@@ -6,17 +6,17 @@ module Fog
     class CloudWatch
       class MetricStatistics < Fog::Collection
         model Fog::AWS::CloudWatch::MetricStatistic
-        
+
         def all(conditions)
           metricName = conditions['MetricName']
           namespace = conditions['Namespace']
           dimensions = conditions['Dimensions']
           get_metric_opts = {"StartTime" => (Time.now-3600).iso8601, "EndTime" => Time.now.iso8601, "Period" => 300}.merge(conditions)
-          data = connection.get_metric_statistics(get_metric_opts).body['GetMetricStatisticsResult']['Datapoints']
+          data = service.get_metric_statistics(get_metric_opts).body['GetMetricStatisticsResult']['Datapoints']
           data.collect! { |datum| datum.merge('MetricName' => metricName, 'Namespace' => namespace, 'Dimensions' => dimensions) }
           load(data) # data is an array of attribute hashes
         end
-        
+
       end
     end
   end

data/lib/fog/aws/models/cloud_watch/metrics.rb

@@ -6,26 +6,46 @@ module Fog
     class CloudWatch
 
       class Metrics < Fog::Collection
+        attribute :next_token, :aliases => 'NextToken'
+
         model Fog::AWS::CloudWatch::Metric
-        
+
         def all(conditions={})
-          data = connection.list_metrics(conditions).body['ListMetricsResult']['Metrics']
-          load(data) # data is an array of attribute hashes
+          result = service.list_metrics(conditions).body['ListMetricsResult']
+          merge_attributes("NextToken" => result["NextToken"])
+          load(result['Metrics']) # an array of attribute hashes
+        end
+
+        alias :each_metric_this_page :each
+        def each
+          if !block_given?
+            self
+          else
+            subset = dup.all
+            subset.each_metric_this_page {|m| yield m }
+
+            while next_token = subset.next_token
+              subset = subset.all("NextToken" => next_token)
+              subset.each_metric_this_page {|m| yield m }
+            end
+
+            self
+          end
         end
-        
+
         def get(namespace, metric_name, dimensions=nil)
           list_opts = {'Namespace' => namespace, 'MetricName' => metric_name}
           if dimensions
             dimensions_array = dimensions.collect do |name, value|
               {'Name' => name, 'Value' => value}
             end
-            # list_opts.merge!('Dimensions' => dimensions_array) 
+            # list_opts.merge!('Dimensions' => dimensions_array)
           end
-          if data = connection.list_metrics(list_opts).body['ListMetricsResult']['Metrics'].first
+          if data = service.list_metrics(list_opts).body['ListMetricsResult']['Metrics'].first
             new(data)
           end
         end
-        
+
       end
     end
   end