hyperclient 0.9.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494b4be638b3b6d76edd4d07e5b12e36433dfd84c9a756dec34a278fd9ea2faa
-  data.tar.gz: 1d9e97e2a76cdf4a991a5803bd14eadf40ae300e4065cbacdedee64b66f19a3c
+  metadata.gz: 5f55cb82362d8eca25347e15c91387bbf2957f1f1241af27fccff1086b412d1b
+  data.tar.gz: f31325a293b0aec888b94910b8c3dc28d2f30a6666fe59063b4112251f46e7c4
 SHA512:
-  metadata.gz: bd401bb429c28fb75af0c95908deaa43f91a67923c47ba17ba369eb238252add1657ea1aa2b57f9721c59113c06d394274268ade288618314b93c7d4e0c11b31
-  data.tar.gz: 5892d3cabd8bad2e6bd5c6e9a5c6ef7f3fa9f7376c6aa39e9225acf8c37160da3550b66ff420440a9565d29ea898784bd3093bd36b09cbf1302f45aaa7d0a5a6
+  metadata.gz: e9b17e112614d3c600497c6c7cfd56268195427da789629d006742ff96e70d2b6972ba16fbfa075ab62613eeace923d8fdb4f231b9d86a04f82b75fa5d4a4826
+  data.tar.gz: 8a8861e266967702c86d5762ec5b786687298c37e797a5c324583c9d3c9d2fe4dc83cf8841c912db3d14a0bf731d1dbee0c1c85b3d43961589c5741b43b3f128

data/.rubocop.yml

@@ -3,8 +3,8 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.3
 
-Metrics/BlockLength:
-  ExcludedMethods: [it, describe]
+Metrics:
+  Enabled: false
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,26 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-25 11:12:51 -0400 using RuboCop version 0.74.0.
+# on 2020-12-03 14:08:14 -0500 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 103
-
-# Offense count: 3
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 25
-
-# Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 265
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
@@ -46,14 +31,22 @@ Style/DoubleNegation:
     - 'lib/hyperclient/curie.rb'
     - 'lib/hyperclient/link.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'lib/hyperclient/link_collection.rb'
+    - 'lib/hyperclient/resource.rb'
+    - 'lib/hyperclient/resource_collection.rb'
+
 # Offense count: 1
 Style/MethodMissingSuper:
   Exclude:
     - 'lib/hyperclient/collection.rb'
 
-# Offense count: 93
+# Offense count: 101
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 142
+Layout/LineLength:
+  Max: 147

data/.travis.yml

@@ -4,22 +4,21 @@ sudo: false
 
 matrix:
   include:
-    - rvm: 2.6.3
-    - rvm: 2.5.5
-    - rvm: 2.4.6
-    - rvm: 2.4.6
+    - rvm: 2.6.6
+      env: FARADAY_VERSION=0.9.0
+    - rvm: 2.6.6
+      env: FARADAY_VERSION=0.17.0
+    - rvm: 2.6.6
+      env: FARADAY_VERSION="~> 1.0"
+    - rvm: 2.6.6
       script:
         - bundle exec danger
+    - rvm: 2.3.8
     - rvm: jruby-9.2.7.0
     - rvm: jruby-head
-    - rvm: 2.3.8
     - rvm: ruby-head
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
 
-before_install:
-  - gem update --system
-  - gem install bundler
-
 bundler_args: --without development

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## Changelog
 
+### 1.0.1 (2021/01/02)
+
+* [#193](https://github.com/codegram/hyperclient/pull/193): Auto-paginate collections - [@dblock](https://github.com/dblock).
+* [#163](https://github.com/codegram/hyperclient/pull/163): Test against Faraday 0.9, 0.17 and 1.0+ - [@dblock](https://github.com/dblock).
+* [#199](https://github.com/codegram/hyperclient/pull/199): Use digest_auth from faraday-digestauth - [@dblock](https://github.com/dblock).
+
+### 1.0.0 (2021/01/02)
+
+* NOTE: **⚠ This version has been yanked ⚠** - [@dblock](https://github.com/dblock).
+
+### 0.9.3 (2020/05/14)
+
+* [#149](https://github.com/codegram/hyperclient/pull/149): Address Faraday warnings - [@yuki24](https://github.com/yuki24).
+* [#160](https://github.com/codegram/hyperclient/pull/160): Require newer 'faraday-digestauth' - [@dblock](https://github.com/dblock).
+
+### 0.9.2 (2020/05/12)
+
+* NOTE: **⚠ This version has been yanked ⚠** - [@dblock](https://github.com/dblock).
+
 ### 0.9.1 (2019/08/25)
 
 * NOTE: **⚠ This version is no longer tested with Ruby < 2.3 ⚠** - [@ivoanjo](https://github.com/ivoanjo).

data/Gemfile

@@ -3,6 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo['/'] ? repo : "#{repo}/#
 
 source 'https://rubygems.org'
 
+gem 'faraday', ENV['FARADAY_VERSION'] if ENV.key?('FARADAY_VERSION')
+
 gemspec
 
 group :development do
@@ -16,7 +18,7 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'rubocop', '~> 0.74.0', require: false
+  gem 'rubocop', '0.81.0', require: false
   gem 'simplecov', require: false
 end
 

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](http://img.shields.io/gem/v/hyperclient.svg)](http://badge.fury.io/rb/hyperclient)
 [![Build Status](http://img.shields.io/travis/codegram/hyperclient.svg)](https://travis-ci.org/codegram/hyperclient)
-[![Dependency Status](https://gemnasium.com/codegram/hyperclient.svg)](https://gemnasium.com/codegram/hyperclient)
 [![Code Climate](https://codeclimate.com/github/codegram/hyperclient.svg)](https://codeclimate.com/github/codegram/hyperclient)
 [![Coverage Status](https://img.shields.io/coveralls/codegram/hyperclient.svg)](https://coveralls.io/r/codegram/hyperclient?branch=master)
 
@@ -86,12 +85,19 @@ api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
 end
 ```
 
-You can modify headers or specify authentication after a connection has been created. Hyperclient supports Basic, Token or Digest auth as well as many other Faraday extensions.
+You can modify headers or specify authentication after a connection has been created. Hyperclient supports Basic, Token or [Digest auth](https://github.com/bhaberer/faraday-digestauth) as well as many other Faraday extensions.
 
 ```ruby
-api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api')
-api.digest_auth('username', 'password')
-api.headers.update('Accept-Encoding' => 'deflate, gzip')
+require 'faraday/digestauth'
+
+api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
+  client.connection(default: false) do |conn|
+    conn.request :digest, 'username', 'password'
+    conn.request :json
+    conn.response :json, content_type: /\bjson$/
+    conn.adapter :net_http
+  end
+end
 ```
 
 You can access the Faraday connection directly after it has been created and add middleware to it. As an example, you could use the [faraday-http-cache-middleware](https://github.com/plataformatec/faraday-http-cache).
@@ -103,7 +109,7 @@ api.connection.use :http_cache
 
 ## Resources and Attributes
 
-Hyperclient will fetch and discover the resources from your API.
+Hyperclient will fetch and discover the resources from your API and automatically paginate when possible.
 
 ```ruby
 api.splines.each do |spline|

data/features/api_navigation.feature

@@ -7,6 +7,11 @@ Feature: API navigation
     When I connect to the API
     Then I should be able to navigate to posts and authors
 
+  Scenario: Links
+    When I connect to the API
+    Then I should be able to paginate posts
+    Then I should be able to paginate authors
+
   Scenario: Templated links
     Given I connect to the API
     When I search for a post with a templated link

data/features/steps/api_navigation.rb

@@ -9,6 +9,19 @@ class Spinach::Features::ApiNavigation < Spinach::FeatureSteps
     assert_requested :get, 'http://api.example.org/authors'
   end
 
+  step 'I should be able to paginate posts' do
+    assert_kind_of Enumerator, api.posts.each
+    assert_equal 4, api.posts.to_a.count
+    assert_requested :get, 'http://api.example.org/posts'
+    assert_requested :get, 'http://api.example.org/posts?page=2'
+    assert_requested :get, 'http://api.example.org/posts?page=3'
+  end
+
+  step 'I should be able to paginate authors' do
+    assert_equal 1, api._links['api:authors'].to_a.count
+    assert_requested :get, 'http://api.example.org/authors'
+  end
+
   step 'I search for a post with a templated link' do
     api._links.search._expand(q: 'something')._resource
   end
@@ -50,8 +63,8 @@ class Spinach::Features::ApiNavigation < Spinach::FeatureSteps
   step 'I should be able to count embedded items' do
     assert_equal 2, api._links.posts._resource._embedded.posts.count
     assert_equal 2, api.posts._embedded.posts.count
-    assert_equal 2, api.posts.count
-    assert_equal 2, api.posts.map.count
+    assert_equal 4, api.posts.count
+    assert_equal 4, api.posts.map.count
   end
 
   step 'I should be able to iterate over embedded items' do
@@ -59,6 +72,6 @@ class Spinach::Features::ApiNavigation < Spinach::FeatureSteps
     api.posts.each do |_post|
       count += 1
     end
-    assert_equal 2, count
+    assert_equal 4, count
   end
 end

data/features/steps/default_config.rb

@@ -25,7 +25,7 @@ class Spinach::Features::DefaultConfig < Spinach::FeatureSteps
   end
 
   step 'it should have been parsed as JSON' do
-    @posts._attributes.total_posts.to_i.must_equal 2
-    @posts._attributes['total_posts'].to_i.must_equal 2
+    @posts._attributes.total_posts.to_i.must_equal 4
+    @posts._attributes['total_posts'].to_i.must_equal 4
   end
 end

data/features/support/api.rb

@@ -8,8 +8,14 @@ module API
     WebMock::Config.instance.query_values_notation = :flat_array
 
     stub_request(:any, /api.example.org*/).to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org').to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/authors').to_return(body: authors_response, headers: { 'Content-Type' => 'application/hal+json' })
     stub_request(:get, 'api.example.org/posts').to_return(body: posts_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/1').to_return(body: post_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=2').to_return(body: posts_page2_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=3').to_return(body: posts_page3_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/1').to_return(body: post1_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/2').to_return(body: post2_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/3').to_return(body: post3_response, headers: { 'Content-Type' => 'application/hal+json' })
     stub_request(:get, 'api.example.org/page2').to_return(body: page2_response, headers: { 'Content-Type' => 'application/hal+json' })
     stub_request(:get, 'api.example.org/page3').to_return(body: page3_response, headers: { 'Content-Type' => 'application/hal+json' })
   end

data/features/support/fixtures.rb

@@ -15,13 +15,32 @@ module Spinach
       }'
     end
 
+    def authors_response
+      '{
+          "_links": {
+            "self": { "href": "/authors" }
+          },
+          "_embedded": {
+            "api:authors": [
+              {
+                "name": "Lorem Ipsum",
+                "_links": {
+                  "self": { "href": "/authors/1" }
+                }
+              }
+            ]
+          }
+      }'
+    end
+
     def posts_response
       '{
           "_links": {
             "self": { "href": "/posts" },
+            "next": {"href": "/posts?page=2"},
             "last_post": {"href": "/posts/1"}
           },
-          "total_posts": "2",
+          "total_posts": "4",
           "_embedded": {
             "posts": [
               {
@@ -43,7 +62,48 @@ module Spinach
       }'
     end
 
-    def post_response
+    def posts_page2_response
+      '{
+          "_links": {
+            "self": { "href": "/posts?page=2" },
+            "next": { "href": "/posts?page=3" }
+          },
+          "total_posts": "4",
+          "_embedded": {
+            "posts": [
+              {
+                "title": "My third blog post",
+                "body":  "Lorem ipsum dolor sit amet",
+                "_links": {
+                  "self": { "href": "/posts/3" }
+                }
+              }
+            ]
+          }
+      }'
+    end
+
+    def posts_page3_response
+      '{
+          "_links": {
+            "self": { "href": "/posts?page=3" }
+          },
+          "total_posts": "4",
+          "_embedded": {
+            "posts": [
+              {
+                "title": "My third blog post",
+                "body":  "Lorem ipsum dolor sit amet",
+                "_links": {
+                  "self": { "href": "/posts/4" }
+                }
+              }
+            ]
+          }
+      }'
+    end
+
+    def post1_response
       '{
           "_links": {
             "self": { "href": "/posts/1" }
@@ -60,6 +120,40 @@ module Spinach
       }'
     end
 
+    def post2_response
+      '{
+          "_links": {
+            "self": { "href": "/posts/2" }
+          },
+          "title": "My first blog post",
+          "body":  "Lorem ipsum dolor sit amet",
+          "_embedded": {
+            "comments": [
+              {
+                "title": "Some comment"
+              }
+            ]
+          }
+      }'
+    end
+
+    def post3_response
+      '{
+          "_links": {
+            "self": { "href": "/posts/3" }
+          },
+          "title": "My first blog post",
+          "body":  "Lorem ipsum dolor sit amet",
+          "_embedded": {
+            "comments": [
+              {
+                "title": "Some comment"
+              }
+            ]
+          }
+      }'
+    end
+
     def page2_response
       '{
           "_links": {

data/hyperclient.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'addressable'
   gem.add_dependency 'faraday', '>= 0.9.0'
-  gem.add_dependency 'faraday-digestauth'
   gem.add_dependency 'faraday_hal_middleware'
   gem.add_dependency 'faraday_middleware'
-  gem.add_dependency 'net-http-digest_auth'
 end

data/lib/hyperclient/entry_point.rb

@@ -1,6 +1,5 @@
 require 'faraday_middleware'
 require 'faraday_hal_middleware'
-require_relative '../faraday/connection'
 
 module Hyperclient
   # Public: Exception that is raised when trying to modify an
@@ -30,7 +29,7 @@ module Hyperclient
     extend Forwardable
 
     # Public: Delegates common methods to be used with the Faraday connection.
-    def_delegators :connection, :basic_auth, :digest_auth, :token_auth, :params, :params=
+    def_delegators :connection, :params, :params=
 
     # Public: Initializes an EntryPoint.
     #
@@ -62,8 +61,7 @@ module Hyperclient
                            block
                          else
                            lambda do |conn|
-                             default_faraday_block.call conn
-                             yield conn
+                             default_faraday_block.call(conn, &block)
                            end
                          end
       else
@@ -138,11 +136,14 @@ module Hyperclient
     #
     # Returns a block.
     def default_faraday_block
-      lambda do |connection|
+      lambda do |connection, &block|
         connection.use Faraday::Response::RaiseError
         connection.use FaradayMiddleware::FollowRedirects
         connection.request :hal_json
         connection.response :hal_json, content_type: /\bjson$/
+
+        block&.call(connection)
+
         connection.adapter :net_http
         connection.options.params_encoder = Faraday::FlatParamsEncoder
       end