excon-hypermedia 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc648cfd5761dfb1236aada3be47b061620a3ad
-  data.tar.gz: f0fc534b110a5de92cbe548a4dbe5eb4bcb6f5e6
+  metadata.gz: f2246dc77b42f4b8b4d785f2436fcdd2baa15439
+  data.tar.gz: 3263ec98d4fa234ac388bde913084645c5832fc5
 SHA512:
-  metadata.gz: 83c3ec47d43ce609a789f2bf0ae0281822ae0b4ba25b00596516ef7ed54e9ecc8ab4f3e834e642172b4a1560da4c8184aa4f6a6ac611f63dc84f22e19b4ee226
-  data.tar.gz: 74fb5d0362acce99b511533c487d18612c81f0c8b455d62633c6fd52e74eb8a262429e6873913e5a5f60e5efae9fdda15132c1602b38a3597e02e0573bf929ea
+  metadata.gz: 34d5efb5420335cfcdcf89fa6600d504c2e14afa7dc2a6baa1bedb7033640a9fed05f73bb942713c2ee4d6d8980b3eb38b37b6bef6ac87967508fce5081c0e35
+  data.tar.gz: 34172c4a37c20c9d9d887f97f48d7a560e36717f590a59d38a4149f34f728ba6184691afeeaee81553b242730a06082c0823650bf82e5c0e336bf5ba813e22f3

data/lib/excon/hypermedia/middlewares/hypertext_cache_pattern.rb

@@ -15,10 +15,10 @@ module Excon
         def request_call(datum)
           @datum = datum
 
-          return super unless datum[:hcp] == true && datum[:method] == :get && find_embedded
+          return super unless datum[:hcp] == true && datum[:method] == :get && resource
 
           datum[:response] = {
-            body:      @embedded.to_json,
+            body:      resource.to_json,
             hcp:       true,
             headers:   content_type_header,
             remote_ip: '127.0.0.1',
@@ -30,22 +30,16 @@ module Excon
 
         private
 
-        def find_embedded
-          datum.dig(:hcp_params, :embedded).to_h.each do |_, object|
-            break if (@embedded = object_to_embedded(object))
-          end
-
-          @embedded
+        def resource
+          @resource ||= embedded.find { |name, _| name == relation_name }.to_a[1]
         end
 
-        def object_to_embedded(object)
-          uri = ::Addressable::URI.new(datum.tap { |h| h.delete(:port) })
+        def relation_name
+          datum.dig(:hcp_params, :relation)
+        end
 
-          if object.respond_to?(:to_ary)
-            object.find { |hash| hash.dig('_links', 'self', 'href') == uri.to_s }
-          elsif object.dig('_links', 'self', 'href') == uri.to_s
-            object
-          end
+        def embedded
+          datum.dig(:hcp_params, :embedded)
         end
 
         def content_type_header

data/lib/excon/hypermedia/response.rb

@@ -58,19 +58,20 @@ module Excon
           raise UnknownRelationError, "unknown relation: #{name}"
         end
 
-        options = rel_params(params.first.to_h)
+        options = rel_params(name, params.first.to_h)
 
         link.respond_to?(:to_ary) ? link.map { |l| l.rel(options) } : link.rel(options)
       end
 
-      def rel_params(params)
+      def rel_params(name, params)
         params.merge(
-          hypermedia: true,
           hcp: (params[:hcp].nil? ? response.data[:hcp] : params[:hcp]),
           hcp_params: {
             content_type: response.headers['Content-Type'],
-            embedded: resource._embedded
-          }
+            embedded: resource._embedded.to_h,
+            relation: name
+          },
+          hypermedia: true
         )
       end
     end

data/lib/excon/hypermedia/version.rb

@@ -2,6 +2,6 @@
 
 module Excon
   module HyperMedia
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon-hypermedia
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jean