musterb 1.0.0 → 1.0.1

data/lib/musterb.rb

@@ -5,7 +5,6 @@ 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/lib/musterb/binding_extractor.rb

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

data/lib/musterb/extract_values.rb

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

data/lib/musterb/hash_extractor.rb

@@ -1,9 +1,9 @@
 require 'hashie'
 
-class Musterb::HashExtractor < Musterb::Extractor
+class Musterb::HashExtractor
   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 < Musterb::Extractor
       hash.hashie_stringify_keys!
     end
   end
-end
+end

data/lib/musterb/instance_variable_extractor.rb

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

data/lib/musterb/null_extractor.rb

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

data/lib/musterb/object_extractor.rb

@@ -1,4 +1,4 @@
-class Musterb::ObjectExtractor < Musterb::Extractor
+class Musterb::ObjectExtractor
   attr_reader :parent, :value
 
   def initialize(value, parent)
@@ -6,11 +6,11 @@ class Musterb::ObjectExtractor < Musterb::Extractor
     @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 < Musterb::Extractor
+class Musterb::RailsLocalsExtractor
   attr_reader :parent, :value
 
   def initialize(locals, binding, parent)
@@ -14,4 +14,4 @@ class Musterb::RailsLocalsExtractor < Musterb::Extractor
       parent[symbol]
     end
   end
-end
+end

data/lib/musterb/template_handler.rb

@@ -15,15 +15,13 @@ class Musterb::TemplateHandler < Musterb::Musterbifier
   end
 
   def self.build_initial_context(locals)
+    return "initial_context" if locals.include?("initial_context")
+    return "Musterb::ExtractValues.new_context(mustache)" if locals.include?("mustache")
     "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") ? "Musterb::TemplateHandler.initial_context(initial_context)" : build_initial_context(template.locals.map(&:to_s))
+    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

data/lib/musterb/version.rb

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

data/spec/musterb/template_handler_spec.rb

@@ -47,7 +47,7 @@ describe Musterb::TemplateHandler do
   end
 
   it "can set the initial context to a hash" do
-    initial_context = 2
-    evaluate("{{to_s}}", binding, :locals => ["initial_context"]).should eq "2"
+    mustache = 2
+    evaluate("{{to_s}}", binding, :locals => ["mustache"]).should eq "2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -121,8 +121,6 @@ files:
   bGliL211c3RlcmIvZXZhbHVhdG9yLnJi
 - !binary |-
   bGliL211c3RlcmIvZXh0cmFjdF92YWx1ZXMucmI=
-- !binary |-
-  bGliL211c3RlcmIvZXh0cmFjdG9yLnJi
 - !binary |-
   bGliL211c3RlcmIvaGFzaF9leHRyYWN0b3IucmI=
 - !binary |-

data/lib/musterb/extractor.rb

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