rodzilla 0.1.3 → 0.3.0

data/test/rodzilla/resource/base_test.rb

@@ -3,84 +3,71 @@ require "test_helper"
 
 describe Rodzilla::Resource::Base do
   before do
-    @base = Rodzilla::Resource::Base.new('http://example.io', 'uname', 'passwd')
+    @base_service = Rodzilla::Resource::Base.new(StubSettings::URL, StubSettings::USERNAME, StubSettings::PASSWORD)
+    def new_mock; MiniTest::Mock.new; end
   end
 
-  describe "instance" do
-
-    it "has base_url accessors" do 
-      @base.must_respond_to('base_url')
-      @base.must_respond_to('base_url=')
-    end
+  it "attribute accessors" do
+    [:base_url, :username, :password, :service, :format].each  { |m| @base_service.must_respond_to(m) }
+    [:base_url=, :username=, :password=, :service=, :format=].each  { |m| @base_service.must_respond_to(m) }
+  end
 
-    it "has username accessors" do 
-      @base.must_respond_to('username')
-      @base.must_respond_to('username=')
+  describe "set_endpoint_url" do
+    it "should accept one argument - format" do
+      lambda { @base_service.send(:set_endpoint_url) }.must_raise(ArgumentError)
     end
 
-    it "has password accessors" do 
-      @base.must_respond_to('password')
-      @base.must_respond_to('password=')
+    it "should return base_url joined with the jsonrpc endpoint when arg is json" do
+      @base_service.send(:set_endpoint_url, :json).must_equal(@base_service.base_url + '/jsonrpc.cgi' )
     end
+  end
 
-    it "has format accessors" do 
-      @base.must_respond_to('format')
-      @base.must_respond_to('format=')
+  describe "setup_service" do
+    it "should accept one argument - format" do
+      lambda { @base_service.send(:setup_service) }.must_raise(ArgumentError)
     end
 
-    it "has request_url accessors" do 
-      @base.must_respond_to('request_url')
-      @base.must_respond_to('request_url=')
+    it "should set @endpoint_url and instantiate JsonRpc::Service when format is json" do
+      @base_service.service = nil
+      @base_service.send(:setup_service, :json)
+      @base_service.instance_variable_get(:@endpoint_url).must_equal(@base_service.base_url + '/jsonrpc.cgi' )
+      @base_service.service.must_be_kind_of(Rodzilla::JsonRpc::Service)
     end
+  end
 
-    it "has response accessors" do 
-      @base.must_respond_to('response')
-      @base.must_respond_to('response=')
+  describe "rpc_call" do
+    it "should require at least one argument - rpc_method_name" do
+      lambda { @base_service.send(:rpc_call) }.must_raise(ArgumentError)
     end
+  end
 
-    it "has result accessors" do 
-      @base.must_respond_to('result')
-      @base.must_respond_to('result=')
+  describe "get_resource_rpc_method_name" do
+    it "should require at least one argument - rpc_method_name" do
+      lambda { @base_service.send(:get_resource_rpc_method_name) }.must_raise(ArgumentError)
     end
 
-    it "has credentials accessors" do 
-      @base.must_respond_to('credentials')
-      @base.must_respond_to('credentials=')
+    it "should return a String as Resource.method_name" do
+      @base_service.send(:get_resource_rpc_method_name, 'hello').must_equal('Base.hello')
     end
+  end
 
-    it "has headers accessors" do 
-      @base.must_respond_to('headers')
-      @base.must_respond_to('headers=')
-    end
+  describe "check_params" do
+    it "should return true if required is a subset of actual" do
+      required = [:name, :age]
+      actual = [:name, :age, :country]
+      actual2 = { name: '', age: 33, country: 'DE' }
 
-    describe "class methods" do
-      it "has a demodularize method" do 
-        Rodzilla::Resource::Base.must_respond_to(:demodulize)
-      end
+      @base_service.send(:check_params, required, actual ).must_equal(true)
+      @base_service.send(:check_params, required, actual2 ).must_equal(true)
     end
 
-    describe "protected_methods" do
-      it "has a prepare_request method" do
-        @base.protected_methods.must_include(:prepare_request)
-      end
-      it "has a build_url method" do
-        @base.protected_methods.must_include(:build_url)
-      end
-      it "has a build_params method" do
-        @base.protected_methods.must_include(:build_params)
-      end
-      it "has a make_id method" do
-        @base.protected_methods.must_include(:make_id)
-      end
-
-      it "has a rpc_call method" do
-        @base.protected_methods.must_include(:rpc_call)
-      end
-
-      it "has a parse_rpc_response! method" do
-        @base.protected_methods.must_include(:parse_rpc_response!)
-      end
+    it "should return false if required is not a subset of actual" do
+      required = [:a,:b, :c]
+      actual = [:a, :b, :foo]
+      actual2 = { a: '', b: 2, foo: 45 }
+      @base_service.send(:check_params, required, actual ).must_equal(false)
+      @base_service.send(:check_params, required, actual2 ).must_equal(false)
     end
-
   end
+
 end

data/test/rodzilla/resource/bug_test.rb

@@ -1,44 +1,6 @@
 require 'test_helper'
 
 describe Rodzilla::Resource::Bug do
-  before do
-    @bug = Rodzilla::Resource::Bug.new('http://asdf.net', 'asdf', 'asdf', :json)
-  end
 
-  describe "bug instance" do
-    it "should inherit from Rodzilla::Resource::Base" do
-      @bug.class.superclass.must_equal(Rodzilla::Resource::Base)
-    end
-
-    it "should respond_to create" do
-      @bug.must_respond_to(:create)
-    end
-
-    it "should respond_to create!" do
-      @bug.must_respond_to(:create!)
-    end
-
-    it "should respond_to fields" do
-      @bug.must_respond_to(:fields)
-    end
-
-    it "should respond_to search" do
-      @bug.must_respond_to(:search)
-    end
-
-  end
-
-  describe "validations" do
-
-    it "should have all Bugzilla REQUIRED_FIELDS for bug creation" do
-      Rodzilla::Resource::Bug.constants.must_include(:REQUIRED_FIELDS)
-      [:product, :component, :summary,
-        :version, :description, :op_sys,
-        :platform, :priority, :severity].each do |field|
-          Rodzilla::Resource::Bug::REQUIRED_FIELDS.must_include(field)
-      end
-    end
-
-  end
 
 end

data/test/rodzilla/resource/util_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+describe Rodzilla::Util do
+
+  describe "methods" do
+
+    it "should have a module method demodulize" do
+      Rodzilla::Util.must_respond_to(:demodulize)
+    end
+    
+  end
+
+  describe "demodulize" do
+
+    it "should extract the classname from a module hierarchy" do
+      Rodzilla::Util.demodulize(Rodzilla::Resource::Base).must_equal('Base')
+    end
+
+    it "should return the to_s version of other arguments" do
+      Rodzilla::Util.demodulize(nil).must_equal("")
+      Rodzilla::Util.demodulize(Rodzilla).must_equal("Rodzilla")
+    end
+  end
+
+end

data/test/rodzilla/web_service_test.rb

@@ -6,15 +6,11 @@ describe Rodzilla::WebService do
     @service = Rodzilla::WebService.new('http://example.io', 'asdf', 'asdf')
   end
 
-  after do
-    @service
-  end
-
-  describe "initialization" do
+  describe "Constructor" do
     it "should accept 4 parameters: base_url, username, password, and format" do
       s = Rodzilla::WebService.new('http://example.io', 'uname', 'passwd', :json)
-      s.username.must_equal('uname')
-      s.password.must_equal('passwd')
+      s.instance_variable_get(:@username).must_equal('uname')
+      s.instance_variable_get(:@password).must_equal('passwd')
       s.base_url.must_equal('http://example.io')
       s.format.must_equal(:json)
     end
@@ -31,11 +27,26 @@ describe Rodzilla::WebService do
     end
   end
 
-  describe "instance methods" do
-  
-    it "products should return ::Resource::Product class" do
-      @service.products.must_be_kind_of(Rodzilla::Resource::Product)
+  describe "Attributes" do
+
+    it "should have attr_accessor for base_url" do
+      @service.must_respond_to(:base_url)
+      @service.must_respond_to(:base_url=)
     end
+    
+    it "should have attr_accessor for format" do
+      @service.must_respond_to(:format)
+      @service.must_respond_to(:format=)
+    end
+
+    it "should have attr_accessor for resource" do
+      @service.must_respond_to(:resource)
+      @service.must_respond_to(:resource=)
+    end
+
+  end
+
+  describe "Resources" do
 
     it "bugs should return a Resource::Bug class" do
       @service.bugs.must_be_kind_of(Rodzilla::Resource::Bug)
@@ -49,10 +60,22 @@ describe Rodzilla::WebService do
       @service.classifications.must_be_kind_of(Rodzilla::Resource::Classification)
     end
 
+    it "groups should return a Resource::Group class" do
+      @service.groups.must_be_kind_of(Rodzilla::Resource::Group)
+    end
+
+    it "products should return ::Resource::Product class" do
+      @service.products.must_be_kind_of(Rodzilla::Resource::Product)
+    end
+
+    it "users should return ::Resource::User class" do
+      @service.users.must_be_kind_of(Rodzilla::Resource::User)
+    end
+
     it "bugzilla_resource should raise a Rodzilla::ResourceNotFoundError exception for undefined resources" do
       Proc.new do
         @service.send(:bugzilla_resource, "Nada")
-      end.must_raise(Rodzilla::ResourceNotFoundError)
+      end.must_raise(Rodzilla::Error::ResourceNotFoundError)
     end
 
   end

data/test/test_helper.rb

@@ -1,3 +1,52 @@
 require 'minitest/spec'
 require 'minitest/autorun'
-require "rodzilla"
+require 'webmock/minitest'
+require "rodzilla"
+
+# ========================
+# Fixtures
+# ========================
+def method_fixture(name); fixture(name, :methods); end
+def error_fixture(name); fixture(name, :errors); end
+
+def fixture(name, type)
+  path = fixture_path(name, type)
+  File.new(path)
+end
+
+def fixture_path(filename, type=:methods)
+  File.expand_path(File.join(Dir.getwd, "test/fixtures", type.to_s, filename))
+end
+
+# ========================
+# Stubs
+# ========================
+
+class StubSettings
+  URL = 'http://bugzilla.test.com'
+  USERNAME = 'bugzilla'
+  PASSWORD = 'bugzilla'
+
+  JSON_URL = URL + '/jsonrpc.cgi'
+  JSON_HEADERS = {
+    "Server"                  =>  "Apache/2.2.22 (Debian)",
+    "X-xss-protection"        =>  "1; mode=block",
+    "X-frame-options"         => "SAMEORIGIN",
+    "X-content-type-options"  => "nosniff", 
+    "Keep-Alive"              => "timeout=5, max=100",
+    "Connection"              => "Keep-Alive",
+    "Transfer-Encoding"       => "chunked",
+    "Content-Type"            => "application/json; charset=UTF-8"
+  }
+
+end
+
+def new_resource(resource)
+  Object.module_eval("Rodzilla::Resource::#{resource}").new(StubSettings::URL, StubSettings::USERNAME, StubSettings::PASSWORD)
+end
+
+def stub_bugzilla_request(rpc_name, type=:methods, http_method=:post)
+  filename =  rpc_name.gsub('.', '_') + ".json"
+  raw_json = fixture(filename, type).read
+  WebMock.stub_request(http_method, StubSettings::JSON_URL ).to_return( body: raw_json, headers: StubSettings::JSON_HEADERS )
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodzilla
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - John Faucett
@@ -38,7 +38,7 @@ cert_chain:
   alZXVFhBWFBFN1FUSWp1NlcrRU12enNqbVNICndEZDdGSlE4bkdEaFlxaUtI
   L01DYXE3SEQ3L0ptZ0ZZalpOUENzeTBsVGtCdXIrVkMxbnN1ZFE9Ci0tLS0t
   RU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -54,34 +54,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: libxml-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,48 +68,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 description: A Bugzilla ReST API Client
 email:
 - jwaterfaucett@gmail.com
@@ -153,16 +83,31 @@ files:
 - Rakefile
 - gem-public_cert.pem
 - lib/rodzilla.rb
-- lib/rodzilla/exception.rb
+- lib/rodzilla/error.rb
+- lib/rodzilla/json_rpc/error.rb
+- lib/rodzilla/json_rpc/request.rb
+- lib/rodzilla/json_rpc/response.rb
+- lib/rodzilla/json_rpc/service.rb
 - lib/rodzilla/resource/base.rb
 - lib/rodzilla/resource/bug.rb
 - lib/rodzilla/resource/bugzilla.rb
 - lib/rodzilla/resource/classification.rb
+- lib/rodzilla/resource/group.rb
 - lib/rodzilla/resource/product.rb
+- lib/rodzilla/resource/user.rb
+- lib/rodzilla/util.rb
 - lib/rodzilla/version.rb
+- lib/rodzilla/web_service.rb
 - rodzilla.gemspec
+- test/fixtures/methods/Bugzilla_extensions.json
+- test/fixtures/methods/Bugzilla_version.json
+- test/rodzilla/json_rpc/error_test.rb
+- test/rodzilla/json_rpc/request_test.rb
+- test/rodzilla/json_rpc/response_test.rb
+- test/rodzilla/json_rpc/service_test.rb
 - test/rodzilla/resource/base_test.rb
 - test/rodzilla/resource/bug_test.rb
+- test/rodzilla/resource/util_test.rb
 - test/rodzilla/web_service_test.rb
 - test/test_helper.rb
 homepage: https://github.com/jwaterfaucett/rodzilla
@@ -190,7 +135,14 @@ signing_key:
 specification_version: 4
 summary: Bugzilla API Client
 test_files:
+- test/fixtures/methods/Bugzilla_extensions.json
+- test/fixtures/methods/Bugzilla_version.json
+- test/rodzilla/json_rpc/error_test.rb
+- test/rodzilla/json_rpc/request_test.rb
+- test/rodzilla/json_rpc/response_test.rb
+- test/rodzilla/json_rpc/service_test.rb
 - test/rodzilla/resource/base_test.rb
 - test/rodzilla/resource/bug_test.rb
+- test/rodzilla/resource/util_test.rb
 - test/rodzilla/web_service_test.rb
 - test/test_helper.rb