hal-interpretation 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea8a51625a140b91f33d23ff8cdce60d2748ebf
-  data.tar.gz: fbcd0ddd428b0114b9e1bf5b506fa6843c8fcda6
+  metadata.gz: ee39c1fec5913e271d4fab7531f9ff40b6623dc9
+  data.tar.gz: 5c21413e4a4be9e30d16eb3cc8e6a00644154731
 SHA512:
-  metadata.gz: ef35522580e2014518d56d1c7c5004d9724ccc026435c27a65fd06c1128ec4b162522c3daba84fc947ec4ddd58890775805203f584bec4b13f64dc5a254725b9
-  data.tar.gz: efbe0228c3e4b8dbb22ed2a05adf28f6c0d7a80632f7d8d395b658d6f823b3f77c2e124c8ce431d6be5f362f860b0577ac0189a3eca8dc009fc96f6b126cfd9f
+  metadata.gz: 7cbe1d536193dd6f563c43823b7828ebe5975ba039201b5189960b033f12dfb72c04b767a95e8765c21736e661aee117b64fb95f769afc4f38fa7f626255ee01
+  data.tar.gz: eb3d579ce01aea81b727c59df2457c509765759ef0bc884492afe3adf57d746de99a43a639c2c44f0b95c6fcf5c998020189f8e0cb62552065c5ab4754ac5f8f

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+cache: bundler
 language: ruby
 rvm:
   - "1.9.3"

data/lib/hal_interpretation/dsl.rb

@@ -106,8 +106,16 @@ module HalInterpretation
       rel = opts.fetch(:rel) { attr_name }.to_s
       path = "/_links/" + json_path_escape(rel)
 
+      stringify_href = ->(string_or_uri_tmpl) {
+        if string_or_uri_tmpl.respond_to? :pattern
+          string_or_uri_tmpl.pattern
+        else
+          string_or_uri_tmpl.to_str
+        end
+      }
+
       extract attr_name, from: path,
-              with: ->(r){ r.related_hrefs(rel){[]} },
+              with: ->(r){ r.raw_related_hrefs(rel){[]}.map &stringify_href },
               coercion: opts[:coercion]
     end
 

data/lib/hal_interpretation/version.rb

@@ -1,3 +1,3 @@
 module HalInterpretation
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/spec/hal_interpretation_spec.rb

@@ -11,11 +11,12 @@ describe HalInterpretation do
       item_class test_item_class
       extract :name
       extract :latitude, from: "/geo/latitude"
+      extract :bday, coercion: ->(val){ Time.parse(val) }
+      extract :seq, with: ->(_) { next_seq_num }
       extract_link  :up
       extract_links :friend_ids, rel: "http://xmlns.com/foaf/0.1/knows",
                     coercion: ->(urls) { urls.map{|u| u.split("/").last } }
-      extract :bday, coercion: ->(val){ Time.parse(val) }
-      extract :seq, with: ->(_) { next_seq_num }
+      extract_link :archives_url_tmpl, rel: "archives"
 
       def initialize(*args)
         @cur_seq_num = 0
@@ -43,7 +44,11 @@ describe HalInterpretation do
           "http://xmlns.com/foaf/0.1/knows": [
             { "href": "http://example.com/bob" },
             { "href": "http://example.com/alice" }
-          ]
+          ],
+          "archives": {
+            "href": "http://example.com/old{?since,until}",
+            "templated": true
+          }
         }
       }
     JSON
@@ -56,6 +61,8 @@ describe HalInterpretation do
     specify { expect(interpreter.item.bday).to eq Time.utc(2013,12,11,10,9,8) }
     specify { expect(interpreter.item.seq).to eq 1 }
     specify { expect(interpreter.item.friend_ids).to eq ["bob", "alice"] }
+    specify { expect(interpreter.item.archives_url_tmpl)
+              .to eq "http://example.com/old{?since,until}" }
 
     specify { expect(interpreter.problems).to be_empty }
 
@@ -271,7 +278,8 @@ describe HalInterpretation do
   let(:test_item_class) { Class.new do
       include ActiveModel::Validations
 
-      attr_accessor :name, :latitude, :up, :bday, :seq, :hair, :friend_ids
+      attr_accessor :name, :latitude, :up, :bday, :seq, :hair, :friend_ids,
+                    :archives_url_tmpl
 
       def initialize
         yield self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hal-interpretation
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hal-client