fog 0.8.2 → 0.9.0

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

@@ -2,14 +2,14 @@ require 'fog/core/collection'
 require 'fog/dns/models/dnsimple/record'
 
 module Fog
-  module DNSimple
-    class DNS
+  module DNS
+    class DNSimple
 
       class Records < Fog::Collection
 
         attribute :zone
 
-        model Fog::DNSimple::DNS::Record
+        model Fog::DNS::DNSimple::Record
 
         def all
           requires :zone

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/dns/models/dnsimple/records'
 
 module Fog
-  module DNSimple
-    class DNS
+  module DNS
+    class DNSimple
 
       class Zone < Fog::Model
 
@@ -20,11 +20,11 @@ module Fog
 
         def records
           @records ||= begin
-                         Fog::DNSimple::DNS::Records.new(
-                                                    :zone       => self,
-                                                    :connection => connection
-                                                    )
-                       end
+            Fog::DNS::DNSimple::Records.new(
+              :zone       => self,
+              :connection => connection
+            )
+          end
         end
 
         def nameservers

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/dns/models/dnsimple/zone'
 
 module Fog
-  module DNSimple
-    class DNS
+  module DNS
+    class DNSimple
 
       class Zones < Fog::Collection
 
-        model Fog::DNSimple::DNS::Zone
+        model Fog::DNS::DNSimple::Zone
 
         def all
           clear

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

@@ -0,0 +1,79 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class DNSMadeEasy
+
+      class Record < Fog::Model
+        extend Fog::Deprecation
+        deprecate :ip, :value
+        deprecate :ip=, :value=
+        
+        identity :id
+
+        attribute :name
+        attribute :type
+        attribute :ttl
+        attribute :gtd_location,  :aliases => "gtdLocation"
+        attribute :password
+        attribute :description
+        attribute :keywords
+        attribute :title
+        attribute :redirect_type, :aliases => "redirectType"
+        attribute :hard_link, :aliases => "hardLink"
+
+        attribute :value,          :aliases => "data"
+  
+        def initialize(attributes={})
+          self.ttl ||= 1800
+          super
+        end
+
+        def destroy
+          connection.delete_record(zone.domain, identity)
+          true
+        end
+
+        def zone
+          @zone
+        end
+
+        def save
+          requires :name, :type, :value, :ttl
+          options = {}
+          options[:ttl]  = ttl if ttl
+          options[:gtdLocation]  = gtd_location if gtd_location
+
+          if type.upcase == 'A'
+            options[:password]  = password if password
+          end
+
+          if type.upcase == 'HTTPRED'
+            options[:description]  = description if description
+            options[:keywords]  = keywords if keywords
+            options[:title]  = title if title
+            options[:redirectType]  = redirect_type if redirect_type
+            options[:hardLink]  = hard_link if hard_link
+          end
+
+          if id.nil?
+            data = connection.create_record(zone.domain, name, type, value, options).body
+          else
+            data = connection.update_record(zone.domain, id, options).body
+          end
+
+          merge_attributes(data)
+          true
+        end
+
+        private
+
+        def zone=(new_zone)
+          @zone = new_zone
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'fog/core/collection'
+require 'fog/dns/models/dnsmadeeasy/record'
+
+module Fog
+  module DNS
+    class DNSMadeEasy
+
+      class Records < Fog::Collection
+
+        attribute :zone
+
+        model Fog::DNS::DNSMadeEasy::Record
+
+        def all
+          requires :zone
+          data = connection.list_records(zone.identity).body
+          load(data)
+        end
+
+        def get(record_id)
+          data = connection.get_record(zone.identity, record_id).body
+          new(data)
+        rescue Fog::Service::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :zone
+          super({ :zone => zone }.merge!(attributes))
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'fog/core/model'
+require 'fog/dns/models/dnsmadeeasy/records'
+
+module Fog
+  module DNS
+    class DNSMadeEasy
+
+      class Zone < Fog::Model
+
+        identity  :id
+        attribute :domain,      :aliases => 'name'
+        attribute :gtd_enabled, :aliases => 'gtdEnabled'
+        attribute :nameservers, :aliases => 'nameServer'
+
+        def destroy
+          requires :identity
+          connection.delete_domain(identity)
+          true
+        end
+
+        def records
+          @records ||= begin
+            Fog::DNS::DNSMadeEasy::Records.new(
+              :zone       => self,
+              :connection => connection
+            )
+          end
+        end
+
+        def save
+          requires :domain
+          data = connection.create_domain(domain).body
+          self.identity = data['name']
+          merge_attributes(data)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'fog/core/collection'
+require 'fog/dns/models/dnsmadeeasy/zone'
+
+module Fog
+  module DNS
+    class DNSMadeEasy
+
+      class Zones < Fog::Collection
+
+        model Fog::DNS::DNSMadeEasy::Zone
+
+        def all
+          clear
+          data = connection.list_domains.body['list'].collect{|domain| {:id => domain}}
+          load(data)
+        end
+
+        def get(zone_id)
+          data = connection.get_domain(zone_id).body
+          data.merge!(:id => data['name'])
+          new(data)
+        rescue Fog::Service::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -1,14 +1,17 @@
 require 'fog/core/model'
 
 module Fog
-  module Linode
-    class DNS
+  module DNS
+    class Linode
 
       class Record < Fog::Model
+        extend Fog::Deprecation
+        deprecate :ip, :value
+        deprecate :ip=, :value=
 
         identity :id,         :aliases => ['ResourceID', 'RESOURCEID']
 
-        attribute :ip,        :aliases => 'TARGET'
+        attribute :value,     :aliases => 'TARGET'
         attribute :name,      :aliases => 'NAME'
         attribute :priority,  :aliases => 'PRIORITY'
         attribute :ttl,       :aliases => 'TTL_SEC'
@@ -44,7 +47,7 @@ module Fog
           #                        types. default: udp
           options[:name]      = name if name
           options[:priority]  = priority if priority
-          options[:target]    = ip if ip
+          options[:target]    = value if value
           options[:ttl_sec]   = ttl if ttl
           response = unless identity
             connection.domain_resource_create(zone.identity, type, options)

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

@@ -2,14 +2,14 @@ require 'fog/core/collection'
 require 'fog/dns/models/linode/record'
 
 module Fog
-  module Linode
-    class DNS
+  module DNS
+    class Linode
 
       class Records < Fog::Collection
 
         attribute :zone
 
-        model Fog::Linode::DNS::Record
+        model Fog::DNS::Linode::Record
 
         def all
           requires :zone

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/dns/models/linode/records'
 
 module Fog
-  module Linode
-    class DNS
+  module DNS
+    class Linode
 
       class Zone < Fog::Model
 
@@ -36,7 +36,7 @@ module Fog
 
         def records
           @records ||= begin
-            Fog::Linode::DNS::Records.new(
+            Fog::DNS::Linode::Records.new(
               :zone       => self,
               :connection => connection
             )

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/dns/models/linode/zone'
 
 module Fog
-  module Linode
-    class DNS
+  module DNS
+    class Linode
 
       class Zones < Fog::Collection
 
-        model Fog::Linode::DNS::Zone
+        model Fog::DNS::Linode::Zone
 
         def all
           data = connection.domain_list.body['DATA']

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

@@ -1,15 +1,18 @@
 require 'fog/core/model'
 
 module Fog
-  module Slicehost
-    class DNS
+  module DNS
+    class Slicehost
 
       class Record < Fog::Model
+        extend Fog::Deprecation
+        deprecate :ip, :value
+        deprecate :ip=, :value=
 
         identity :id
 
         attribute :active
-        attribute :ip,          :aliases => 'ip'
+        attribute :value,       :aliases => 'ip'
         attribute :name
         attribute :description, :aliases => 'aux'
         attribute :ttl
@@ -43,12 +46,12 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          requires :ip, :name, :type, :zone
+          requires :name, :type, :value, :zone
           options = {}
           options[:active]  = active ? 'Y' : 'N'
           options[:aux]     = description if description
           options[:ttl]     = ttl if ttl
-          data = connection.create_record(type, zone.id, name, ip, options)
+          data = connection.create_record(type, zone.id, name, value, options)
           merge_attributes(data.body)
           true
         end

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

@@ -2,14 +2,14 @@ require 'fog/core/collection'
 require 'fog/dns/models/slicehost/record'
 
 module Fog
-  module Slicehost
-    class DNS
+  module DNS
+    class Slicehost
 
       class Records < Fog::Collection
 
         attribute :zone
 
-        model Fog::Slicehost::DNS::Record
+        model Fog::DNS::Slicehost::Record
 
         def all
           requires :zone

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

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/dns/models/slicehost/records'
 
 module Fog
-  module Slicehost
-    class DNS
+  module DNS
+    class Slicehost
 
       class Zone < Fog::Model
 
@@ -36,7 +36,7 @@ module Fog
 
         def records
           @records ||= begin
-            Fog::Slicehost::DNS::Records.new(
+            Fog::DNS::Slicehost::Records.new(
               :zone       => self,
               :connection => connection
             )

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/dns/models/slicehost/zone'
 
 module Fog
-  module Slicehost
-    class DNS
+  module DNS
+    class Slicehost
 
       class Zones < Fog::Collection
 
-        model Fog::Slicehost::DNS::Zone
+        model Fog::DNS::Slicehost::Zone
 
         def all
           data = connection.get_zones.body['zones']

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

@@ -1,15 +1,18 @@
 require 'fog/core/model'
 
 module Fog
-  module Zerigo
-    class DNS
+  module DNS
+    class Zerigo
 
       class Record < Fog::Model
+        extend Fog::Deprecation
+        deprecate :ip, :value
+        deprecate :ip=, :value=
 
         identity :id
 
         attribute :created_at,  :aliases => 'created-at'
-        attribute :ip,          :aliases => 'data'
+        attribute :value,       :aliases => 'data'
         attribute :domain,      :aliases => 'fqdn'
         attribute :name,        :aliases => 'hostname'
         attribute :description, :aliases => 'notes'
@@ -35,14 +38,14 @@ module Fog
         end
 
         def save
-          requires :zone, :type, :ip
+          requires :zone, :type, :value
           options = {}
           options[:hostname]  = name if name
           options[:notes]     = description if description
           options[:priority]  = priority if priority
           options[:ttl]       = ttl if ttl
           data = unless identity
-            connection.create_host(@zone.id, type, ip, options)
+            connection.create_host(@zone.id, type, value, options)
           else
             options[:host_type] = type
             options[:data]      = data