lumberg 1.0.6 → 1.1.1

data/spec/whm/base_spec.rb

@@ -10,10 +10,6 @@ module Lumberg
     end
 
     describe "#initialize" do
-      it "creates a new instance of server" do
-        expect { Whm::Base.new }.to raise_error(WhmArgumentError, /Missing required param/)
-      end
-
       it "allows a server instance to be passed in" do
         @base.server.should be_a(Whm::Server)
       end

data/spec/whm/dns_spec.rb

@@ -10,25 +10,6 @@ module Lumberg
     end
 
     describe "#addzone" do
-      it "requires a domain" do
-        @dns.stub(:perform_request)
-        requires_attr('domain') { @dns.add_zone }
-      end
-
-      it "requires an ip" do
-        requires_attr('ip') { @dns.add_zone(:domain => 'example.com') } 
-      end
-
-      it "allows template" do
-        @dns.server.stub(:perform_request)
-        @dns.add_zone(:domain => 'example.com', :ip => '127.0.0.1', :template => 'something')
-      end
-
-      it "allows trueowner" do
-        @dns.server.stub(:perform_request)
-        @dns.add_zone(:domain => 'example.com', :ip => '127.0.0.1', :trueowner => 'something')
-      end
-
       use_vcr_cassette "whm/dns/adddns"
 
       it "creates a zone" do
@@ -45,14 +26,10 @@ module Lumberg
     end
 
     describe "#addzonerecord" do
-      it "requires a zone" do
-        requires_attr('zone') { @dns.add_zone_record }
-      end
-
       use_vcr_cassette "whm/dns/addzonerecord"
 
       it "adds a zone record" do
-        result = @dns.add_zone_record(:zone => 'example.com', 
+        result = @dns.add_zone_record(:zone => 'example.com',
                                       :name => 'example.com.',
                                       :address => '192.1.2.3',
                                       :type => 'A')
@@ -85,14 +62,6 @@ module Lumberg
     describe "#getzonerecord" do
       use_vcr_cassette "whm/dns/getzonerecord"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.get_zone_record(:Line => 1) }
-      end
-
-      it "requires a Line" do
-        requires_attr('Line') { @dns.get_zone_record(:domain => "example.com") }
-      end
-
       it "returns the zone" do
         result = @dns.get_zone_record(:domain => "example.com", :Line => 1)
         result[:success].should be_true
@@ -117,10 +86,6 @@ module Lumberg
     describe "#dumpzone" do
       use_vcr_cassette "whm/dns/dumpzone"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.dump_zone }
-      end
-
       it "dumps the zone" do
         result = @dns.dump_zone(:domain => "example.com")
         result[:success].should be_true
@@ -139,14 +104,6 @@ module Lumberg
     describe "#resolvedomainname" do
       use_vcr_cassette "whm/dns/resolvedomainname"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.resolve_domain("api.version".to_sym => 1) }
-      end
-
-      it "requires the api version" do
-        requires_attr('api.version') { @dns.resolve_domain(:domain => "example.com") }
-      end
-
       it "returns the ip address of the domain" do
         result = @dns.resolve_domain(:domain => "example.com", "api.version".to_sym => 1)
         result[:params][:ip].should == "192.1.2.3"
@@ -162,14 +119,6 @@ module Lumberg
     describe "#editzonerecord" do
       use_vcr_cassette "whm/dns/editzonerecord"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.edit_zone_record(:Line => 1) }
-      end
-
-      it "requires a Line" do
-        requires_attr('Line') { @dns.edit_zone_record(:domain => "example.com") }
-      end
-
       it "updates the zone record" do
         result = @dns.edit_zone_record(:domain => "example.com", :Line => 1, :ttl => "86400")
         result[:success].should be_true
@@ -192,10 +141,6 @@ module Lumberg
     describe "#killdns" do
       use_vcr_cassette "whm/dns/killdns"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.kill_dns }
-      end
-
       it "kills the dns" do
         result = @dns.kill_dns(:domain => "example.com")
         result[:success].should be_true
@@ -212,10 +157,6 @@ module Lumberg
     describe "#lookupnsip" do
       use_vcr_cassette "whm/dns/lookupnsip"
 
-      it "requires a nameserver" do
-        requires_attr('nameserver') { @dns.lookup_nameserver_ip }
-      end
-
       it "returns the nameserver's ip" do
         result = @dns.lookup_nameserver_ip(:nameserver => "example.com")
         result[:params][:ip].should == "192.1.2.3"
@@ -230,14 +171,6 @@ module Lumberg
     describe "#removezonerecord" do
       use_vcr_cassette "whm/dns/removezonerecord"
 
-      it "requires a zone" do
-        requires_attr('zone') { @dns.remove_zone_record(:Line => 1) }
-      end
-
-      it "requires a Line" do
-        requires_attr('Line') { @dns.remove_zone_record(:zone => "example.com") }
-      end
-
       it "removes the zone record" do
         result = @dns.remove_zone_record(:zone => "example.com", :Line => 1)
         result[:success].should be_true
@@ -260,14 +193,6 @@ module Lumberg
     describe "#resetzone" do
       use_vcr_cassette "whm/dns/resetzone"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.reset_zone(:zone => "example.com") }
-      end
-
-      it "requires a zone" do
-        requires_attr('zone') { @dns.reset_zone(:domain => "example.com") }
-      end
-
       it "resets the zone" do
         result = @dns.reset_zone(:domain => "example.com", :zone => "example.com")
         result[:success].should be_true
@@ -284,14 +209,6 @@ module Lumberg
     describe "#listmxs" do
       use_vcr_cassette "whm/dns/listmxs"
 
-      it "requires a domain" do
-        requires_attr('domain') { @dns.list_mxs("api.version".to_sym => 1) }
-      end
-
-      it "requires the api.version" do
-        requires_attr('api.version') { @dns.list_mxs(:domain => "example.com") }
-      end
-
       it "returns a list of mxs" do
         result = @dns.list_mxs(:domain => "example.com", "api.version".to_sym => 1)
         result[:params][:record].should be_a_kind_of Array
@@ -304,46 +221,11 @@ module Lumberg
     describe "#savemxs" do
       use_vcr_cassette "whm/dns/savemxs"
 
-      it "requires the api.version" do
-        requires_attr('api.version') { @dns.save_mx(:domain => "example.com", 
-                                                    :name => "mail.example.com", 
-                                                    :exchange => "example.com", 
-                                                    :preference => 10) }
-      end
-
-      it "requires a domain" do
-        requires_attr('domain') { @dns.save_mx("api.version".to_sym => 1, 
-                                               :name => "mail.example.com", 
-                                               :exchange => "example.com", 
-                                               :preference => 10) }
-      end
-
-      it "requires a name" do
-        requires_attr('name') { @dns.save_mx("api.version".to_sym => 1, 
-                                             :domain => "example.com", 
-                                             :exchange => "example.com", 
-                                             :preference => 10) }
-      end
-
-      it "requires an exchange" do
-        requires_attr('exchange') { @dns.save_mx("api.version".to_sym => 1, 
-                                                 :domain => "example.com", 
-                                                 :name => "mail.example.com", 
-                                                 :preference => 10) }
-      end
-
-      it "requires a preference" do
-        requires_attr('preference') { @dns.save_mx("api.version".to_sym => 1, 
-                                                   :domain => "example.com", 
-                                                   :name => "mail.example.com", 
-                                                   :exchange => "example.com") }
-      end
-
       it "saves the mx record" do
-        result = @dns.save_mx("api.version".to_sym => 1, 
-                              :domain => "example.com", 
-                              :name => "mail.example.com", 
-                              :exchange => "example.com", 
+        result = @dns.save_mx("api.version".to_sym => 1,
+                              :domain => "example.com",
+                              :name => "mail.example.com",
+                              :exchange => "example.com",
                               :preference => 10)
         result[:message].should match(/Bind reloading on .*example.com/i)
       end

data/spec/whm/reseller_spec.rb

@@ -11,10 +11,6 @@ module Lumberg
     describe "#setup_reseller" do
       use_vcr_cassette "whm/reseller/setupreseller"
 
-      it "requires username" do
-        requires_attr('username') { @reseller.create }
-      end
-
       it "fails when the user doesn't exist" do
         result = @reseller.create(:username => 'invalid')
         result[:success].should be_false
@@ -41,15 +37,11 @@ module Lumberg
         result[:params][:resellers].should have(2).resellers
         result[:params][:resellers].should include('bob', 'ted')
       end
-    end 
+    end
 
     describe "#setresellerips" do
       use_vcr_cassette "whm/reseller/setresellerips"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.add_ips }
-      end
-
       it "adds the ip address to the reseller account" do
         result = @reseller.add_ips(:username => 'bob', :ips =>'192.1.2.3')
         result[:message].should match(/Successfully configured IP addresses delegation to reseller/i)
@@ -64,12 +56,8 @@ module Lumberg
     describe "#setresellerlimits" do
       use_vcr_cassette "whm/reseller/setresellerlimits"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.set_limits }
-      end
-
       it "sets the limits" do
-        result = @reseller.set_limits(:username => 'bob', :diskspace_limit => 1024, :enable_overselling => true, 
+        result = @reseller.set_limits(:username => 'bob', :diskspace_limit => 1024, :enable_overselling => true,
                                       :enable_overselling_diskspace => true)
         result[:success].should be_true
         result[:message].should match(/Successfully set reseller account .*limits/i)
@@ -79,10 +67,6 @@ module Lumberg
     describe "#terminate" do
       use_vcr_cassette "whm/reseller/terminatereseller"
 
-      it "requires a reseller" do
-        requires_attr('reseller') { @reseller.terminate }
-      end
-
       it "terminates the reseller" do
         result = @reseller.terminate(:reseller => 'terminat')
         result[:success].should be_true
@@ -108,14 +92,6 @@ module Lumberg
     describe "#setresellermainip" do
       use_vcr_cassette "whm/reseller/setresellermainip"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.set_main_ip(:ip => '192.1.2.3') }
-      end
-
-      it "requires an ip" do
-        requires_attr('ip') { @reseller.set_main_ip(:username => 'bob') }
-      end
-
       it "sets the main ip" do
         result = @reseller.set_main_ip(:username => 'bob', :ip => '192.1.2.3')
         result[:success].should be_true
@@ -138,18 +114,6 @@ module Lumberg
     describe "#setresellerpackagelimit" do
       use_vcr_cassette "whm/reseller/setresellerpackagelimit"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.set_package_limit(:no_limit => true, :package => 'gold') }
-      end
-
-      it "requires no_limit" do
-        requires_attr('no_limit') { @reseller.set_package_limit(:username => 'bob', :package => 'gold') }
-      end
-
-      it "requires package" do
-        requires_attr('package') { @reseller.set_package_limit(:username => 'bob', :no_limit => true) }
-      end
-
       it "sets the package limit" do
         result = @reseller.set_package_limit(:username => 'bob', :no_limit => false, :package => 'gold', :allowed => true)
         result[:success].should be_true
@@ -161,15 +125,11 @@ module Lumberg
         result[:success].should be_true
         result[:message].should match(/Successfully set reseller package limit/i)
       end
-    end                                                                                                   
+    end
 
     describe "#suspendreseller" do
       use_vcr_cassette "whm/reseller/suspendreseller"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.suspend }
-      end
-
       it "suspends the reseller" do
         result = @reseller.suspend(:username => 'bob')
         result[:success].should be_true
@@ -192,10 +152,6 @@ module Lumberg
     describe "#unsuspendreseller" do
       use_vcr_cassette "whm/reseller/unsuspendreseller"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.unsuspend }
-      end
-
       it "should unsuspend the user" do
         result = @reseller.unsuspend(:username => 'bob')
         result[:success].should be_true
@@ -212,18 +168,14 @@ module Lumberg
     describe "#acctcounts" do
       use_vcr_cassette "whm/reseller/acctcounts"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.account_counts }
-      end
-
       it "returns the account counts" do
         result = @reseller.account_counts(:username => 'bob')
         result[:success].should be_true
         result[:message].should match(/Obtained reseller account counts/i)
-        result[:params][:account].should == "bob" 
+        result[:params][:account].should == "bob"
         result[:params][:suspended].to_i.should == 0
         result[:params][:active].to_i.should == 0
-        result[:params][:limit].should == "" 
+        result[:params][:limit].should == ""
       end
 
       it "returns an error when the user is invalid" do
@@ -236,22 +188,18 @@ module Lumberg
     describe "#setresellernameservers" do
       use_vcr_cassette "whm/reseller/setresellernameservers"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.set_nameservers }
-      end
-
       it "sets the default nameservers" do
         result = @reseller.set_nameservers(:username => 'bob')
         result[:success].should be_true
         result[:message].should match(/Set resellers nameservers/i)
       end
-      
+
       it "sets the specified nameservers" do
         result = @reseller.set_nameservers(:username => 'bob', :nameservers => 'ns1.example.com')
         result[:success].should be_true
         result[:message].should match(/Set resellers nameservers/i)
       end
-      
+
       it "returns an error for an invalid username" do
         result = @reseller.account_counts(:username => 'notexists')
         result[:success].should be_false
@@ -262,16 +210,12 @@ module Lumberg
     describe "#resellerstats" do
       use_vcr_cassette "whm/reseller/resellerstats"
 
-      it "requires a reseller" do
-        requires_attr('reseller') { @reseller.stats }
-      end
-
       it "returns the stats of the reseller" do
         result = @reseller.stats(:reseller => 'bob')
         result[:success].should be_true
         result[:message].should match(/Fetched Reseller Data OK/i)
         result[:params][:diskquota].to_i.should == 0
-        result[:params][:diskoverselling].to_i.should == 1 
+        result[:params][:diskoverselling].to_i.should == 1
         result[:params][:bandwidthlimit].to_i.should == 0
       end
 
@@ -297,10 +241,6 @@ module Lumberg
     describe "#saveacllist" do
       use_vcr_cassette "whm/reseller/saveacllist"
 
-      it "requires an acllist name" do
-        requires_attr('acllist') { @reseller.save_acl_list }
-      end
-
       it "creates a new reseller ACL list" do
         result = @reseller.save_acl_list(:acllist => 'testacllist')
         result[:success].should be_true
@@ -308,9 +248,9 @@ module Lumberg
       end
 
       it "creates a new reseller ACL list with optional settings" do
-        result = @reseller.save_acl_list(:acllist => 'testacllist', 
+        result = @reseller.save_acl_list(:acllist => 'testacllist',
                                          "acl-ssl".to_sym => true,
-                                         "acl-add-pkg".to_sym => true, 
+                                         "acl-add-pkg".to_sym => true,
                                          "acl-stats".to_sym => true)
         result[:success].should be_true
         result[:message].should match(/ACL List testacllist saved/i)
@@ -320,16 +260,12 @@ module Lumberg
     describe "#setacls" do
       use_vcr_cassette "whm/reseller/setacls"
 
-      it "requires a reseller" do
-        requires_attr('reseller') { @reseller.set_acls }
-      end
-
       it "sets the ACL for the reseller" do
         result = @reseller.set_acls(:reseller => 'bob', :acllist => 'testacllist')
         result[:success].should be_true
         result[:message].should match(/Reseller Acls Saved/i)
       end
-      
+
       it "returns an error for an invalid reseller" do
         result = @reseller.set_acls(:reseller => 'notexists')
         result[:success].should be_false
@@ -340,10 +276,6 @@ module Lumberg
     describe "#unsetupreseller" do
       use_vcr_cassette "whm/reseller/unsetupreseller"
 
-      it "requires a username" do
-        requires_attr('username') { @reseller.unsetup }
-      end
-
       it "removes the reseller status from the user" do
         result = @reseller.unsetup(:username => 'bob')
         result[:success].should be_true

data/spec/whm/server_spec.rb

@@ -188,37 +188,28 @@ module Lumberg
         @whm.account.should be_an(Whm::Account)
       end
 
-      it "returns the same thing twice" do
-        @whm.account.should be_a(Whm::Account)
-        @whm.account.should respond_to(:list)
-
-        @whm.account.should be_a(Whm::Account)
-        @whm.account.should respond_to(:list)
+      it "sets the server" do
+        @whm.account.server.should == @whm
       end
-
     end
 
     describe "#dns" do
       it "has an dns accessor" do
         @whm.dns.should be_an(Whm::Dns)
       end
+
+      it "sets the server" do
+        @whm.dns.server.should == @whm
+      end
     end
 
     describe "#reseller" do
       it "has an reseller accessor" do
         @whm.reseller.should be_an(Whm::Reseller)
       end
-    end
 
-    describe "#method_missing" do
-      it "caches @vars" do
-        Whm.should_receive(:const_get).once.and_return(Whm::Account)
-        @whm.account
-        @whm.account
-      end
-
-      it "raises to super" do
-        expect { @whm.asdf }.to raise_error(NoMethodError)
+      it "sets the server" do
+        @whm.reseller.server.should == @whm
       end
     end
 
@@ -236,14 +227,6 @@ module Lumberg
     describe "#add_ip" do
       use_vcr_cassette "whm/server/addip"
 
-      it "requires an ip address" do
-        requires_attr('ip') { @whm.add_ip(:netmask => '255.255.255.250') }
-      end
-
-      it "requires a netmask" do
-        requires_attr('netmask') { @whm.add_ip(:ip => '123.123.123.123') }
-      end
-
       it "adds the ip address" do
         result = @whm.add_ip(:ip => '208.77.188.166', :netmask => '255.255.255.0')
         result[:success].should be_true
@@ -253,10 +236,6 @@ module Lumberg
     describe "#delete_ip" do
       use_vcr_cassette "whm/server/delip"
 
-      it "requires an ip address" do
-        requires_attr('ip') { @whm.delete_ip }
-      end
-
       it "deletes the ip address" do
         result = @whm.delete_ip(:ip => '208.77.188.166')
         result[:success].should be_true
@@ -266,10 +245,6 @@ module Lumberg
     describe "#set_hostname" do
       use_vcr_cassette "whm/server/sethostname"
 
-      it "requires a hostname" do
-        requires_attr('hostname') { @whm.set_hostname }
-      end
-
       it "changes the server's hostname" do
         result = @whm.set_hostname(:hostname => "myhost.com")
         result[:success].should be_true
@@ -279,10 +254,6 @@ module Lumberg
     describe "#set_resolvers" do
       use_vcr_cassette "whm/server/setresolvers"
 
-      it "requires a nameserver1" do
-        requires_attr('nameserver1') { @whm.set_resolvers }
-      end
-
       it "configures the nameservers" do
         result = @whm.set_resolvers(:nameserver1 => "123.123.123.123", :nameserver2 => "123.123.123.124")
         result[:success].should be_true