zooming-proxy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce7fec1ef62580c41fd24d84a9831239006d6dc
-  data.tar.gz: dd8b3d9f1a65bd359c72dde212b995d00c397e44
+  metadata.gz: 6aec5a165d48e311fb815794e281f8598ad51035
+  data.tar.gz: 89cd684060e0cd20a72584981f0ffc1f22935bac
 SHA512:
-  metadata.gz: 05cb4f51b3b89fd1ab364d0f17bd6656058950daa20f1cd980515a73a107ba4b1439c5f00c816e98f23e771b41672be2f10af88937470fdbbe6e01523f86e4c6
-  data.tar.gz: ff528c17789806d933e245ddaa4f1039ce8eff2068059a25ef712e476918444dc7b5d640c1dfb53d9ce770f347db6798f6a97385d501c484d2b67353b49289b7
+  metadata.gz: e24978b2333fe58ef3dfe5685394d3870b2d87cd05023375190e7feb6921cc0dc41acc0aaf06bc2b38e6c91a419ec630d8ddb37c8f6373a38a84acecf05341a1
+  data.tar.gz: befdb7b2aa145c69033d98c86cd0ad33349f483158f8677fb148121b471cabdb250a4fe7adbd6b4d6aadfb6317a998d8c0d98718f832ffd218dcc36b9aa4f20b

data/.rubocop.yml

@@ -6,3 +6,6 @@ Metrics/LineLength:
 
 Metrics/MethodLength:
   Max: 15
+
+Metrics/ClassLength:
+  Max: 150

data/lib/zooming-proxy/middleware.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'typhoeus'
+
+Typhoeus::Config.memoize = true
 
 module ZoomingProxy
   # Middleware
@@ -59,25 +62,33 @@ module ZoomingProxy
 
       body['_embedded'] ||= {}
       headers['X-HAL-Zooming'] = depth
+      body = parallel_zooms(body, headers, depth)
 
-      requested_links(body, headers).each { |link| body = zoom_rel(headers, body, depth, link) }
       zoomed_response(status, headers, body, depth)
     end
 
-    def zoom_rel(headers, body, depth, link)
-      relation, hrefs = link
-      array = hrefs.respond_to?(:to_ary)
+    def parallel_zooms(body, headers, depth)
+      hydra = Typhoeus::Hydra.new
+      requested_links(body, headers).map do |url, attributes|
+        request = request_rel(url, headers)
+        request.on_complete do |res|
+          body = zoom_rel(attributes[:relation], res, body, attributes[:array], depth)
+        end
+        hydra.queue(request)
+      end
+      hydra.run
 
-      [*hrefs].each do |href|
-        res = request_rel(href, headers)
-        embedded_body = handle_nested_embeds(res, depth)
+      body
+    end
 
-        if array
-          body['_embedded'][relation] ||= []
-          body['_embedded'][relation] << embedded_body
-        else
-          body['_embedded'][relation] = embedded_body
-        end
+    def zoom_rel(relation, response, body, array, depth)
+      embedded_body = handle_nested_embeds(response, depth)
+
+      if array
+        body['_embedded'][relation] ||= []
+        body['_embedded'][relation] << embedded_body
+      else
+        body['_embedded'][relation] = embedded_body
       end
 
       body
@@ -88,7 +99,7 @@ module ZoomingProxy
       uri.scheme = scheme
       uri.host = host
 
-      Typhoeus.get(uri, headers: headers)
+      Typhoeus::Request.new(uri, headers: headers)
     end
 
     def response_to_hash(response)
@@ -126,16 +137,14 @@ module ZoomingProxy
     end
 
     def requested_links(body, headers)
-      links = requested_zooms(headers).select { |rel| body['_links'].key?(rel) }
-      links.map do |rel|
-        link = body['_links'][rel]
+      body['_links']
+        .to_h
+        .select { |k, _| headers['x-hal-zoom'].split(/\s+/).include?(k) }
+        .each_with_object({}) do |(k, v), urls|
+          array = v.respond_to?(:to_ary)
 
-        [rel, link.respond_to?(:to_ary) ? link.map { |l| l['href'] } : link['href']]
-      end
-    end
-
-    def requested_zooms(headers)
-      headers['x-hal-zoom'].split(/\s+/)
+          [v].flatten.each { |url| urls[url['href']] = { relation: k, array: array } }
+        end
     end
   end
 end

data/lib/zooming-proxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZoomingProxy
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/zooming-proxy.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
                                         .reject { |f| f.match(%r{^(test|spec|features)/}) }
 
+  spec.add_dependency 'typhoeus', '~> 1.0.2'
+
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'cucumber', '~> 2.4'
   spec.add_development_dependency 'cucumber-blendle-steps', '~> 0.8'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zooming-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Blendle developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement