eac_rest 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275b7cb77a0cf2c309381dcd4759579584b53663a05fd1844e8bf7fb40430066
-  data.tar.gz: 50fde4de859dcdcb38af6b8d3c808e6b2dc0ab328079f6faae8c39cc296b2021
+  metadata.gz: ec5c659c04fb86d3d9764a999b685150bc2ccde5933584fcb36efe95ea98acaf
+  data.tar.gz: 60ccb2b06749fdf1a7543871c85b8b6a9e94aae9101284ed84a7d4393b39feb9
 SHA512:
-  metadata.gz: b4402b89378a23d574ee3137d379c94af5e541ee70d7a9cec55235722231eb51c1380f9a5a1d2ec22745b3133b5ee1b32136bc479332e588bc10210fab4ff4c8
-  data.tar.gz: 8679dc9886b157040d7f05da6849b304c123c1fc0e97ec33be35f39e0fefd03eda5629a73691003c0773b9b7a067da396c4cd38632918ea0955fb31b261f0b6f
+  metadata.gz: 532f9ee524f10fa97f41e94b674a3cc1fa01913fb86912e418c5e654fd3a9ab19cb8458aa9968cb7c660fc28360f331b477d13685bac884db2ca902c4c5dd865
+  data.tar.gz: 289128a0de9b339b1779cc74c1f4b306de7f5002e902c2776473fd2fd63abfe6b1853d3cd6f1a4b0cf8297abf19c8de5a3ec4a3277eed1ca71ab0108da80c042

data/lib/eac_rest/api.rb

@@ -26,13 +26,22 @@ module EacRest
       end
     end
 
+    # @return [Addressable::URI]
     def build_service_url(suffix)
-      s = ::Addressable::URI.parse(suffix)
+      r = ::Addressable::URI.parse(suffix)
+      return r if r.scheme.present?
+
+      s = build_service_url_suffix(suffix)
       r = ::Addressable::URI.parse(root_url)
       r.path += s.path
       r.query_values = r.query_values(::Array).if_present([]) +
                        s.query_values(::Array).if_present([])
-      r.to_s
+      r
+    end
+
+    # @return [Addressable::URI]
+    def build_service_url_suffix(suffix)
+      ::Addressable::URI.parse(suffix)
     end
   end
 end

data/lib/eac_rest/response.rb

@@ -6,6 +6,18 @@ require 'json'
 
 module EacRest
   class Response < ::StandardError
+    HEADER_LINE_PARSER = /\A([^:]+):(.*)\z/.to_parser do |m|
+      [m[1].strip, m[2].strip]
+    end
+
+    # https://www.w3.org/wiki/LinkHeader
+    LINKS_HEADER_NAME = 'Link'
+
+    # https://www.w3.org/wiki/LinkHeader
+    LINK_PARSER = /\A\<(.+)\>\s*;\s*rel\s*=\s*\"(.*)\"\z/.to_parser do |m|
+      [m[2], m[1]]
+    end
+
     common_constructor :curl, :body_data_proc
 
     def body_data
@@ -23,7 +35,7 @@ module EacRest
       body_data
     end
 
-    delegate :body_str, :headers, to: :performed_curl
+    delegate :body_str, to: :performed_curl
 
     def body_str_or_raise
       raise_unless_200
@@ -31,6 +43,26 @@ module EacRest
       body_str
     end
 
+    def header(name)
+      hash_search(headers, name)
+    end
+
+    def headers
+      performed_curl.header_str.each_line.map(&:strip)[1..-1].reject(&:blank?)
+                    .map { |header_line| HEADER_LINE_PARSER.parse!(header_line) }
+                    .to_h
+    end
+
+    def link(rel)
+      hash_search(links, rel)
+    end
+
+    def links
+      header(LINKS_HEADER_NAME).if_present({}) do |v|
+        v.split(',').map { |w| LINK_PARSER.parse!(w.strip) }.to_h
+      end
+    end
+
     def raise_unless_200
       return nil if status == 200
 
@@ -57,6 +89,14 @@ module EacRest
       Hash.from_xml(body_str)
     end
 
+    def hash_search(hash, key)
+      key = key.to_s.downcase
+      hash.each do |k, v|
+        return v if k.to_s.downcase == key
+      end
+      nil
+    end
+
     def perform
       @perform ||= begin
         curl.perform || raise("CURL perform failed for #{url}")

data/lib/eac_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRest
-  VERSION = '0.3.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rest
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: 
 email: 
 executables: []