swd 0.0.7 → 0.0.8

data/.gitignore

@@ -14,7 +14,7 @@ tmtags
 *.swp
 
 ## PROJECT::GENERAL
-coverage
+coverage*
 rdoc
 pkg
 

data/.travis.yml

@@ -2,5 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - ree
+  - jruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swd (0.0.4)
+    swd (0.0.7)
       activesupport (>= 3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.1)
@@ -11,37 +11,44 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
-    crack (0.1.8)
+    configatron (2.9.0)
+      yamler (>= 0.1.0)
+    cover_me (1.2.0)
+      configatron
+      hashie
+    crack (0.3.1)
     diff-lcs (1.1.3)
-    httpclient (2.2.1)
+    hashie (1.2.0)
+    httpclient (2.2.4)
     i18n (0.6.0)
-    json (1.5.4)
-    multi_json (1.0.3)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    json (1.6.5)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    webmock (1.7.5)
-      addressable (> 2.2.5, ~> 2.2)
+    rspec-mocks (2.8.0)
+    webmock (1.7.10)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
+    yamler (0.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  cover_me (>= 1.2.0)
   jruby-openssl (>= 0.7)
   rake (>= 0.8)
-  rcov (>= 0.9)
   rspec (>= 2)
   swd!
   webmock (>= 1.6.2)

data/Rakefile

@@ -1,11 +1,19 @@
-require 'bundler/gem_tasks'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rcov = true
-  spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
+if RUBY_VERSION >= '1.9'
+  require 'cover_me'
+  CoverMe.config do |c|
+    c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
+  end
+else
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.rcov = true
+    spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
+  end
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/swd.rb

@@ -42,6 +42,18 @@ module SWD
     self.debugging = original
   end
   self.debugging = false
+
+  def self.http_client
+    _http_client_ = HTTPClient.new(
+      :agent_name => "SWD (#{VERSION})"
+    )
+    _http_client_.request_filter << Debugger::RequestFilter.new if SWD.debugging?
+    http_config.try(:call, _http_client_)
+    _http_client_
+  end
+  def self.http_config(&block)
+    @@http_config ||= block
+  end
 end
 
 require 'swd/cache'

data/lib/swd/resource.rb

@@ -22,7 +22,7 @@ module SWD
     def discover!(cache_options = {})
       SWD.cache.fetch(cache_key, cache_options) do
         handle_response do
-          http_client.get_content endpoint.to_s
+          SWD.http_client.get_content endpoint.to_s
         end
       end
     end
@@ -38,14 +38,6 @@ module SWD
 
     private
 
-    def http_client
-      _http_client_ = HTTPClient.new(
-        :agent_name => "SWD (#{VERSION})"
-      )
-      _http_client_.request_filter << Debugger::RequestFilter.new if SWD.debugging?
-      _http_client_
-    end
-
     def handle_response
       res = JSON.parse(yield).with_indifferent_access
       if redirect = res[:SWD_service_redirect]

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+if RUBY_VERSION >= '1.9'
+  require 'cover_me'
+  at_exit do
+    CoverMe.complete!
+  end
+end
+
 require 'rspec'
 require 'swd'
 

data/spec/swd/resource_spec.rb

@@ -70,41 +70,41 @@ describe SWD::Resource do
     end
 
     describe 'error handling' do
-      let(:http_client) { resource.send(:http_client) }
       before do
         module SWD
-          class Resource
-            def http_client
-              @http_client ||= HTTPClient.new
+          class << self
+            def http_client_with_cached
+              @http_client ||= http_client_without_cached
             end
+            alias_method_chain :http_client, :cached
           end
         end
       end
 
       context 'when invalid SSL cert' do
         it do
-          http_client.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
+          SWD.http_client.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
           expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
 
       context 'when invalid JSON' do
         it do
-          http_client.should_receive(:get_content).and_raise(JSON::ParserError)
+          SWD.http_client.should_receive(:get_content).and_raise(JSON::ParserError)
           expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
 
       context 'when SocketError' do
         it do
-          http_client.should_receive(:get_content).and_raise(SocketError)
+          SWD.http_client.should_receive(:get_content).and_raise(SocketError)
           expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end
 
       context 'when BadResponseError without response' do
         it do
-          http_client.should_receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
+          SWD.http_client.should_receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
           expect { res = resource.discover! }.should raise_error SWD::Exception
         end
       end

data/spec/swd_spec.rb

@@ -43,4 +43,17 @@ describe SWD do
       SWD.debugging?.should be_true
     end
   end
+
+  describe '.http_client' do
+    context 'with http_config' do
+      before do
+        SWD.http_config do |config|
+          config.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+      end
+      it 'should configure http_client' do
+        SWD.http_client.ssl_config.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+      end
+    end
+  end
 end

data/swd.gemspec

@@ -16,7 +16,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "attr_required", ">= 0.0.3"
   s.add_development_dependency "rake", ">= 0.8"
-  s.add_development_dependency "rcov", ">= 0.9"
+  if RUBY_VERSION >= '1.9'
+    s.add_development_dependency "cover_me", ">= 1.2.0"
+  else
+    s.add_development_dependency "rcov", ">= 0.9"
+  end
   s.add_development_dependency "rspec", ">= 2"
   s.add_development_dependency "webmock", ">= 1.6.2"
 end

metadata

@@ -1,126 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: swd
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70323199319380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70323199319380
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &70323199619160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70323199619160
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70323199704860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70323199704860
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70323199818480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: attr_required
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70323199818480
+- !ruby/object:Gem::Dependency
+  name: attr_required
+  requirement: &70323202583220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70323202583220
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70323203381700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70323203381700
+- !ruby/object:Gem::Dependency
+  name: cover_me
+  requirement: &70323203676500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70323203676500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70323203882660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70323203882660
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70323204209540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *70323204209540
 description: SWD (Simple Web Discovery) Client Library
-email: 
+email:
 - nov@matake.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -150,32 +146,29 @@ files:
 - swd.gemspec
 homepage: https://github.com/nov/swd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: SWD (Simple Web Discovery) Client Library
-test_files: 
+test_files:
 - spec/helpers/webmock_helper.rb
 - spec/mock_json/blank.json
 - spec/mock_json/redirect.json