hyperclient 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c935e08d5410e72969d8b83c213ef56d7ae5236e
-  data.tar.gz: a250cb39f383c471f637cec668ce683c0310e808
+  metadata.gz: 35a0a5739c9ec4a3ba6bc86bba399d2c6ad5a2e2
+  data.tar.gz: 9ed0041d6c5800b897a94b075655729cfb4e0018
 SHA512:
-  metadata.gz: 10c73a4a2d78e9947a69719e831d1dccd467fecf6006a21fba2561cd23e74e5c7b8604398dc75477a76a5327cf0dfc31e018424cf41c81067bb057854dbd5960
-  data.tar.gz: c4eba8f9223ccc8ffa166dc731e32ac842d8230f4e9ee507b9f175503ee935a235e5820d823a24378239080de2d8c74bfb2ee29a25949a841d44d78d5a4ff747
+  metadata.gz: d0ca28cf98b945f26e1f43f39a0bb455bddb9d8312727394fdd75a3a87a81fd2c7bb459d628eec976df99508ad48401ba8f7c82c8892deba68bbd7892803dade
+  data.tar.gz: ad8de8de9a44cfa88b96ed1339a99cc6d574ea26e970e6aad4ff69f8bb3bb0ed45faf2fe10ab9bb23dfefd2177a151f0d8f47770af901f7981b4bd6e4d70784d

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-15 16:01:39 -0400 using RuboCop version 0.33.0.
+# on 2015-08-23 09:45:44 -0400 using RuboCop version 0.33.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
@@ -11,20 +11,20 @@
 Metrics/ClassLength:
   Max: 103
 
-# Offense count: 80
+# Offense count: 85
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 142
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 14
+  Max: 25
 
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 238
+  Max: 258
 
 # Offense count: 1
 Style/AsciiComments:

data/.travis.yml

@@ -1,5 +1,14 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1
+  - 2.2
+  - rbx-2.2.10
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.7.2 (August 23, 2015)
+
+* [#95](https://github.com/codegram/hyperclient/issues/95): Fix: re-add eager delegation for `resource.x._embeddded.x` - [@dblock](https://github.com/dblock).
+
 ### 0.7.1 (August 15, 2015)
 
 * [#89](https://github.com/codegram/hyperclient/issues/89): Added `Hyperclient::Resource#fetch` - [@alabeduarte](https://github.com/alabeduarte).

data/Gemfile

@@ -9,7 +9,6 @@ gem 'guard-minitest'
 gem 'guard-spinach'
 gem 'pry'
 
-gem 'redcarpet'
 gem 'yard', '~> 0.8'
 gem 'yard-tomdoc'
 gem 'simplecov', require: false

data/features/api_navigation.feature

@@ -26,3 +26,7 @@ Feature: API navigation
     When I connect to the API
     Then I should be able to navigate to next page
     Then I should be able to navigate to next page without links
+
+  Scenario: Counts
+    When I connect to the API
+    Then I should be able to count embedded items

data/features/steps/api_navigation.rb

@@ -38,4 +38,10 @@ class Spinach::Features::ApiNavigation < Spinach::FeatureSteps
   step 'I should be able to navigate to next page without links' do
     assert_equal '/posts_of_page2', api.next.posts._url
   end
+
+  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
+  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 9
-    @posts._attributes['total_posts'].to_i.must_equal 9
+    @posts._attributes.total_posts.to_i.must_equal 2
+    @posts._attributes['total_posts'].to_i.must_equal 2
   end
 end

data/features/support/fixtures.rb

@@ -20,7 +20,25 @@ module Spinach
             "self": { "href": "/posts" },
             "last_post": {"href": "/posts/1"}
           },
-          "total_posts": "9"
+          "total_posts": "2",
+          "_embedded": {
+            "posts": [
+              {
+                "title": "My first blog post",
+                "body":  "Lorem ipsum dolor sit amet",
+                "_links": {
+                  "self": { "href": "/posts/1" }
+                }
+              },
+              {
+                "title": "My second blog post",
+                "body":  "Lorem ipsum dolor sit amet",
+                "_links": {
+                  "self": { "href": "/posts/2" }
+                }
+              }
+            ]
+          }
       }'
     end
 

data/hyperclient.gemspec

@@ -14,18 +14,18 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Hyperclient::VERSION
 
-  gem.add_dependency 'faraday', '~> 0.8'
-  gem.add_dependency 'futuroscope', '>= 0.0.10'
-  gem.add_dependency 'faraday_middleware', '~> 0.9'
-  gem.add_dependency 'faraday_hal_middleware', '~> 0.0.1'
-  gem.add_dependency 'uri_template', '~> 0.5'
-  gem.add_dependency 'net-http-digest_auth', '~> 1.2'
-  gem.add_dependency 'faraday-digestauth', '~> 0.2'
+  gem.add_dependency 'faraday'
+  gem.add_dependency 'futuroscope'
+  gem.add_dependency 'faraday_middleware'
+  gem.add_dependency 'faraday_hal_middleware'
+  gem.add_dependency 'uri_template'
+  gem.add_dependency 'net-http-digest_auth'
+  gem.add_dependency 'faraday-digestauth'
 
-  gem.add_development_dependency 'minitest', '~> 3.4.0'
-  gem.add_development_dependency 'turn', '~> 0.9'
-  gem.add_development_dependency 'webmock', '~> 1.8'
-  gem.add_development_dependency 'mocha', '~> 0.13'
-  gem.add_development_dependency 'rack-test', '~> 0.6'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'turn'
+  gem.add_development_dependency 'webmock'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'spinach'
 end

data/lib/hyperclient/link.rb

@@ -154,7 +154,7 @@ module Hyperclient
 
     # Internal: avoid delegating to resource
     #
-    # #to_ary is called for implicit array coersion (such as parallel assignment
+    # #to_ary is called for implicit array coercion (such as parallel assignment
     # or Array#flatten). Returning nil tells Ruby that this record is not Array-like.
     def to_ary
       nil

data/lib/hyperclient/resource.rb

@@ -84,7 +84,7 @@ module Hyperclient
     def method_missing(method, *args, &block)
       if args.any? && args.first.is_a?(Hash)
         _links.send(method, [], &block)._expand(*args)
-      else
+      elsif !Enumerable.method_defined?(method)
         [:_attributes, :_embedded, :_links].each do |target|
           target = send(target)
           return target.send(method, *args, &block) if target.respond_to?(method.to_s)

data/lib/hyperclient/version.rb

@@ -1,3 +1,3 @@
 module Hyperclient
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/test/hyperclient/link_test.rb

@@ -75,6 +75,21 @@ module Hyperclient
           link._expand._url.must_equal '/orders'
           link._url.must_equal '/orders'
         end
+
+        it 'does not expand unknown variables' do
+          link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
+          link._expand(unknown: '1')._url.must_equal '/orders'
+        end
+
+        it 'only expands known variables' do
+          link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point)
+          link._expand(unknown: '1', id: '2')._url.must_equal '/orders?id=2'
+        end
+
+        it 'only expands templated links' do
+          link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => false }, entry_point)
+          link._expand(id: '1')._url.must_equal '/orders{?id}'
+        end
       end
     end
 
@@ -91,6 +106,18 @@ module Hyperclient
         link._url.must_equal '/orders?id=1'
       end
 
+      it 'does not expand an uri template with unknown variables' do
+        link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, unknown: 1)
+
+        link._url.must_equal '/orders'
+      end
+
+      it 'only expands known variables in a uri template' do
+        link = Link.new('key', { 'href' => '/orders{?id}', 'templated' => true }, entry_point, unknown: 1, id: 2)
+
+        link._url.must_equal '/orders?id=2'
+      end
+
       it 'returns the link when no uri template' do
         link = Link.new('key', { 'href' => '/orders' }, entry_point)
         link._url.must_equal '/orders'

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: hyperclient
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Oriol Gual
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: futuroscope
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_hal_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday-digestauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spinach
   requirement: !ruby/object:Gem::Requirement