panelbeater 0.1.0 → 0.1.1

data/Rakefile

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "panelbeater"
-  s.version           = "0.1.0"
+  s.version           = "0.1.1"
   s.summary           = "A gem for communicating with the cPanel and WHM API's"
   s.author            = "Jamie Dyer"
   s.email             = "jamie@kernowsoul.com"
@@ -41,7 +41,7 @@ spec = Gem::Specification.new do |s|
 
   # If your tests use any gems, include them here
   s.add_development_dependency("shoulda")
-  s.add_development_dependency("fakeweb")
+  s.add_development_dependency("webmock")
 
   # If you want to publish automatically to rubyforge, you'll may need
   # to tweak this, and the publishing task below too.

data/lib/panelbeater/response.rb

@@ -5,6 +5,10 @@ module CpanelApi
       @response = response
     end
     
+    def success?
+      json['result'].first['status'] == 1
+    end
+    
     def json
       JSON.parse @response.body
     end

data/panelbeater.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{panelbeater}
+  s.version = "0.1.1"
+
+  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.email = %q{jamie@kernowsoul.com}
+  s.files = ["lib", "lib/panelbeater", "lib/panelbeater/cpanel", "lib/panelbeater/cpanel/commands.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", "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.5}
+  s.summary = %q{A gem for communicating with the cPanel and WHM API's}
+  s.test_files = ["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"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+  end
+end

data/test/test_helper.rb

@@ -6,18 +6,15 @@ require 'panelbeater'
  
 require 'test/unit'
 require 'shoulda'
-require 'fakeweb'
- 
+require 'webmock'
+require 'webmock/test_unit'
+
 class Test::Unit::TestCase
   
-  # we don't want any connections to the outside world
-  FakeWeb.allow_net_connect = false
+  include WebMock
   
-  # include RR::Adapters::TestUnit
-  
-  # def response(name)
-  #   Pepper::Stanzas::Epp.parse File.read( File.join(File.dirname(__FILE__),"fixtures", "#{name}.xml") )
-  # end
+  # we don't want any connections to the outside world
+  WebMock.disable_net_connect!
   
   def fixture(name)
     File.read( File.join(File.dirname(__FILE__),"fixtures", "#{name}.json") )

data/test/whm_test.rb

@@ -4,29 +4,57 @@ require "test_helper"
 class WhmTest < Test::Unit::TestCase
   
   def setup
-    FakeWeb.clean_registry
     @expected_url = 'https://cpanel.server.local:2087/json-api/'
-    @connection = CpanelApi::Whm::Commands.new({ :url => 'cpanel.server.local', :api_key => '1234' })
+    @expected_auth_header = "WHM root:12345678"
+    @connection = CpanelApi::Whm::Commands.new({ :url => 'cpanel.server.local', :api_key => "1234\r5678" })
   end
   
   
   context "404 error handling" do
     setup do
-      FakeWeb.register_uri(:get, "#{@expected_url}applist?", :body => '', :status => ["404", "Not Found"])
+      stub_request(:get, "#{@expected_url}applist?").with(:headers => { 'Authorization' => @expected_auth_header }).to_return(:status => "404")
       @response = @connection.applist
     end
 
     should "return an error status" do
-      assert_equal 'Not Found', @response.message
       assert_equal '404', @response.code
     end
   end
   
   
+  context "returning a successful response" do
+    setup do
+      stub_request(:get, "#{@expected_url}applist?").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:body => fixture('createacct_success'))
+      @response = @connection.applist
+    end
+
+    should "return true" do
+      assert @response.success?
+    end
+  end
+  
+  
+  context "returning a unsuccessful response" do
+    setup do
+      stub_request(:get, "#{@expected_url}applist?").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:body => fixture('createacct_fail'))
+      @response = @connection.applist
+    end
+
+    should "return false" do
+      assert !@response.success?
+    end
+  end
+  
   
   context "getting a list of commands the server supports" do
     setup do
-      FakeWeb.register_uri(:get, "#{@expected_url}applist?", :body => fixture('applist'))
+      stub_request(:get, "#{@expected_url}applist?").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:body => fixture('applist'))
       @response = @connection.applist
     end
 
@@ -38,9 +66,9 @@ class WhmTest < Test::Unit::TestCase
   
   context "creating a new account" do
     setup do
-      FakeWeb.register_uri  :get,
-      "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n",
-                            :body => fixture('createacct_success')
+      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
 
@@ -52,9 +80,9 @@ class WhmTest < Test::Unit::TestCase
   
   context "creating a new account with key mappings" do
     setup do
-      FakeWeb.register_uri  :get,
-      "#{@expected_url}createacct?cpmod=x3&maxlst=0&hasshell=n&reseller=0&featurelist=default&ip=n&username=amos&cgi=y&frontpage=n",
-                            :body => fixture('createacct_success')
+      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({ :krazy => 'amos' }, { :krazy => :username })
     end
 
@@ -66,9 +94,9 @@ class WhmTest < Test::Unit::TestCase
   
   context "changing a users password" do
     setup do
-      FakeWeb.register_uri  :get,
-      "#{@expected_url}passwd?user=bob&pass=hello",
-                            :body => fixture('passwd_success')
+      stub_request(:get, "#{@expected_url}passwd?user=bob&pass=hello").
+        with(:headers => { 'Authorization' => @expected_auth_header }).
+        to_return(:body => fixture('passwd_success'))
       @response = @connection.passwd('bob', 'hello')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: panelbeater
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jamie Dyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +00:00
+date: 2010-04-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: webmock
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -51,14 +51,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- cpanel-gem.gemspec
 - lib/panelbeater/cpanel/commands.rb
 - lib/panelbeater/model.rb
 - lib/panelbeater/remote.rb
 - lib/panelbeater/response.rb
 - lib/panelbeater/whm/commands.rb
 - lib/panelbeater.rb
-- pkg/cpanel-gem-0.1.0.gem
+- panelbeater.gemspec
+- pkg/panelbeater-0.1.0.gem
 - Rakefile
 - Readme.markdown
 - test/fixtures/applist.json

data/cpanel-gem.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{cpanel-gem}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jamie Dyer"]
-  s.date = %q{2010-01-29}
-  s.email = %q{jamie@kernowsoul.com}
-  s.files = ["cpanel-gem.gemspec", "lib", "lib/cpanel_api", "lib/cpanel_api/cpanel", "lib/cpanel_api/cpanel/commands.rb", "lib/cpanel_api/model.rb", "lib/cpanel_api/remote.rb", "lib/cpanel_api/response.rb", "lib/cpanel_api/whm", "lib/cpanel_api/whm/commands.rb", "lib/cpanel_api.rb", "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.5}
-  s.summary = %q{A gem for communicating with cPanel}
-  s.test_files = ["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"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
-end