swd 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b1ef4355a0eb454bc541b4d39740444445316294bb9e23916ca9901437dc73
-  data.tar.gz: 452ca7702a025a61919fe4982d701c810c4b79be4076cad8af1efff39b635aa4
+  metadata.gz: 9f60030386576c99f1d32d337056513f9a5e129eb12ffda22cb39e72e0497930
+  data.tar.gz: d5919e42679f55337ada7688fb667f7c98c05ca55af5dd4493ab952e1f377c2f
 SHA512:
-  metadata.gz: 603f6c3000796cacaf8ecb852f08cfc29364443bde30073f50b23e40560eb81ee35b7e567df7479f20fefeb0581e9dff09a1ad88e0d47d9a684c5a11482f08cf
-  data.tar.gz: 513dfadd5bb60c22d351f0ce930a42272bfa8f2d2e9d110c461d782874af0d3350a8db48784669f8ccfb750dbceeefe1c8d25b858b8fdfc2e83de50adaddd5d3
+  metadata.gz: b81930fdf6bb71c44c0eca8701cc1fa6c030b6434c43bfec6ea2786046f27f237c51894dcdc288ab0e9fdf2805f38e1c68cda8e8668a3ff769c943660e59c18b
+  data.tar.gz: 1c68def1a77cf6aaf488aceb75f02e58260285982363c7b323fefe888b62061dff5ad917d04704bacab2f59de1b929ea24e9187a2b3352c0d8155412acf3a8ce

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/.travis.yml

@@ -2,6 +2,7 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
+  - 2.6.10
+  - 2.7.6
+  - 3.0.4
+  - 3.1.2

data/VERSION

@@ -1 +1 @@
-1.3.0
+2.0.0

data/lib/swd/resource.rb

@@ -17,7 +17,7 @@ module SWD
     def discover!(cache_options = {})
       SWD.cache.fetch(cache_key, cache_options) do
         handle_response do
-          SWD.http_client.get_content endpoint.to_s
+          SWD.http_client.get endpoint.to_s
         end
       end
     end
@@ -34,33 +34,27 @@ module SWD
     private
 
     def handle_response
-      res = JSON.parse(yield).with_indifferent_access
-      if redirect = res[:SWD_service_redirect]
+      json = yield.body.with_indifferent_access
+      if redirect = json[:SWD_service_redirect]
         redirect_to redirect[:location], redirect[:expires]
       else
-        to_response_object(res)
+        Response.new json
       end
-    rescue HTTPClient::BadResponseError => e
-      case e.res.try(:status)
+    rescue Faraday::Error => e
+      case e.response_status
       when nil
-        raise Exception.new(e.message)
+        raise e
       when 400
-        raise BadRequest.new('Bad Request', res)
+        raise BadRequest.new('Bad Request', e.response_body)
       when 401
-        raise Unauthorized.new('Unauthorized', res)
+        raise Unauthorized.new('Unauthorized', e.response_body)
       when 403
-        raise Forbidden.new('Forbidden', res)
+        raise Forbidden.new('Forbidden', e.response_body)
       when 404
-        raise NotFound.new('Not Found', res)
+        raise NotFound.new('Not Found', e.response_body)
       else
-        raise HttpError.new(e.res.status, e.res.reason, res)
+        raise HttpError.new(e.response_status, e.response_body, e.response_body)
       end
-    rescue JSON::ParserError, OpenSSL::SSL::SSLError, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
-      raise Exception.new(e.message)
-    end
-
-    def to_response_object(hash)
-      Response.new hash
     end
 
     def redirect_to(location, expires)

data/lib/swd.rb

@@ -3,7 +3,8 @@ require 'logger'
 require 'openssl'
 require 'active_support'
 require 'active_support/core_ext'
-require 'httpclient'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'attr_required'
 require 'attr_optional'
 
@@ -51,17 +52,14 @@ module SWD
   self.debugging = false
 
   def self.http_client
-    _http_client_ = HTTPClient.new(
-      :agent_name => "SWD (#{VERSION})"
-    )
-
-    # NOTE: httpclient gem seems stopped maintaining root certtificate set, use OS default.
-    _http_client_.ssl_config.clear_cert_store
-    _http_client_.ssl_config.cert_store.set_default_paths
-
-    _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
-    http_config.try(:call, _http_client_)
-    _http_client_
+    Faraday.new(headers: {user_agent: "SWD #{VERSION}"}) do |faraday|
+      faraday.response :raise_error
+      faraday.response :json
+      faraday.response :follow_redirects
+      faraday.response :logger, WebFinger.logger if debugging?
+      faraday.adapter Faraday.default_adapter
+      http_config.try(:call, faraday)
+    end
   end
   def self.http_config(&block)
     @@http_config ||= block
@@ -79,6 +77,5 @@ require 'swd/cache'
 require 'swd/exception'
 require 'swd/resource'
 require 'swd/response'
-require 'swd/debugger'
 
 SWD.cache = SWD::Cache.new

data/spec/helpers/webmock_helper.rb

@@ -24,6 +24,9 @@ module WebMockHelper
 
   def response_for(response_file, options = {})
     response = {}
+    response[:headers] = {
+      'Content-Type' => 'application/json'
+    }
     response[:body] = File.new(File.join(File.dirname(__FILE__), '../mock_json', "#{response_file}.json"))
     if options[:status]
       response[:status] = options[:status]

data/spec/swd/exception_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe SWD::HttpError do
   subject do
-    SWD::HttpError.new 400, 'Bad Request', HTTP::Message.new_response('')
+    SWD::HttpError.new 400, 'Bad Request', 'Message'
   end
 
   its(:status)   { should == 400 }
   its(:message)  { should == 'Bad Request' }
-  its(:response) { should be_a HTTP::Message }
+  its(:response) { should == 'Message' }
 end
 
 describe SWD::BadRequest do

data/spec/swd/resource_spec.rb

@@ -97,31 +97,10 @@ describe SWD::Resource do
         end
       end
 
-      context 'when invalid SSL cert' do
+      context 'when Faraday::Error without response' do
         it do
-          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
-          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
-          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
-          expect(SWD.http_client).to receive(:get_content).and_raise(HTTPClient::BadResponseError.new(''))
-          expect { res = resource.discover! }.to raise_error SWD::Exception
+          expect(SWD.http_client).to receive(:get).and_raise(Faraday::Error)
+          expect { res = resource.discover! }.to raise_error Faraday::Error
         end
       end
 

data/spec/swd_spec.rb

@@ -108,11 +108,11 @@ describe SWD do
     context 'with http_config' do
       before do
         SWD.http_config do |config|
-          config.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          config.ssl.verify = false
         end
       end
       it 'should configure http_client' do
-        SWD.http_client.ssl_config.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
+        SWD.http_client.ssl.verify.should be_falsy
       end
     end
   end

data/swd.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
-  s.add_runtime_dependency 'httpclient', '>= 2.4'
+  s.add_runtime_dependency 'faraday', '~> 2.0'
+  s.add_runtime_dependency 'faraday-follow_redirects'
   s.add_runtime_dependency 'activesupport', '>= 3'
   s.add_runtime_dependency 'attr_required', '>= 0.0.5'
   s.add_development_dependency 'rake'

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: swd
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 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.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -139,8 +155,6 @@ files:
 - VERSION
 - lib/swd.rb
 - lib/swd/cache.rb
-- lib/swd/debugger.rb
-- lib/swd/debugger/request_filter.rb
 - lib/swd/exception.rb
 - lib/swd/resource.rb
 - lib/swd/response.rb
@@ -151,7 +165,6 @@ files:
 - spec/mock_json/redirect_with_port.json
 - spec/mock_json/success.json
 - spec/spec_helper.rb
-- spec/swd/debugger/request_filter_spec.rb
 - spec/swd/exception_spec.rb
 - spec/swd/resource_spec.rb
 - spec/swd_spec.rb
@@ -174,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: SWD (Simple Web Discovery) Client Library
@@ -186,7 +199,6 @@ test_files:
 - spec/mock_json/redirect_with_port.json
 - spec/mock_json/success.json
 - spec/spec_helper.rb
-- spec/swd/debugger/request_filter_spec.rb
 - spec/swd/exception_spec.rb
 - spec/swd/resource_spec.rb
 - spec/swd_spec.rb

data/lib/swd/debugger/request_filter.rb

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

data/lib/swd/debugger.rb

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

data/spec/swd/debugger/request_filter_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe SWD::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) { SWD::Debugger::RequestFilter.new }
-
-  describe '#filter_request' do
-    it 'should log request' do
-      expect(SWD.logger).to receive(:info).with(
-        "======= [SWD] HTTP REQUEST STARTED =======\n" +
-        request.dump
-      )
-      request_filter.filter_request(request)
-    end
-  end
-
-  describe '#filter_response' do
-    it 'should log response' do
-      expect(SWD.logger).to receive(:info).with(
-        "--------------------------------------------------\n" +
-        response.dump +
-        "\n======= [SWD] HTTP REQUEST FINISHED ======="
-      )
-      request_filter.filter_response(request, response)
-    end
-  end
-end