roar 0.11.16 → 0.11.17

data/CHANGES.markdown

@@ -1,3 +1,8 @@
+# 0.11.17
+
+* Fixing HAL + Decorator.
+* Requiring representable-1.5.0.
+
 # 0.11.16
 
 * Added `Roar::Decorator::HypermediaConsumer` which propagates incoming hypermedia links to the represented object (it has to have accessors for `:links`).

data/lib/roar/decorator.rb

@@ -6,5 +6,11 @@ class Roar::Decorator < Representable::Decorator
       super # TODO: this currently sets #links which is not obvious.
       represented.links = links
     end
+
+    # TODO: what is the deal with #links_array and #links?
+    def links=(*args)
+      super
+      represented.links = links
+    end
   end
 end

data/lib/roar/representer/json/hal.rb

@@ -109,8 +109,8 @@ module Roar::Representer
         module LinkCollectionRepresenter
           include Representable::JSON::Hash
 
-          values :extend => lambda { |item| item.is_a?(Array) ? LinkArrayRepresenter : Roar::Representer::JSON::HyperlinkRepresenter },
-            :class => lambda { |hsh| hsh.is_a?(LinkArray) ? nil : Roar::Representer::Feature::Hypermedia::Hyperlink }
+          values :extend => lambda { |item, *| item.is_a?(Array) ? LinkArrayRepresenter : Roar::Representer::JSON::HyperlinkRepresenter },
+            :class => lambda { |hsh, *| hsh.is_a?(LinkArray) ? nil : Roar::Representer::Feature::Hypermedia::Hyperlink }
 
           def to_hash(options)
             super.tap do |hsh|  # TODO: cool: super(:exclude => [:rel]).
@@ -157,11 +157,11 @@ module Roar::Representer
           def links_definition_options
             [:links,
               {
-                :as       => :links,
                 :extend   => HAL::Links::LinkCollectionRepresenter,
-                :instance => lambda { |hsh| LinkCollection.new(link_array_rels) }, # defined in InstanceMethods as this is executed in represented context.
+                :instance => lambda { |*| LinkCollection.new(link_array_rels) }, # defined in InstanceMethods as this is executed in represented context.
                 :representer_exec => true,
-                :getter => lambda { |*| links }
+                :getter => lambda { |*| links },
+                :setter => lambda { |val,*| self.links=(val) }
               }
             ]
           end

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.16"
+  VERSION = "0.11.17"
 end

data/roar.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "representable", ">= 1.4.2"
+  s.add_runtime_dependency "representable", ">= 1.5.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "test_xml", ">= 0.1.4"

data/test/decorator_test.rb

@@ -20,6 +20,7 @@ class DecoratorTest < MiniTest::Spec
     end
 
     let (:model) { Object.new }
+    let (:model_with_links) { model.singleton_class.instance_eval { attr_accessor :links }; model }
 
     describe "JSON" do
       let (:decorator) { rpr_mod = rpr
@@ -32,10 +33,9 @@ class DecoratorTest < MiniTest::Spec
       end
 
       it "sets links on decorator" do
-        decorator.new(model).from_hash("links"=>[{:rel=>:self, :href=>"http://self"}]).links.must_equal("self"=>link(:rel=>:self, :href=>"http://self"))
+        decorator.new(model).from_hash("links"=>[{:rel=>:self, :href=>"http://next"}]).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
       end
 
-      let (:model_with_links) { model.singleton_class.instance_eval { attr_accessor :links }; model }
       it "does not set links on represented" do
         decorator.new(model_with_links).from_hash("links"=>[{:rel=>:self, :href=>"http://self"}])
         model_with_links.links.must_equal nil
@@ -49,8 +49,8 @@ class DecoratorTest < MiniTest::Spec
           end }
 
         it "propagates links to represented" do
-          decorator.new(model_with_links).from_hash("links"=>[{:rel=>:self, :href=>"http://self"}])
-          model_with_links.links[:self].must_equal(link(:rel=>:self, :href=>"http://self"))
+          decorator.new(model_with_links).from_hash("links"=>[{:rel=>:self, :href=>"http://next"}])
+          model_with_links.links[:self].must_equal(link(:rel=>:self, :href=>"http://next"))
         end
       end
     end
@@ -71,7 +71,7 @@ class DecoratorTest < MiniTest::Spec
       end
 
       it "sets links on decorator" do
-        decorator.new(model).from_xml(%{<song><link rel="self" href="http://self"/></song>}).links.must_equal("self"=>link(:rel=>:self, :href=>"http://self"))
+        decorator.new(model).from_xml(%{<song><link rel="self" href="http://next"/></song>}).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
       end
     end
 
@@ -88,6 +88,23 @@ class DecoratorTest < MiniTest::Spec
       it "rendering links works" do
         decorator.new(model).to_hash.must_equal({"_links"=>{"self"=>{:href=>"http://self"}}})
       end
+
+      it "sets links on decorator" do
+        decorator.new(model).from_hash({"_links"=>{"self"=>{:href=>"http://next"}}}).links.must_equal("self"=>link(:rel=>:self, :href=>"http://next"))
+      end
+
+      describe "Decorator::HypermediaClient" do
+        let (:decorator) { rpr_mod = rpr
+          Class.new(Roar::Decorator) do
+            include rpr_mod
+            include Roar::Decorator::HypermediaConsumer
+          end }
+
+        it "propagates links to represented" do
+          decorator.new(model_with_links).from_hash("_links"=>{"self"=>{:href=>"http://self"}})
+          model_with_links.links[:self].must_equal(link(:rel=>:self, :href=>"http://self"))
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.16
+  version: 0.11.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement