musterb 0.2.0 → 1.0.0

data/lib/musterb/binding_extractor.rb

@@ -1,4 +1,4 @@
-class Musterb::BindingExtractor
+class Musterb::BindingExtractor < Musterb::Extractor
   attr_reader :value, :parent
 
   def initialize(_binding, parent)

data/lib/musterb/extract_values.rb

@@ -11,9 +11,10 @@ module Musterb::ExtractValues
     Musterb::Chain.new self[symbol]
   end
 
-  private
-  def new_context(value, old_context = @context)
+  def self.new_context(value, old_context = @context)
     case value
+    when Musterb::Extractor
+      value
     when Hash
       Musterb::HashExtractor.new(value, old_context)
     when nil
@@ -22,4 +23,9 @@ module Musterb::ExtractValues
       Musterb::ObjectExtractor.new(value, old_context)
     end
   end
-end
+
+  private
+  def new_context(value, old_context = @context)
+    Musterb::ExtractValues.new_context(value, old_context)
+  end
+end

data/lib/musterb/extractor.rb

@@ -0,0 +1,4 @@
+# Does nothing, but is a super class for other extractors
+class Musterb::Extractor
+
+end

data/lib/musterb/hash_extractor.rb

@@ -1,9 +1,9 @@
 require 'hashie'
 
-class Musterb::HashExtractor
+class Musterb::HashExtractor < Musterb::Extractor
   attr_reader :parent, :value
 
-  def initialize(value, parent)    
+  def initialize(value, parent)
     @value = to_string_access(value)
     @parent = parent
   end
@@ -23,4 +23,4 @@ class Musterb::HashExtractor
       hash.hashie_stringify_keys!
     end
   end
-end
+end

data/lib/musterb/instance_variable_extractor.rb

@@ -1,4 +1,4 @@
-class Musterb::InstanceVariableExtractor
+class Musterb::InstanceVariableExtractor < Musterb::Extractor
   attr_reader :parent, :value
 
   def initialize(value, parent)
@@ -13,4 +13,4 @@ class Musterb::InstanceVariableExtractor
       @parent[symbol]
     end
   end
-end
+end

data/lib/musterb/null_extractor.rb

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

data/lib/musterb/object_extractor.rb

@@ -1,4 +1,4 @@
-class Musterb::ObjectExtractor
+class Musterb::ObjectExtractor < Musterb::Extractor
   attr_reader :parent, :value
 
   def initialize(value, parent)
@@ -6,11 +6,11 @@ class Musterb::ObjectExtractor
     @parent = parent
   end
 
-  def [](symbol)    
+  def [](symbol)
     if @value.respond_to? symbol
       @value.send(symbol)
     else
       @parent[symbol]
     end
   end
-end
+end

data/lib/musterb/rails_locals_extractor.rb

@@ -1,4 +1,4 @@
-class Musterb::RailsLocalsExtractor
+class Musterb::RailsLocalsExtractor < Musterb::Extractor
   attr_reader :parent, :value
 
   def initialize(locals, binding, parent)
@@ -14,4 +14,4 @@ class Musterb::RailsLocalsExtractor
       parent[symbol]
     end
   end
-end
+end

data/lib/musterb/template_handler.rb

@@ -18,10 +18,14 @@ class Musterb::TemplateHandler < Musterb::Musterbifier
     "Musterb::RailsLocalsExtractor.new(#{locals.inspect}, binding, Musterb::InstanceVariableExtractor.new(self, Musterb::NullExtractor.new))"
   end
 
+  def self.initial_context(initial_context)
+    Musterb::ExtractValues.new_context(initial_context)
+  end
+
   def self.call(template)
-    initial_context = template.locals.include?("initial_context") ? "initial_context" : build_initial_context(template.locals.map(&:to_s) - ["initial_context"])
+    initial_context = template.locals.include?("initial_context") ? "Musterb::TemplateHandler.initial_context(initial_context)" : build_initial_context(template.locals.map(&:to_s))
     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
+end

data/lib/musterb/version.rb

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

data/lib/musterb.rb

@@ -5,6 +5,7 @@ module Musterb
 
   autoload :ExtractValues,             "musterb/extract_values"
   autoload :Musterbifier,              "musterb/musterbifier"
+  autoload :Extractor,                 "musterb/extractor"
   autoload :BindingExtractor,          "musterb/binding_extractor"
   autoload :HashExtractor,             "musterb/hash_extractor"
   autoload :ObjectExtractor,           "musterb/object_extractor"

data/spec/musterb/template_handler_spec.rb

@@ -7,7 +7,7 @@ describe Musterb::TemplateHandler do
     "output_buffer = nil; " + Musterb::TemplateHandler::call(template)
   end
 
-  def evaluate(template, binding, options = {})    
+  def evaluate(template, binding, options = {})
     binding.eval compile_template(template, options)
   end
 
@@ -25,7 +25,7 @@ describe Musterb::TemplateHandler do
     evaluate("{{foo}}", binding, :locals => ["foo"]).should eq "<br>"
   end
 
-  it "does not escape things in triple staches" do    
+  it "does not escape things in triple staches" do
     foo = "<br>"
     evaluate("{{{foo}}}", binding, :locals => ["foo"]).should eq "<br>"
   end
@@ -45,4 +45,9 @@ describe Musterb::TemplateHandler do
     foo = "bye"
     evaluate("{{foo}}", binding, :locals => ["foo"]).should eq "bye"
   end
-end
+
+  it "can set the initial context to a hash" do
+    initial_context = 2
+    evaluate("{{to_s}}", binding, :locals => ["initial_context"]).should eq "2"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -121,6 +121,8 @@ files:
   bGliL211c3RlcmIvZXZhbHVhdG9yLnJi
 - !binary |-
   bGliL211c3RlcmIvZXh0cmFjdF92YWx1ZXMucmI=
+- !binary |-
+  bGliL211c3RlcmIvZXh0cmFjdG9yLnJi
 - !binary |-
   bGliL211c3RlcmIvaGFzaF9leHRyYWN0b3IucmI=
 - !binary |-