lumberg 1.0.1 → 1.0.3

data/spec/vcr_cassettes/whm/server/sethostname.yml

@@ -1,22 +1,31 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+---
+http_interactions:
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/sethostname?hostname=myhost.com
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.87
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"sethostname\":[{\"status\":1,\"statusmsg\":\"Hostname Changed to: myhost.com\",\"msgs\":\"Updating Apache configuration\\nUpdating cPanel license...Done. Update succeeded.\\nBuilding global cache for cpanel...Done\",\"warns\":[]}]}"
-    http_version: "1.1"
+    body:
+      encoding: UTF-8
+      string: ! '{"sethostname":[{"status":1,"statusmsg":"Hostname Changed to: myhost.com","msgs":"Updating
+        Apache configuration\nUpdating cPanel license...Done. Update succeeded.\nBuilding
+        global cache for cpanel...Done","warns":[]}]}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+recorded_with: VCR 2.0.0
+...

data/spec/vcr_cassettes/whm/server/setresolvers.yml

@@ -1,22 +1,30 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+---
+http_interactions:
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/setresolvers?nameserver1=123.123.123.123&nameserver2=123.123.123.124
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.87
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"setresolvers\":[{\"status\":1,\"statusmsg\":\"Your resolvers have been setup!\",\"msgs\":[\"Listed in order they are:\",\"123.123.123.123\",\"123.123.123.124\"],\"warns\":null}]}"
-    http_version: "1.1"
+    body:
+      encoding: UTF-8
+      string: ! '{"setresolvers":[{"status":1,"statusmsg":"Your resolvers have been
+        setup!","msgs":["Listed in order they are:","123.123.123.123","123.123.123.124"],"warns":null}]}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+recorded_with: VCR 2.0.0
+...

data/spec/vcr_cassettes/whm/server/showbw.yml

@@ -1,22 +1,29 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+---
+http_interactions:
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/showbw?month=5&year=2011
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.87
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"bandwidth\":[{\"reseller\":\"root\",\"month\":\"5\",\"acct\":[{\"reseller\":\"1\",\"bwusage\":[{\"deleted\":0,\"usage\":0,\"domain\":\"testsiteone.com\"}],\"deleted\":0,\"limit\":\"999999999999990\",\"owner\":\"testsi\",\"user\":\"chicagot\",\"maindomain\":\"testsiteone.com\",\"totalbytes\":0},{\"reseller\":0,\"bwusage\":[{\"deleted\":0,\"usage\":0,\"domain\":\"testsitetwo.com\"}],\"deleted\":0,\"limit\":\"1048576000\",\"owner\":\"root\",\"user\":\"testsit\",\"maindomain\":\"testsitetwo.com\",\"totalbytes\":0},{\"reseller\":0,\"bwusage\":[{\"deleted\":0,\"usage\":0,\"domain\":\"blah.example.com\"},{\"deleted\":0,\"usage\":0,\"domain\":\"newuser.example.com\"}],\"deleted\":0,\"limit\":\"1049624576\",\"owner\":\"root\",\"user\":\"newuser\",\"maindomain\":\"blah.example.com\",\"totalbytes\":0}],\"totalused\":0,\"year\":\"2011\"}]}"
-    http_version: "1.1"
+    body:
+      encoding: UTF-8
+      string: ! '{"bandwidth":[{"reseller":"root","month":"5","acct":[{"reseller":"1","bwusage":[{"deleted":0,"usage":0,"domain":"testsiteone.com"}],"deleted":0,"limit":"999999999999990","owner":"testsi","user":"chicagot","maindomain":"testsiteone.com","totalbytes":0},{"reseller":0,"bwusage":[{"deleted":0,"usage":0,"domain":"testsitetwo.com"}],"deleted":0,"limit":"1048576000","owner":"root","user":"testsit","maindomain":"testsitetwo.com","totalbytes":0},{"reseller":0,"bwusage":[{"deleted":0,"usage":0,"domain":"blah.example.com"},{"deleted":0,"usage":0,"domain":"newuser.example.com"}],"deleted":0,"limit":"1049624576","owner":"root","user":"newuser","maindomain":"blah.example.com","totalbytes":0}],"totalused":0,"year":"2011"}]}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+recorded_with: VCR 2.0.0
+...

data/spec/vcr_cassettes/whm/server/systemloadavg.yml

@@ -1,43 +1,54 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+---
+http_interactions:
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/systemloadavg
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.64
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"error\":\"Unknown App Requested: systemloadavg\"}"
-    http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+    body:
+      encoding: UTF-8
+      string: ! '{"error":"Unknown App Requested: systemloadavg"}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/systemloadavg?api.version=1
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.64
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"data\":{\"one\":\"0.00\",\"five\":\"0.04\",\"fifteen\":\"0.01\"},\"metadata\":{\"result\":1,\"reason\":\"OK\",\"version\":1,\"command\":\"systemloadavg\"}}"
-    http_version: "1.1"
+    body:
+      encoding: UTF-8
+      string: ! '{"data":{"one":"0.00","five":"0.04","fifteen":"0.01"},"metadata":{"result":1,"reason":"OK","version":1,"command":"systemloadavg"}}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+recorded_with: VCR 2.0.0
+...

data/spec/vcr_cassettes/whm/server/version.yml

@@ -1,22 +1,29 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
+---
+http_interactions:
+- request:
+    method: get
     uri: https://myhost.com:2087/json-api/version
-    body: 
-    headers: 
-      authorization: 
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
       - WHM root:iscool
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response:
+    status:
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      Server:
       - cpsrvd/11.28.64
-      transfer-encoding: 
+      Transfer-Encoding:
       - chunked
-      content-type: 
+      Content-Type:
       - text/plain
-    body: "{\"version\":\"11.28.64\"}"
-    http_version: "1.1"
+    body:
+      encoding: UTF-8
+      string: ! '{"version":"11.28.64"}'
+    http_version: '1.1'
+  recorded_at: Wed, 07 Mar 2012 21:53:52 GMT
+recorded_with: VCR 2.0.0
+...

data/spec/whm/account_spec.rb

@@ -39,7 +39,6 @@ module Lumberg
       end
 
       it "returns an error on duplicate accounts" do
-        @account.create(:username => 'invalid', :password => 'hummingbird123', :domain => 'invalid-thing.com')
         result = @account.create(:username => 'invalid', :password => 'hummingbird123', :domain => 'invalid-thing.com')
         result[:success].should be(false)
         result[:message].should match(/username already exists/i)

data/spec/whm/server_spec.rb

@@ -86,25 +86,22 @@ module Lumberg
             @whm.perform_request('my_function')
             @whm.function.should == 'my_function'
             @whm.params.should be_empty
-            @whm.raw_response.should be_a(Net::HTTPOK)
           end
 
           it "calls the proper URL and arguments" do
             JSON.should_receive(:parse).with("[]").and_return([])
             @whm.perform_request('my_function', :arg1 => 1, :arg2 => 'test')
             @whm.function.should == 'my_function'
-            @whm.params.should == "arg1=1&arg2=test"
-            @whm.raw_response.should be_a(Net::HTTPOK)
+            @whm.params.should == {:arg1 => 1, :arg2 => 'test'}
           end
 
           it "changes params to booleans when given a block" do
             req = @whm.perform_request('my_function', :block => 1) do |p|
               p.boolean_params =  :true, :false
             end
-
-            @whm.boolean_params.should include(:true, :false)
             req[:params].should include(:true => true, :false => false, :other => 2)
           end
+
         end
       end
 
@@ -135,75 +132,6 @@ module Lumberg
       end
     end
 
-    describe "#response_type" do
-
-      use_vcr_cassette "whm/server/response_type"
-
-      it "detects an action function" do
-        @whm.perform_request('testing')
-        @whm.send(:response_type).should == :action
-      end
-
-      it "detects an error function" do
-        @whm.perform_request('testing_error')
-        @whm.send(:response_type).should == :error
-      end
-
-      it "detects a query function" do
-        @whm.perform_request('testing_query')
-        @whm.send(:response_type).should == :query
-      end
-
-      it "detects an unknown function" do
-        @whm.perform_request('testing_unknown')
-        @whm.send(:response_type).should == :unknown
-      end
-
-      it "forces response type" do
-        @whm.force_response_type = :magic
-        @whm.send(:response_type).should == :magic
-        @whm.perform_request('testing')
-      end
-
-      it "resets response_type each request" do
-        @whm.force_response_type.should be_nil
-        @whm.force_response_type = :magic
-        @whm.send(:response_type).should == :magic
-
-        @whm.force_response_type = :magic
-        @whm.perform_request('testing')
-        @whm.force_response_type.should be_nil
-      end
-
-
-      it "returns true for a successful :action" do
-        @whm.perform_request('testing')
-        response = @whm.send(:format_response)
-        response[:success].should be(true)
-      end
-
-      it "returns true for a successful :query" do
-        @whm.perform_request('testing_query')
-        response = @whm.send(:format_response)
-        response[:success].should be(true)
-        response[:params].should have_key(:acct)
-      end
-
-      it "returns false on :error" do
-        @whm.perform_request('testing_error')
-        response = @whm.send(:format_response)
-        response[:success].should be(false)
-        response[:message].should match(/Unknown App Req/)
-      end
-
-      it "returns false on :unknown" do
-        @whm.perform_request('testing_unknown')
-        response = @whm.send(:format_response)
-        response[:success].should be(false)
-        response[:message].should match(/Unknown error occurred .*wtf.*/)
-      end
-    end
-
     describe "#gethostname" do
       use_vcr_cassette "whm/server/gethostname"
 
@@ -294,38 +222,6 @@ module Lumberg
       end
     end
 
-    describe "#prepare_request" do
-      context "when @basic_auth is true" do
-        before do
-          @whm.basic_auth = true
-          @req = @whm.instance_eval {
-            prepare_request(URI.parse("http://example.com/"))
-          }
-        end
-
-        it "sets Authorization header to 'Basic {base64text}'" do
-          test_auth = Base64.encode64("#{@whm.user}:#{@whm.hash}")
-          auth = @req['Authorization']
-          auth.should_not be_nil
-          auth.should == "Basic #{test_auth}"
-        end
-      end
-
-      context "when @basic_auth is false" do
-        before do
-          @req = @whm.instance_eval {
-            prepare_request(URI.parse("http://example.com/"))
-          }
-        end
-        it "sets Authorization header to 'WHM user:hash'" do
-          test_auth = "#{@whm.user}:#{@whm.hash}"
-          auth = @req['Authorization']
-          auth.should_not be_nil
-          auth.should == "WHM #{test_auth}"
-        end
-      end
-    end
-
     describe "#list_ips" do
       use_vcr_cassette "whm/server/listips"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumberg
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,123 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 -05:00
-default_executable: 
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15104980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *15104980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15102040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *15102040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &15100140 !ruby/object:Gem::Requirement
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *15100140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.7
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &15099300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: 2.0.0rc2
   type: :development
   prerelease: false
-  version_requirements: *15099300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0rc2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15098380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +133,12 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *15098380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 description: Ruby library for the WHM & cPanel API; It's not a half day or anything
   like that
 email:
@@ -85,7 +157,9 @@ files:
 - Rakefile
 - lib/cacert.pem
 - lib/lumberg.rb
+- lib/lumberg/config.rb
 - lib/lumberg/exceptions.rb
+- lib/lumberg/format_whm.rb
 - lib/lumberg/version.rb
 - lib/lumberg/whm.rb
 - lib/lumberg/whm/account.rb
@@ -94,8 +168,8 @@ files:
 - lib/lumberg/whm/dns.rb
 - lib/lumberg/whm/reseller.rb
 - lib/lumberg/whm/server.rb
-- lib/net_http_hacked.rb
 - lumberg.gemspec
+- spec/config_spec.rb
 - spec/lumberg_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/whm/account/accountsummary.yml
@@ -154,7 +228,6 @@ files:
 - spec/vcr_cassettes/whm/server/nvget.yml
 - spec/vcr_cassettes/whm/server/nvset.yml
 - spec/vcr_cassettes/whm/server/reboot.yml
-- spec/vcr_cassettes/whm/server/response_type.yml
 - spec/vcr_cassettes/whm/server/sethostname.yml
 - spec/vcr_cassettes/whm/server/setresolvers.yml
 - spec/vcr_cassettes/whm/server/showbw.yml
@@ -167,7 +240,6 @@ files:
 - spec/whm/reseller_spec.rb
 - spec/whm/server_spec.rb
 - spec/whm/whm_spec.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -182,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1961563340658462226
+      hash: 954596705739906551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -191,14 +263,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1961563340658462226
+      hash: 954596705739906551
 requirements: []
 rubyforge_project: lumberg
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library for the WHM & cPanel API
 test_files:
+- spec/config_spec.rb
 - spec/lumberg_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/whm/account/accountsummary.yml
@@ -257,7 +330,6 @@ test_files:
 - spec/vcr_cassettes/whm/server/nvget.yml
 - spec/vcr_cassettes/whm/server/nvset.yml
 - spec/vcr_cassettes/whm/server/reboot.yml
-- spec/vcr_cassettes/whm/server/response_type.yml
 - spec/vcr_cassettes/whm/server/sethostname.yml
 - spec/vcr_cassettes/whm/server/setresolvers.yml
 - spec/vcr_cassettes/whm/server/showbw.yml