hyperclient 0.9.3 → 1.0.1

data/test/hyperclient/resource_collection_test.rb

@@ -14,21 +14,21 @@ module Hyperclient
     end
 
     it 'is a collection' do
-      ResourceCollection.ancestors.must_include Collection
+      _(ResourceCollection.ancestors).must_include Collection
     end
 
     it 'initializes the collection with resources' do
-      resources.must_respond_to :author
-      resources.must_respond_to :episodes
+      _(resources).must_respond_to :author
+      _(resources).must_respond_to :episodes
     end
 
     it 'returns resource objects for each resource' do
-      resources.author.must_be_kind_of Resource
+      _(resources.author).must_be_kind_of Resource
     end
 
     it 'also builds arras of resource' do
-      resources.episodes.must_be_kind_of Array
-      resources.episodes.first.must_be_kind_of Resource
+      _(resources.episodes).must_be_kind_of Array
+      _(resources.episodes.first).must_be_kind_of Resource
     end
   end
 end

data/test/hyperclient/resource_test.rb

@@ -29,7 +29,7 @@ module Hyperclient
 
         resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-        resource._response.must_equal mock_response
+        _(resource._response).must_equal mock_response
       end
 
       it 'does not mutate the response.body' do
@@ -38,7 +38,7 @@ module Hyperclient
 
         resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-        resource._response.body.must_equal body
+        _(resource._response.body).must_equal body
       end
 
       describe 'with an empty body in response' do
@@ -47,13 +47,13 @@ module Hyperclient
 
           resource = Resource.new(mock_response.body, entry_point, mock_response)
 
-          resource._response.must_equal mock_response
+          _(resource._response).must_equal mock_response
         end
       end
 
       describe 'with an invalid representation' do
         it 'raises an InvalidRepresentationError' do
-          proc { Resource.new('invalid representation data', entry_point) }.must_raise InvalidRepresentationError
+          _(proc { Resource.new('invalid representation data', entry_point) }).must_raise InvalidRepresentationError
         end
       end
     end
@@ -61,9 +61,9 @@ module Hyperclient
     describe '_links' do
       it '_expand' do
         resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } }, entry_point)
-        resource._links.orders._expand(id: 1)._url.must_equal '/orders/1'
-        resource.orders._expand(id: 1)._url.must_equal '/orders/1'
-        resource.orders(id: 1)._url.must_equal '/orders/1'
+        _(resource._links.orders._expand(id: 1)._url).must_equal '/orders/1'
+        _(resource.orders._expand(id: 1)._url).must_equal '/orders/1'
+        _(resource.orders(id: 1)._url).must_equal '/orders/1'
       end
     end
 
@@ -74,84 +74,84 @@ module Hyperclient
 
       describe 'links' do
         it 'returns a LinkCollection' do
-          resource._links.must_be_kind_of LinkCollection
+          _(resource._links).must_be_kind_of LinkCollection
         end
       end
 
       describe 'attributes' do
         it 'returns a Attributes' do
-          resource._attributes.must_be_kind_of Attributes
+          _(resource._attributes).must_be_kind_of Attributes
         end
       end
 
       describe 'embedded' do
         it 'returns a ResourceCollection' do
-          resource._embedded.must_be_kind_of ResourceCollection
+          _(resource._embedded).must_be_kind_of ResourceCollection
         end
       end
 
       describe 'method_missing' do
         it 'delegates to attributes' do
           resource._attributes.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to links' do
           resource._links.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to embedded' do
           resource._embedded.expects(:foo).returns('bar')
-          resource.foo.must_equal 'bar'
+          _(resource.foo).must_equal 'bar'
         end
 
         it 'delegates to attributes, links, embedded' do
           resource._attributes.expects('respond_to?').with('foo').returns(false)
           resource._links.expects('respond_to?').with('foo').returns(false)
           resource._embedded.expects('respond_to?').with('foo').returns(false)
-          -> { resource.foo }.must_raise NoMethodError
+          _(-> { resource.foo }).must_raise NoMethodError
         end
 
         it 'delegates []' do
           resource._attributes.expects(:foo).returns('bar')
-          resource['foo'].must_equal 'bar'
+          _(resource['foo']).must_equal 'bar'
         end
 
         describe '#fetch' do
           it 'returns the value for keys that exist' do
             resource._attributes.expects(:foo).returns('bar')
 
-            resource.fetch('foo').must_equal 'bar'
+            _(resource.fetch('foo')).must_equal 'bar'
           end
 
           it 'raises an error for missing keys' do
-            proc { resource.fetch('missing key') }.must_raise KeyError
+            _(proc { resource.fetch('missing key') }).must_raise KeyError
           end
 
           describe 'with a default value' do
             it 'returns the value for keys that exist' do
               resource._attributes.expects(:foo).returns('bar')
-              resource.fetch('foo', 'default value').must_equal 'bar'
+              _(resource.fetch('foo', 'default value')).must_equal 'bar'
             end
 
             it 'returns the default value for missing keys' do
-              resource.fetch('missing key', 'default value').must_equal 'default value'
+              _(resource.fetch('missing key', 'default value')).must_equal 'default value'
             end
           end
 
           describe 'with a block' do
             it 'returns the value for keys that exist' do
               resource._attributes.expects(:foo).returns('bar')
-              resource.fetch('foo') { 'default value' }.must_equal 'bar'
+              _(resource.fetch('foo') { 'default value' }).must_equal 'bar'
             end
 
             it 'returns the value from the block' do
-              resource.fetch('z') { 'go fish!' }.must_equal 'go fish!'
+              _(resource.fetch('z') { 'go fish!' }).must_equal 'go fish!'
             end
 
             it 'returns the value with args from the block' do
-              resource.fetch('z') { |el| "go fish, #{el}" }.must_equal 'go fish, z'
+              _(resource.fetch('z') { |el| "go fish, #{el}" }).must_equal 'go fish, z'
             end
           end
         end
@@ -179,7 +179,7 @@ module Hyperclient
         end
 
         it 'proxies to the response object' do
-          resource._success?.must_equal true
+          _(resource._success?).must_equal true
         end
       end
 
@@ -189,7 +189,7 @@ module Hyperclient
         end
 
         it 'returns nil' do
-          resource._success?.must_be_nil
+          _(resource._success?).must_be_nil
         end
       end
     end
@@ -205,7 +205,7 @@ module Hyperclient
         end
 
         it 'proxies to the response object' do
-          resource._status.must_equal 200
+          _(resource._status).must_equal 200
         end
       end
 
@@ -215,7 +215,7 @@ module Hyperclient
         end
 
         it 'returns nil' do
-          resource._status.must_be_nil
+          _(resource._status).must_be_nil
         end
       end
     end

data/test/hyperclient_test.rb

@@ -20,23 +20,22 @@ describe Hyperclient do
       end
 
       it 'creates a Faraday connection with the default and additional headers' do
-        client.headers['Content-Type'].must_equal 'application/hal+json'
-        client.headers['Accept'].must_equal 'application/hal+json,application/json'
-        client.headers['Access-Token'].must_equal 'token'
+        _(client.headers['Content-Type']).must_equal 'application/hal+json'
+        _(client.headers['Accept']).must_equal 'application/hal+json,application/json'
+        _(client.headers['Access-Token']).must_equal 'token'
       end
 
       it 'creates a Faraday connection with the entry point url' do
-        client.connection.url_prefix.to_s.must_equal 'http://api.example.org/'
+        _(client.connection.url_prefix.to_s).must_equal 'http://api.example.org/'
       end
 
       it 'creates a Faraday connection with the default block plus any additional handlers' do
         handlers = client.connection.builder.handlers
-        handlers.must_include Faraday::Request::OAuth
-        handlers.must_include Faraday::Response::RaiseError
-        handlers.must_include FaradayMiddleware::FollowRedirects
-        handlers.must_include FaradayMiddleware::EncodeHalJson
-        handlers.must_include FaradayMiddleware::ParseHalJson
-        handlers.must_include Faraday::Adapter::NetHttp
+        _(handlers).must_include Faraday::Request::OAuth
+        _(handlers).must_include Faraday::Response::RaiseError
+        _(handlers).must_include FaradayMiddleware::FollowRedirects
+        _(handlers).must_include FaradayMiddleware::EncodeHalJson
+        _(handlers).must_include FaradayMiddleware::ParseHalJson
       end
     end
   end

data/test/test_helper.rb

@@ -2,12 +2,16 @@ $LOAD_PATH << 'lib'
 
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'json'
 
 MiniTest::Test.class_eval do
   def stub_request(conn, adapter_class = Faraday::Adapter::Test, &stubs_block)
     adapter_handler = conn.builder.handlers.find { |h| h.klass < Faraday::Adapter }
-    conn.builder.swap(adapter_handler, adapter_class, &stubs_block)
+    if adapter_handler
+      conn.builder.swap(adapter_handler, adapter_class, &stubs_block)
+    else
+      conn.builder.adapter adapter_class, &stubs_block
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperclient
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Oriol Gual
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: faraday-digestauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: faraday_hal_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-http-digest_auth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Hyperclient is a Ruby Hypermedia API client.
 email:
 - oriol.gual@gmail.com
@@ -125,7 +97,6 @@ files:
 - features/support/env.rb
 - features/support/fixtures.rb
 - hyperclient.gemspec
-- lib/faraday/connection.rb
 - lib/hyperclient.rb
 - lib/hyperclient/attributes.rb
 - lib/hyperclient/collection.rb
@@ -136,7 +107,6 @@ files:
 - lib/hyperclient/resource.rb
 - lib/hyperclient/resource_collection.rb
 - lib/hyperclient/version.rb
-- test/faraday/connection_test.rb
 - test/fixtures/collection.json
 - test/fixtures/element.json
 - test/fixtures/root.json
@@ -153,7 +123,7 @@ files:
 homepage: https://github.com/codegram/hyperclient/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ''
 test_files:
@@ -180,7 +150,6 @@ test_files:
 - features/support/api.rb
 - features/support/env.rb
 - features/support/fixtures.rb
-- test/faraday/connection_test.rb
 - test/fixtures/collection.json
 - test/fixtures/element.json
 - test/fixtures/root.json

data/lib/faraday/connection.rb

@@ -1,17 +0,0 @@
-require 'faraday'
-require 'faraday/digestauth'
-
-module Faraday
-  # Reopen Faraday::Connection to add a helper to set the digest auth data.
-  class Connection
-    # Public: Adds the digest auth middleware at the top and sets the user and
-    # password.
-    #
-    # user     - A String with the user.
-    # password - A String with the password.
-    #
-    def digest_auth(user, password)
-      builder.insert(0, Faraday::Request::DigestAuth, user, password)
-    end
-  end
-end

data/test/faraday/connection_test.rb

@@ -1,29 +0,0 @@
-require_relative '../test_helper'
-require_relative '../../lib/faraday/connection'
-
-module Faraday
-  describe Connection do
-    describe 'digest_auth' do
-      let(:connection) do
-        Faraday.new('http://api.example.org/') do |builder|
-          builder.request :url_encoded
-          builder.adapter :net_http
-        end
-      end
-
-      it 'inserts the DigestAuth middleware at the top' do
-        connection.digest_auth('user', 'password')
-
-        connection.builder.handlers.first.klass.must_equal Faraday::Request::DigestAuth
-      end
-
-      it 'passes the user and password to the middleware' do
-        connection.digest_auth('user', 'password')
-
-        Faraday::Request::DigestAuth.expects(:new).with(anything, 'user', 'password').returns(stub_everything)
-
-        connection.get('/')
-      end
-    end
-  end
-end