nested 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1da30913da1721509e3310efdcf6fb168f66cba2
-  data.tar.gz: b0651cc3cee6b4f23c1477d9a9e5cb41cca3c0f1
+  metadata.gz: 166d069fbce22175e7ed0212140ae0c269484e68
+  data.tar.gz: 64e7a84b68750c89bc54ecc827c4ef35d2c48ede
 SHA512:
-  metadata.gz: 3c5fa1babd027eca810e0cf89c2da126bb88fc9ace44082040e6baf121dd212b063cab71eae249aeaeb33d1cf9a7548d26974616b0551228fce0e4a3be8039d0
-  data.tar.gz: ba7ed143ec326111981a03c361bd80b531a6de237f3ac660045f694cbf18bab9dd159a045db1f8e55725717d36ba445803d76669280f6e586a23ad88a0e6ac52
+  metadata.gz: 4f7c3dd136ccbfc5a716d68033a87db8a141939779f58b732661e541aaae3a69b29b9952002d4c8106eb0966da4e4e0f9517dfccbd0415262f022cf2875b9a07
+  data.tar.gz: 3ba0d93d82c54adfb4c56b4e09a873c211a95705cacb8bdcf7c396f3625931178255ff2c7800c4081fadf226c859def7b84077d98599f6381544174409b9f5e3

data/lib/nested.rb

@@ -15,10 +15,6 @@ module Nested
   end
 
   class Resource
-    SERIALIZE = ->(obj, sinatra, resource) do
-      obj
-    end
-
     FETCH =  ->(resource, ctrl) do
       raise "implement fetch for resource #{resource.name}"  unless resource.parent
       raise "implement fetch for singleton #{resource.name}" if resource.singleton?
@@ -48,12 +44,16 @@ module Nested
       @resources = []
       @actions = []
 
-      @__init = ->(resource) do
+      init &->(resource) do
         fetched = FETCH.call(resource, self)
 
         puts "set @#{resource.instance_variable_name} to #{fetched.inspect} for #{self}"
         self.instance_variable_set("@#{resource.instance_variable_name}", fetched)
       end
+
+      serialize &->(obj, resource) do
+        obj
+      end
     end
 
     def singleton?
@@ -71,28 +71,12 @@ module Nested
     def serialize(*args, &block)
       raise "pass either *args or &block" if args.empty? && !block
 
-      @__serialize = ->(obj, sinatra, resource) do
-        obj = block.call(obj) if block
+      @__serialize = ->(obj, resource) do
+        obj = self.instance_exec(obj, resource, &block) if block
         obj = obj.attributes if obj.is_a?(ActiveRecord::Base)
         obj = obj.symbolize_keys.slice(*args) unless args.empty?
         obj
       end
-
-
-
-      # if block && !args.empty?
-      #   @__serialize = ->(obj, sinatra, resource) do
-      #     block.call(obj).attributes.symbolize_keys.slice(*args)
-      #   end
-      # elsif block && args.empty?
-      #   @__serialize = block
-      # elsif !block && !args.empty?
-      #   @__serialize = ->(obj, sinatra, resource) do
-      #     obj.attributes.symbolize_keys.slice(*args)
-      #   end
-      # else
-      #   raise "pass either *args or &block"
-      # end
     end
 
     def init(&block)
@@ -179,10 +163,6 @@ module Nested
       (self.parents + [self]).reverse
     end
 
-    def serializer
-      @__serialize || SERIALIZE
-    end
-
     # --------------------------
 
     def sinatra_init(sinatra)
@@ -229,9 +209,9 @@ module Nested
 
     def sinatra_response_create_data(sinatra, response)
       data = if response && collection?
-        response.to_a.map{|e| serializer.call(e, sinatra, self)}
+        response.to_a.map{|e| sinatra.instance_exec(e, self, &@__serialize) }
       else
-        serializer.call(response, sinatra, self)
+        sinatra.instance_exec(response, self, &@__serialize)
       end
 
       {data: data, ok: true}

data/nested.gemspec

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

data/test/nested_test.rb

@@ -74,7 +74,7 @@ class NestedTest < Test::Unit::TestCase
 
     @r.serialize :name
 
-    assert_equal({name: :joe}, @r.instance_variable_get("@__serialize").call({name: :joe, test: true}, {}, {}))
+    assert_equal({name: :joe}, @r.instance_variable_get("@__serialize").call({name: :joe, test: true}, {}))
   end
 
   def test_route
@@ -312,9 +312,12 @@ class NestedTest < Test::Unit::TestCase
 
   def test_serializer
     singleton!
-    assert_equal(@r.serializer, Nested::Resource::SERIALIZE)
-    @r.instance_variable_set("@__serialize", 123)
-    assert_equal(@r.serializer, 123)
+    # assert_equal(@r.serializer, Nested::Resource::SERIALIZE)
+
+    ser = ->(obj, resource) { [obj, resource] }
+    @r.serialize &ser
+
+    assert_equal [1, @r], @r.instance_variable_get("@__serialize").call(1, @r)
   end
 
   # ----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jan Zimmek