nested 0.0.16 → 0.0.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/nested.rb +9 -1
- data/nested.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e59bb33223f6b09ae1e78f0af958533f430ff90c
|
4
|
+
data.tar.gz: 9fedc4f9b0557ffe08afa28c40262499c01cf65a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 25a5e634ad799ece06b774dac6fb596e784b1e0efa367aeae6e3b8901b979239b000b94a41d40ca572fcc5613471de2de7f8e1dc2ca557509518cb6030ee0d8b
|
7
|
+
data.tar.gz: dccf00f2fa6b24baa29f48cd36a597020604f16c3b73aaabb3c66330d54bd4a222dcae16e117d10097c6197580cef02b09a3764d2d92aa784af8fa286ff0d5cb
|
data/lib/nested.rb
CHANGED
@@ -55,7 +55,8 @@ module Nested
|
|
55
55
|
fetched = instance_exec(&(init_block||FETCH))
|
56
56
|
|
57
57
|
# puts "set @#{@__resource.instance_variable_name} to #{fetched.inspect} for #{self}"
|
58
|
-
self.instance_variable_set("@#{@__resource.instance_variable_name}", fetched)
|
58
|
+
# self.instance_variable_set("@#{@__resource.instance_variable_name}", fetched)
|
59
|
+
@__resource.sinatra_set_instance_variable(self, @__resource.instance_variable_name, fetched)
|
59
60
|
end
|
60
61
|
|
61
62
|
if member?
|
@@ -180,6 +181,11 @@ module Nested
|
|
180
181
|
|
181
182
|
# --------------------------
|
182
183
|
|
184
|
+
def sinatra_set_instance_variable(sinatra, name, value)
|
185
|
+
raise "variable @#{name} already defined" if sinatra.instance_variable_defined?(:"@#{name}")
|
186
|
+
sinatra.instance_variable_set(:"@#{name}", value)
|
187
|
+
end
|
188
|
+
|
183
189
|
def sinatra_init(sinatra)
|
184
190
|
sinatra.instance_variable_set("@__resource", self)
|
185
191
|
sinatra.instance_exec(&@__init)
|
@@ -218,6 +224,8 @@ module Nested
|
|
218
224
|
sinatra_init_data(:post, sinatra, &block)
|
219
225
|
res = sinatra.instance_exec(*sinatra.instance_variable_get("@__data"), &block)
|
220
226
|
sinatra.instance_variable_set("@#{self.instance_variable_name}", res)
|
227
|
+
# TODO: do we need to check for existing variables here?
|
228
|
+
# sinatra_set_instance_variable(sinatra, self.instance_variable_name, res)
|
221
229
|
end
|
222
230
|
|
223
231
|
def sinatra_response_type(response)
|
data/nested.gemspec
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nested
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jan Zimmek
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-11-
|
11
|
+
date: 2013-11-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|