nested 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1b8488edca79e7f4326470f3e5182edefe611c
-  data.tar.gz: b269294899ef8132adb3061fd99ab6b5e4830867
+  metadata.gz: 55bc0e32ebd2026fff78d9f51d3442b566644d8c
+  data.tar.gz: 258a00be59fff86245c67a1a229de723e94b28e3
 SHA512:
-  metadata.gz: 97ef31ce4db550a90afef2b9dad762500dae8af68ff5f0a7bbf958151e2a1870838a3acd20e5c81d79de0029a8eed6f50f8ff3b2be8119eb056c370251143dbc
-  data.tar.gz: 1d2872a7c21971a4659dfb387c7abe0fd961f89cdf265b26f677a3eadee139fb0b33c47a7dd3c95a6a0178e9da9fc5e5114b8f42c9d501eeb4d27065b0b64e1a
+  metadata.gz: d6059be129db9adc1bd3d1b97590427029c19e15852570875cfa460577fd9421ece0ab5ece5c57edff733f3e11af10d96661278383eddeabf03b716003b772df
+  data.tar.gz: f70c325da379d55242d92ca7cd06f3bf9f2abfc3c86fe87514b01b4d125e5e1edce99e5e1e27b0c2843eb10e0a2d7b0952c830f1389f179aeddb2f2bd4314bee

data/lib/nested.rb

@@ -32,7 +32,7 @@ module Nested
 
     attr_reader :name, :parent, :actions, :resources
 
-    def initialize(sinatra, name, singleton, collection, parent)
+    def initialize(sinatra, name, singleton, collection, parent, init_block)
       raise SingletonAndCollectionError.new if singleton && collection
       raise NameMissingError.new if (singleton || collection) && !name
 
@@ -45,7 +45,7 @@ module Nested
       @actions = []
 
       init &-> do
-        fetched = instance_exec(&FETCH)
+        fetched = instance_exec(&(init_block||FETCH))
 
         puts "set @#{@__resource.instance_variable_name} to #{fetched.inspect} for #{self}"
         self.instance_variable_set("@#{@__resource.instance_variable_name}", fetched)
@@ -133,32 +133,22 @@ module Nested
       create_sinatra_route :delete, action, &block
     end
 
-    def singleton(name, &block)
-      child_resource(name, true, false, &block)
+    def singleton(name, init_block=nil, &block)
+      child_resource(name, true, false, init_block, &block)
     end
 
-    def delegate(name, &block)
-      singleton(name) do
-        resource = self
-        init do
-          instance_variable_set("@#{resource.instance_variable_name}", instance_variable_get("@#{resource.parent.instance_variable_name}"))
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def many(name, &block)
+    def many(name, init_block=nil, &block)
       raise ManyInManyError.new "do not nest many in many" if collection?
-      child_resource(name, false, true, &block)
+      child_resource(name, false, true, init_block, &block)
     end
 
-    def one(name=nil, &block)
+    def one(name=nil, init_block=nil, &block)
       raise OneWithNameInManyError.new("call one (#{name}) without name argument when nested in a many (#{@name})") if name && collection?
-      child_resource(name, false, false, &block)
+      child_resource(name, false, false, init_block, &block)
     end
 
-    def child_resource(name, singleton, collection, &block)
-       Resource.new(@sinatra, name, singleton, collection, self)
+    def child_resource(name, singleton, collection, init_block, &block)
+       Resource.new(@sinatra, name, singleton, collection, self, init_block)
         .tap{|r| r.instance_eval(&block)}
         .tap{|r| @resources << r}
     end
@@ -278,7 +268,8 @@ module Nested
     end
 
     module Sinatra
-      def create_resource(name, singleton, collection, &block)
+      # def create_resource(name, singleton, collection, &block)
+      def create_resource(*args, &block)
         angularize(super)
       end
 
@@ -430,17 +421,17 @@ module Nested
         @nested_config ||= {}
       end
     end
-    def singleton(name, &block)
-      create_resource(name, true, false, &block)
+    def singleton(name, init_block=nil, &block)
+      create_resource(name, true, false, init_block, &block)
     end
-    def many(name, &block)
-      create_resource(name, false, true, &block)
+    def many(name, init_block=nil, &block)
+      create_resource(name, false, true, init_block, &block)
     end
-    def one(name, &block)
-      create_resource(name, false, false, &block)
+    def one(name, init_block=nil, &block)
+      create_resource(name, false, false, init_block, &block)
     end
-    def create_resource(name, singleton, collection, &block)
-      ::Nested::Resource.new(self, name, singleton, collection, nil).tap{|r| r.instance_eval(&block) }
+    def create_resource(name, singleton, collection, init_block, &block)
+      ::Nested::Resource.new(self, name, singleton, collection, nil, init_block).tap{|r| r.instance_eval(&block) }
     end
   end
 

data/nested.gemspec

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

data/test/nested_test.rb

@@ -8,15 +8,15 @@ require "nested"
 class NestedTest < Test::Unit::TestCase
 
   def singleton!
-    @r = Nested::Resource.new(@sinatra, :project, true, false, nil)
+    @r = Nested::Resource.new(@sinatra, :project, true, false, nil, nil)
   end
 
   def collection!
-    @r = Nested::Resource.new(@sinatra, :project, false, true, nil)
+    @r = Nested::Resource.new(@sinatra, :project, false, true, nil, nil)
   end
 
   def member!
-    @r = Nested::Resource.new(@sinatra, :project, false, false, nil)
+    @r = Nested::Resource.new(@sinatra, :project, false, false, nil, nil)
   end
 
   def setup
@@ -25,11 +25,11 @@ class NestedTest < Test::Unit::TestCase
 
   def test_initialize_name
     assert_raise Nested::NameMissingError do
-      Nested::Resource.new({}, nil, true, false, nil)
+      Nested::Resource.new({}, nil, true, false, nil, nil)
     end
 
     assert_raise Nested::NameMissingError do
-      Nested::Resource.new({}, nil, false, true, nil)
+      Nested::Resource.new({}, nil, false, true, nil, nil)
     end
   end
 
@@ -140,29 +140,29 @@ class NestedTest < Test::Unit::TestCase
 
   def test_singleton
     singleton!
-    @r.expects(:child_resource).with(:statistic, true, false)
+    @r.expects(:child_resource).with(:statistic, true, false, nil)
     @r.singleton(:statistic)
 
     member!
-    @r.expects(:child_resource).with(:statistic, true, false)
+    @r.expects(:child_resource).with(:statistic, true, false, nil)
     @r.singleton(:statistic)
 
     collection!
-    @r.expects(:child_resource).with(:statistic, true, false)
+    @r.expects(:child_resource).with(:statistic, true, false, nil)
     @r.singleton(:statistic)
   end
 
   def test_one
     singleton!
-    @r.expects(:child_resource).with(:statistic, false, false)
+    @r.expects(:child_resource).with(:statistic, false, false, nil)
     @r.one(:statistic)
 
     member!
-    @r.expects(:child_resource).with(:statistic, false, false)
+    @r.expects(:child_resource).with(:statistic, false, false, nil)
     @r.one(:statistic)
 
     collection!
-    @r.expects(:child_resource).with(nil, false, false)
+    @r.expects(:child_resource).with(nil, false, false, nil)
     @r.one
 
     collection!
@@ -173,11 +173,11 @@ class NestedTest < Test::Unit::TestCase
 
   def test_many
     singleton!
-    @r.expects(:child_resource).with(:statistics, false, true)
+    @r.expects(:child_resource).with(:statistics, false, true, nil)
     @r.many(:statistics)
 
     member!
-    @r.expects(:child_resource).with(:statistics, false, true)
+    @r.expects(:child_resource).with(:statistics, false, true, nil)
     @r.many(:statistics)
 
     collection!
@@ -228,26 +228,26 @@ class NestedTest < Test::Unit::TestCase
 
   def test_child_resource
     singleton!
-    r = @r.child_resource(:statistic, false, false) { }
+    r = @r.child_resource(:statistic, false, false, nil) { }
     assert_equal :statistic, r.name
     assert_equal false, r.instance_variable_get("@singleton")
     assert_equal false, r.instance_variable_get("@collection")
 
     singleton!
-    r = @r.child_resource(:statistic, true, false) { }
+    r = @r.child_resource(:statistic, true, false, nil) { }
     assert_equal :statistic, r.name
     assert_equal true, r.instance_variable_get("@singleton")
     assert_equal false, r.instance_variable_get("@collection")
 
     singleton!
-    r = @r.child_resource(:statistic, false, true) { }
+    r = @r.child_resource(:statistic, false, true, nil) { }
     assert_equal :statistic, r.name
     assert_equal false, r.instance_variable_get("@singleton")
     assert_equal true, r.instance_variable_get("@collection")
 
     singleton!
     assert_raise Nested::SingletonAndCollectionError do
-      @r.child_resource(:statistic, true, true) { }
+      @r.child_resource(:statistic, true, true, nil) { }
     end
   end
 

metadata

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