musterb 0.1.2 → 0.2.0

data/lib/musterb.rb

@@ -19,7 +19,7 @@ module Musterb
   def self.to_erb(template, options = {})
     klass = options[:musterbifier_klass] || Musterbifier
     musterbifier = klass.new(template)
-    initial_context = options[:initial_context] || 'Musterb::BindingExtractor.new binding'
+    initial_context = options[:initial_context] || 'Musterb::BindingExtractor.new(binding, Musterb::NullExtractor.new)'
     "<% Musterb::Evaluator.new(#{initial_context}).tap do |musterb| %>#{musterbifier.to_erb}<% end %>"
   end
 

data/lib/musterb/binding_extractor.rb

@@ -1,11 +1,14 @@
 class Musterb::BindingExtractor
-  def initialize(_binding)
+  attr_reader :value, :parent
+
+  def initialize(_binding, parent)
     @binding = _binding
+    @parent = parent
   end
 
   def [](symbol)
     @binding.eval symbol
   rescue NameError
-    nil
+    parent[symbol]
   end
 end

data/lib/musterb/null_extractor.rb

@@ -1,8 +1,8 @@
 class Musterb::NullExtractor
   attr_reader :value, :parent
 
-  def initialize(parent)
-    @parent = parent
+  def initialize(parent = nil)
+    @parent = parent || self
   end
 
   def [](value)

data/lib/musterb/template_handler.rb

@@ -15,7 +15,7 @@ class Musterb::TemplateHandler < Musterb::Musterbifier
   end
 
   def self.build_initial_context(locals)
-    "Musterb::RailsLocalsExtractor.new(#{locals.inspect}, binding, Musterb::InstanceVariableExtractor.new(self,  Musterb::BindingExtractor.new(binding)))"
+    "Musterb::RailsLocalsExtractor.new(#{locals.inspect}, binding, Musterb::InstanceVariableExtractor.new(self, Musterb::NullExtractor.new))"
   end
 
   def self.call(template)

data/lib/musterb/version.rb

@@ -1,3 +1,3 @@
 module Musterb
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/musterb/binding_extractor_spec.rb

@@ -1,12 +1,12 @@
 describe Musterb::BindingExtractor do
   it "can pull out local variables from the binding" do
     foo = "bar"
-    extractor = Musterb::BindingExtractor.new binding
+    extractor = Musterb::BindingExtractor.new binding, nil
     extractor["foo"].should eq "bar"
   end
 
   it "returns nil if the local variable cannot be found" do
-    extractor = Musterb::BindingExtractor.new binding
+    extractor = Musterb::BindingExtractor.new binding, Musterb::NullExtractor.new
     extractor["foo"].should be_nil
   end
 end

data/spec/musterb/evaluator_spec.rb

@@ -1,7 +1,7 @@
 describe Musterb::Evaluator do
   it "can pull local variables out from the binding" do
     foo = "bar"
-    evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding)
+    evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding, nil)
     evaluator["foo"].should eq "bar"
   end
 
@@ -72,7 +72,7 @@ describe Musterb::Evaluator do
   context "switching context" do
     it "switches inside a hash" do
       hash = { "foo" => "bar"}    
-      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding)
+      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding, nil)
       evaluator.block_if hash do
         evaluator['foo'].should eq 'bar'
       end
@@ -80,7 +80,7 @@ describe Musterb::Evaluator do
 
     it "resets the context later" do
       hash = { "foo" => "bar"}
-      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding)
+      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding, nil)
       evaluator.block_if(hash) {}
       evaluator["hash"].should eq hash
     end
@@ -88,7 +88,7 @@ describe Musterb::Evaluator do
     it "cascades the context to the parent" do
       foo = "bar"
       hash = { }
-      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding)
+      evaluator = Musterb::Evaluator.new Musterb::BindingExtractor.new(binding, nil)
       evaluator.block_if hash do
         evaluator['foo'].should eq 'bar'
       end

data/spec/musterb/template_handler_spec.rb

@@ -13,7 +13,7 @@ describe Musterb::TemplateHandler do
 
   it "is wired up correctly" do
     foo = "hi"
-    evaluate("{{foo}}", binding).should eq "hi"
+    evaluate("{{foo}}", binding, :locals => ["foo"]).should eq "hi"
   end
 
   it "renders partials corrects" do
@@ -22,12 +22,12 @@ describe Musterb::TemplateHandler do
 
   it "escapes things by default" do
     foo = "<br>"
-    evaluate("{{foo}}", binding).should eq "&lt;br&gt;"  
+    evaluate("{{foo}}", binding, :locals => ["foo"]).should eq "&lt;br&gt;"
   end
 
   it "does not escape things in triple staches" do    
     foo = "<br>"
-    evaluate("{{{foo}}}", binding).should eq "<br>"
+    evaluate("{{{foo}}}", binding, :locals => ["foo"]).should eq "<br>"
   end
 
   it "can read from instance variables (likely on the controller)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis