hal-client 3.12.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95db91d4db8f1599d671ef361262bdbb22f64808
-  data.tar.gz: 7d293f6b47f9ee2512938f42c9bf54ee96f73b32
+  metadata.gz: 553aacea1a5e60830f4444b701d714433dcb7fbc
+  data.tar.gz: dacb874f8b57a68e908028dee737b7d48cae4ce0
 SHA512:
-  metadata.gz: d5be9718970338b4fc5b4b618b06297054fb3b855e1fe31b810df008f9ff11cb6bac7787adc2a5bf3b6da7b712b5a5f75bbea7af437c63b76f5e7a1f24c1c6b0
-  data.tar.gz: 32533202e76e007b18864ef1bd5ce149b32bf8f4f144df3b23348d61d307c21608ecc4a60ad0262aaf4ec4648bd0680d3c487d1f2533394fd1517577113865e5
+  metadata.gz: e58ada075076a0ebd8ea3aa8366ed4980d972d6813be97294c6eafde889ae03e5bfab120fe8ca797b1590f6fee8c27c670c7f141f8e444f88b080da2039443d8
+  data.tar.gz: d746794430e8b5bc974b8917dc33c4ce0fe5afe08d0fdf4c51978cb1cb2bd8a76f949c0eeb0d15aae39bf03ca0e1266c9ce42f590f9d4a2fa5ba141212e521a4

data/lib/hal_client/links_section.rb

@@ -4,10 +4,13 @@ class HalClient
   class LinksSection
     UNSET = Object.new
 
-    def initialize(section, namespaces=nil)
-      @namespaces = namespaces || CurieResolver.new(section.fetch("curies"){[]})
+    # section - json hash for the links section
+    # base_url - base URL with which to resolve relative URLs
+    def initialize(section, opts={} )
+      @namespaces = CurieResolver.new(section.fetch("curies"){[]})
 
       @section = section.merge(fully_qualified(section))
+      @base_url = opts.fetch(:base_url) { raise ArgumentError, "base_url must be specified" }
     end
 
     attr_reader :namespaces
@@ -39,18 +42,18 @@ class HalClient
 
     protected
 
-    attr_reader :section
+    attr_reader :section, :base_url
 
     def resolve_to_url(link)
       (fail HalClient::InvalidRepresentationError) unless link.respond_to? :fetch
 
-      url = link.fetch("href")
+      url = base_url + link.fetch("href")
       is_templated = link.fetch("templated", false)
 
       if is_templated
-        Addressable::Template.new(url)
+        Addressable::Template.new(url.to_s)
       else
-        url
+        url.to_s
       end
 
     rescue KeyError

data/lib/hal_client/representation.rb

@@ -103,11 +103,10 @@ class HalClient
 
     # Returns the URL of the resource this representation represents.
     def href
-      @href ||= if has_related? "self"
-                  links.hrefs('self').first
-                else
-                  nil
-                end
+      @href ||= raw
+              .fetch("_links",{})
+              .fetch("self",{})
+              .fetch("href",nil)
     end
 
     # Returns the value of the specified property or representations
@@ -297,11 +296,14 @@ class HalClient
 
 
     def links
-      @links ||= LinksSection.new raw.fetch("_links"){{}}
+      @links ||= LinksSection.new((raw.fetch("_links"){{}}),
+                                  base_url: Addressable::URI.parse(href || ""))
     end
 
     def embedded_section
-      @embedded_section ||= fully_qualified raw.fetch("_embedded", {})
+      embedded = raw.fetch("_embedded", {})
+
+      @embedded_section ||= embedded.merge fully_qualified(embedded)
     end
 
     def embedded(link_rel, &default_proc)

data/lib/hal_client/version.rb

@@ -1,3 +1,3 @@
 class HalClient
-  VERSION = "3.12.0"
+  VERSION = "3.13.0"
 end

data/spec/hal_client/links_section_spec.rb

@@ -2,11 +2,17 @@ require "spec_helper"
 require 'hal-client'
 
 describe HalClient::LinksSection, "namespaces embedded" do
-  subject(:section) { described_class.new(raw_section) }
+  subject(:section) {
+    described_class.new(raw_section,
+                        base_url: Addressable::URI.parse("http://example.com/foo"))
+  }
 
   specify { expect(section.hrefs("up"))
     .to contain_exactly "http://example.com/parent" }
 
+  specify { expect(section.hrefs("next"))
+    .to contain_exactly "http://example.com/foo?p=2" }
+
   specify { expect(section.hrefs(fully_qualified_first_rel))
     .to contain_exactly "http://example.com/foo" }
 
@@ -39,7 +45,8 @@ describe HalClient::LinksSection, "namespaces embedded" do
       "search" => {"href" => "http://example.com/s{?q}", "templated" => true },
       "ns1:first" => {"href" => "http://example.com/foo"},
       "ns2:second" => [{"href" => "http://example.com/bar"},
-                       {"href" => "http://example.com/baz"}]
+                       {"href" => "http://example.com/baz"}],
+      "next" => {"href" =>  "/foo?p=2"}
     } }
 
   matcher :all do |expected|
@@ -50,7 +57,10 @@ describe HalClient::LinksSection, "namespaces embedded" do
 end
 
 describe HalClient::LinksSection, "invalid" do
-  subject(:section) { described_class.new(raw_section) }
+  subject(:section) {
+    described_class.new(raw_section,
+                        base_url: Addressable::URI.parse("http://example.com/"))
+  }
 
   specify { expect{section.hrefs("bareurl")}
       .to raise_error HalClient::InvalidRepresentationError }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hal-client
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http