roar 0.11.6 → 0.11.7

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.11.7
+
+* Maintenance release: Fixing the horrible bug fix from 0.11.6 and make it a bit less horrible.
+
 ## 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.

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

@@ -39,20 +39,6 @@ module Roar
           base.extend ClassMethods
         end
 
-        # TODO: the whole declarative setup in representable should happen on instance level so we don't need to share methods between class and instance.
-        module LinksDefinitionMethods
-        private
-          def create_links_definition
-            representable_attrs << links = LinksDefinition.new(*links_definition_options)
-            links
-          end
-
-          def links_definition
-            representable_attrs.find { |d| d.is_a?(LinksDefinition) } or create_links_definition
-          end
-        end
-        include LinksDefinitionMethods
-
         def before_serialize(options={})
           prepare_links!(options) unless options[:links] == false  # DISCUSS: doesn't work when links are already setup (e.g. from #deserialize).
           super # Representer::Base
@@ -77,6 +63,10 @@ module Roar
         end
 
       private
+        def links_definition
+          representable_attrs.find { |d| d.is_a?(LinksDefinition) } or [] # FIXME: this is a bug as soon as #links_definition is used somewhere else beside #prepare_links.
+        end
+
         # Setup hypermedia links by invoking their blocks. Usually called by #serialize.
         def prepare_links!(*args)
           links_definition.each do |config|  # config is [{..}, block]
@@ -110,7 +100,6 @@ module Roar
 
 
         module ClassMethods
-          include LinksDefinitionMethods
           # Declares a hypermedia link in the document.
           #
           # Example:
@@ -125,6 +114,16 @@ module Roar
             options = {:rel => options} if options.is_a?(Symbol)
             links_definition << [options, block]
           end
+
+        private
+          def create_links_definition
+            representable_attrs << links = LinksDefinition.new(*links_definition_options)
+            links
+          end
+
+          def links_definition
+            representable_attrs.find { |d| d.is_a?(LinksDefinition) } or create_links_definition
+          end
         end
 
 

data/lib/roar/representer/json.rb

@@ -49,9 +49,6 @@ 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.

data/lib/roar/representer/xml.rb

@@ -47,10 +47,6 @@ 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.6"
+  VERSION = "0.11.7"
 end

data/test/hypermedia_test.rb

@@ -59,7 +59,7 @@ class HypermediaTest < MiniTest::Spec
         representer_for {}
 
         it "still allows rendering" do
-          subject.to_json.must_equal "{\"links\":[]}"
+          subject.to_json.must_equal "{}"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
   prerelease: 
 platform: ruby
 authors: