Enable JSONAPI#to_hash meta option

Fixes trailblazer#196

Signed-off-by: Alex Coles <alex@alexbcoles.com>

lib/roar/json/json_api.rb

@@ -35,6 +35,7 @@ def collection_representer # FIXME: cache.
             def to_hash(options={})
               hash = super(to_a: options) # [{data: {..}, data: {..}}]
               collection = hash["to_a"]
+              meta       = options.fetch('meta', {})
 
               document = {data: []}
               included = []
@@ -45,6 +46,8 @@ def to_hash(options={})
 
               Fragment::Links.(document, Renderer::Links.new.(hash, {}), options)
               Fragment::Included.(document, included, options)
+              Fragment::Meta.(document, meta, options)
+
               document
             end
           end)
@@ -69,10 +72,6 @@ def link(name, options={}, &block)
           for_collection.link(name, &block)
         end
 
-        def meta(&block)
-          representable_attrs[:meta_representer] = Class.new(Roar::Decorator, &block)
-        end
-
         def has_one(name, options={}, &block)
           # every nested representer is a full-blown JSONAPI representer.
           dfn = nil
@@ -135,6 +134,10 @@ module Fragment
         Links = ->(document, links, options) do
           document[:links] = links if links.any?
         end
+
+        Meta = ->(document, meta, options) do
+          document[:meta] = meta if meta.any?
+        end
       end
 
       # {:include=>[:id, :title, :author, :included],
@@ -164,7 +167,7 @@ def to_hash(options={})
           res = super(Options::Include.(options, self))
 
           links = Renderer::Links.new.call(res, options)
-          # meta  = render_meta(options)
+          meta  = options.fetch('meta', {})
 
           relationships = render_relationships(res)
           included      = render_included(res)
@@ -180,6 +183,7 @@ def to_hash(options={})
 
           Fragment::Links.(data, links, options)
           Fragment::Included.(document, included, options)
+          Fragment::Meta.(document, meta, options)
 
           document
         end
@@ -217,15 +221,6 @@ def render_included(hash)
           end.flatten
         end
 
-        def render_meta(options)
-          # TODO: this will call collection.page etc, directly on the collection. we could allow using a "meta"
-          # object to hold this data.
-          # `meta call_meta: true` or something
-          return {"meta" => options["meta"]} if options["meta"]
-          return {} unless representer = representable_attrs[:meta_representer]
-          {"meta" => representer.new(represented).extend(Representable::Hash).to_hash}
-        end
-
         def render_relationships(res)
           (res["relationships"] || []).each do |name, hash|
             if hash.is_a?(::Hash)

test/jsonapi/collection_render_test.rb

@@ -135,6 +135,16 @@ class JsonapiCollectionRenderTest < MiniTest::Spec
     )
   end
 
+  it 'renders meta information if meta option supplied' do
+    hash = decorator.to_hash('meta' => { page: 2, total: 9 })
+    hash[:meta].must_equal(page: 2, total: 9)
+  end
+
+  it 'does not render meta information if meta option is empty' do
+    hash = decorator.to_hash('meta' => {})
+    hash[:meta].must_be_nil
+  end
+
   describe "Fetching Resources (empty collection)" do
     let(:document) {
       {

test/jsonapi/render_test.rb

@@ -102,6 +102,16 @@ class JsonapiRenderTest < MiniTest::Spec
     )
   end
 
+  it 'renders meta information if meta option supplied' do
+    hash = decorator.to_hash('meta' => { 'copyright' => 'Nick Sutterer' })
+    hash[:meta].must_equal('copyright' => 'Nick Sutterer')
+  end
+
+  it 'does not render meta information if meta option is empty' do
+    hash = decorator.to_hash('meta' => {})
+    hash[:meta].must_be_nil
+  end
+
   describe "Single Resource Object" do
     class DocumentSingleResourceObjectDecorator < Roar::Decorator
       include Roar::JSON::JSONAPI