excon-hypermedia 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac864a15335585a7b84fcee3def970232abe429
-  data.tar.gz: 53aaadb46648675e6d2d919fdadda891aee9f106
+  metadata.gz: 29b47d541b2f707b73bc69d61e0cc0a4682104c2
+  data.tar.gz: fd216f256e5b926307bdb4dd59dd58774a3a2753
 SHA512:
-  metadata.gz: 6806fc02216a5c3ad4d73db1b3d0e6f049a3841ac7d3d3113cc14f65a3a8210b3746fb724c870625fe69322fc119a0906893a361361c8d3964132f69e7f62bf1
-  data.tar.gz: bf537f951a42146063a8be8c8edeaa535ea65f4ce4e7f5d46d08a61bed43475ba53ab7e1113eb4b121b820d04acb1643bc258709b49a008c0ae6a38f7d7cf5ae
+  metadata.gz: 85536ac1d03e1179c50c66de11085db9b6004e19a951896d01cf8fab7661d78188668e5ba6a116466d3161c54e2132e0f421a14f437c41cf2c8cfdb6d10a41f4
+  data.tar.gz: 36eeaa8528105c6dd4d1614fed06a56e782e485238055890c123a21d010acd3d80eaa9996e0a59c011d2846cd8e60037142d00476952ef92a93d167ff4baccca

data/excon-hypermedia.gemspec

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'excon/hypermedia/version'
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'm', '~> 1.5'
 
   spec.add_dependency 'excon', '~> 0.49'
-  spec.add_dependency 'excon-addressable', '~> 0.2'
+  spec.add_dependency 'excon-addressable', '~> 0.3'
 end

data/lib/excon/hypermedia/response.rb

@@ -37,7 +37,7 @@ module Excon
       end
 
       def body_to_hash
-        content_type.include?('application/hal+json') ? JSON.parse(response.body) : {}
+        (content_type =~ %r{application/(hal\+)?json}).nil? ? {} : JSON.parse(response.body)
       end
 
       def content_type

data/lib/excon/hypermedia/version.rb

@@ -2,6 +2,6 @@
 
 module Excon
   module HyperMedia
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/test/excon/integration_test.rb

@@ -92,6 +92,13 @@ module Excon
       assert_equal data(:front_wheel)['position'], response.resource._embedded.wheels.first.position
     end
 
+    def test_request_with_json_content_type
+      api      = Excon.get('https://www.example.org/api_v2.json', hypermedia: true)
+      response = api.rel('product', expand: { uid: 'bicycle' }).get
+
+      assert response.body.include?('https://www.example.org/product/bicycle')
+    end
+
     def teardown
       Excon.stubs.clear
     end

data/test/test_helper.rb

@@ -23,6 +23,7 @@ module Excon
       Excon.stub({ method: :get, path: '/product/bicycle/wheels/rear' }, response.merge(body: rear_wheel_body))
       Excon.stub({ method: :get, path: '/product/pump' }, response.merge(body: pump_body))
       Excon.stub({ method: :get, path: '/product/handlebar' }, response.merge(body: handlebar_body))
+      Excon.stub({ method: :get, path: '/api_v2.json' }, body: api_body, headers: { 'Content-Type' => 'application/json' })
     end
 
     def teardown
@@ -92,7 +93,9 @@ module Excon
       <<~EOF
         {
           "_links": {
-            "self": "https://www.example.org/product/handlebar"
+            "self": {
+              "href": "https://www.example.org/product/handlebar"
+            }
           },
           "material": "Carbon fiber",
           "reach": "75mm",
@@ -105,7 +108,9 @@ module Excon
       <<~EOF
         {
           "_links": {
-            "self": "https://www.example.org/product/pump"
+            "self": {
+              "href": "https://www.example.org/product/pump"
+            }
           },
           "weight": "2kg",
           "type": "Floor Pump",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon-hypermedia
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Excon, with Hypermedia traversing baked in.
 email:
 - jean@mertz.fm
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Excon, with Hypermedia traversing baked in.