fog 0.6.0 → 0.7.0

data/lib/fog/dns/models/dnsimple/record.rb

@@ -36,7 +36,17 @@ module Fog
           options = {}
           options[:prio] = priority if priority
           options[:ttl]  = ttl if ttl
-          data = connection.create_record(zone.domain, name, type, ip, options)
+
+          # decide whether its a new record or update of an existing
+          if id.nil?
+            data = connection.create_record(zone.domain, name, type, ip, options)
+          else
+            options[:name] = name if name
+            options[:content] = ip if ip
+            options[:type] = type if type
+            data = connection.update_record(zone.domain, id, options)
+          end
+          
           merge_attributes(data.body["record"])
           true
         end

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

@@ -13,16 +13,16 @@ module Fog
 
         def all
           requires :zone
-          data = connection.list_records(zone.id).body
+          clear
+          data = connection.list_records(zone.id).body.map {|record| record['record']}
+          load(data)
         end
 
         def get(record_id)
-          all.each do |record|
-            if record["record"]["id"] == record_id
-              return new(record)
-            end
-          end
-
+          requires :zone
+          data = connection.get_record(zone.id, record_id).body["record"]
+          new(data)
+        rescue Excon::Errors::NotFound
           nil
         end
 

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

@@ -10,7 +10,8 @@ module Fog
         model Fog::DNSimple::DNS::Zone
 
         def all
-          data = connection.list_domains.body
+          clear
+          data = connection.list_domains.body.map {|zone| zone['domain']}
           load(data)
         end
 

data/lib/fog/dns/requests/dnsimple/get_record.rb

@@ -0,0 +1,34 @@
+module Fog
+  module DNSimple
+    class DNS
+      class Real
+
+        # Gets record from given domain.
+        #
+        # ==== Parameters
+        # * domain<~String>
+        # * record_id<~String>
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * record<~Hash>
+        #     * name<~String>
+        #     * ttl<~Integer>
+        #     * created_at<~String>
+        #     * special_type<~String>
+        #     * updated_at<~String>
+        #     * domain_id<~Integer>
+        #     * id<~Integer>
+        #     * content<~String>
+        #     * record_type<~String>
+        #     * prio<~Integer>
+        def get_record(domain, record_id)
+
+          request( :expects  => 200,
+                   :method   => "GET",
+                   :path     => "/domains/#{domain}/records/#{record_id}" )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/dns/slicehost.rb

@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -45,6 +39,11 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@slicehost_password)
           @data = self.class.data[@slicehost_password]
         end
 

data/lib/fog/dns/zerigo.rb

@@ -36,12 +36,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -52,8 +46,12 @@ module Fog
 
           @zerigo_email = options[:zerigo_email]
           @zerigo_token = options[:zerigo_token]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@zerigo_email)
           @data = self.class.data[@zerigo_email]
-          @data = self.class.data[@zerigo_password]
         end
 
       end

data/lib/fog/providers.rb

@@ -9,6 +9,7 @@ end
 require 'fog/providers/aws'
 require 'fog/providers/bluebox'
 require 'fog/providers/brightbox'
+require 'fog/providers/dnsimple'
 require 'fog/providers/ecloud'
 require 'fog/providers/go_grid'
 require 'fog/providers/google'
@@ -17,6 +18,6 @@ require 'fog/providers/local'
 require 'fog/providers/new_servers'
 require 'fog/providers/rackspace'
 require 'fog/providers/slicehost'
+require 'fog/providers/virtual_box'
 require 'fog/providers/voxel'
 require 'fog/providers/zerigo'
-require 'fog/providers/dnsimple'

data/lib/fog/providers/aws.rb

@@ -6,14 +6,16 @@ module Fog
 
     extend Fog::Provider
 
-    service(:cdn,       'cdn/aws')
-    service(:compute,   'compute/aws')
-    service(:dns,       'dns/aws')
-    service(:elb,       'aws/elb')
-    service(:iam,       'aws/iam')
-    service(:ses,       'aws/ses')
-    service(:simpledb,  'aws/simpledb')
-    service(:storage,   'storage/aws')
+    service(:cdn,             'cdn/aws')
+    service(:compute,         'compute/aws')
+    service(:cloud_formation, 'aws/cloud_formation')
+    service(:dns,             'dns/aws')
+    service(:elb,             'aws/elb')
+    service(:iam,             'aws/iam')
+    service(:rds,             'aws/rds')
+    service(:ses,             'aws/ses')
+    service(:simpledb,        'aws/simpledb')
+    service(:storage,         'storage/aws')
 
     def self.indexed_param(key, values)
       params = {}

data/lib/fog/providers/virtual_box.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module VirtualBox
+
+    extend Fog::Provider
+
+    service(:compute, 'compute/virtual_box')
+
+  end
+end

data/lib/fog/storage.rb

@@ -21,5 +21,26 @@ module Fog
       end
     end
 
+    def self.parse_data(data)
+      metadata = {
+        :body => nil,
+        :headers => {}
+      }
+
+      if data.is_a?(String)
+        metadata[:body] = data
+        metadata[:headers]['Content-Length'] = metadata[:body].size
+      else
+        filename = ::File.basename(data.path)
+        unless (mime_types = MIME::Types.of(filename)).empty?
+          metadata[:headers]['Content-Type'] = mime_types.first.content_type
+        end
+        metadata[:body] = data
+        metadata[:headers]['Content-Length'] = ::File.size(data.path)
+      end
+      # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
+      metadata
+    end
+
   end
 end

data/lib/fog/storage/aws.rb

@@ -58,27 +58,6 @@ module Fog
           )
         end
 
-        def parse_data(data)
-          metadata = {
-            :body => nil,
-            :headers => {}
-          }
-
-          if data.is_a?(String)
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size
-          else
-            filename = ::File.basename(data.path)
-            unless (mime_types = MIME::Types.of(filename)).empty?
-              metadata[:headers]['Content-Type'] = mime_types.first.content_type
-            end
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = ::File.size(data.path)
-          end
-          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-          metadata
-        end
-
         def url(params, expires)
           params[:headers]['Date'] = expires.to_i
           params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
@@ -169,12 +148,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -188,23 +161,32 @@ module Fog
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
+          when 'ap-northeast-1'
+            's3-ap-northeast-1.amazonaws.com'
+          when 'ap-southeast-1'
+            's3-ap-southeast-1.amazonaws.com'
           when 'eu-west-1'
             's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
           when 'us-west-1'
             's3-us-west-1.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @region = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
       class Real
@@ -250,12 +232,14 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
+            when 'ap-northeast-1'
+              's3-ap-northeast-1.amazonaws.com'
+            when 'ap-southeast-1'
+              's3-ap-southeast-1.amazonaws.com'
             when 'eu-west-1'
               's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
             when 'us-west-1'
               's3-us-west-1.amazonaws.com'
             else

data/lib/fog/storage/google.rb

@@ -31,27 +31,6 @@ module Fog
 
       module Utils
 
-        def parse_data(data)
-          metadata = {
-            :body => nil,
-            :headers => {}
-          }
-
-          if data.is_a?(String)
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size
-          else
-            filename = ::File.basename(data.path)
-            unless (mime_types = MIME::Types.of(filename)).empty?
-              metadata[:headers]['Content-Type'] = mime_types.first.content_type
-            end
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = ::File.size(data.path)
-          end
-          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-          metadata
-        end
-
         def url(params, expires)
           params[:headers]['Date'] = expires.to_i
           params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
@@ -140,12 +119,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -156,12 +129,18 @@ module Fog
 
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@google_storage_access_key_id)
           @data = self.class.data[@google_storage_access_key_id]
         end
 
         def signature(params)
           "foo"
         end
+
       end
 
     

data/lib/fog/storage/local.rb

@@ -19,12 +19,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           Fog::Mock.not_implemented
 
@@ -37,7 +31,7 @@ module Fog
           end
 
           @local_root = ::File.expand_path(options[:local_root])
-          @data       = self.class.data[@local_root]
+          reset_data
         end
 
         def local_root
@@ -47,6 +41,12 @@ module Fog
         def path_to(partial)
           ::File.join(@local_root, partial)
         end
+
+        def reset_data
+          self.class.data.delete(@local_root)
+          @data = self.class.data[@local_root]
+        end
+
       end
 
       class Real

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

@@ -15,7 +15,7 @@ module Fog
         def destroy
           requires :key
           connection.delete_container(key)
-          connection.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
+          connection.cdn.post_container(key, 'X-CDN-Enabled' => 'False')
           true
         rescue Excon::Errors::NotFound
           false

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

@@ -57,6 +57,7 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+          options['Content-Type'] = content_type if content_type
           data = connection.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
           if body.is_a?(String)

data/lib/fog/storage/rackspace.rb

@@ -34,27 +34,6 @@ module Fog
           )
         end
 
-        def parse_data(data)
-          metadata = {
-            :body => nil,
-            :headers => {}
-          }
-
-          if data.is_a?(String)
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
-          else
-            filename = ::File.basename(data.path)
-            unless (mime_types = MIME::Types.of(filename)).empty?
-              metadata[:headers]['Content-Type'] = mime_types.first.content_type
-            end
-            metadata[:body] = data.read
-            metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
-          end
-          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-          metadata
-        end
-
       end
 
       class Mock
@@ -66,12 +45,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -83,6 +56,11 @@ module Fog
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@rackspace_username)
           @data = self.class.data[@rackspace_username]
         end