webfinger 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/webfinger/request.rb

@@ -1,11 +1,11 @@
 module WebFinger
   class Request
-    attr_accessor :resource, :relations, :path
+    attr_accessor :resource, :relations
 
     def initialize(resource, options = {})
       self.resource = resource
       self.relations = Array(options[:rel] || options[:relations])
-      self.path ||= '/.well-known/webfinger'
+      @options = options
     end
 
     def discover!(cache_options = nil)
@@ -30,10 +30,11 @@ module WebFinger
     end
 
     def endpoint
-      host = URI.parse(resource).host || resource.split(':').last.split('@').last
-      WebFinger.url_builder.build [nil, host, nil, path, query_string, nil]
-    rescue URI::Error => e
-      raise Exception.new(e.message)
+      uri = URI.parse(resource)
+      path = '/.well-known/webfinger'
+      host = @options[:host] || uri.host || resource.split(':').last.split('@').last.split('/').first
+      port = @options[:port] || ([80, 443].include?(uri.port) ? nil : uri.port)
+      WebFinger.url_builder.build [nil, host, port, path, query_string, nil]
     end
 
     def query_string
@@ -41,31 +42,31 @@ module WebFinger
     end
 
     def query_params
-      _query_params_ = [{resource: resource}.to_query]
+      query_params = [{resource: resource}]
       relations.each do |relation|
-        _query_params_ << {rel: relation}.to_query
+        query_params << {rel: relation}
       end
-      _query_params_
+      query_params.collect(&:to_query)
     end
 
     def handle_response
-      raw_jrd = yield
-      jrd = MultiJson.load raw_jrd, symbolize_keys: true
+      raw_response = yield
+      jrd = MultiJson.load raw_response, symbolize_keys: true
       Response.new jrd
     rescue HTTPClient::BadResponseError => e
       case e.res.try(:status)
       when nil
-        raise Exception.new(e.message)
+        raise e
       when 400
-        raise BadRequest.new('Bad Request', res)
+        raise BadRequest.new('Bad Request', raw_response)
       when 401
-        raise Unauthorized.new('Unauthorized', res)
+        raise Unauthorized.new('Unauthorized', raw_response)
       when 403
-        raise Forbidden.new('Forbidden', res)
+        raise Forbidden.new('Forbidden', raw_response)
       when 404
-        raise NotFound.new('Not Found', res)
+        raise NotFound.new('Not Found', raw_response)
       else
-        raise HttpError.new(e.res.status, e.res.reason, res)
+        raise HttpError.new(e.res.status, e.res.reason, raw_response)
       end
     end
   end

data/lib/webfinger/response.rb

@@ -26,7 +26,7 @@ module WebFinger
     end
     def expires_in
       if expires.present?
-        (Time.now - expires).to_i
+        (expires - Time.now).to_i
       end
     end
   end

data/spec/webfinger/response_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe WebFinger::Response do
+  let(:expires) { 10.minutes.from_now }
+  let(:_subject_) { 'acct:nov@matake.jp' }
+  let(:aliases) { ['mailto:nov@matake.jp'] }
+  let(:properties) do
+    {'http://webfinger.net/rel/name' => 'Nov Matake'}
+  end
+  let(:links) do
+    [{
+      rel: 'http://openid.net/specs/connect/1.0/issuer',
+      href: 'https://openid.example.com/'
+    }]
+  end
+  subject do
+    WebFinger::Response.new(
+      expires: expires,
+      subject: _subject_,
+      aliases: aliases,
+      properties: properties,
+      links: links
+    )
+  end
+
+  its(:expired?)   { should be_false }
+  its(:expires)    { should == expires }
+  its(:expires_in) { should == (expires - Time.now).to_i }
+  its(:subject)    { should == subject }
+  its(:aliases)    { should == aliases }
+  its(:properties) { should == properties }
+  its(:links)      { should == links }
+end

data/spec/webfinger_spec.rb

@@ -1,12 +1,100 @@
 require 'spec_helper'
 
 describe WebFinger do
-  let(:resource) { "acct:nov@example.com" }
-  describe '#discover' do
-    it 'should return WebFinger::Response' do
-      mock_json "https://example.com/.well-known/webfinger", 'all', query: {resource: resource} do
-        response = WebFinger.discover! resource
-        response.should be_instance_of WebFinger::Response
+  let(:resource) { 'acct:nov@example.com' }
+
+  describe '#discover!' do
+    shared_examples_for :discovery_succeeded do
+      it 'should return WebFinger::Response' do
+        mock_json 'https://example.com/.well-known/webfinger', 'all', query: {resource: resource} do
+          response = WebFinger.discover! resource
+          response.should be_instance_of WebFinger::Response
+        end
+      end
+    end
+
+    [:acct, :mailto, :device, :unknown].each do |scheme|
+      context "with #{scheme} scheme" do
+        let(:resource) { "#{scheme}:nov@example.com" }
+        it_behaves_like :discovery_succeeded
+      end
+    end
+
+    context 'with http scheme' do
+      let(:resource) { 'http://example.com/nov' }
+      it_behaves_like :discovery_succeeded
+    end
+
+    context 'with https scheme' do
+      let(:resource) { 'https://example.com/nov' }
+      it_behaves_like :discovery_succeeded
+    end
+
+    context 'with host option' do
+      it 'should use given host' do
+        mock_json 'https://discover.example.com/.well-known/webfinger', 'all', query: {resource: resource} do
+          response = WebFinger.discover! resource, host: 'discover.example.com'
+          response.should be_instance_of WebFinger::Response
+        end
+      end
+    end
+
+    context 'with port option' do
+      it 'should use given port' do
+        mock_json 'https://example.com:8080/.well-known/webfinger', 'all', query: {resource: resource} do
+          response = WebFinger.discover! resource, port: 8080
+          response.should be_instance_of WebFinger::Response
+        end
+      end
+    end
+
+    context 'with rel option' do
+      shared_examples_for :discovery_with_rel do
+        let(:query_string) do
+          query_params = [{resource: resource}.to_query]
+          Array(rel).each do |_rel_|
+            query_params << {rel: _rel_}.to_query
+          end
+          query_params.join('&')
+        end
+
+        it 'should request with rel' do
+          query_string.scan('rel').count.should == Array(rel).count
+          mock_json 'https://example.com/.well-known/webfinger', 'all', query: query_string do
+            response = WebFinger.discover! resource, rel: rel
+            response.should be_instance_of WebFinger::Response
+          end
+        end
+      end
+
+      context 'when single rel' do
+        let(:rel) { 'http://openid.net/specs/connect/1.0/issuer' }
+        it_behaves_like :discovery_with_rel
+      end
+
+      context 'when multiple rel' do
+        let(:rel) { ['http://openid.net/specs/connect/1.0/issuer', 'vcard'] }
+        it_behaves_like :discovery_with_rel
+      end
+    end
+
+    context 'when error' do
+      {
+        400 => WebFinger::BadRequest,
+        401 => WebFinger::Unauthorized,
+        403 => WebFinger::Forbidden,
+        404 => WebFinger::NotFound,
+        500 => WebFinger::HttpError
+      }.each do |status, exception_class|
+        context "when status=#{status}" do
+          it "should raise #{exception_class}" do
+            expect do
+              mock_json 'https://example.com/.well-known/webfinger', 'all', query: {resource: resource}, status: [status, 'HTTPError'] do
+                response = WebFinger.discover! resource
+              end
+            end.to raise_error exception_class
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webfinger
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -134,7 +134,7 @@ files:
 - spec/mock_json/open_id.json
 - spec/spec_helper.rb
 - spec/webfinger/debugger/request_filter_spec.rb
-- spec/webfinger/request_spec.rb
+- spec/webfinger/response_spec.rb
 - spec/webfinger_spec.rb
 - webfinger.gemspec
 homepage: https://github.com/nov/webfinger
@@ -169,5 +169,5 @@ test_files:
 - spec/mock_json/open_id.json
 - spec/spec_helper.rb
 - spec/webfinger/debugger/request_filter_spec.rb
-- spec/webfinger/request_spec.rb
+- spec/webfinger/response_spec.rb
 - spec/webfinger_spec.rb

data/spec/webfinger/request_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe WebFinger::Request do
-
-end