roar 0.11.5 → 0.11.6

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.11.6
+
+* "Fixing" a bug where `links_definition_option` was missing when no link was set in a representer. Note that this is a quick and horrible bugfix and will soon be cleaned up.
+
 ## 0.11.5
 
 * Introducing HAL::links method to map arrays of link objects in the HAL format. This completes the HAL/JSON specification.

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

@@ -52,9 +52,6 @@ module Roar
           end
         end
         include LinksDefinitionMethods
-        def links_definition_options  # FIXME: make this unnecessary.
-          self.class.links_definition_options
-        end
 
         def before_serialize(options={})
           prepare_links!(options) unless options[:links] == false  # DISCUSS: doesn't work when links are already setup (e.g. from #deserialize).

data/lib/roar/representer/json.rb

@@ -49,6 +49,10 @@ module Roar
         end
       end
 
+      def links_definition_options  # FIXME: remove me ASAP!
+        [:links_array, {:from => :links, :class => Feature::Hypermedia::Hyperlink, :extend => HyperlinkRepresenter, :collection => true}]
+      end
+
       require "representable/json/hash"
       # Represents a hyperlink in standard roar+json hash representation.
       module HyperlinkRepresenter

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

@@ -86,7 +86,7 @@ module Roar::Representer
         def self.included(base)
           base.class_eval do
             include Roar::Representer::Feature::Hypermedia
-            include InstanceMethods
+            include InstanceMethods 
             extend Links::ClassMethods
           end
         end

data/lib/roar/representer/xml.rb

@@ -47,6 +47,10 @@ module Roar
         end
       end
 
+      def links_definition_options  # FIXME: remove me ASAP!
+        [:links_array, {:from => :link, :class => Feature::Hypermedia::Hyperlink, :collection => true, :extend => XML::HyperlinkRepresenter}]
+      end
+
 
       require 'representable/xml/hash'
       module HyperlinkRepresenter

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

data/test/hypermedia_feature_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'roar/representer/feature/hypermedia'
 require 'roar/representer/json'
 
-class HypermediaTest
+class HypermediaTest < MiniTest::Spec
   describe "Hypermedia Feature" do
 
 
@@ -135,35 +135,6 @@ class LinkCollectionTest < MiniTest::Spec
   end
 end
 
-class HyperlinkTest < MiniTest::Spec
-  Hyperlink = Roar::Representer::Feature::Hypermedia::Hyperlink
-  describe "Hyperlink" do
-    subject { Hyperlink.new(:rel => "self", "href" => "http://self", "data-whatever" => "Hey, @myabc") }
-
-    it "accepts string keys in constructor" do
-      assert_equal "Hey, @myabc", subject.send("data-whatever")
-    end
-
-    it "responds to #rel" do
-      assert_equal "self", subject.rel
-    end
-
-    it "responds to #href" do
-      assert_equal "http://self", subject.href
-    end
-
-    it "responds to #replace with string keys" do
-      subject.replace("rel" => "next")
-      assert_equal nil, subject.href
-      assert_equal "next", subject.rel
-    end
-
-    it "responds to #each and implements Enumerable" do
-      assert_equal ["rel:self", "href:http://self", "data-whatever:Hey, @myabc"], subject.collect { |k,v| "#{k}:#{v}" }
-    end
-  end
-end
-
 class HyperlinkInheritanceTest < MiniTest::Spec
   describe "when the base representer has a link" do
     before do

data/test/hypermedia_test.rb

@@ -54,6 +54,14 @@ class HypermediaTest < MiniTest::Spec
           subject.to_json.must_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"//self\",\"type\":\"image/jpg\"}]}"
         end
       end
+
+      describe "not calling #link" do
+        representer_for {}
+
+        it "still allows rendering" do
+          subject.to_json.must_equal "{\"links\":[]}"
+        end
+      end
     end
 
     # private tests:
@@ -97,4 +105,32 @@ class LinksDefinitionTest < MiniTest::Spec
       assert subject.clone.rel2block.object_id != subject.rel2block.object_id
     end
   end
-end
+end
+
+class HyperlinkTest < MiniTest::Spec
+  describe "Hyperlink" do
+    subject { link(:rel => "self", "href" => "http://self", "data-whatever" => "Hey, @myabc") }
+
+    it "accepts string keys in constructor" do
+      assert_equal "Hey, @myabc", subject.send("data-whatever")
+    end
+
+    it "responds to #rel" do
+      assert_equal "self", subject.rel
+    end
+
+    it "responds to #href" do
+      assert_equal "http://self", subject.href
+    end
+
+    it "responds to #replace with string keys" do
+      subject.replace("rel" => "next")
+      assert_equal nil, subject.href
+      assert_equal "next", subject.rel
+    end
+
+    it "responds to #each and implements Enumerable" do
+      assert_equal ["rel:self", "href:http://self", "data-whatever:Hey, @myabc"], subject.collect { |k,v| "#{k}:#{v}" }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable