nested 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e094093ea980a578d78107c00f909441725de662
-  data.tar.gz: 4313216ddde4c3e9a20b4bea403e28a62d6755c8
+  metadata.gz: e59bb33223f6b09ae1e78f0af958533f430ff90c
+  data.tar.gz: 9fedc4f9b0557ffe08afa28c40262499c01cf65a
 SHA512:
-  metadata.gz: c424d4769683d24f933508a2974d410871dca9325d05d3dba0471c551d30de68c8b914402d638e7f555d22e13aa3a74a86fe339b659aede851999fe51cb6db05
-  data.tar.gz: 41e439448d8985bc7e70d5cf905b8d4ceafe6730c86e2e9dea9e23317ee24613f2830d505d2bcaf53ac66ba16222764bc0b9740f76d3498e1a4cdbae5af1df6a
+  metadata.gz: 25a5e634ad799ece06b774dac6fb596e784b1e0efa367aeae6e3b8901b979239b000b94a41d40ca572fcc5613471de2de7f8e1dc2ca557509518cb6030ee0d8b
+  data.tar.gz: dccf00f2fa6b24baa29f48cd36a597020604f16c3b73aaabb3c66330d54bd4a222dcae16e117d10097c6197580cef02b09a3764d2d92aa784af8fa286ff0d5cb

data/lib/nested.rb

@@ -55,7 +55,8 @@ module Nested
         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)
+        # self.instance_variable_set("@#{@__resource.instance_variable_name}", fetched)
+        @__resource.sinatra_set_instance_variable(self, @__resource.instance_variable_name, fetched)
       end
 
       if member?
@@ -180,6 +181,11 @@ module Nested
 
     # --------------------------
 
+    def sinatra_set_instance_variable(sinatra, name, value)
+      raise "variable @#{name} already defined" if sinatra.instance_variable_defined?(:"@#{name}")
+      sinatra.instance_variable_set(:"@#{name}", value)
+    end
+
     def sinatra_init(sinatra)
       sinatra.instance_variable_set("@__resource", self)
       sinatra.instance_exec(&@__init)
@@ -218,6 +224,8 @@ module Nested
       sinatra_init_data(:post, sinatra, &block)
       res = sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
       sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
+      # TODO: do we need to check for existing variables here?
+      # sinatra_set_instance_variable(sinatra, self.instance_variable_name, res)
     end
 
     def sinatra_response_type(response)

data/nested.gemspec

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

metadata

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