nested 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471ad424d8ae4b8514a2ed8e1916d8cc0994d4eb
-  data.tar.gz: c2084f08d95070dd85116579c8bb3b87d4c560cc
+  metadata.gz: 38c9a0d53765eb2f648f9d4f5ef2a9fb5fc4b528
+  data.tar.gz: 3d8212a2d22886567404470d0b288514a961f2b5
 SHA512:
-  metadata.gz: 9de43f76316d0f4406df50cb9535c9fa9fd936fc5e96a4d5962c47464bff532467d709d82aaecb2f753f5630627fbd44fac8cfd7a8e7584d7834bb255064e7d6
-  data.tar.gz: 1b0861468765d7928b9ba85e172e91a31fc3cdf51b9ca27774dc24a3f3b00048485056fdb9acb0a211246da840a238b02120df83c010fa3680da05ee67e0be7a
+  metadata.gz: 9e9ebefde4d1f116da2ceeaa625334d2eba6b1b54dcd45cf25e2c71f32722467b1bfbd9181f634c440704d19251cfe7fdcffd8ba4542011f48e70bde04b05698
+  data.tar.gz: 2d7284067772373590898e15fc13cfe8df87581c39c4f446360b82199a851e32dd7a788c6f97647067d85059a732f24b328ca3a437cd8c0df49980a541158b60

data/lib/nested.rb

@@ -60,12 +60,7 @@ module Nested
       end
 
       if member?
-        __serialize_args = @parent.instance_variable_get("@__serialize_args")
-        __serialize_block = @parent.instance_variable_get("@__serialize_block")
-
-        serialize *__serialize_args, &__serialize_block
-      else
-        serialize &->(obj) { raise "implement serializer for #{@__resource.type} #{@__resource.name}" }
+        serialize *@parent.instance_variable_get("@__serialize_args")
       end
     end
 
@@ -93,17 +88,20 @@ module Nested
       end
     end
 
-    def serialize(*args, &block)
-      raise "pass either *args or &block" if args.empty? && !block && !member?
-
+    def serialize(*args)
       @__serialize_args = args
-      @__serialize_block = block
 
       @__serialize = ->(obj) do
-        obj = self.instance_exec(obj, &block) if block
-        obj = obj.attributes if obj.is_a?(ActiveRecord::Base)
-        obj = obj.symbolize_keys.slice(*args) unless args.empty?
-        obj
+        args.inject({}) do |memo, field|
+          case field
+            when Symbol
+              memo[field] = obj.is_a?(Hash) ? obj[field] : obj.send(field)
+            when Hash
+              field, proc = field.to_a.first
+              memo[field] = self.instance_exec(obj, &proc)
+          end
+          memo
+        end
       end
     end
 

data/nested.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name               = "nested"
-  s.version            = "0.0.23"
+  s.version            = "0.0.24"
 
   s.authors = ["Jan Zimmek"]
   s.email = %q{jan.zimmek@web.de}

data/test/nested_test.rb

@@ -313,12 +313,15 @@ class NestedTest < Test::Unit::TestCase
 
   def test_serializer
     singleton!
-    # assert_equal(@r.serializer, Nested::Resource::SERIALIZE)
 
-    ser = ->(obj) { obj }
-    @r.serialize &ser
+    @r.serialize :name
+
+    assert_equal({name: "joe"}, @r.instance_variable_get("@__serialize").call({name: "joe"}))
+    assert_equal({name: "joe"}, @r.instance_variable_get("@__serialize").call({name: "joe", boss: true}))
+    assert_equal({name: "joe"}, @r.instance_variable_get("@__serialize").call(OpenStruct.new({name: "joe"})))
 
-    assert_equal 1, @r.instance_variable_get("@__serialize").call(1)
+    @r.serialize :name, virtual: ->(o){ o[:name] + "!!" }
+    assert_equal({name: "joe", virtual: "joe!!"}, @r.instance_variable_get("@__serialize").call({name: "joe"}))
   end
 
   # ----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport