musterb 0.1.0 → 0.1.1

data/lib/musterb.rb

@@ -1,18 +1,19 @@
 require "erubis"
 
 module Musterb
-  autoload :VERSION,          "musterb/version"
+  autoload :VERSION,                   "musterb/version"
 
-  autoload :ExtractValues,    "musterb/extract_values"
-  autoload :Musterbifier,     "musterb/musterbifier"
-  autoload :BindingExtractor, "musterb/binding_extractor"
-  autoload :HashExtractor,    "musterb/hash_extractor"
-  autoload :ObjectExtractor,  "musterb/object_extractor"
-  autoload :NullExtractor,    "musterb/null_extractor"
-  autoload :Evaluator,        "musterb/evaluator"
-  autoload :Chain,            "musterb/chain"
+  autoload :ExtractValues,             "musterb/extract_values"
+  autoload :Musterbifier,              "musterb/musterbifier"
+  autoload :BindingExtractor,          "musterb/binding_extractor"
+  autoload :HashExtractor,             "musterb/hash_extractor"
+  autoload :ObjectExtractor,           "musterb/object_extractor"
+  autoload :InstanceVariableExtractor, "musterb/instance_variable_extractor"
+  autoload :NullExtractor,             "musterb/null_extractor"
+  autoload :Evaluator,                 "musterb/evaluator"
+  autoload :Chain,                     "musterb/chain"
 
-  autoload :TemplateHandler,  "musterb/template_handler"
+  autoload :TemplateHandler,           "musterb/template_handler"
 
   def self.to_erb(template, options = {})
     klass = options[:musterbifier_klass] || Musterbifier

data/lib/musterb/instance_variable_extractor.rb

@@ -0,0 +1,17 @@
+class Musterb::InstanceVariableExtractor
+  attr_reader :parent, :value
+
+  def initialize(value, parent)
+    @value = value
+    @parent = parent
+  end
+
+  def [](symbol)
+    puts "looking for #{symbol}"
+    if value.instance_variable_defined?("@#{symbol}")
+      value.instance_variable_get("@#{symbol}")
+    else
+      @parent[symbol]
+    end
+  end
+end

data/lib/musterb/template_handler.rb

@@ -15,14 +15,13 @@ class Musterb::TemplateHandler < Musterb::Musterbifier
   end
 
   def self.compile_mustache(source, options = {})
-    erb = Musterb.to_erb(source, options.merge(:musterbifier_klass => self))
+    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
   end
 
   def self.call(template)
-   options = {}
-   options[:initial_context] = "initial_context" if template.locals.include? "initial_context"
-   compile_mustache(template.source, options)
+    compile_mustache(template.source, :start_with_existing_context => template.locals.include?("initial_context"))
   end
 end

data/lib/musterb/version.rb

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

data/spec/musterb/instance_variable_extractor_spec.rb

@@ -0,0 +1,15 @@
+describe Musterb::InstanceVariableExtractor do
+  class TestClass
+    def initialize
+      @foo = "bar"
+    end
+  end
+
+  it "reads instance variables" do
+    Musterb::InstanceVariableExtractor.new(TestClass.new, nil)["foo"].should eq "bar"    
+  end
+
+  it "delegates to the parent if it's not found" do
+    Musterb::InstanceVariableExtractor.new(TestClass.new, Musterb::ObjectExtractor.new(2, nil))["to_s"].should eq "2"
+  end
+end

data/spec/musterb/template_handler_spec.rb

@@ -1,8 +1,8 @@
 require 'musterb/template_handler'
 
 describe Musterb::TemplateHandler do
-  def evaluate(template, binding)
-    compiled = "output_buffer = nil; " + Musterb::TemplateHandler::compile_mustache(template)
+  def evaluate(template, binding, options = {})
+    compiled = "output_buffer = nil; " + Musterb::TemplateHandler::compile_mustache(template, options)
     binding.eval compiled
   end
 
@@ -24,4 +24,14 @@ describe Musterb::TemplateHandler do
     foo = "<br>"
     evaluate("{{{foo}}}", binding).should eq "<br>"
   end
+
+  it "can read from instance variables (likely on the controller)" do
+    @foo = "hello"
+    evaluate("{{foo}}", binding).should eq "hello"
+  end
+
+  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"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -123,6 +123,8 @@ files:
   bGliL211c3RlcmIvZXh0cmFjdF92YWx1ZXMucmI=
 - !binary |-
   bGliL211c3RlcmIvaGFzaF9leHRyYWN0b3IucmI=
+- !binary |-
+  bGliL211c3RlcmIvaW5zdGFuY2VfdmFyaWFibGVfZXh0cmFjdG9yLnJi
 - !binary |-
   bGliL211c3RlcmIvbXVzdGVyYmlmaWVyLnJi
 - !binary |-
@@ -141,6 +143,9 @@ files:
   c3BlYy9tdXN0ZXJiL2V2YWx1YXRvcl9zcGVjLnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL2hhc2hfZXh0cmFjdG9yX3NwZWMucmI=
+- !binary |-
+  c3BlYy9tdXN0ZXJiL2luc3RhbmNlX3ZhcmlhYmxlX2V4dHJhY3Rvcl9zcGVj
+  LnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL211c3RlcmJpZmllcl9zcGVjLnJi
 - !binary |-
@@ -184,6 +189,9 @@ test_files:
   c3BlYy9tdXN0ZXJiL2V2YWx1YXRvcl9zcGVjLnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL2hhc2hfZXh0cmFjdG9yX3NwZWMucmI=
+- !binary |-
+  c3BlYy9tdXN0ZXJiL2luc3RhbmNlX3ZhcmlhYmxlX2V4dHJhY3Rvcl9zcGVj
+  LnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL211c3RlcmJpZmllcl9zcGVjLnJi
 - !binary |-