swd 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - ree

data/Gemfile

@@ -1,2 +1,7 @@
 source "http://rubygems.org"
+
+platform :jruby do
+  gem 'jruby-openssl', '>= 0.7'
+end
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swd (0.0.2)
+    swd (0.0.4)
       activesupport (>= 3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.1)
@@ -11,14 +11,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
     crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     httpclient (2.2.1)
     i18n (0.6.0)
-    json (1.5.3)
+    json (1.5.4)
+    multi_json (1.0.3)
     rake (0.9.2)
     rcov (0.9.10)
     rspec (2.6.0)
@@ -29,7 +31,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    webmock (1.7.4)
+    webmock (1.7.5)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
@@ -37,6 +39,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  jruby-openssl (>= 0.7)
   rake (>= 0.8)
   rcov (>= 0.9)
   rspec (>= 2)

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

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
-          HTTPClient.get_content endpoint.to_s
+          http_client.get_content endpoint.to_s
         end
       end
     end
@@ -38,6 +38,14 @@ 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/lib/swd.rb

@@ -1,19 +1,53 @@
+require 'logger'
+
 module SWD
+  VERSION = ::File.read(
+    ::File.join(::File.dirname(__FILE__), '../VERSION')
+  )
+
   def self.cache=(cache)
     @@cache = cache
   end
   def self.cache
     @@cache
   end
+
   def self.discover!(attributes = {})
     Resource.new(attributes).discover!(attributes[:cache])
   end
+
+  def self.logger
+    @@logger
+  end
+  def self.logger=(logger)
+    @@logger = logger
+  end
+  self.logger = ::Logger.new(STDOUT)
+  self.logger.progname = 'SWD'
+
+  def self.debugging?
+    @@debugging
+  end
+  def self.debugging=(boolean)
+    @@debugging = boolean
+  end
+  def self.debug!
+    self.debugging = true
+  end
+  def self.debug(&block)
+    original = self.debugging?
+    self.debugging = true
+    yield
+  ensure
+    self.debugging = original
+  end
+  self.debugging = false
 end
 
 require 'swd/cache'
 require 'swd/exception'
 require 'swd/resource'
 require 'swd/response'
+require 'swd/debugger'
 
-# NOTE: Default Cache doesn't cache anything.
 SWD.cache = SWD::Cache.new

data/spec/swd/resource_spec.rb

@@ -70,31 +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
+            end
+          end
+        end
+      end
 
       context 'when invalid SSL cert' do
         it do
-          HTTPClient.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
+          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
-          HTTPClient.should_receive(:get_content).and_raise(JSON::ParserError)
+          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
-          HTTPClient.should_receive(:get_content).and_raise(SocketError)
+          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
-          HTTPClient.should_receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
+          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

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe SWD do
+  after { SWD.debugging = false }
+
+  its(:logger) { should be_a Logger }
+  its(:debugging?) { should be_false }
   its(:cache) { should be_a SWD::Cache }
 
   describe '#discover!' do
@@ -17,4 +21,26 @@ describe SWD do
       end
     end
   end
+
+  describe '.debug!' do
+    before { SWD.debug! }
+    its(:debugging?) { should be_true }
+  end
+
+  describe '.debug' do
+    it 'should enable debugging within given block' do
+      SWD.debug do
+        SWD.debugging?.should be_true
+      end
+      SWD.debugging?.should be_false
+    end
+
+    it 'should not force disable debugging' do
+      SWD.debug!
+      SWD.debug do
+        SWD.debugging?.should be_true
+      end
+      SWD.debugging?.should be_true
+    end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swd
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 0.0.4
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 Z
+date: 2011-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id001
@@ -31,6 +41,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
         version: 2.2.1
   type: :runtime
   version_requirements: *id002
@@ -42,6 +57,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
         version: "3"
   type: :runtime
   version_requirements: *id003
@@ -53,6 +71,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -64,6 +85,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id005
@@ -75,6 +101,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id006
@@ -86,6 +116,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id007
@@ -97,6 +131,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id008
@@ -108,6 +145,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id009
@@ -123,6 +165,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -157,12 +200,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []