zerigo_dns 1.1.1 → 1.1.2

data/lib/zerigo_dns.rb

@@ -43,8 +43,8 @@ module Zerigo
 
   
     class Zone < Base
-      # Find or Create Zone
-      def self.find_or_create(domain)
+      # Find by domain
+      def self.find_by_domain(domain)
         zones = find(:all) 
         zone = nil
         zones.each do |z|
@@ -53,7 +53,13 @@ module Zerigo
             break;
           end
         end
-
+        zone
+      end
+      
+      
+      # Find or Create Zone
+      def self.find_or_create(domain)
+        zone = find_by_domain(domain)
         unless zone
           zone = create(:domain=> domain, :ns_type=>'pri_sec')
         end  
@@ -64,8 +70,8 @@ module Zerigo
   
     class Host < Base
       
-      # Update or Create Host for a zone
-      def self.update_or_create(zone, hostname, type, data)
+      # Find by host name
+      def self.find_by_hostname(zone, hostname)
         hosts = find(:all) 
         host = nil
         hosts.each do |h|
@@ -73,22 +79,27 @@ module Zerigo
             host = h
             break;
           end
-        end
-
+        end      
+        host
+      end
+      
+      # Update or Create Host for a zone
+      def self.update_or_create(zone, hostname, type, ttl, data)
+        host = find_by_hostname(zone, hostname)
         if host
           # update
-          host.host_type = type
-          host.data = data
-          host.ttl = 86400
+          host.host_type  = type
+          host.data       = data
+          host.ttl        = ttl
           host.save
         else
           # creatae
           host = create(
-            :zone_id => zone, 
-            :hostname => hostname,
-            :host_type => type,
-            :data => data,
-            :ttl=>86400
+            :zone_id    => zone, 
+            :hostname   => hostname,
+            :host_type  => type,
+            :data       => data,
+            :ttl        => ttl
           )
         end  
         host

data/spec/lib/host_spec.rb

@@ -6,7 +6,7 @@ describe "Zerigo::DNS::Host.update_or_create" do
     Zerigo::DNS::Host.stub!(:find).and_return([])
     Zerigo::DNS::Host.stub!(:create).and_return(:success => true)
     
-    Zerigo::DNS::Host.update_or_create(1, 'www', 'A', '10.10.10.10')[:success].should be_true
+    Zerigo::DNS::Host.update_or_create(1, 'www', 'A', '10.10.10.10', 86400)[:success].should be_true
   end
 
   it 'should update host' do
@@ -20,8 +20,13 @@ describe "Zerigo::DNS::Host.update_or_create" do
     Zerigo::DNS::Host.stub!(:find).and_return([jackhq])
     Zerigo::DNS::Host.stub!(:create).and_return(:success => false)
     
-    Zerigo::DNS::Host.update_or_create(1, 'www', 'A', '10.10.10.10').hostname == 'www'
+    Zerigo::DNS::Host.update_or_create(1, 'www', 'A', '10.10.10.10', 86499).hostname == 'www'
+  end
+
+  it 'should find by zone and host' do
+    jackhq = mock('Zerigo::DNS::Host')
+    jackhq.stub!(:hostname).and_return('www')
+    Zerigo::DNS::Host.stub!(:find).and_return([jackhq])
+    Zerigo::DNS::Host.find_by_hostname(1, 'www').hostname == 'www'
   end
-  
-  
 end

data/spec/lib/zone_spec.rb

@@ -18,6 +18,15 @@ describe "Zerigo::DNS::Zone.find_or_create" do
     
     Zerigo::DNS::Zone.find_or_create('example.com').domain == 'example.com'
   end
+
+  it 'should find zone by domain' do
+    jackhq = mock('Zerigo::DNS::Zone')
+    jackhq.stub!(:domain).and_return('example.com')
+    
+    Zerigo::DNS::Zone.stub!(:find).and_return([jackhq])
+    
+    Zerigo::DNS::Zone.find_by_domain('example.com').domain == 'example.com'
+  end
   
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zerigo_dns
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tom Wilson