harpy 1.0.0 → 2.0.0.preview1

data/spec/harpy_spec.rb

@@ -4,94 +4,94 @@ describe Harpy do
   after{ Harpy.reset }
 
   it "defaults to Harpy::Client" do
-    Harpy.client.should be_kind_of Harpy::Client
+    expect(Harpy.client).to be_kind_of Harpy::Client
   end
 
   it "does allow using another client" do
     custom_client = double
     Harpy.client = custom_client
-    Harpy.client.should be custom_client
+    expect(Harpy.client).to be custom_client
   end
 
   it "has no default entry_point_url" do
-    Harpy.entry_point_url.should be_nil
+    expect(Harpy.entry_point_url).to be_nil
   end
 
   it "does allow setting an entry_point_url" do
     Harpy.entry_point_url = "http://localhost"
-    Harpy.entry_point_url.should == "http://localhost"
+    expect(Harpy.entry_point_url).to eq("http://localhost")
   end
 
   it "raises Harpy::EntryPointRequired when trying to access entry_point and none has been created yet" do
-    lambda{ Harpy.entry_point }.should raise_error Harpy::EntryPointRequired
+    expect{ Harpy.entry_point }.to raise_error Harpy::EntryPointRequired
   end
 
   it "returns a valid Harpy::EntryPoint object if entry_point_url has been set" do
     Harpy.entry_point_url = "http://localhost"
-    Harpy.entry_point.should be_kind_of Harpy::EntryPoint
-    Harpy.entry_point.url.should == "http://localhost"
+    expect(Harpy.entry_point).to be_kind_of Harpy::EntryPoint
+    expect(Harpy.entry_point.url).to eq("http://localhost")
   end
 
   it "does allow setting entry_point manually" do
     Harpy.entry_point = (entry_point = double)
-    Harpy.entry_point.should be entry_point
-    entry_point.should_receive(:url).and_return "http://localhost"
-    Harpy.entry_point_url.should == "http://localhost"
+    expect(Harpy.entry_point).to be entry_point
+    expect(entry_point).to receive(:url).and_return "http://localhost"
+    expect(Harpy.entry_point_url).to eq("http://localhost")
   end
 
   it "Harpy.reset clears both client and entry_point" do
     Harpy.entry_point_url = "http://localhost"
     Harpy.client = (custom_client = double)
     Harpy.reset
-    Harpy.entry_point_url.should be_nil
-    Harpy.client.should_not be custom_client
+    expect(Harpy.entry_point_url).to be_nil
+    expect(Harpy.client).not_to be custom_client
   end
 end
 
 describe Harpy::Exception do
   it "is an ::Exception" do
-    Harpy::Exception.ancestors.should include ::Exception
+    expect(Harpy::Exception.ancestors).to include ::Exception
   end
 end
 
 describe Harpy::EntryPointRequired do
   it "is an Harpy::Exception" do
-    Harpy::EntryPointRequired.ancestors.should include Harpy::Exception
+    expect(Harpy::EntryPointRequired.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::UrlRequired do
   it "is an Harpy::Exception" do
-    Harpy::UrlRequired.ancestors.should include Harpy::Exception
+    expect(Harpy::UrlRequired.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::BodyToBig do
   it "is an Harpy::Exception" do
-    Harpy::BodyToBig.ancestors.should include Harpy::Exception
+    expect(Harpy::BodyToBig.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::ClientTimeout do
   it "is an Harpy::Exception" do
-    Harpy::ClientTimeout.ancestors.should include Harpy::Exception
+    expect(Harpy::ClientTimeout.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::ClientError do
   it "is an Harpy::Exception" do
-    Harpy::ClientError.ancestors.should include Harpy::Exception
+    expect(Harpy::ClientError.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::Unauthorized do
   it "is an Harpy::Exception" do
-    Harpy::Unauthorized.ancestors.should include Harpy::Exception
+    expect(Harpy::Unauthorized.ancestors).to include Harpy::Exception
   end
 end
 
 describe Harpy::InvalidResponseCode do
   it "is an Harpy::Exception" do
-    Harpy::InvalidResponseCode.ancestors.should include Harpy::Exception
+    expect(Harpy::InvalidResponseCode.ancestors).to include Harpy::Exception
   end
 end

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,100 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: harpy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0.preview1
 platform: ruby
 authors:
 - Joseph HALTER
 - Jonathan TRON
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-29 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: '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
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
-  prerelease: false
+        version: 5.2.0
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  prerelease: false
+        version: 5.2.0
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activemodel
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: hash-deep-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
-  prerelease: false
+        version: 0.1.1
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: hash-deep-merge
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.8.7
+  type: :development
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   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,11 +116,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".forgejo/workflows/test.yml"
+- ".github/workflows/test.yml"
+- ".gitignore"
+- ".rspec"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -116,7 +129,9 @@ files:
 - lib/harpy/client.rb
 - lib/harpy/collection.rb
 - lib/harpy/entry_point.rb
+- lib/harpy/gem_version.rb
 - lib/harpy/resource.rb
+- lib/harpy/version.rb
 - spec/harpy/client_spec.rb
 - spec/harpy/entry_point_spec.rb
 - spec/harpy/resource_spec.rb
@@ -126,24 +141,21 @@ homepage: https://github.com/TalentBox/harpy
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 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: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Client for REST API
 test_files:

data/.travis.yml

@@ -1,9 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx-19mode
-  - jruby-19mode
-  - jruby-20mode
-notifications:
-  disabled: true

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    harpy (1.0.0)
-      activemodel (>= 3.1.0)
-      activesupport (>= 3.1.0)
-      hash-deep-merge (~> 0.1.1)
-      typhoeus (~> 0.6.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14-java)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
-    ethon (0.6.2)
-      ffi (>= 1.3.0)
-      mime-types (~> 1.18)
-    ffi (1.9.3-java)
-    hash-deep-merge (0.1.1)
-    i18n (0.6.9)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    thread_safe (0.1.3-java)
-      atomic
-    typhoeus (0.6.7)
-      ethon (~> 0.6.2)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  harpy!
-  rake (>= 0.8.7)
-  rspec