harpy 1.1.0 → 2.0.0.preview1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6437acd381d436843e94394aa9d1c6df605c4ca43ca5fb3e32746a4f6d805ed
-  data.tar.gz: b03c709ef5b4297a059280926773fb376b5f9feb77ab6656ea9f7d169cd69c6b
+  metadata.gz: c6bccc44b8e3516964d14dfb259eb7b9294c42449c4f9f72876b5ed1852ed3d0
+  data.tar.gz: 989d3494a0b11a5ee04b2c472c2f3ac85920bf42296c3194c1a756f7e1ddd680
 SHA512:
-  metadata.gz: 074b8e393b71cb510d5f8acf96aa2473395689458d4b7b1ca58965b44a1a902be536f77f452a0bd1d5d675b456244d52cf0937b1c266abdc019f16eaed71b475
-  data.tar.gz: 96996c71087173593a8eaed967fdd500a505ab92b6ddcf0e2025cb62ab87735a29748e9e8958ed37573e74ea96c3bdfb8c4afabe5de4865fd5316598c19b705d
+  metadata.gz: c0d99509101d673e64f08a18d7dd0ac8335f59e462e60e51638e365fc54b5a11bb5cd43e1454052af17bab69ebb7a94b6b69dbd0de27a5d8932f694a90e61c5b
+  data.tar.gz: 83f63ada339c06bd86231d8175b767bf5e56afffd80d7862093189a28e2eb4c86cdf8243b5cd88113fca49715f8f6a94bda439983c024cbef383a171a5ee48d3

data/.forgejo/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: docker
+    container:
+      image: docker.io/library/ruby:${{ matrix.image }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: "3.4"
+            image: "3.4"
+          - ruby: "4.0"
+            image: "4.0"
+          - ruby: "4.1"
+            image: "4.1-rc"
+    steps:
+      - name: Install Node.js 24 for the checkout action
+        run: |
+          apt-get update
+          apt-get install -y ca-certificates curl
+          curl -fsSL https://deb.nodesource.com/setup_24.x | bash -
+          apt-get install -y nodejs
+          node --version
+      - name: Check out the repository
+        uses: actions/checkout@v7
+      - run: bundle install
+      - run: bundle exec rake

data/.github/workflows/test.yml

@@ -0,0 +1,20 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.4", "4.0", "4.1"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/README.md

@@ -1,16 +1,15 @@
 Harpy
 ======
 
-[![Build Status](https://travis-ci.org/TalentBox/harpy.png?branch=master)](https://travis-ci.org/TalentBox/harpy)
-[![Code Climate](https://codeclimate.com/github/TalentBox/harpy.png)](https://codeclimate.com/github/TalentBox/harpy)
+[![Test](https://github.com/TalentBox/harpy/actions/workflows/test.yml/badge.svg)](https://github.com/TalentBox/harpy/actions/workflows/test.yml)
 
 Client for REST API with HATEOAS
 
 Dependencies
 ------------
 
-* Ruby >= 2.4.
-* gem "typhoeus", ">= 0.6.5"
+* Ruby >= 3.4.
+* gem "httpx", ">= 1.0"
 * gem "activesupport", ">= 5.2.0"
 * gem "activemodel", ">= 5.2.0"
 * gem "hash-deep-merge", ">= 0.1.1"
@@ -44,7 +43,7 @@ Usage
         # => instance of MyModel with attributes filled in on 200
         # => nil on 404
         # => raises Harpy::ClientTimeout on timeout
-        # => raises Harpy::ClientError on Curl error
+        # => raises Harpy::ClientError on HTTP client error
         # => raises Harpy::InvalidResponseCode on other response codes
 
         # Fetch multiple by url in parallel
@@ -60,7 +59,7 @@ Usage
           }
         # => return an array of MyModel instances on 200
         # => raises Harpy::ClientTimeout on timeout
-        # => raises Harpy::ClientError on Curl error
+        # => raises Harpy::ClientError on HTTP client error
         # => raises Harpy::InvalidResponseCode on other response codes
 
         # Search by first_name

data/harpy.gemspec

@@ -12,17 +12,19 @@ Gem::Specification.new do |s|
   s.summary     = %q{Client for REST API}
   s.description = %q{Client for REST API with HATEOAS}
   s.license     = "MIT"
+  s.required_ruby_version = ">= 3.4"
 
   s.files         = `git ls-files`.split("\n")
   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 "typhoeus", ">= 0.6.5"
+  s.add_runtime_dependency "httpx", ">= 1.0"
   s.add_runtime_dependency "activesupport", [">= 5.2.0"]
   s.add_runtime_dependency "activemodel", [">= 5.2.0"]
   s.add_runtime_dependency "hash-deep-merge", [">= 0.1.1"]
 
   s.add_development_dependency "rake", [">= 0.8.7"]
   s.add_development_dependency "rspec"
+  s.add_development_dependency "webmock"
 end

data/lib/harpy/client.rb

@@ -1,4 +1,6 @@
-require "typhoeus"
+require "base64"
+require "openssl"
+require "httpx"
 require "hash_deep_merge"
 
 module Harpy
@@ -7,6 +9,7 @@ module Harpy
 
     def initialize(opts=nil)
       self.options = (opts || {})
+      @session = HTTPX::Session.new
     end
 
     def get(url_or_urls, opts=nil)
@@ -34,33 +37,68 @@ module Harpy
     end
 
     def run(requests)
-      requests.each{|request| Typhoeus::Hydra.hydra.queue request}
-      Typhoeus::Hydra.hydra.run
-      requests.collect(&:response)
+      return [] if requests.empty?
+
+      responses = @session.request(*requests)
+      responses.is_a?(Array) ? responses : [responses]
+    end
+
+    def response_status(response)
+      response.is_a?(HTTPX::ErrorResponse) ? 0 : response.status
     end
 
     def invalid_code(response)
-      if response.timed_out?
-        raise ClientTimeout
-      elsif response.code.zero?
-        raise ClientError, response.return_message
+      if response.is_a?(HTTPX::ErrorResponse)
+        if response.error.is_a?(HTTPX::TimeoutError)
+          raise ClientTimeout
+        else
+          raise ClientError, response.error.message
+        end
       else
-        raise InvalidResponseCode, response.code.to_s
+        raise InvalidResponseCode, response.status.to_s
       end
     end
 
   private
 
     def request(method, urls, opts=nil)
-      opts = options.deep_merge(opts || {})
+      opts = httpx_options(options.deep_merge(opts || {}))
       case urls
       when Array
-        requests = urls.collect do |url|
-          Typhoeus::Request.new url, opts.merge(:method => method)
+        urls.collect do |url|
+          @session.build_request(method, url, opts.dup)
         end
       else
-        Typhoeus::Request.send method, urls, opts
+        @session.request(method.to_s.upcase, urls, **opts)
+      end
+    end
+
+    def httpx_options(opts)
+      timeout = opts[:timeout]
+      if timeout.is_a?(Numeric)
+        opts[:timeout] = {total_request_timeout: timeout.to_f / 1000} if timeout.positive?
+        opts.delete(:timeout) unless timeout.positive?
+      end
+
+      ssl_options = (opts[:ssl] || {}).dup
+      if opts.key?(:ssl_verifypeer)
+        verify_peer = opts.delete(:ssl_verifypeer)
+        ssl_options[:verify_mode] = verify_peer ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+      end
+      if opts.key?(:ssl_verifyhost)
+        verify_host = opts.delete(:ssl_verifyhost)
+        ssl_options[:verify_hostname] = verify_host != false && verify_host != 0
+      end
+      opts[:ssl] = ssl_options unless ssl_options.empty?
+
+      username = opts.delete(:username)
+      password = opts.delete(:password)
+      if username || password
+        headers = (opts[:headers] || {}).dup
+        headers["Authorization"] ||= "Basic #{Base64.strict_encode64("#{username}:#{password}")}"
+        opts[:headers] = headers
       end
+      opts
     end
   end
 end

data/lib/harpy/entry_point.rb

@@ -10,7 +10,7 @@ module Harpy
 
     def resource_url(resource_type)
       response = Harpy.client.get url
-      case response.code
+      case Harpy.client.response_status(response)
       when 200
         body = JSON.parse response.body
         link = (body["link"] || []).detect{|link| link["rel"] == resource_type}
@@ -22,9 +22,9 @@ module Harpy
 
     def urn(urn)
       response = Harpy.client.get "#{url}/#{urn}"
-      case response.code
+      case Harpy.client.response_status(response)
       when 301
-        response.headers_hash["Location"]
+        response.headers["location"]
       when 404
         nil
       else

data/lib/harpy/gem_version.rb

@@ -4,10 +4,10 @@ module Harpy
   end
 
   module VERSION
-    MAJOR = 1
-    MINOR = 1
+    MAJOR = 2
+    MINOR = 0
     TINY  = 0
-    PRE   = nil
+    PRE   = "preview1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/harpy/resource.rb

@@ -62,7 +62,7 @@ module Harpy
 
       def search(conditions={})
         response = Harpy.client.get url, :params => conditions
-        case response.code
+        case Harpy.client.response_status(response)
         when 200
           parsed = JSON.parse response.body
           items = parsed[resource_name].collect{|model| new model}
@@ -109,7 +109,7 @@ module Harpy
       end
 
       def from_url_handler(response)
-        case response.code
+        case Harpy.client.response_status(response)
         when 200
           new JSON.parse response.body
         when 404
@@ -120,7 +120,7 @@ module Harpy
       end
 
       def delete_from_url_handler(response)
-        case response.code
+        case Harpy.client.response_status(response)
         when 204
           true
         when 404
@@ -228,7 +228,7 @@ module Harpy
       end
 
       def process_response(response, context)
-        case response.code
+        case Harpy.client.response_status(response)
         when 200, 201, 302
           @attrs.merge! JSON.parse(response.body)
           true
@@ -249,6 +249,7 @@ module Harpy
       def read_attribute_for_validation(key)
         @attrs[key]
       end
+      public :read_attribute_for_validation
 
       def method_missing(method, *args)
         key = method.to_s

data/spec/harpy/client_spec.rb

@@ -25,78 +25,120 @@ describe Harpy::Client do
     describe "##{method}(url, opts={})" do
       context "with one url" do
         before do
-          @expected = Typhoeus::Response.new :code => 200
-          Typhoeus.stub(entry_url, method: method){@expected}
+          stub_request(method, entry_url).to_return(status: 200)
         end
+
         it "sends a #{method.to_s.upcase} to the url" do
-          expect(subject.send(method, entry_url)).to eq(@expected)
+          response = subject.send(method, entry_url)
+          expect(response.status).to eq(200)
+          expect(WebMock).to have_requested(method, entry_url)
         end
+
         it "merges options" do
           client = Harpy::Client.new :headers => {"Authorization" => "spec"}
-          Typhoeus.stub(entry_url, method: method){Typhoeus::Response.new :code => 200}
+          stub_request(method, entry_url).to_return(status: 200)
           response = client.send method, entry_url, :headers => {"X-Files" => "Harpy"}
-          expect(response.request.options[:headers]).to include({"X-Files" => "Harpy", "Authorization" => "spec"})
+          expect(WebMock).to have_requested(method, entry_url).with(headers: {
+            "X-Files" => "Harpy",
+            "Authorization" => "spec"
+          })
         end
       end
+
       context "with multiple urls" do
         it "does not execute requests" do
           expect {
             subject.send method, [entry_url, users_url]
           }.not_to raise_error
         end
-        it "returns one requests per url" do
+
+        it "returns one request per url" do
           requests = subject.send method, [entry_url, users_url]
           expect(requests.size).to eq(2)
-          expect(requests.collect{|r| r.options[:method]}).to match_array([method, method])
-          expect(requests.collect(&:url)).to match_array([entry_url, users_url])
+          expect(requests.collect{|request| request.verb.downcase.to_sym}).to match_array([method, method])
+          expect(requests.collect{|request| request.uri.to_s}).to match_array([entry_url, users_url])
         end
+
         it "merges options" do
           client = Harpy::Client.new :headers => {"Authorization" => "spec"}
           requests = client.send method, [entry_url, users_url], :headers => {"X-Files" => "Harpy"}
           requests.each do |request|
-            expect(request.options[:headers]).to include({"X-Files" => "Harpy", "Authorization" => "spec"})
+            expect(request.headers["x-files"]).to eq("Harpy")
+            expect(request.headers["authorization"]).to eq("spec")
           end
         end
       end
     end
   end
+
+  describe "HTTPX request options" do
+    it "encodes query parameters" do
+      stub_request(:get, "#{users_url}?active=true").to_return(status: 200)
+
+      response = subject.get(users_url, params: {active: true})
+
+      expect(response.status).to eq(200)
+      expect(WebMock).to have_requested(:get, "#{users_url}?active=true")
+    end
+
+    it "maps username and password to basic authentication" do
+      stub_request(:get, entry_url).with(headers: {"Authorization" => "Basic aGFycHk6c3BlYw=="}).to_return(status: 200)
+
+      response = Harpy::Client.new(username: "harpy", password: "spec").get(entry_url)
+
+      expect(response.status).to eq(200)
+    end
+
+    it "maps legacy timeout and SSL options" do
+      request = Harpy::Client.new(timeout: 5000, ssl_verifypeer: false, ssl_verifyhost: 0).get([entry_url]).first
+
+      expect(request.options.timeout.total_request_timeout).to eq(5)
+      expect(request.options.ssl).to include(verify_mode: OpenSSL::SSL::VERIFY_NONE, verify_hostname: false)
+    end
+  end
+
   describe "#run(requests)" do
     before do
-      @entry_response = Typhoeus::Response.new :code => 200, :body => "entry"
-      @users_response = Typhoeus::Response.new :code => 200, :body => "users"
-
-      Typhoeus.stub(entry_url, method: :get){ @entry_response }
-      Typhoeus.stub(users_url, method: :get){ @users_response }
+      stub_request(:get, entry_url).to_return(status: 200, body: "entry")
+      stub_request(:get, users_url).to_return(status: 200, body: "users")
     end
-    it "executes requests in parallel" do
-      expect(Typhoeus::Hydra.hydra).to receive(:run).once
-      subject.run subject.get([entry_url, users_url])
+
+    it "submits the requests together to HTTPX" do
+      requests = subject.get([entry_url, users_url])
+      expect(subject.instance_variable_get(:@session)).to receive(:request).with(*requests).and_call_original
+      subject.run requests
     end
+
     it "returns responses" do
       responses = subject.run subject.get([entry_url, users_url])
-      expect(responses).to match_array([@entry_response, @users_response])
+      expect(responses.map(&:body)).to match_array(["entry", "users"])
     end
-    it "requests response is filled in" do
+
+    it "fills in each request response" do
       requests = subject.get([entry_url, users_url])
       subject.run requests
-      expect(requests[0].response).to eq(@entry_response)
-      expect(requests[1].response).to eq(@users_response)
+      expect(requests.map{|request| request.response.body}).to eq(["entry", "users"])
     end
   end
+
   describe "#invalid_code(response)" do
     it "raises Harpy::ClientTimeout on request timeout" do
+      error = HTTPX::RequestTimeoutError.new(nil, nil, 1)
       expect {
-        subject.invalid_code double("Response", :timed_out? => true)
+        subject.invalid_code httpx_error_response(error)
       }.to raise_error Harpy::ClientTimeout
     end
-    it "raises Harpy::ClientError on code 0" do
+
+    it "raises Harpy::ClientError on transport error" do
+      error = HTTPX::ConnectionError.new("Could not connect to server")
       expect {
-        subject.invalid_code double("Response", :timed_out? => false, :code => 0, :return_message => "Could not connect to server")
+        subject.invalid_code httpx_error_response(error)
       }.to raise_error Harpy::ClientError, "Could not connect to server"
     end
+
     it "raises Harpy::InvalidResponseCode with code otherwise" do
       expect {
-        subject.invalid_code double("Response", :timed_out? => false, :code => 404)
+        subject.invalid_code httpx_response(:code => 404)
       }.to raise_error Harpy::InvalidResponseCode, "404"
     end
   end

data/spec/harpy/entry_point_spec.rb

@@ -11,8 +11,8 @@ describe Harpy::EntryPoint do
   describe "#resource_url(resource_type)" do
     let(:company_url) { "#{url}/company"}
     let(:json_response) { %Q|{"link": [{"rel": "company", "href": "#{company_url}"}]}| }
-    let(:success_response) {  Typhoeus::Response.new :code => 200, :body => json_response }
-    let(:error_response) {  Typhoeus::Response.new :code => 500 }
+    let(:success_response) {  httpx_response :code => 200, :body => json_response }
+    let(:error_response) {  httpx_response :code => 500 }
     it "gets entry point from url using client" do
       expect(Harpy.client).to receive(:get).with(url).and_return success_response
       subject.resource_url "user"
@@ -35,9 +35,9 @@ describe Harpy::EntryPoint do
   describe "#urn(urn)" do
     let(:urn) { "urn:harpy:company:1" }
     let(:company_url) { "#{url}/company/1"}
-    let(:success_response) {  Typhoeus::Response.new :code => 301, :headers => "Location: #{company_url}" }
-    let(:error_response) {  Typhoeus::Response.new :code => 500 }
-    let(:not_found_response) {  Typhoeus::Response.new :code => 404 }
+    let(:success_response) {  httpx_response :code => 301, :headers => "Location: #{company_url}" }
+    let(:error_response) {  httpx_response :code => 500 }
+    let(:not_found_response) {  httpx_response :code => 404 }
     it "query remote for this urn using client" do
       expect(Harpy.client).to receive(:get).with("#{url}/#{urn}").and_return success_response
       expect(subject.urn(urn)).to eq(company_url)

data/spec/harpy/resource_spec.rb

@@ -4,9 +4,8 @@ describe Harpy::Resource do
   describe ".from_url(hash)" do
     let(:company_url) { "http://localhost/company/1" }
     let(:json_response) { %Q|{"name": "Harpy ltd", "link": [{"rel": "self", "href": "#{company_url}"}]}| }
-    let(:success_response) { Typhoeus::Response.new :code => 200, :body => json_response}
     it "queries multiple resources in parallel and return instances" do
-      Typhoeus.stub(company_url, method: :get){ success_response }
+      stub_request(:get, company_url).to_return(status: 200, body: json_response)
       responses = Harpy::Resource.from_url({ Harpy::Spec::Company => [company_url] })
       expect(responses.size).to eq(1)
       expect(responses[Harpy::Spec::Company].size).to eq(1)
@@ -59,7 +58,7 @@ describe "class including Harpy::Resource" do
     context "called with only one url" do
       let(:url){ "http://localhost/company/1" }
       it "is a properly filled-in instance of Harpy::Spec::Company on success" do
-        response = Typhoeus::Response.new :code => 200, :body => <<-eos
+        response = httpx_response :code => 200, :body => <<-eos
           {
             "name": "Harpy Ltd",
             "link": [
@@ -74,12 +73,12 @@ describe "class including Harpy::Resource" do
         expect(result.link("self")).to eq(url)
       end
       it "is nil when not found" do
-        response = Typhoeus::Response.new :code => 404
+        response = httpx_response :code => 404
         expect(Harpy.client).to receive(:get).with(url).and_return response
         expect(Harpy::Spec::Company.from_url(url)).to be_nil
       end
       it "delegates response code != 200 or 404 to client" do
-        response = Typhoeus::Response.new :code => 500
+        response = httpx_response :code => 500
         expect(Harpy.client).to receive(:get).with(url).and_return response
         expect(Harpy.client).to receive(:invalid_code).with response
         Harpy::Spec::Company.from_url(url)
@@ -89,7 +88,7 @@ describe "class including Harpy::Resource" do
       let(:url1){ "http://localhost/company/1" }
       let(:url2){ "http://localhost/company/2" }
       it "is a properly filled-in instance of Harpy::Spec::Company on success" do
-        response1 = Typhoeus::Response.new :code => 200, :body => <<-eos
+        response1 = httpx_response :code => 200, :body => <<-eos
           {
             "name": "Harpy Ltd",
             "link": [
@@ -97,7 +96,7 @@ describe "class including Harpy::Resource" do
             ]
           }
         eos
-        response2 = Typhoeus::Response.new :code => 200, :body => <<-eos
+        response2 = httpx_response :code => 200, :body => <<-eos
           {
             "name": "Harpy Inc",
             "link": [
@@ -105,8 +104,8 @@ describe "class including Harpy::Resource" do
             ]
           }
         eos
-        Typhoeus.stub(url1, method: :get){ response1 }
-        Typhoeus.stub(url2, method: :get){ response2 }
+        stub_request(:get, url1).to_return(status: 200, body: response1.body.to_s)
+        stub_request(:get, url2).to_return(status: 200, body: response2.body.to_s)
         results = Harpy::Spec::Company.from_url [url1, url2]
         expect(results.size).to eq(2)
         expect(results[0]).to be_kind_of Harpy::Spec::Company
@@ -197,18 +196,18 @@ describe "class including Harpy::Resource" do
     context "called with only one url" do
       let(:url){ "http://localhost/company/1" }
       it "is true on success" do
-        response = Typhoeus::Response.new :code => 204
+        response = httpx_response :code => 204
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         result = Harpy::Spec::Company.delete_from_url url
         expect(result).to be_truthy
       end
       it "is false when not found" do
-        response = Typhoeus::Response.new :code => 404
+        response = httpx_response :code => 404
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         expect(Harpy::Spec::Company.delete_from_url(url)).to be_falsey
       end
       it "delegates response code != 204 or 404 to client" do
-        response = Typhoeus::Response.new :code => 500
+        response = httpx_response :code => 500
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         expect(Harpy.client).to receive(:invalid_code).with response
         Harpy::Spec::Company.delete_from_url url
@@ -309,7 +308,7 @@ describe "class including Harpy::Resource" do
        expect(Harpy.entry_point).to receive(:resource_url).with("harpy/spec/company").and_return url
     end
     it "return properly filled instances on 200" do
-      response = Typhoeus::Response.new :code => 200, :body => <<-eos
+      response = httpx_response :code => 200, :body => <<-eos
       {
         "harpy/spec/company": [
           {
@@ -347,7 +346,7 @@ describe "class including Harpy::Resource" do
       expect(companies.blank?).to be true
     end
     it "delegates other response codes to client" do
-      response = Typhoeus::Response.new :code => 500
+      response = httpx_response :code => 500
       expect(Harpy.client).to receive(:get).with(url, :params => {}).and_return response
       expect(Harpy.client).to receive(:invalid_code).with response
       Harpy::Spec::Company.search
@@ -356,7 +355,7 @@ describe "class including Harpy::Resource" do
   describe ".with_url(url)" do
     let(:url){ "http://localhost/user/1/company" }
     it "overrides url used for searches" do
-      response = Typhoeus::Response.new :code => 500
+      response = httpx_response :code => 500
       expect(Harpy.client).to receive(:get).with(url, :params => {}).and_return response
       expect(Harpy.client).to receive(:invalid_code).with response
       Harpy::Spec::Company.with_url(url) do
@@ -365,7 +364,7 @@ describe "class including Harpy::Resource" do
     end
     it "can be nested" do
       url2 = "http://localhost/user/2/company"
-      response = Typhoeus::Response.new :code => 500
+      response = httpx_response :code => 500
       expect(Harpy.client).to receive(:get).ordered.with(url2, :params => {}).and_return response
       expect(Harpy.client).to receive(:get).ordered.with(url, :params => {}).and_return response
       expect(Harpy.client).to receive(:invalid_code).twice.with response
@@ -492,7 +491,7 @@ describe "class including Harpy::Resource" do
     describe "#inspect" do
       subject { Harpy::Spec::Company.new "firstname" => "Anthony" }
       it "shows class name, attributes, errors and persisted state" do
-        expect(subject.inspect).to eq('<Harpy::Spec::Company @attrs:{"firstname"=>"Anthony"} @errors:[] persisted:false>')
+        expect(subject.inspect).to include("Harpy::Spec::Company", "firstname", "Anthony", "@errors:[] persisted:false>")
       end
     end
     describe "#has_key?(key)" do
@@ -566,7 +565,7 @@ describe "class including Harpy::Resource" do
       end
       [200, 201, 302].each do |response_code|
         it "is true and merges response attributes on #{response_code}" do
-          response = Typhoeus::Response.new :code => response_code, :body => <<-eos
+          response = httpx_response :code => response_code, :body => <<-eos
             {
               "firstname": "Anthony",
               "urn": "urn:harpy:user:1",
@@ -584,19 +583,19 @@ describe "class including Harpy::Resource" do
         end
       end
       it "raises Harpy::InvalidResponseCode on 204" do
-        response = Typhoeus::Response.new :code => 204
+        response = httpx_response :code => 204
         expect(Harpy.client).to receive(:post).with(url, :body => body).and_return response
         expect { subject.save }.to raise_error Harpy::InvalidResponseCode, "204"
         expect(subject.callbacks).to match_array([:save, :create])
       end
       it "raises Harpy::Unauthorized on 401" do
-        response = Typhoeus::Response.new :code => 401
+        response = httpx_response :code => 401
         expect(Harpy.client).to receive(:post).with(url, :body => body).and_return response
         expect { subject.save }.to raise_error Harpy::Unauthorized, "Server returned a 401 response code"
         expect(subject.callbacks).to match_array([:save, :create])
       end
       it "is false and fills in errors on 422" do
-        response = Typhoeus::Response.new :code => 422, :body => <<-eos
+        response = httpx_response :code => 422, :body => <<-eos
           {
             "firstname": "Anthony",
             "errors": {
@@ -613,7 +612,7 @@ describe "class including Harpy::Resource" do
         expect(subject.company_name).to eq("Stark Enterprises")
       end
       it "delegates other response codes to client" do
-        response = Typhoeus::Response.new :code => 500
+        response = httpx_response :code => 500
         expect(Harpy.client).to receive(:post).with(url, :body => body).and_return response
         expect(Harpy.client).to receive(:invalid_code).with(response)
         subject.save
@@ -643,7 +642,7 @@ describe "class including Harpy::Resource" do
       end
       [200, 201, 302].each do |response_code|
         it "is true and merges response attributes on #{response_code}" do
-          response = Typhoeus::Response.new :code => response_code, :body => <<-eos
+          response = httpx_response :code => response_code, :body => <<-eos
             {
               "firstname": "Anthony",
               "urn": "urn:harpy:user:1",
@@ -660,20 +659,20 @@ describe "class including Harpy::Resource" do
         end
       end
       it "is true but doesn't touch attributes on 204" do
-        response = Typhoeus::Response.new :code => 204
+        response = httpx_response :code => 204
         expect(Harpy.client).to receive(:put).with(url, :body => body).and_return response
         expect(subject.save).to be_truthy
         expect(subject.callbacks).to match_array([:save, :update])
         expect(subject.company_name).to eq("Stark Enterprises")
       end
       it "raises Harpy::Unauthorized on 401" do
-        response = Typhoeus::Response.new :code => 401
+        response = httpx_response :code => 401
         expect(Harpy.client).to receive(:put).with(url, :body => body).and_return response
         expect { subject.save }.to raise_error Harpy::Unauthorized, "Server returned a 401 response code"
         expect(subject.callbacks).to match_array([:save, :update])
       end
       it "is false and fills in errors on 422" do
-        response = Typhoeus::Response.new :code => 422, :body => <<-eos
+        response = httpx_response :code => 422, :body => <<-eos
           {
             "firstname": "Anthony",
             "errors": {
@@ -690,7 +689,7 @@ describe "class including Harpy::Resource" do
         expect(subject.company_name).to eq("Stark Enterprises")
       end
       it "delegates other response codes to client" do
-        response = Typhoeus::Response.new :code => 500
+        response = httpx_response :code => 500
         expect(Harpy.client).to receive(:put).with(url, :body => body).and_return response
         expect(Harpy.client).to receive(:invalid_code).with(response)
         subject.save
@@ -717,7 +716,7 @@ describe "class including Harpy::Resource" do
       end
       [200, 201, 302].each do |response_code|
         it "is true and merges response attributes on #{response_code}" do
-          response = Typhoeus::Response.new :code => response_code, :body => <<-eos
+          response = httpx_response :code => response_code, :body => <<-eos
             {
               "firstname": "Anthony",
               "urn": "urn:harpy:user:1",
@@ -734,20 +733,20 @@ describe "class including Harpy::Resource" do
         end
       end
       it "is true but doesn't touch attributes on 204" do
-        response = Typhoeus::Response.new :code => 204
+        response = httpx_response :code => 204
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         expect(subject.destroy).to be_truthy
         expect(subject.callbacks).to match_array([:destroy])
         expect(subject.company_name).to eq("Stark Enterprises")
       end
       it "raises Harpy::Unauthorized on 401" do
-        response = Typhoeus::Response.new :code => 401
+        response = httpx_response :code => 401
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         expect { subject.destroy }.to raise_error Harpy::Unauthorized, "Server returned a 401 response code"
         expect(subject.callbacks).to match_array([:destroy])
       end
       it "is false and fills in errors on 422" do
-        response = Typhoeus::Response.new :code => 422, :body => <<-eos
+        response = httpx_response :code => 422, :body => <<-eos
           {
             "firstname": "Anthony",
             "errors": {
@@ -764,7 +763,7 @@ describe "class including Harpy::Resource" do
         expect(subject.company_name).to eq("Stark Enterprises")
       end
       it "delegates other response codes to client" do
-        response = Typhoeus::Response.new :code => 500
+        response = httpx_response :code => 500
         expect(Harpy.client).to receive(:delete).with(url).and_return response
         expect(Harpy.client).to receive(:invalid_code).with(response)
         subject.destroy

data/spec/spec_helper.rb

@@ -1,10 +1,39 @@
+require "webmock/rspec"
+require "httpx"
 require "harpy"
-require "typhoeus"
+
+WebMock.disable_net_connect!
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each{|f| require f}
 
+module HTTPXSpecHelpers
+  def httpx_response(options)
+    session = HTTPX::Session.new
+    request = session.build_request("GET", "http://localhost")
+    headers = options[:headers] || {}
+    if headers.is_a?(String)
+      headers = headers.lines.each_with_object({}) do |line, parsed|
+        name, value = line.split(":", 2)
+        parsed[name.strip] = value.strip if value
+      end
+    end
+
+    response = HTTPX::Response.new(request, options[:code], "1.1", headers)
+    response << options[:body] if options[:body]
+    response.finish!
+    response
+  end
+
+  def httpx_error_response(error)
+    session = HTTPX::Session.new
+    request = session.build_request("GET", "http://localhost")
+    HTTPX::ErrorResponse.new(request, error)
+  end
+end
+
 RSpec.configure do |config|
+  config.include HTTPXSpecHelpers
   config.after(:each) do
-    Typhoeus::Expectation.clear
+    WebMock.reset!
   end
 end

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: harpy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.preview1
 platform: ruby
 authors:
 - Joseph HALTER
 - Jonathan TRON
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client for REST API with HATEOAS
 email:
 - joseph.halter@thetalentbox.com
@@ -103,9 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".forgejo/workflows/test.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -127,7 +141,6 @@ homepage: https://github.com/TalentBox/harpy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,15 +148,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Client for REST API
 test_files:

data/.travis.yml

@@ -1,7 +0,0 @@
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - jruby-9.2.7.0
-notifications:
-  disabled: true