fog 0.3.33 → 0.3.34

data/.gitignore

@@ -3,6 +3,7 @@
 *.sw?
 .bundle
 .DS_Store
+_site/*
 coverage
 doc/*
 rdoc

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fog (0.3.33)
+    fog (0.3.34)
       builder
-      excon (>= 0.3.3)
+      excon (>= 0.3.6)
       formatador (>= 0.0.16)
       json
       mime-types
@@ -15,7 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    excon (0.3.3)
+    excon (0.3.6)
     formatador (0.0.16)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
@@ -35,7 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  excon (>= 0.3.3)
+  excon (>= 0.3.6)
   fog!
   formatador (>= 0.0.16)
   json

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.33'
-  s.date              = '2010-12-22'
+  s.version           = '0.3.34'
+  s.date              = '2010-12-23'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '>=0.3.3')
+  s.add_dependency('excon', '>=0.3.6')
   s.add_dependency('formatador', '>=0.0.16')
   s.add_dependency('json')
   s.add_dependency('mime-types')

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.33'
+    VERSION = '0.3.34'
   end
 
 end

data/lib/fog/aws.rb

@@ -58,7 +58,7 @@ module Fog
           body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
         end
       end
-      string_to_sign = "POST\n#{options[:host]}\n#{options[:path]}\n" << body.chop
+      string_to_sign = "POST\n#{options[:host]}:#{options[:port]}\n#{options[:path]}\n" << body.chop
       signed_string = options[:hmac].sign(string_to_sign)
       body << "Signature=#{CGI.escape(Base64.encode64(signed_string).chomp!).gsub(/\+/, '%20')}"
 

data/lib/fog/aws/compute.rb

@@ -205,6 +205,7 @@ module Fog
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
+              :port               => @port,
               :version            => '2010-08-31'
             }
           )

data/lib/fog/aws/elb.rb

@@ -82,6 +82,7 @@ module Fog
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
+              :port               => @port,
               :version            => '2009-11-25'
             }
           )

data/lib/fog/aws/iam.rb

@@ -81,6 +81,7 @@ module Fog
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
+              :port               => @port,
               :version            => '2010-05-08'
             }
           )

data/lib/fog/aws/simpledb.rb

@@ -140,6 +140,7 @@ module Fog
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
+              :port               => @port,
               :version            => '2009-04-15'
             }
           )

data/lib/fog/zerigo/dns.rb

@@ -5,25 +5,27 @@ module Fog
       requires :zerigo_email, :zerigo_token
       recognizes :timeout, :persistent
 
-      # model_path 'fog/zerigo/models/dns'
-      # model       :server
-      # collection  :servers
+      model_path 'fog/zerigo/models/dns'
+      model       :record
+      collection  :records
+      model       :zone
+      collection  :zones
 
       request_path 'fog/zerigo/requests/dns'
-      request :list_zones
+      request :count_hosts
       request :count_zones
-      request :get_zone
-      request :get_zone_stats
+      request :create_host
       request :create_zone
-      request :update_zone
+      request :delete_host
       request :delete_zone
-      request :list_hosts
       request :find_hosts
-      request :count_hosts
       request :get_host
-      request :create_host
+      request :get_zone
+      request :get_zone_stats
+      request :list_zones
+      request :list_hosts
       request :update_host
-      request :delete_host
+      request :update_zone
 
       class Mock
 

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

@@ -0,0 +1,54 @@
+require 'fog/core/model'
+
+module Fog
+  module Zerigo
+    class DNS
+
+      class Record < Fog::Model
+
+        identity :id
+
+        attribute :created_at,  :aliases => 'created-at'
+        attribute :ip,          :aliases => 'data'
+        attribute :domain,      :aliases => 'fqdn'
+        attribute :name,        :aliases => 'hostname'
+        attribute :notes
+        attribute :priority
+        attribute :ttl
+        attribute :type,        :aliases => 'host-type'
+        attribute :updated_at,  :aliases => 'updated-at'
+        attribute :zone_id,     :aliases => 'zone-id'
+
+        def destroy
+          requires :identity
+          connection.delete_host(identity)
+          true
+        end
+
+        def zone
+          @zone
+        end
+
+        def save
+          requires :zone, :type, :ip
+          options = {}
+          options[:hostname]  = name if name
+          options[:notes]     = notes if notes
+          options[:priority]  = priority if priority
+          options[:ttl]       = ttl if ttl
+          data = connection.create_host(@zone.id, type, ip, options)
+          merge_attributes(data.body)
+          true
+        end
+
+        private
+        
+        def zone=(new_zone)
+          @zone = new_zone
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'fog/core/collection'
+require 'fog/zerigo/models/dns/record'
+
+module Fog
+  module Zerigo
+    class DNS
+
+      class Records < Fog::Collection
+
+        attribute :zone
+
+        model Fog::Zerigo::DNS::Record
+
+        def all
+          requires :zone
+          parent = zone.collection.get(zone.identity)
+          if parent
+            merge_attributes(parent.records.attributes)
+            load(parent.records.map {|record| record.attributes})
+          else
+            nil
+          end
+        end
+
+        def get(record_id)
+          data = connection.get_host(record_id).body
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :zone
+          super({ :zone => zone }.merge!(attributes))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+require 'fog/core/model'
+require 'fog/zerigo/models/dns/records'
+
+module Fog
+  module Zerigo
+    class DNS
+
+      class Zone < Fog::Model
+
+        identity :id
+
+        attribute :created_at,  :aliases => 'created-at'
+        attribute :domain
+        attribute :ttl,         :aliases => 'default-ttl'
+        attribute :type,        :aliases => 'ns-type'
+        attribute :updated_at,  :aliases => 'updated-at'
+
+        # <custom-nameservers>ns1.example.com,ns2.example.com</custom-nameservers>
+        # <custom-ns type="boolean">true</custom-ns> 
+        # <hostmaster>dnsadmin@example.com</hostmaster> 
+        # <notes nil="true"/>
+        # <ns1 nil="true"/>
+        # <nx-ttl nil="true"></nx-ttl>
+        # <slave-nameservers nil="true"/>
+        # <tag-list>one two</tag-list>
+        # <hosts-count>1</hosts-count>
+
+        def initialize(attributes={})
+          self.type ||= 'pri_sec'
+          self.ttl  ||= 3600
+          super
+        end
+
+        def destroy
+          requires :identity
+          connection.delete_zone(identity)
+          true
+        end
+
+        def records
+          @records ||= begin
+            Fog::Zerigo::DNS::Records.new(
+              :zone       => self,
+              :connection => connection
+            )
+          end
+        end
+
+        def nameservers
+          [
+            'a.ns.zerigo.net',
+            'b.ns.zerigo.net',
+            'c.ns.zerigo.net',
+            'd.ns.zerigo.net',
+            'e.ns.zerigo.net'
+          ]
+        end
+
+        def save
+          requires :domain, :type, :ttl
+          options = {}
+          # * options<~Hash> - optional paramaters
+          #   * ns1<~String> - required if ns_type == sec
+          #   * nx_ttl<~Integer> -
+          #   * slave_nameservers<~String> - required if ns_type == pri
+          #   * axfr_ips<~String> - comma-separated list of IPs or IP blocks allowed to perform AXFRs
+          #   * custom_nameservers<~String> - comma-separated list of custom nameservers
+          #   * custom_ns<~String> - indicates if vanity (custom) nameservers are enabled for this domain
+          #   * hostmaster<~String> - email of the DNS administrator or hostmaster
+          #   * notes<~String> - notes about the domain
+          #   * restrict_axfr<~String> - indicates if AXFR transfers should be restricted to IPs in axfr-ips
+          #   * tag_list<~String> - List of all tags associated with this domain
+          data = connection.create_zone(domain, ttl, type, options)
+          merge_attributes(data.body)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'fog/core/collection'
+require 'fog/zerigo/models/dns/zone'
+
+module Fog
+  module Zerigo
+    class DNS
+
+      class Zones < Fog::Collection
+
+        model Fog::Zerigo::DNS::Zone
+
+        def all
+          data = connection.list_zones.body['zones']
+          load(data)
+        end
+
+        def get(zone_id)
+          data = connection.get_zone(zone_id).body
+          zone = new(data)
+          zone.records.load(data['hosts'])
+          zone
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/zerigo/requests/dns/create_host.rb

@@ -31,7 +31,7 @@ module Fog
         #     * 'updated-at'<~String>
         #     * 'zone-id'<~String>
         #   * 'status'<~Integer> - 201 if successful        
-        def create_host( zone_id, host_type, data, options = {} )
+        def create_host(zone_id, host_type, data, options = {})
           
           optional_tags= ''
           options.each { |option, value|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 3
-  - 33
-  version: 0.3.33
+  - 34
+  version: 0.3.34
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -08:00
+date: 2010-12-23 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,12 +38,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 0
         - 3
-        - 3
-        version: 0.3.3
+        - 6
+        version: 0.3.6
   type: :runtime
   name: excon
   prerelease: false
@@ -842,6 +842,10 @@ files:
 - lib/fog/zerigo.rb
 - lib/fog/zerigo/bin.rb
 - lib/fog/zerigo/dns.rb
+- lib/fog/zerigo/models/dns/record.rb
+- lib/fog/zerigo/models/dns/records.rb
+- lib/fog/zerigo/models/dns/zone.rb
+- lib/fog/zerigo/models/dns/zones.rb
 - lib/fog/zerigo/parsers/dns/count_hosts.rb
 - lib/fog/zerigo/parsers/dns/count_zones.rb
 - lib/fog/zerigo/parsers/dns/create_host.rb