swd 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swd (0.1.1)
+    swd (0.1.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.1)
@@ -11,12 +11,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.1)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.3.2)
     attr_required (0.0.5)
-    configatron (2.9.0)
+    configatron (2.9.1)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
@@ -24,21 +24,21 @@ GEM
     crack (0.3.1)
     diff-lcs (1.1.3)
     hashie (1.2.0)
-    httpclient (2.2.4)
-    i18n (0.6.0)
-    json (1.6.5)
-    multi_json (1.0.4)
+    httpclient (2.2.7)
+    i18n (0.6.1)
+    json (1.7.5)
+    multi_json (1.3.6)
     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.8.0)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    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)
 

data/Rakefile

@@ -5,9 +5,15 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 if RUBY_VERSION >= '1.9'
-  require 'cover_me'
-  CoverMe.config do |c|
-    c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
+  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|

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/swd.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'active_support/core_ext'
 require 'httpclient'
 require 'attr_required'
+require 'attr_optional'
 
 module SWD
   VERSION = ::File.read(

data/lib/swd/resource.rb

@@ -1,12 +1,13 @@
 module SWD
   class Resource
-    include AttrRequired
+    include AttrRequired, AttrOptional
     attr_required :principal, :service, :host, :path
+    attr_optional :port
 
     class Expired < Exception; end
 
     def initialize(attributes = {})
-      required_attributes.each do |key|
+      (optional_attributes + required_attributes).each do |key|
         self.send "#{key}=", attributes[key]
       end
       @path ||= '/.well-known/simple-web-discovery'
@@ -22,7 +23,7 @@ module SWD
     end
 
     def endpoint
-      SWD.url_builder.build [nil, host, nil, path, {
+      SWD.url_builder.build [nil, host, port, path, {
         :principal => principal,
         :service => service
       }.to_query, nil]
@@ -64,7 +65,7 @@ module SWD
 
     def redirect_to(location, expires)
       uri = URI.parse(location)
-      @host, @path = uri.host, uri.path
+      @host, @path, @port = uri.host, uri.path, uri.port
       raise Expired if expires && expires.to_i < Time.now.utc.to_i
       discover!
     end

data/spec/mock_json/redirect_with_port.json

@@ -0,0 +1,5 @@
+{
+  "SWD_service_redirect": {
+    "location": "https://swd.proseware.com:8080/swd_server"
+  }
+}

data/spec/spec_helper.rb

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

data/spec/swd/resource_spec.rb

@@ -17,7 +17,7 @@ describe SWD::Resource do
     it "should require #{key}" do
       expect do
         SWD::Resource.new attributes.merge(key => nil)
-      end.should raise_error AttrRequired::AttrMissing
+      end.to raise_error AttrRequired::AttrMissing
     end
   end
 
@@ -49,7 +49,7 @@ describe SWD::Resource do
       context 'when expired' do
         it 'should return SWD::Response' do
           mock_json resource.endpoint, 'redirect_expired' do
-            expect { res = resource.discover! }.should raise_error SWD::Resource::Expired
+            expect { res = resource.discover! }.to raise_error SWD::Resource::Expired
           end
         end
       end
@@ -84,35 +84,35 @@ describe SWD::Resource do
       context 'when invalid SSL cert' do
         it do
           SWD.http_client.should_receive(:get_content).and_raise(OpenSSL::SSL::SSLError)
-          expect { res = resource.discover! }.should raise_error SWD::Exception
+          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 { res = resource.discover! }.should raise_error SWD::Exception
+          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 { res = resource.discover! }.should raise_error SWD::Exception
+          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 { res = resource.discover! }.should raise_error SWD::Exception
+          expect { res = resource.discover! }.to raise_error SWD::Exception
         end
       end
 
       context 'when bad request' do
         it 'should raise SWD::BadRequest' do
           mock_json resource.endpoint, 'blank', :status => 400 do
-            expect { res = resource.discover! }.should raise_error SWD::BadRequest
+            expect { res = resource.discover! }.to raise_error SWD::BadRequest
           end
         end
       end
@@ -120,7 +120,7 @@ describe SWD::Resource do
       context 'when unauthorized' do
         it 'should raise SWD::Unauthorized' do
           mock_json resource.endpoint, 'blank', :status => 401 do
-            expect { res = resource.discover! }.should raise_error SWD::Unauthorized
+            expect { res = resource.discover! }.to raise_error SWD::Unauthorized
           end
         end
       end
@@ -128,7 +128,7 @@ describe SWD::Resource do
       context 'when forbidden' do
         it 'should raise SWD::Forbidden' do
           mock_json resource.endpoint, 'blank', :status => 403 do
-            expect { res = resource.discover! }.should raise_error SWD::Forbidden
+            expect { res = resource.discover! }.to raise_error SWD::Forbidden
           end
         end
       end
@@ -136,7 +136,7 @@ describe SWD::Resource do
       context 'when not found' do
         it 'should raise SWD::NotFound' do
           mock_json resource.endpoint, 'blank', :status => 404 do
-            expect { res = resource.discover! }.should raise_error SWD::NotFound
+            expect { res = resource.discover! }.to raise_error SWD::NotFound
           end
         end
       end
@@ -144,7 +144,7 @@ describe SWD::Resource do
       context 'when other error happened' do
         it 'should raise SWD::HttpError' do
           mock_json resource.endpoint, 'blank', :status => 500 do
-            expect { res = resource.discover! }.should raise_error SWD::HttpError
+            expect { res = resource.discover! }.to raise_error SWD::HttpError
           end
         end
       end

data/spec/swd_spec.rb

@@ -20,6 +20,66 @@ describe SWD do
         ).should be_a SWD::Response
       end
     end
+
+    context 'when port specified' do
+      it 'should use it' do
+        mock_json "https://example.com:8080/.well-known/simple-web-discovery", 'success', :query => {
+          :principal => 'mailto:joe@example.com',
+          :service => 'urn:adatum.com:calendar'
+        } do
+          SWD.discover!(
+            :principal => 'mailto:joe@example.com',
+            :service => 'urn:adatum.com:calendar',
+            :host => 'example.com',
+            :port => 8080
+          ).should be_a SWD::Response
+        end
+      end
+
+      context 'when redirected to different host' do
+        context 'with port' do
+          it 'should success' do
+            mock_json "https://example.com:8080/.well-known/simple-web-discovery", 'redirect_with_port', :query => {
+              :principal => 'mailto:joe@example.com',
+              :service => 'urn:adatum.com:calendar'
+            } do
+              mock_json "https://swd.proseware.com:8080/swd_server", 'success', :query => {
+                :principal => 'mailto:joe@example.com',
+                :service => 'urn:adatum.com:calendar'
+              } do
+                SWD.discover!(
+                  :principal => 'mailto:joe@example.com',
+                  :service => 'urn:adatum.com:calendar',
+                  :host => 'example.com',
+                  :port => 8080
+                ).should be_a SWD::Response
+              end
+            end
+          end
+        end
+
+        context 'without port' do
+          it 'should success' do
+            mock_json "https://example.com:8080/.well-known/simple-web-discovery", 'redirect', :query => {
+              :principal => 'mailto:joe@example.com',
+              :service => 'urn:adatum.com:calendar'
+            } do
+              mock_json "https://swd.proseware.com/swd_server", 'success', :query => {
+                :principal => 'mailto:joe@example.com',
+                :service => 'urn:adatum.com:calendar'
+              } do
+                SWD.discover!(
+                  :principal => 'mailto:joe@example.com',
+                  :service => 'urn:adatum.com:calendar',
+                  :host => 'example.com',
+                  :port => 8080
+                ).should be_a SWD::Response
+              end
+            end
+          end
+        end
+      end
+    end
   end
 
   describe '.debug!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70264558491420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70264558491420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70264558490160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264558490160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70264558489460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70264558489460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70264558488860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70264558488860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70264558488260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70264558488260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70264558483860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70264558483860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70264558481700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70264558481700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70264558480100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70264558480100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70264558478160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70264558478160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 description: SWD (Simple Web Discovery) Client Library
 email:
 - nov@matake.jp
@@ -137,6 +182,7 @@ files:
 - spec/mock_json/blank.json
 - spec/mock_json/redirect.json
 - spec/mock_json/redirect_expired.json
+- spec/mock_json/redirect_with_port.json
 - spec/mock_json/success.json
 - spec/spec_helper.rb
 - spec/swd/debugger/request_filter_spec.rb
@@ -164,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: SWD (Simple Web Discovery) Client Library
@@ -173,6 +219,7 @@ test_files:
 - spec/mock_json/blank.json
 - spec/mock_json/redirect.json
 - spec/mock_json/redirect_expired.json
+- spec/mock_json/redirect_with_port.json
 - spec/mock_json/success.json
 - spec/spec_helper.rb
 - spec/swd/debugger/request_filter_spec.rb