musterb 0.1.1 → 0.1.2

data/lib/musterb/instance_variable_extractor.rb

@@ -7,7 +7,6 @@ class Musterb::InstanceVariableExtractor
   end
 
   def [](symbol)
-    puts "looking for #{symbol}"
     if value.instance_variable_defined?("@#{symbol}")
       value.instance_variable_get("@#{symbol}")
     else

data/lib/musterb/rails_locals_extractor.rb

@@ -0,0 +1,17 @@
+class Musterb::RailsLocalsExtractor
+  attr_reader :parent, :value
+
+  def initialize(locals, binding, parent)
+    @locals = locals
+    @parent = parent
+    @binding = binding
+  end
+
+  def [](symbol)
+    if @locals.include? symbol
+      @binding.eval symbol
+    else
+      parent[symbol]
+    end
+  end
+end

data/lib/musterb/template_handler.rb

@@ -14,14 +14,14 @@ class Musterb::TemplateHandler < Musterb::Musterbifier
     "<%= #{tokens} %>"
   end
 
-  def self.compile_mustache(source, options = {})
-    initial_context = options[:start_with_existing_context] ? "initial_context" : 'Musterb::InstanceVariableExtractor.new(self, Musterb::BindingExtractor.new(binding))'
-    erb = Musterb.to_erb(source, options.merge(:musterbifier_klass => self, :initial_context => initial_context))
-    klass = ActionView::Template::Handlers::ERB
-    klass.erb_implementation.new(erb, :trim => (klass.erb_trim_mode == "-")).src
+  def self.build_initial_context(locals)
+    "Musterb::RailsLocalsExtractor.new(#{locals.inspect}, binding, Musterb::InstanceVariableExtractor.new(self,  Musterb::BindingExtractor.new(binding)))"
   end
 
   def self.call(template)
-    compile_mustache(template.source, :start_with_existing_context => template.locals.include?("initial_context"))
+    initial_context = template.locals.include?("initial_context") ? "initial_context" : build_initial_context(template.locals.map(&:to_s) - ["initial_context"])
+    erb = Musterb.to_erb(template.source, :musterbifier_klass => self, :initial_context => initial_context)
+    klass = ActionView::Template::Handlers::ERB
+    klass.erb_implementation.new(erb, :trim => (klass.erb_trim_mode == "-")).src
   end
 end

data/lib/musterb/version.rb

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

data/lib/musterb.rb

@@ -13,6 +13,7 @@ module Musterb
   autoload :Evaluator,                 "musterb/evaluator"
   autoload :Chain,                     "musterb/chain"
 
+  autoload :RailsLocalsExtractor,      "musterb/rails_locals_extractor"
   autoload :TemplateHandler,           "musterb/template_handler"
 
   def self.to_erb(template, options = {})

data/spec/musterb/template_handler_spec.rb

@@ -1,9 +1,14 @@
 require 'musterb/template_handler'
+require 'ostruct'
 
 describe Musterb::TemplateHandler do
-  def evaluate(template, binding, options = {})
-    compiled = "output_buffer = nil; " + Musterb::TemplateHandler::compile_mustache(template, options)
-    binding.eval compiled
+  def compile_template(template, options = {})
+    template = OpenStruct.new({:source => template, :locals => []}.merge(options))
+    "output_buffer = nil; " + Musterb::TemplateHandler::call(template)
+  end
+
+  def evaluate(template, binding, options = {})    
+    binding.eval compile_template(template, options)
   end
 
   it "is wired up correctly" do
@@ -12,7 +17,7 @@ describe Musterb::TemplateHandler do
   end
 
   it "renders partials corrects" do
-    Musterb::TemplateHandler::compile_mustache("{{>foo}}").should include "render :partial => 'foo', :locals => {:initial_context => musterb.context}"
+    compile_template("{{>foo}}").should include "render :partial => 'foo', :locals => {:initial_context => musterb.context}"
   end
 
   it "escapes things by default" do
@@ -32,6 +37,12 @@ describe Musterb::TemplateHandler do
 
   it "can be bootstrapped from an initial_context" do
     initial_context = Musterb::ObjectExtractor.new(2, nil)
-    evaluate("{{to_s}}", binding, :start_with_existing_context => true).should eq "2"
+    evaluate("{{to_s}}", binding, :locals => ["initial_context"]).should eq "2"
+  end
+
+  it "favors locals over instance variables if passed into locals" do
+    @foo = "hello"
+    foo = "bye"
+    evaluate("{{foo}}", binding, :locals => ["foo"]).should eq "bye"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -131,6 +131,8 @@ files:
   bGliL211c3RlcmIvbnVsbF9leHRyYWN0b3IucmI=
 - !binary |-
   bGliL211c3RlcmIvb2JqZWN0X2V4dHJhY3Rvci5yYg==
+- !binary |-
+  bGliL211c3RlcmIvcmFpbHNfbG9jYWxzX2V4dHJhY3Rvci5yYg==
 - !binary |-
   bGliL211c3RlcmIvdGVtcGxhdGVfaGFuZGxlci5yYg==
 - !binary |-