swd 0.2.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 252ca7c37d1cebf052d7e5c41917b5b5123a04e6
+  data.tar.gz: 549ca01faa4f2f50a6eb8278076877f9e88acc4e
+SHA512:
+  metadata.gz: 20b3f7e56f29eb563c1cedb143ff9c41ad473d09973ff0cbc965148ee782f761beb8e9566b022e17693e4e5eedf0132a6010bf3397f66b9544a9ce8154c02648
+  data.tar.gz: 01476c9da0f885d64ee765566455c415c79e1e391d0356dd04c3e0e86623d358b56cc002a8ce33ca543be2088e1cb7d42e28b01d6f65f25195047b1059130c75

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2

data/README.rdoc

@@ -1,7 +1,11 @@
-= OpenIDConnect
+= SWD
 
 SWD (Simple Web Discovery) Client Library
 
+NOTE:
+SWD was designed to be the core of OpenID Connect Discovery, but it's replaced with WebFinger.
+So I'm no longer supporting this gem.
+
 == Installation
 
   gem install swd
@@ -27,7 +31,7 @@ SWD (Simple Web Discovery) Client Library
   end
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/Rakefile

@@ -1,25 +1,18 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-if RUBY_VERSION >= '1.9'
-  namespace :cover_me do
-    desc "Generates and opens code coverage report."
-    task :report do
-      require 'cover_me'
-      CoverMe.complete!
-    end
-  end
-  task :spec do
-    Rake::Task['cover_me:report'].invoke
-  end
-else
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.rcov = true
-    spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
+namespace :coverage do
+  desc 'Open coverage report'
+  task :report do
+    require 'simplecov'
+    `open '#{File.join SimpleCov.coverage_path, 'index.html'}'`
   end
 end
 
-task :default => :spec
+task :spec do
+  Rake::Task[:'coverage:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
+end
+
+task default: :spec

data/VERSION

@@ -1 +1 @@
-0.2.1
+1.0.0

data/lib/swd.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'digest/md5'
 require 'json'
+require 'active_support'
 require 'active_support/core_ext'
 require 'httpclient'
 require 'attr_required'

data/spec/helpers/webmock_helper.rb

@@ -18,9 +18,7 @@ module WebMockHelper
 
   def request_for(options = {})
     request = {}
-    if options[:query]
-      request[:query] = options[:query]
-    end
+    request[:query] = options[:query]
     request
   end
 

data/spec/spec_helper.rb

@@ -1,8 +1,17 @@
-if RUBY_VERSION >= '1.9'
-  require 'cover_me'
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'spec'
 end
 
 require 'rspec'
+require 'rspec/its'
 require 'swd'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 require 'helpers/webmock_helper'

data/spec/swd/debugger/request_filter_spec.rb

@@ -8,7 +8,7 @@ describe SWD::Debugger::RequestFilter do
 
   describe '#filter_request' do
     it 'should log request' do
-      SWD.logger.should_receive(:info).with(
+      expect(SWD.logger).to receive(:info).with(
         "======= [SWD] HTTP REQUEST STARTED =======\n" +
         request.dump
       )
@@ -18,7 +18,7 @@ describe SWD::Debugger::RequestFilter do
 
   describe '#filter_response' do
     it 'should log response' do
-      SWD.logger.should_receive(:info).with(
+      expect(SWD.logger).to receive(:info).with(
         "--------------------------------------------------\n" +
         response.dump +
         "\n======= [SWD] HTTP REQUEST FINISHED ======="

data/spec/swd/resource_spec.rb

@@ -38,7 +38,7 @@ describe SWD::Resource do
 
     context 'when redirected' do
       it 'should follow redirect' do
-        resource.should_receive(:redirect_to).with(
+        expect(resource).to receive(:redirect_to).with(
           'https://swd.proseware.com/swd_server', nil
         )
         mock_json resource.endpoint, 'redirect' do
@@ -70,41 +70,57 @@ describe SWD::Resource do
     end
 
     describe 'error handling' do
-      before do
+      before(:all) do
         module SWD
           class << self
             def http_client_with_cached
               @http_client ||= http_client_without_cached
             end
             alias_method_chain :http_client, :cached
+
+            def clear_http_client!
+              @http_client = nil
+            end
+          end
+        end
+      end
+
+      after(:all) do
+        module SWD
+          class << self
+            def http_client_with_cache_cleared
+              @http_client = nil
+              http_client_without_cache_cleared
+            end
+            alias_method_chain :http_client, :cache_cleared
           end
         end
       end
 
       context 'when invalid SSL cert' do
         it do
-          SWD.http_client.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
+          expect(SWD.http_client).to receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
           expect { res = resource.discover! }.to raise_error SWD::Exception
         end
       end
 
       context 'when invalid JSON' do
         it do
-          SWD.http_client.should_receive(:get_content).and_raise(JSON::ParserError)
+          expect(SWD.http_client).to receive(:get_content).and_raise(JSON::ParserError)
           expect { res = resource.discover! }.to raise_error SWD::Exception
         end
       end
 
       context 'when SocketError' do
         it do
-          SWD.http_client.should_receive(:get_content).and_raise(SocketError)
+          expect(SWD.http_client).to receive(:get_content).and_raise(SocketError)
           expect { res = resource.discover! }.to raise_error SWD::Exception
         end
       end
 
       context 'when BadResponseError without response' do
         it do
-          SWD.http_client.should_receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
+          expect(SWD.http_client).to receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
           expect { res = resource.discover! }.to raise_error SWD::Exception
         end
       end

data/spec/swd_spec.rb

@@ -4,7 +4,7 @@ describe SWD do
   after { SWD.debugging = false }
 
   its(:logger) { should be_a Logger }
-  its(:debugging?) { should be_false }
+  its(:debugging?) { should == false }
   its(:cache) { should be_a SWD::Cache }
 
   describe '#discover!' do
@@ -84,23 +84,23 @@ describe SWD do
 
   describe '.debug!' do
     before { SWD.debug! }
-    its(:debugging?) { should be_true }
+    its(:debugging?) { should == true }
   end
 
   describe '.debug' do
     it 'should enable debugging within given block' do
       SWD.debug do
-        SWD.debugging?.should be_true
+        SWD.debugging?.should == true
       end
-      SWD.debugging?.should be_false
+      SWD.debugging?.should == false
     end
 
     it 'should not force disable debugging' do
       SWD.debug!
       SWD.debug do
-        SWD.debugging?.should be_true
+        SWD.debugging?.should == true
       end
-      SWD.debugging?.should be_true
+      SWD.debugging?.should == true
     end
   end
 

data/swd.gemspec

@@ -11,16 +11,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_runtime_dependency "json", ">= 1.4.3"
-  s.add_runtime_dependency "httpclient", ">= 2.2.1"
+  s.add_runtime_dependency "httpclient", ">= 2.4"
   s.add_runtime_dependency "activesupport", ">= 3"
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "attr_required", ">= 0.0.5"
-  s.add_development_dependency "rake", ">= 0.8"
-  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"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency 'rspec-its'
+  s.add_development_dependency "webmock"
+  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,160 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: swd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cover_me
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 description: SWD (Simple Web Discovery) Client Library
 email:
 - nov@matake.jp
@@ -162,11 +157,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -192,27 +186,26 @@ files:
 - swd.gemspec
 homepage: https://github.com/nov/swd
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SWD (Simple Web Discovery) Client Library
 test_files:
 - spec/helpers/webmock_helper.rb

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    swd (0.1.2)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.2.1)
-      i18n
-      json (>= 1.4.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.2)
-    attr_required (0.0.5)
-    configatron (2.9.1)
-      yamler (>= 0.1.0)
-    cover_me (1.2.0)
-      configatron
-      hashie
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    hashie (1.2.0)
-    httpclient (2.2.7)
-    i18n (0.6.1)
-    json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yamler (0.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cover_me (>= 1.2.0)
-  jruby-openssl (>= 0.7)
-  rake (>= 0.8)
-  rspec (>= 2)
-  swd!
-  webmock (>= 1.6.2)