oat 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b724a91b70428b2d8119bb6bdd9a30c814ac10d
-  data.tar.gz: 043edf3fd0dcb99075cf01660851e8a183270d1f
+  metadata.gz: 557a927aa61099a4c1e3eb84c7cb4520247cb8ff
+  data.tar.gz: ba7fd708868211a749732afd0d8e48b2f3fde252
 SHA512:
-  metadata.gz: 7662b374492e8c20c8e3fbe030d1b08bbcd27665cb4230a4c696142b1e80d6d298eb4870977943ac99d12d20517792c97240d88602b28f29c2bd0974f3bf7455
-  data.tar.gz: a4887962d0788adfcb7992a79e21c884ddb92734c690b99f77c9541278003db4c7fbe5c5f1ffae2696c114c58a7236ce621a619ac9c44b3c8d151b4eafee6b47
+  metadata.gz: e6ada6ca09572536681a11853b3958e676893cce4508f35006c33ad56e11ea4eb5f35e4bf3f436156be98b800af92efd935dae252cd4b89fcb9e5a4333a48134
+  data.tar.gz: 7bb01a60f853efd5fe8b7a7457565fe7bd41e8716ba6c80841abc9195442034d5ed1b6610a34d295da73b37391beaff0072fc7fc295eaaea81e595057de797b9

data/.travis.yml

@@ -23,8 +23,3 @@ matrix:
       rvm: 1.8.7
     - gemfile: gemfiles/Gemfile.as-4.0.x
       rvm: 1.9.2
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.as-3.0.x
-      rvm: 1.8.7
-    - gemfile: gemfiles/Gemfile.as-1.4.4
-      rvm: 1.8.7

data/README.md

@@ -1,4 +1,6 @@
-# Oat [![Build Status](https://travis-ci.org/ismasan/oat.png)](https://travis-ci.org/ismasan/oat)
+# Oat
+[![Build Status](https://travis-ci.org/ismasan/oat.png)](https://travis-ci.org/ismasan/oat)
+[![Gem Version](https://badge.fury.io/rb/oat.png)](http://badge.fury.io/rb/oat)
 
 Adapters-based API serializers with Hypermedia support for Ruby apps. Read [the blog post](http://new-bamboo.co.uk/blog/2013/11/21/oat-explicit-media-type-serializers-in-ruby) for context and motivation.
 

data/lib/oat/adapter.rb

@@ -31,7 +31,7 @@ module Oat
         serializer.top.instance_exec(obj, s, &block)
         s.to_hash
       else
-        serializer_class.new(obj, serializer.context.merge(context_options), serializer.adapter_class).to_hash
+        serializer_class.new(obj, serializer.context.merge(context_options), serializer.adapter_class, serializer.top).to_hash
       end
     end
   end

data/lib/oat/adapters/json_api.rb

@@ -34,7 +34,7 @@ module Oat
 
       def entity(name, obj, serializer_class = nil, context_options = {}, &block)
         @entities[name.to_s.pluralize.to_sym] ||= []
-        ent = entity_without_root(obj, serializer_class, context_options, &block)
+        ent = serializer_from_block_or_class(obj, serializer_class, context_options, &block)
         if ent
           link name, :href => ent[:id]
           @entities[name.to_s.pluralize.to_sym] << ent
@@ -47,7 +47,7 @@ module Oat
 
         collection.each do |obj|
           @entities[link_name] ||= []
-          ent = entity_without_root(obj, serializer_class, context_options, &block)
+          ent = serializer_from_block_or_class(obj, serializer_class, context_options, &block)
           if ent
             data[:links][link_name] << ent[:id]
             @entities[link_name] << ent
@@ -57,20 +57,19 @@ module Oat
 
       def to_hash
         raise "JSON API entities MUST define a type. Use type 'user' in your serializers" unless root_name
-        h = {root_name.pluralize.to_sym => [data]}
-        h[:linked] = @entities if @entities.keys.any?
-        h
+        if serializer.top != serializer
+          return data
+        else
+          h = {root_name.pluralize.to_sym => [data]}
+          h[:linked] = @entities if @entities.keys.any?
+          return h
+        end
       end
 
       protected
 
       attr_reader :root_name
 
-      def entity_without_root(obj, serializer_class = nil, context_options = {}, &block)
-        ent = serializer_from_block_or_class(obj, serializer_class, context_options, &block)
-        ent.values.first.first if ent
-      end
-
     end
   end
 end

data/lib/oat/version.rb

@@ -1,3 +1,3 @@
 module Oat
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oat
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ismael Celis