oat 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6119b57e5a68a59050cdebb3b16d90f75bc2ce9a
-  data.tar.gz: a33f4b5e3e01b3554f7f04b0ce0cfadbb7477e79
+  metadata.gz: ba603c78357fe7c01817de9999727c2cb8980e9f
+  data.tar.gz: 8106d0bdc27f381887c2b614e04b3557e5eb0713
 SHA512:
-  metadata.gz: 987245ceead54d06e645bd3af2b965aa0f01aa109aa2529149aeb6115f26074cc1e99759719345e5b9d8fbbcce47d233405b0e2fe96b4d07c14e8def8318e3a9
-  data.tar.gz: 7c096108dee29fac37563fd090b6867557d2183f7861c215e9dc9cd844472d90996f8d1f548af7d49dfc8abedf0f72e155442300e41bfd87067b7ac4f1fe26bf
+  metadata.gz: e2b34f0607bb589e0e47f8bb0edec1ffce5057e02dd439a565025845f429add68307ddf7fdde84a75880be72b07301effdea3cd5d9c4a9ade2803272d5978a04
+  data.tar.gz: ca0062c54c4800a7076e86683376fce749293eb7bfb094036da9a3eca35d571438fd9a1b46113fd3105723f1d0aed074b425cd2acb5447fc5f9bff6445e151aa

data/README.md

@@ -346,6 +346,17 @@ class SocialSerializer < Oat::Serializer
 end
 ```
 
+You can specify multiple schema blocks, including across class hierarchies. This allows us to append schema attributes or override previously defined attributes:
+
+```ruby
+class ExtendedUserSerializer < UserSerializer
+  schema do
+    name item.full_name # name property will now by the user's full name
+    property :dob, item.dob # additional date of birth attribute
+  end
+end
+```
+
 ## URLs
 
 Hypermedia is all about the URLs linking your resources together. Oat adapters can have methods to declare links in your entity schema but it's up to your code/framework how to create those links.
@@ -642,7 +653,7 @@ Now http requests that specify the Siren mime type will work as
 expected.
 
 **NOTE**
-The key thing that makes this all hang together is that the
+The key thing that makes this all work together is that the
 object passed to `respond_with` implements a `to_FORMAT` method, where
 `FORMAT` is the symbol used to register the mime type and responder
 (`:siren`).  Without it, Rails will not invoke your responder block.

data/lib/oat/adapter.rb

@@ -26,6 +26,7 @@ module Oat
 
       if block_given?
         serializer_class = Class.new(serializer.class)
+        serializer_class.schemas = []
         serializer_class.adapter self.class
         s = serializer_class.new(obj, serializer.context.merge(context_options), serializer.adapter_class, serializer.top)
         serializer.instance_exec(obj, s, &block)

data/lib/oat/serializer.rb

@@ -2,11 +2,12 @@ require 'support/class_attribute'
 module Oat
   class Serializer
 
-    class_attribute :_adapter, :logger
+    class_attribute :_adapter, :logger, :schemas
+
+    self.schemas = []
 
     def self.schema(&block)
-      @schema = block if block_given?
-      @schema || Proc.new{}
+      self.schemas += [block] if block_given?
     end
 
     def self.adapter(adapter_class = nil)
@@ -51,7 +52,10 @@ module Oat
 
     def to_hash
       @to_hash ||= (
-        instance_eval(&self.class.schema)
+        self.class.schemas.each do |schema|
+          instance_eval(&schema)
+        end
+
         adapter.to_hash
       )
     end

data/lib/oat/version.rb

@@ -1,3 +1,3 @@
 module Oat
-  VERSION = "0.4.7"
+  VERSION = "0.5.0"
 end

data/spec/serializer_spec.rb

@@ -78,6 +78,39 @@ describe Oat::Serializer do
         :self => "http://foo.bar.com/#{user1.id}"
       )
     end
-  end
 
+    context "when multiple schema blocks are specified across a class hierarchy" do
+      let(:child_serializer) {
+        Class.new(@sc) do
+          schema do
+            attribute :id_plus_x, "#{item.id}_x"
+
+            attributes do |attrs|
+              attrs.inherited "true"
+            end
+          end
+        end
+      }
+
+      it "produces the result of both schema blocks in order" do
+        serializer = child_serializer.new(user1, :name => "child_controller")
+
+        expect(serializer.to_hash.fetch(:attributes)).to include(
+          :special => 'Hello',
+          :id => user1.id,
+          :id_plus_x => "#{user1.id}_x",
+          :inherited => "true"
+        )
+      end
+
+      it "does not affect the parent serializer" do
+        serializer = @sc.new(user1, :name => 'some_controller')
+
+        attributes = serializer.to_hash.fetch(:attributes)
+
+        expect(attributes).to_not have_key(:id_plus_x)
+        expect(attributes).to_not have_key(:inherited)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oat
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport