openid_connect 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.3.1)
+    openid_connect (0.3.2)
       activemodel (>= 3)
       attr_required (>= 0.0.5)
       json (>= 1.4.3)
@@ -38,7 +38,6 @@ GEM
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
     json (1.7.5)
-    json (1.7.5-java)
     json-jwt (0.3.0)
       activesupport (>= 2.3)
       i18n
@@ -68,7 +67,7 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    swd (0.1.2)
+    swd (0.2.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.1)

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/openid_connect/discovery/principal.rb

@@ -1,7 +1,7 @@
 module OpenIDConnect
   module Discovery
     class Principal
-      attr_reader :identifier, :host
+      attr_reader :identifier, :host, :port
 
       def self.parse(identifier)
         raise InvalidIdentifier.new('Identifier Required') if identifier.blank?
@@ -19,6 +19,7 @@ module OpenIDConnect
           :principal => identifier,
           :service => Provider::SERVICE_URI,
           :host => host,
+          :port => port,
           :cache => cache_options
         )
       rescue SWD::Exception => e

data/lib/openid_connect/discovery/principal/uri.rb

@@ -6,6 +6,7 @@ module OpenIDConnect
           uri = normalize(identifier)
           @identifier = uri.to_s
           @host = uri.host
+          @port = uri.port unless [80, 443].include?(uri.port)
         end
 
         private

data/spec/openid_connect/discovery/principal/uri_spec.rb

@@ -31,6 +31,18 @@ describe OpenIDConnect::Discovery::Principal::URI do
       let(:identifier) { input }
       its(:identifier) { should == output }
       its(:host) { should == 'server.example.com' }
+      its(:port) { should be_nil }
+    end
+  end
+
+  {
+    'server.example.com:8080' => 'https://server.example.com:8080'
+  }.each do |input, output|
+    context "when '#{input}' is given" do
+      let(:identifier) { input }
+      its(:identifier) { should == output }
+      its(:host) { should == 'server.example.com' }
+      its(:port) { should == 8080 }
     end
   end
 

data/spec/openid_connect/discovery/principal_spec.rb

@@ -23,6 +23,19 @@ describe OpenIDConnect::Discovery::Principal do
       request
     end
 
+    context 'when port specified' do
+      it do
+        SWD.should_receive(:discover!).with(
+          :principal => "https://example.com:8080",
+          :service => "http://openid.net/specs/connect/1.0/issuer",
+          :host => "example.com",
+          :port => 8080,
+          :cache => {}
+        )
+        OpenIDConnect::Discovery::Principal.parse('example.com:8080').discover!
+      end
+    end
+
     context 'when discovery failed' do
       it do
         SWD.should_receive(:discover!).and_raise(SWD::Exception)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors: