webfinger 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e585dd48362fb9183c88d4168b6e757de4d9f137
-  data.tar.gz: e8ac29431ccdd34af684b06fdd30cc8e6d172941
+SHA256:
+  metadata.gz: 453c181e3514a3c48a35bf9313439ce3e010b55381a825551563361e6ff1a10b
+  data.tar.gz: 6eea576a4c6402866a98ade6a92ab14f4823b81a03210b3ff156b800250f8c0a
 SHA512:
-  metadata.gz: fb8c5fe788304d9b55df12032de2787161d2eda074e362bd0cd3a2e57b3acf44d7b76681f7db8a8880bb91b0e1e649a8aacf25f646b1760ab962ee970c4bcaab
-  data.tar.gz: 0df4c2fe1a31b00bc4d85405432625a267aab47669761ce57e9695a5c61bed7f7c498faa99186fa64013785f80b0ff7b7a372b9111481d6428f123de53b38929
+  metadata.gz: a350849707db88ae1a09d9fb86e6fbb05a9b20528f1ed9ff726830aa2f17ac3fb31659d7c83eb1ec56ef3243966066812d65926de088e62ac6604304f258d14a
+  data.tar.gz: 4f52b74f9f365229dfa41017cf2e06ff8d5d1e6497f40fc8acda26630829a43cd3fbd005f25a3c263bbc19b886357b005cf6e2f1b4dd7b422d675eeb3849f535

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: nov

data/.github/workflows/spec.yml

@@ -0,0 +1,32 @@
+name: Spec
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  spec:
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        # ubuntu 22.04 only supports ssl 3 and thus only ruby 3.1
+        include:
+        - os: 'ubuntu-22.04'
+          ruby-version: '3.1'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run Specs
+      run: bundle exec rake spec

data/README.rdoc

@@ -2,8 +2,6 @@
 
 An Ruby WebFinger client library.
 
-{<img src="https://secure.travis-ci.org/nov/webfinger.png" />}[http://travis-ci.org/nov/webfinger]
-
 Following the latest WebFinger spec discussed at IETF WebFinger WG.
 http://tools.ietf.org/html/draft-ietf-appsawg-webfinger
 
@@ -75,4 +73,4 @@ You can also specify URL builder to force non-HTTPS access. (NOTE: allow non-HTT
 
 == Copyright
 
-Copyright (c) 2012 nov matake. See LICENSE for details.
+Copyright (c) 2012 nov matake. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/lib/webfinger/exception.rb

@@ -33,4 +33,4 @@ module WebFinger
       super 404, message, response
     end
   end
-end
+end

data/lib/webfinger/request.rb

@@ -10,7 +10,7 @@ module WebFinger
 
     def discover!
       handle_response do
-        WebFinger.http_client.get_content endpoint.to_s
+        WebFinger.http_client.get(endpoint.to_s)
       end
     end
 
@@ -50,23 +50,22 @@ module WebFinger
     end
 
     def handle_response
-      raw_response = yield
-      jrd = JSON.parse(raw_response).with_indifferent_access
-      Response.new jrd
-    rescue HTTPClient::BadResponseError => e
-      case e.res.try(:status)
+      json = yield.body
+      Response.new json
+    rescue Faraday::Error => e
+      case e.response_status
       when nil
         raise e
       when 400
-        raise BadRequest.new('Bad Request', raw_response)
+        raise BadRequest.new('Bad Request', e.response_body)
       when 401
-        raise Unauthorized.new('Unauthorized', raw_response)
+        raise Unauthorized.new('Unauthorized', e.response_body)
       when 403
-        raise Forbidden.new('Forbidden', raw_response)
+        raise Forbidden.new('Forbidden', e.response_body)
       when 404
-        raise NotFound.new('Not Found', raw_response)
+        raise NotFound.new('Not Found', e.response_body)
       else
-        raise HttpError.new(e.res.status, e.res.reason, raw_response)
+        raise HttpError.new(e.response_status, e.response_body, e.response_body)
       end
     end
   end

data/lib/webfinger.rb

@@ -1,5 +1,6 @@
 require 'json'
-require 'httpclient'
+require 'faraday'
+require 'faraday_middleware'
 require 'active_support'
 require 'active_support/core_ext'
 
@@ -42,19 +43,20 @@ module WebFinger
   end
 
   def http_client
-    _http_client_ = HTTPClient.new(
-      agent_name: "WebFinger (#{VERSION})"
-    )
-    _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
-    http_config.try(:call, _http_client_)
-    _http_client_
+    Faraday.new(headers: {user_agent: "WebFinger #{VERSION}"}) do |f|
+      f.response :raise_error
+      f.response :json
+      f.response :logger, WebFinger.logger if debugging?
+      f.use FaradayMiddleware::FollowRedirects
+      http_config.try(:call, f)
+    end
   end
+
   def http_config(&block)
     @http_config ||= block
   end
 end
 
-require 'webfinger/debugger'
 require 'webfinger/exception'
 require 'webfinger/request'
 require 'webfinger/response'

data/spec/helpers/webmock_helper.rb

@@ -35,4 +35,4 @@ module WebMockHelper
 end
 
 include WebMockHelper
-WebMock.disable_net_connect!
+WebMock.disable_net_connect!

data/spec/webfinger_spec.rb

@@ -158,16 +158,16 @@ describe WebFinger do
     subject { WebFinger.http_client }
 
     describe '#request_filter' do
-      subject { WebFinger.http_client.request_filter.collect(&:class) }
+      subject { WebFinger.http_client.builder.handlers.collect(&:klass) }
 
       context 'as default' do
-        it { should_not include WebFinger::Debugger::RequestFilter }
+        it { should_not include Faraday::Response::Logger }
       end
 
       context 'when debugging' do
         before { WebFinger.debug! }
-        it { should include WebFinger::Debugger::RequestFilter }
+        it { should include Faraday::Response::Logger }
       end
     end
   end
-end
+end

data/webfinger.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-  gem.add_runtime_dependency 'httpclient', '>= 2.4'
+  gem.add_runtime_dependency 'faraday', '~> 1.7'
+  gem.add_runtime_dependency 'faraday_middleware', '~> 1.1'
   gem.add_runtime_dependency 'activesupport'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: webfinger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2022-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +129,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/webfinger.rb
-- lib/webfinger/debugger.rb
-- lib/webfinger/debugger/request_filter.rb
 - lib/webfinger/exception.rb
 - lib/webfinger/request.rb
 - lib/webfinger/response.rb
@@ -134,7 +147,6 @@ files:
 - spec/mock_json/email_config.json
 - spec/mock_json/open_id.json
 - spec/spec_helper.rb
-- spec/webfinger/debugger/request_filter_spec.rb
 - spec/webfinger/response_spec.rb
 - spec/webfinger_spec.rb
 - webfinger.gemspec
@@ -157,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby WebFinger client library, following IETF WebFinger WG spec updates.
@@ -169,6 +180,5 @@ test_files:
 - spec/mock_json/email_config.json
 - spec/mock_json/open_id.json
 - spec/spec_helper.rb
-- spec/webfinger/debugger/request_filter_spec.rb
 - spec/webfinger/response_spec.rb
 - spec/webfinger_spec.rb

data/.travis.yml

@@ -1,6 +0,0 @@
-before_install:
-  - gem install bundler
-
-rvm:
-  - 2.3.5
-  - 2.4.2

data/lib/webfinger/debugger/request_filter.rb

@@ -1,20 +0,0 @@
-module WebFinger
-  module Debugger
-    class RequestFilter
-      # Callback called in HTTPClient (before sending a request)
-      # request:: HTTP::Message
-      def filter_request(request)
-        started = "======= [WebFinger] HTTP REQUEST STARTED ======="
-        WebFinger.logger.info [started, request.dump].join("\n")
-      end
-
-      # Callback called in HTTPClient (after received a response)
-      # request::  HTTP::Message
-      # response:: HTTP::Message
-      def filter_response(request, response)
-        finished = "======= [WebFinger] HTTP REQUEST FINISHED ======="
-        WebFinger.logger.info ['-' * 50, response.dump, finished].join("\n")
-      end
-    end
-  end
-end

data/lib/webfinger/debugger.rb

@@ -1,3 +0,0 @@
-Dir[File.dirname(__FILE__) + '/debugger/*.rb'].each do |file|
-  require file
-end

data/spec/webfinger/debugger/request_filter_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe WebFinger::Debugger::RequestFilter do
-  let(:resource_endpoint) { 'https://example.com/resources' }
-  let(:request) { HTTP::Message.new_request(:get, URI.parse(resource_endpoint)) }
-  let(:response) { HTTP::Message.new_response({:hello => 'world'}.to_json) }
-  let(:request_filter) { WebFinger::Debugger::RequestFilter.new }
-
-  describe '#filter_request' do
-    it 'should log request' do
-      expect(WebFinger.logger).to receive(:info).with(
-        "======= [WebFinger] HTTP REQUEST STARTED =======\n" +
-        request.dump
-      )
-      request_filter.filter_request(request)
-    end
-  end
-
-  describe '#filter_response' do
-    it 'should log response' do
-      expect(WebFinger.logger).to receive(:info).with(
-        "--------------------------------------------------\n" +
-        response.dump +
-        "\n======= [WebFinger] HTTP REQUEST FINISHED ======="
-      )
-      request_filter.filter_response(request, response)
-    end
-  end
-end