fog 0.10.0 → 0.11.0

data/lib/fog/compute/requests/brightbox/reset_ftp_password_account.rb

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def reset_ftp_password_account(options = {})
-          request(
-            :expects  => [200],
-            :method   => 'POST',
-            :path     => "/1.0/account/reset_ftp_password",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def reset_ftp_password_account
+          request("post", "/1.0/account/reset_ftp_password", [200])
         end
 
       end

data/lib/fog/compute/requests/brightbox/shutdown_server.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def shutdown_server(identifier, options = {})
+        def shutdown_server(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers/#{identifier}/shutdown",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/servers/#{identifier}/shutdown", [202])
         end
 
       end

data/lib/fog/compute/requests/brightbox/snapshot_server.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def snapshot_server(identifier, options = {})
+        def snapshot_server(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers/#{identifier}/snapshot",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/servers/#{identifier}/snapshot", [202])
         end
 
       end

data/lib/fog/compute/requests/brightbox/start_server.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def start_server(identifier, options = {})
+        def start_server(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers/#{identifier}/start",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/servers/#{identifier}/start", [202])
         end
 
       end

data/lib/fog/compute/requests/brightbox/stop_server.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def stop_server(identifier, options = {})
+        def stop_server(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers/#{identifier}/stop",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/servers/#{identifier}/stop", [202])
         end
 
       end

data/lib/fog/compute/requests/brightbox/unmap_cloud_ip.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def unmap_cloud_ip(identifier, options = {})
+        def unmap_cloud_ip(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/cloud_ips/#{identifier}/unmap",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/cloud_ips/#{identifier}/unmap", [202])
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_account.rb

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def update_account(options = {})
+        def update_account(options)
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [200],
-            :method   => 'PUT',
-            :path     => "/1.0/account",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/account", [200], options)
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_api_client.rb

@@ -3,16 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_api_client(identifier, options = {})
+        def update_api_client(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [200],
-            :method   => 'PUT',
-            :path     => "/1.0/api_clients/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/api_clients/#{identifier}", [200], options)
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_image.rb

@@ -3,16 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_image(identifier, options = {})
+        def update_image(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [200],
-            :method   => 'PUT',
-            :path     => "/1.0/images/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/images/#{identifier}", [200], options)
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_load_balancer.rb

@@ -3,16 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_load_balancer(identifier, options = {})
+        def update_load_balancer(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [202],
-            :method   => 'PUT',
-            :path     => "/1.0/load_balancers/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/load_balancers/#{identifier}", [202], options)
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_server.rb

@@ -3,16 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_server(identifier, options = {})
+        def update_server(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [200],
-            :method   => 'PUT',
-            :path     => "/1.0/servers/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/servers/#{identifier}", [200], options)
         end
 
       end

data/lib/fog/compute/requests/brightbox/update_user.rb

@@ -3,16 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_user(identifier, options = {})
+        def update_user(identifier, options)
           return nil if identifier.nil? || identifier == ""
           return nil if options.empty? || options.nil?
-          request(
-            :expects  => [200],
-            :method   => 'PUT',
-            :path     => "/1.0/users/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("put", "/1.0/users/#{identifier}", [200], options)
         end
 
       end

data/lib/fog/core.rb

@@ -23,6 +23,7 @@ require 'fog/core/credentials'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
+require 'fog/core/json'
 require 'fog/core/model'
 require 'fog/core/mock'
 require 'fog/core/parser' # FIXME: would be better to only load when nokogiri is required

data/lib/fog/core/credentials.rb

@@ -44,7 +44,7 @@ module Fog
       end
     end
   end
-  
+
   def self.symbolize_credentials(args)
     if args.is_a? Hash
       Hash[ *args.collect do |key, value|

data/lib/fog/core/errors.rb

@@ -16,6 +16,8 @@ module Fog
 
     class NotFound < Fog::Errors::Error; end
 
+    class LoadError < LoadError; end
+
     # @return [String] The error message that will be raised, if credentials cannot be found
     def self.missing_credentials
       missing_credentials_message = <<-YML
@@ -68,7 +70,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
 #######################################################
 
     YML
-    raise(LoadError.new(missing_credentials_message))
+    raise(Fog::Errors::LoadError.new(missing_credentials_message))
   end
 
   end

data/lib/fog/core/json.rb

@@ -0,0 +1,20 @@
+module Fog
+  module JSON
+
+    def self.sanitize(data)
+      case data
+      when Array
+        data.map {|datum| sanitize(datum)}
+      when Hash
+        for key, value in data
+          data[key] = sanitize(value)
+        end
+      when ::Time
+        data.strftime("%Y-%m-%dT%H:%M:%SZ")
+      else
+        data
+      end
+    end
+
+  end
+end

data/lib/fog/core/provider.rb

@@ -6,7 +6,9 @@ module Fog
     end
 
     def service(new_service, path)
-      services << new_service
+      Fog.services[new_service] ||= []
+      Fog.services[new_service] << self.to_s.split('::').last.downcase.to_sym
+      self.services << new_service
       require File.join('fog', path)
     end
 

data/lib/fog/core/service.rb

@@ -1,4 +1,9 @@
 module Fog
+
+  def self.services
+    @services ||= {}
+  end
+
   class Service
 
     class Error < Fog::Errors::Error; end

data/lib/fog/dns.rb

@@ -20,6 +20,9 @@ module Fog
       when :dnsmadeeasy
         require 'fog/dns/dnsmadeeasy'
         Fog::DNS::DNSMadeEasy.new(attributes)
+      when :dynect
+        require 'fog/dns/dynect'
+        Fog::DNS::Dynect.new(attributes)
       when :linode
         require 'fog/dns/linode'
         Fog::DNS::Linode.new(attributes)
@@ -34,9 +37,13 @@ module Fog
       end
     end
 
+    def self.providers
+      Fog.services[:dns]
+    end
+
     def self.zones
       zones = []
-      for provider in [:aws, :bluebox, :dnsimple, :dnsmadeeasy, :linode, :slicehost, :zerigo]
+      for provider in self.providers
         begin
           zones.concat(self[provider].zones)
         rescue # ignore any missing credentials/etc

data/lib/fog/dns/dynect.rb

@@ -0,0 +1,80 @@
+module Fog
+  module DNS
+    class Dynect < Fog::Service
+
+      requires :dynect_customer, :dynect_username, :dynect_password
+      recognizes :timeout, :persistent
+      recognizes :provider # remove post deprecation
+
+      model_path 'fog/dns/models/dynect'
+      model       :record
+      collection  :records
+      model       :zone
+      collection  :zones
+
+      request_path 'fog/dns/requests/dynect'
+      request :delete_record
+      request :delete_zone
+      request :get_node_list
+      request :get_record
+      request :get_zone
+      request :post_record
+      request :post_session
+      request :post_zone
+      request :put_zone
+
+      class Mock
+
+        def initialize(options={})
+          @dynect_customer = options[:dynect_customer]
+          @dynect_username = options[:dynect_username]
+          @dynect_password = options[:dynect_password]
+        end
+
+      end
+
+      class Real
+        def initialize(options={})
+          require 'multi_json'
+
+          @dynect_customer = options[:dynect_customer]
+          @dynect_username = options[:dynect_username]
+          @dynect_password = options[:dynect_password]
+
+          @host    = "api2.dynect.net"
+          @port    = options[:port]    || 443
+          @path    = options[:path]    || '/REST'
+          @scheme  = options[:scheme]  || 'https'
+          @version = options[:version] || '2.3.1'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true)
+        end
+
+        def auth_token
+          @auth_token ||= post_session.body['data']['token']
+        end
+
+        def request(params)
+          begin
+            params[:headers] ||= {}
+            params[:headers]['Content-Type'] = 'application/json'
+            params[:headers]['API-Version'] = @version
+            params[:headers]['Auth-Token'] = auth_token unless params[:path] == "Session"
+            params[:path] = "#{@path}/#{params[:path]}"
+            response = @connection.request(params.merge!({:host => @host}))
+
+            unless response.body.empty?
+              response.body = MultiJson.decode(response.body)
+            end
+            response
+
+          rescue Excon::Errors::HTTPStatusError => error
+            raise error
+          end
+
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class Dynect
+
+      class Record < Fog::Model
+        extend Fog::Deprecation
+
+        identity  :id
+        attribute :name,        :aliases => [:fqdn, 'fqdn']
+        attribute :rdata
+        attribute :serial_style
+        attribute :ttl
+        attribute :type,        :aliases => 'record_type'
+        attribute :value
+
+        def destroy
+          requires :identity, :name, :type, :zone
+          connection.delete_record(type, zone.identity, name, identity)
+          true
+        end
+
+        def save
+          requires :name, :type, :value, :zone
+
+          options = {
+            :ttl => ttl
+          }
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.post_record(type, zone.identity, name, {'address' => value}, options).body['data']
+          # avoid overwriting zone object with zone string
+          data = data.reject {|key, value| key == 'zone'}
+          merge_attributes(data)
+
+          zone.publish
+          records = connection.get_record(type, zone.identity, name).body['data']
+          # data in format ['/REST/xRecord/domain/fqdn/identity]
+          records.map! do |record|
+            tokens = record.split('/')
+            {
+              :identity => tokens.last,
+              :type     => tokens[2][0...-6] # everything before 'Record'
+            }
+          end
+          record = records.detect {|record| record[:type] == type}
+          merge_attributes(record)
+
+          true
+        end
+
+        def zone
+          @zone
+        end
+
+        private
+
+        def zone=(new_zone)
+          @zone = new_zone
+        end
+
+      end
+
+    end
+  end
+end