roar 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7cda8e7774438e2c12828c256a93501719b176
-  data.tar.gz: 2f61956f6ea000358e40713d958af2e8c58219a6
+  metadata.gz: f83dc6d5009e6fee594a68ec001885cd1fe34633
+  data.tar.gz: 5e82fb1a251205d78898f1609d1fa992e8c0dbb5
 SHA512:
-  metadata.gz: 5b04289bf9e1b07ff13ffe52dea647c0c82b6154d49d5ac2e2b657498a031bf24574751a546ecce8dd76fb9511a3ded0eb2f3131eb3c1e16306849f115335da2
-  data.tar.gz: 28a0c35f6240627b1fe1b5924e2f7e8d8ca27761c4f56a12138fabd8768394dfe3ea63517892bdbb9f83f36ee5222c003d3d16a00cfc63e6ab1af3c03c87cad7
+  metadata.gz: ef5c2c6fe33df422ee672250b5bd482aaa56bace33debdd1ae842ad2878e3a8cbb5a85da35308653952f3bf83734f98520a187b2e3751c06bf1586ad5d613e21
+  data.tar.gz: e8e31d4672aad7bd3470c49e640cae28aebfaa3541b4ab14ea25f2bb9b29084a84f2c4d817a3da9cee1dd2b01deb991b45713244d973ae50207b53844e777bdf

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+# 0.12.7
+
+* Bug fix where hypermedia links were wrong when invoking serialization multiple times on the same instance.
+
 # 0.12.6
 
 * Remove deprecations (most of 'em) from representable-1.8. Sorry for that.

data/lib/roar/representer/feature/hypermedia.rb

@@ -94,7 +94,7 @@ module Roar
         end
 
         def prepare_link_for(href, options)
-          options.merge! href.is_a?(Hash) ? href : {:href => href}
+          options = options.merge(href.is_a?(Hash) ? href : {:href => href})
           Hyperlink.new(options)
         end
 

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.12.6"
+  VERSION = "0.12.7"
 end

data/test/hypermedia_test.rb

@@ -107,10 +107,20 @@ class HypermediaTest < MiniTest::Spec
       describe "returning option hash from block" do
         representer_for do
           link(:self) do {:href => "//self", :type => "image/jpg"} end
+          link(:other) do |params|
+            hash = { :href => "//other" }
+            hash.merge!(:type => 'image/jpg') if params[:type]
+            hash
+          end
         end
 
         it "is rendered as link attributes" do
-          subject.to_json.must_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\",\"type\":\"image/jpg\"}]}"
+          subject.to_json.must_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\",\"type\":\"image/jpg\"},{\"rel\":\"other\",\"href\":\"//other\"}]}"
+        end
+
+        it "is rendered according to context" do
+          subject.to_json(type: true).must_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\",\"type\":\"image/jpg\"},{\"rel\":\"other\",\"href\":\"//other\",\"type\":\"image/jpg\"}]}"
+          subject.to_json.must_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\",\"type\":\"image/jpg\"},{\"rel\":\"other\",\"href\":\"//other\"}]}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable