nested 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ece57cb831e671f0e3db5c785867a19aef488531
-  data.tar.gz: d2a6be9a7a66705051d3bdbe502aafe8cf8b86b7
+  metadata.gz: 49bb517e6971a0a86442877831128da5bba7655d
+  data.tar.gz: 02518d037ff5a282f2617d78aed2c6cdf93b7624
 SHA512:
-  metadata.gz: fa90d6d5af153bd20d31c805c5b6efb407a7fd00670f0d6fa475b9074faf89531b9500d1c92890a78dd1b9f0965373bb4c0434f5c1eceaf5bc86b9941b9e23a5
-  data.tar.gz: 559040efaf939783b885922b6003017fe58907060e03c79c65f159135f567ecdb40f5082c63a7d7cb629070c16f5e85865b85b34d34e5488c1c401b9f89d24b0
+  metadata.gz: f9aa03054fc3fcb2dd7cfbe8ac8f91442b37dde54976e865ca43ddc05681117a70cf9b24fd0eb254b9ffd652267c8f180619a839173cb1315df4c4a5dbd58637
+  data.tar.gz: 41ce15bbd4beb3000ce43bb56172f20843a9509872d0b1b0b9b8c65b23b3938228c4f1a91de01a5b094aa8a60e296eed39e3cf3450b8f90ba94be059fba05626

data/lib/nested.rb

@@ -15,7 +15,7 @@ module Nested
   end
 
   class Resource
-    SERIALIZE = ->(obj, ctrl, resource) do
+    SERIALIZE = ->(obj, sinatra, resource) do
       obj
     end
 
@@ -47,6 +47,13 @@ module Nested
       @parent = parent
       @resources = []
       @actions = []
+
+      @__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
     end
 
     def singleton?
@@ -61,10 +68,36 @@ module Nested
       @collection == true
     end
 
-    def before_fetch(&block);   @__before_fetch = block;  end
-    def fetch(&block);          @__fetch        = block;  end
-    def after_fetch(&block);    @__after_fetch  = block;  end
-    def serialize(&block);      @__serialize    = block;  end
+    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
+        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)
+      @__init = block
+    end
 
     def route(args={}, action=nil)
       "".tap do |r|
@@ -146,10 +179,6 @@ module Nested
       (self.parents + [self]).reverse
     end
 
-    def fetcher
-      @__fetch || FETCH
-    end
-
     def serializer
       @__serialize || SERIALIZE
     end
@@ -157,13 +186,7 @@ module Nested
     # --------------------------
 
     def sinatra_init(sinatra)
-      @__before_fetch.call(self, sinatra) if @__before_fetch
-      resource_obj = fetcher.call(self, sinatra)
-
-      puts "set @#{self.instance_variable_name} to #{resource_obj.inspect} for #{sinatra}"
-      sinatra.instance_variable_set("@#{self.instance_variable_name}", resource_obj)
-
-      @__after_fetch.call(self, sinatra) if @__after_fetch
+      sinatra.instance_exec(self, &@__init)
     end
 
     def sinatra_exec_get_block(sinatra, &block)

data/nested.gemspec

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

data/test/nested_test.rb

@@ -2,6 +2,7 @@ require "test/unit"
 require "mocha/setup"
 require "active_support/all"
 require "active_model/errors"
+require "active_record"
 require "nested"
 
 class NestedTest < Test::Unit::TestCase
@@ -59,50 +60,23 @@ class NestedTest < Test::Unit::TestCase
     assert_equal false, @r.member?
   end
 
-  def test_fetch
+  def test_init
     singleton!
 
-    fetch = -> { }
-    @r.fetch &fetch
+    init = -> { }
+    @r.init &init
 
-    assert_equal(fetch, @r.instance_variable_get("@__fetch"))
+    assert_equal init, @r.instance_variable_get("@__init")
   end
 
   def test_serialize
     singleton!
 
-    serialize = -> { }
-    @r.serialize &serialize
+    @r.serialize :name
 
-    assert_equal(serialize, @r.instance_variable_get("@__serialize"))
+    assert_equal({name: :joe}, @r.instance_variable_get("@__serialize").call({name: :joe, test: true}, {}, {}))
   end
 
-  # def test_fetch_object
-  #   singleton!
-
-  #   Nested::Resource::FETCH.expects(:call).with(@r, {})
-  #   @r.fetch_object({})
-
-  #   fetch = -> { }
-  #   @r.fetch &fetch
-
-  #   fetch.expects(:call).with(@r, {})
-  #   @r.fetch_object({})
-  # end
-
-  # def test_serialize_object
-  #   singleton!
-
-  #   Nested::Resource::SERIALIZE.expects(:call).with({name: :joe}, {}, @r)
-  #   @r.serialize_object({name: :joe}, {})
-
-  #   serialize = -> { }
-  #   @r.serialize &serialize
-
-  #   serialize.expects(:call).with({name: :joe}, {}, @r)
-  #   @r.serialize_object({name: :joe}, {})
-  # end
-
   def test_route
     # no parent
     singleton!
@@ -336,13 +310,6 @@ class NestedTest < Test::Unit::TestCase
     assert_equal [{method: :post, action: :action}], @r.actions
   end
 
-  def test_fetcher
-    singleton!
-    assert_equal(@r.fetcher, Nested::Resource::FETCH)
-    @r.instance_variable_set("@__fetch", 123)
-    assert_equal(@r.fetcher, 123)
-  end
-
   def test_serializer
     singleton!
     assert_equal(@r.serializer, Nested::Resource::SERIALIZE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jan Zimmek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport