fog-aws 0.1.1 → 0.1.2

data/lib/fog/aws/models/dns/records.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/dns/record'
 
 module Fog

data/lib/fog/aws/models/dns/zone.rb

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 # require 'fog/aws/models/dns/records'
 
 module Fog

data/lib/fog/aws/models/dns/zones.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/dns/zone'
 
 module Fog

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Elasticache

data/lib/fog/aws/models/elasticache/clusters.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/elasticache/cluster'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Elasticache

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/elasticache/parameter_group'
 
 module Fog

data/lib/fog/aws/models/elasticache/security_group.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Elasticache

data/lib/fog/aws/models/elasticache/security_groups.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/elasticache/security_group'
 
 module Fog

data/lib/fog/aws/models/elasticache/subnet_group.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Elasticache

data/lib/fog/aws/models/elasticache/subnet_groups.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/elasticache/subnet_group'
 
 module Fog

data/lib/fog/aws/models/elb/backend_server_description.rb

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 module Fog
   module AWS
     class ELB

data/lib/fog/aws/models/elb/listener.rb

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 module Fog
   module AWS
     class ELB

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 module Fog
   module AWS
     class ELB

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

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 module Fog
   module AWS
     class ELB

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Glacier

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/glacier/archive'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class Glacier

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/glacier/job'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 require 'fog/aws/models/glacier/archives'
 require 'fog/aws/models/glacier/jobs'
 

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/glacier/vault'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class IAM

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/iam/access_key'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/iam/policy'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class IAM

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class IAM

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/iam/role'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class IAM

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/iam/user'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/event_subscription'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/instance_option'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/log_file'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/parameter_group'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/parameter'
 
 module Fog

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

@@ -1,6 +1,3 @@
-require 'fog/core/model'
-require 'fog/core/current_machine'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/security_group'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/server'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/snapshot'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class RDS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/rds/subnet_group'
 
 module Fog

data/lib/fog/aws/models/sns/subscriptions.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/sns/subscription'
 
 module Fog

data/lib/fog/aws/models/sns/topic.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module AWS
     class SNS

data/lib/fog/aws/models/sns/topics.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/sns/topic'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/storage/directory'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 require 'fog/aws/models/storage/files'
 require 'fog/aws/models/storage/versions'
 

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

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 require 'fog/aws/models/storage/versions'
 
 module Fog
@@ -50,15 +49,19 @@ module Fog
           @acl = new_acl
         end
 
-        # Get file's body if exists, else ' '.
+        # Get file's body if exists, else ''.
         #
         # @return [File]
         #
         def body
-          attributes[:body] ||= if last_modified && (file = collection.get(identity))
-            file.body
+          return attributes[:body] if attributes[:body]
+          return '' unless last_modified
+
+          file = collection.get(identity)
+          if file
+            attributes[:body] = file.body
           else
-            ''
+            attributes[:body] = ''
           end
         end
 

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/storage/file'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Storage
     class AWS

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/aws/models/storage/version'
 
 module Fog

data/lib/fog/aws/parsers/compute/describe_spot_price_history.rb

@@ -15,7 +15,7 @@ module Fog
             when 'item'
               @response['spotPriceHistorySet'] << @spot_price
               @spot_price = {}
-            when 'requestId'
+            when 'requestId', 'nextToken'
               @response[name] = value
             when 'spotPrice'
               @spot_price[name] = value.to_f

data/lib/fog/aws/rds.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class RDS < Fog::Service
@@ -101,6 +99,22 @@ module Fog
                 :subnet_groups       => {},
                 :snapshots           => {},
                 :event_subscriptions => {},
+                :db_engine_versions  => [
+                  {
+                    'Engine'                     => "mysql",
+                    'DBParameterGroupFamily'     => "mysql5.1",
+                    'DBEngineDescription'        => "MySQL Community Edition",
+                    'EngineVersion'              => "5.1.57",
+                    'DBEngineVersionDescription' => "MySQL 5.1.57"
+                  },
+                  {
+                    'Engine'                     => "postgres",
+                    'DBParameterGroupFamily'     => "postgres9.3",
+                    'DBEngineDescription'        => "PostgreSQL",
+                    'EngineVersion'              => "9.3.5",
+                    'DBEngineVersionDescription' => "PostgreSQL 9.3.5"
+                  },
+                ],
                 :parameter_groups    => {
                   "default.mysql5.1" => {
                     "DBParameterGroupFamily" => "mysql5.1",

data/lib/fog/aws/redshift.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class Redshift < Fog::Service

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -63,6 +63,9 @@ module Fog
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1b", "zoneState" => "available"},