panelbeater 0.1.2 → 0.1.3

data/Rakefile

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "panelbeater"
-  s.version           = "0.1.2"
+  s.version           = "0.1.3"
   s.summary           = "A gem for communicating with the cPanel and WHM API's"
   s.author            = "Jamie Dyer"
   s.email             = "jamie@kernowsoul.com"

data/lib/panelbeater/remote.rb

@@ -17,11 +17,7 @@ module CpanelApi
       http.start do |http|
         req = Net::HTTP::Get.new "/json-api/#{command}#{map_options_to_url(options)}"
         req.add_field 'Authorization', "WHM #{username}:#{api_key}"
-        # req.each_header {|k,v| @log.info "#{k}: #{v}"}
         http.request(req)
-        # puts response.to_yaml
-        # response.value
-        # response.body
       end
     end
     
@@ -29,10 +25,7 @@ module CpanelApi
       options = key_mappings(mappings, options) unless mappings.nil?
       options = filter_options(options)
       response = connect self.base_url, self.port, command, self.user, self.api_key, options
-      # if response.code == '200'
-      #   response.json = JSON.parse(response.body)
-      # end
-      CpanelApi::Response.new(response)
+      CpanelApi::Response.new(command, response)
     end
     
     def map_options_to_url(options={})

data/lib/panelbeater/response.rb

@@ -1,12 +1,23 @@
 module CpanelApi
   class Response
     
-    def initialize(response)
+    @@response_types = {
+      :applist      => 'app',
+      :createacct   => 'result',
+      :passwd       => 'passwd'
+    }
+    
+    def initialize(command, response)
+      @command  = command
       @response = response
     end
     
     def success?
-      json['result'].first['status'] == 1
+      json[node_name].first['status'] == 1
+    end
+    
+    def code
+      @response.code
     end
     
     def json
@@ -14,8 +25,15 @@ module CpanelApi
     end
     
     def method_missing(method, *args)
-      @response.send(method) if @response.respond_to?(method)
+      # check for a key in the json response
+      return(json[node_name].first[method.to_s]) if json[node_name].first.has_key?(method.to_s)
     end
     
+    private
+    
+      def node_name
+        @node_name ||= @@response_types[@command.to_sym]
+      end
+    
   end
 end

data/panelbeater.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panelbeater}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamie Dyer"]
-  s.date = %q{2010-04-03}
+  s.date = %q{2010-04-05}
   s.email = %q{jamie@kernowsoul.com}
-  s.files = ["lib", "lib/panelbeater", "lib/panelbeater/cpanel", "lib/panelbeater/cpanel/commands.rb", "lib/panelbeater/fixture_helper.rb", "lib/panelbeater/model.rb", "lib/panelbeater/remote.rb", "lib/panelbeater/response.rb", "lib/panelbeater/whm", "lib/panelbeater/whm/commands.rb", "lib/panelbeater.rb", "panelbeater.gemspec", "pkg", "pkg/panelbeater-0.1.0.gem", "pkg/panelbeater-0.1.1.gem", "Rakefile", "Readme.markdown", "test", "test/fixtures", "test/fixtures/applist.json", "test/fixtures/createacct_fail.json", "test/fixtures/createacct_success.json", "test/fixtures/passwd_fail.json", "test/fixtures/passwd_success.json", "test/test_helper.rb", "test/whm_test.rb", "~"]
+  s.files = ["lib", "lib/panelbeater", "lib/panelbeater/cpanel", "lib/panelbeater/cpanel/commands.rb", "lib/panelbeater/fixture_helper.rb", "lib/panelbeater/model.rb", "lib/panelbeater/remote.rb", "lib/panelbeater/response.rb", "lib/panelbeater/whm", "lib/panelbeater/whm/commands.rb", "lib/panelbeater.rb", "panelbeater.gemspec", "pkg", "pkg/panelbeater-0.1.0.gem", "pkg/panelbeater-0.1.1.gem", "pkg/panelbeater-0.1.2.gem", "Rakefile", "Readme.markdown", "test", "test/fixtures", "test/fixtures/applist.json", "test/fixtures/createacct_fail.json", "test/fixtures/createacct_success.json", "test/fixtures/passwd_fail.json", "test/fixtures/passwd_success.json", "test/test_helper.rb", "test/whm_test.rb", "~"]
   s.homepage = %q{http://kernowsoul.com}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}

data/test/whm_test.rb

@@ -12,7 +12,9 @@ class WhmTest < Test::Unit::TestCase
   
   context "404 error handling" do
     setup do
-      stub_request(:get, "#{@expected_url}applist?").with(:headers => { 'Authorization' => @expected_auth_header }).to_return(:status => "404")
+      stub_request(:get, "#{@expected_url}applist?").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:status => "404")
       @response = @connection.applist
     end
 
@@ -21,13 +23,12 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
-  
   context "returning a successful response" do
     setup do
-      stub_request(:get, "#{@expected_url}applist?").
+      stub_request(:get, "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n").
         with(:headers => { 'Authorization' => @expected_auth_header }).
         to_return(:body => fixture('createacct_success'))
-      @response = @connection.applist
+      @response = @connection.createacct :username => 'amos'
     end
 
     should "return true" do
@@ -35,13 +36,12 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
-  
   context "returning a unsuccessful response" do
     setup do
-      stub_request(:get, "#{@expected_url}applist?").
+      stub_request(:get, "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n").
         with(:headers => { 'Authorization' => @expected_auth_header }).
         to_return(:body => fixture('createacct_fail'))
-      @response = @connection.applist
+      @response = @connection.createacct :username => 'amos'
     end
 
     should "return false" do
@@ -49,6 +49,18 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
+  context "getting cpanel data from the cpanel response" do
+    setup do
+      stub_request(:get, "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:body => fixture('createacct_success'))
+      @response = @connection.createacct :username => 'amos'
+    end
+
+    should "return the status message" do
+      assert_equal @response.statusmsg, 'Account Creation Ok'
+    end
+  end
   
   context "getting a list of commands the server supports" do
     setup do
@@ -63,7 +75,6 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
-  
   context "creating a new account" do
     setup do
       stub_request(:get, "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n").
@@ -77,7 +88,6 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
-  
   context "creating a new account with key mappings" do
     setup do
       stub_request(:get, "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n").
@@ -91,7 +101,6 @@ class WhmTest < Test::Unit::TestCase
     end
   end
   
-  
   context "changing a users password" do
     setup do
       stub_request(:get, "#{@expected_url}passwd?user=bob&pass=hello").

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jamie Dyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +01:00
+date: 2010-04-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - panelbeater.gemspec
 - pkg/panelbeater-0.1.0.gem
 - pkg/panelbeater-0.1.1.gem
+- pkg/panelbeater-0.1.2.gem
 - Rakefile
 - Readme.markdown
 - test/fixtures/applist.json