kotovalexarian-likes-github/docile
1
0
Fork 0
mirror of https://github.com/ms-ati/docile synced 2023-03-27 23:21:52 -04:00
Code Releases Activity

support instance variables from block context in one-level dsl

Browse source
This commit is contained in:
Marc Siegel 2011-12-06 15:34:46 -05:00
parent c04587a03f
commit d7fd1a9450
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/docile.rb
View file

@ -18,7 +18,13 @@ module Docile
# @return [Object] the given DSL object
def dsl_eval(dsl, &block)
block_context = eval("self", block.binding)
FallbackContextProxy.new(dsl, block_context).instance_eval(&block)
proxy_context = FallbackContextProxy.new(dsl, block_context)
block_context.instance_variables.each { |ivar| proxy_context.instance_variable_set(ivar, block_context.instance_variable_get(ivar)) }
begin
proxy_context.instance_eval(&block)
ensure
block_context.instance_variables.each { |ivar| block_context.instance_variable_set(ivar, proxy_context.instance_variable_get(ivar)) }
end
dsl
end
module_function :dsl_eval

4
lib/docile/fallback_context_proxy.rb
View file

@ -2,7 +2,9 @@ require 'set'
module Docile
class FallbackContextProxy
BASIC_METHODS = Set[:==, :equal?, :"!", :"!=", :instance_eval, :object_id, :__send__, :__id__]
BASIC_METHODS = Set[:==, :equal?, :"!", :"!=",
:instance_eval, :instance_variable_get, :instance_variable_set,
:object_id, :__send__, :__id__]
instance_methods.each do |method|
unless BASIC_METHODS.include?(method.to_sym)

8
spec/docile_spec.rb
View file

@ -72,8 +72,14 @@ describe Docile do
end
context "instance variables" do
it "should find instance variable from block definition in outer dsl scope" do
@iv1 = 'iv1'; outer { @iv1.should == 'iv1' }
end
#it "should find instance variable from block definition in inner dsl scope" do
# @iv1 = 'iv1'; outer { inner { @iv1.should == 'iv1' } }
# @iv2 = 'iv2'; outer { inner {
# @iv2.should == 'iv2'
# } }
#end
end