Merge pull request #2 from bf4/dynamic-jsonapi-string-links

Use return value of link block if any
beauby · Dec 31, 2015 · 88e5e50 · 88e5e50
2 parents 4ce77c5 + 013d71a
commit 88e5e50
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
@@ -209,15 +209,7 @@ def add_included_resources_for(serializer, include_tree, primary_data, included)
 
         def links_for(serializer)
           serializer.links.each_with_object({}) do |(name, value), hash|
-            hash[name] =
-              if value.respond_to?(:call)
-                link = Link.new(serializer)
-                link.instance_eval(&value)
-
-                link.to_hash
-              else
-                value
-              end
+            hash[name] = Link.new(serializer).value(value)
           end
         end
 

diff --git a/lib/active_model/serializer/adapter/json_api/link.rb b/lib/active_model/serializer/adapter/json_api/link.rb
@@ -10,29 +10,40 @@ def initialize(serializer)
 
           def href(value)
             self._href = value
+            nil
           end
 
           def meta(value)
             self._meta = value
+            nil
           end
 
-          def string(value)
-            self._string = value
+          def value(value)
+            if value.respond_to?(:call)
+              string instance_eval(&value)
+              _string || to_hash
+            else
+              value
+            end
           end
 
-          def to_hash
-            return _string unless _string.nil?
+          protected
+
+          attr_accessor :_href, :_meta, :_string
+          attr_reader :object, :scope
+
+          private
 
+          def to_hash
             hash = { href: _href }
             hash.merge!(meta: _meta) if _meta
 
             hash
           end
 
-          protected
-
-          attr_accessor :_href, :_meta, :_string
-          attr_reader :object, :scope
+          def string(value)
+            self._string = value
+          end
         end
       end
     end

diff --git a/test/adapter/json_api/links_test.rb b/test/adapter/json_api/links_test.rb
@@ -15,7 +15,7 @@ class LinkAuthorSerializer < ActiveModel::Serializer
             link :other, '//example.com/resource'
 
             link :yet_another do
-              string "//example.com/resource/#{object.id}"
+              "//example.com/resource/#{object.id}"
             end
           end