musterb 0.0.7 → 0.1.0

data/lib/musterb/chain.rb

@@ -1,5 +1,5 @@
 class Musterb::Chain
-  include ExtractValues
+  include Musterb::ExtractValues
 
   def initialize(value)
     @context = new_context(value, Musterb::NullExtractor.new(nil))

data/lib/musterb/evaluator.rb

@@ -1,5 +1,5 @@
 class Musterb::Evaluator
-  include ExtractValues
+  include Musterb::ExtractValues
 
   attr_reader :context
 

data/lib/musterb/extract_values.rb

@@ -1,4 +1,4 @@
-module ExtractValues
+module Musterb::ExtractValues
   def value
     @context.value
   end

data/lib/musterb/musterbifier.rb

@@ -1,11 +1,12 @@
 class Musterb::Musterbifier
-  def initialize(template, render_partial_template = nil)
+  def initialize(template)
     @template = template
-    @render_partial_template = render_partial_template || method(:partials_not_implemented)
   end
 
-  def fetch(tokens)
-    tokens = tokens.strip.split(".")
+  def fetch(match)
+    match = match.strip
+    return "musterb.current" if match == '.'
+    tokens = match.split(".")
     last_token = tokens.pop
     fetch_command = tokens.inject("musterb") do |str, token|
       "#{str}.chain('#{token}')"
@@ -13,35 +14,61 @@ class Musterb::Musterbifier
     "#{fetch_command}['#{last_token}']"
   end
 
+  def block_if(tokens)
+    "<% musterb.block_if #{tokens} do %>"
+  end
+
+  def block_unless(tokens)
+    "<% musterb.block_unless #{tokens} do %>"
+  end
+
+  def block_end
+    "<% end %>"
+  end
+
+  def text_without_escaping(tokens)
+    "<%= #{tokens} %>"
+  end
+
+  def text_with_escaping(tokens)
+    "<%== #{tokens} %>"
+  end
+
+  def comment
+    ""
+  end
+
+  def change_token
+    raise NotImplementedError, 'Not able to change the mustache delimiter just yet'
+  end
+
+  def render_partial(partial)
+    raise NotImplementedError, "Override render_partial in Musterbifier to render partials"    
+  end
+
   def to_erb
     @template.gsub(/\{\{(\{?[^\}]*\}?)\}\}/) do |match|
       match = $1
       case match[0]
       when '#'
-        "<% musterb.block_if #{fetch match[1..-1]} do %>"
+        block_if fetch match[1..-1]
       when '^'
-        "<% musterb.block_unless #{fetch match[1..-1]} do %>"
+        block_unless fetch match[1..-1]        
       when "/"
-        "<% end %>"
+        block_end
       when '{'
-        "<%= #{fetch match[1..-2]} %>"
+        text_without_escaping fetch match[1..-2]        
       when '&'
-        "<%= #{fetch match[1..-1]} %>"
+        text_without_escaping fetch match[1..-1]
       when '!'
-        ""
-      when '.'
-        "<%== musterb.current %>"
+        comment
       when '='
-        raise NotImplementedError, 'Not able to change the mustache delimiter just yet'
+        change_token
       when '>'
-        "<%= #{@render_partial_template.call(match[1..-1].strip)} %>"
+        render_partial match[1..-1].strip        
       else
-        "<%== #{fetch match} %>"
+        text_with_escaping fetch match        
       end
     end
   end
-
-  def partials_not_implemented(partial)
-    "raise NotImplementedError, 'Don't know how to render partial: #{partial}'"
-  end
 end

data/lib/musterb/template_handler.rb

@@ -1,15 +1,28 @@
 require 'musterb'
+require 'action_view'
 
-module Musterb::TemplateHandler
-  def self.render_partial_template(partial)
-    "render :partial => '#{partial}', :locals => {:initial_context => musterb.context}"
+class Musterb::TemplateHandler < Musterb::Musterbifier
+  def render_partial(partial)
+    "<%= render :partial => '#{partial}', :locals => {:initial_context => musterb.context} %>"
+  end
+
+  def text_without_escaping(tokens)
+    "<%= #{tokens}.html_safe %>"
+  end
+
+  def text_with_escaping(tokens)
+    "<%= #{tokens} %>"
+  end
+
+  def self.compile_mustache(source, options = {})
+    erb = Musterb.to_erb(source, options.merge(:musterbifier_klass => self))
+    klass = ActionView::Template::Handlers::ERB
+    klass.erb_implementation.new(erb, :trim => (klass.erb_trim_mode == "-")).src
   end
 
   def self.call(template)
-   options = {:render_partial_template => method(:render_partial_template)}
+   options = {}
    options[:initial_context] = "initial_context" if template.locals.include? "initial_context"
-   erb = Musterb.to_erb(template.source, options)
-   klass = ActionView::Template::Handlers::ERB
-   klass.erb_implementation.new(erb, :trim => (klass.erb_trim_mode == "-")).src
+   compile_mustache(template.source, options)
   end
 end

data/lib/musterb/version.rb

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

data/lib/musterb.rb

@@ -1,18 +1,22 @@
-require "musterb/version"
-require "musterb/extract_values"
-require "musterb/musterbifier"
-require "musterb/binding_extractor"
-require "musterb/hash_extractor"
-require "musterb/object_extractor"
-require "musterb/null_extractor"
-require "musterb/evaluator"
-require "musterb/chain"
-
 require "erubis"
 
 module Musterb
+  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 :TemplateHandler,  "musterb/template_handler"
+
   def self.to_erb(template, options = {})
-    musterbifier = Musterbifier.new(template, options[:render_partial_template])
+    klass = options[:musterbifier_klass] || Musterbifier
+    musterbifier = klass.new(template)
     initial_context = options[:initial_context] || 'Musterb::BindingExtractor.new binding'
     "<% Musterb::Evaluator.new(#{initial_context}).tap do |musterb| %>#{musterbifier.to_erb}<% end %>"
   end

data/musterb.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "hashie"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "mustache" # for performance
+  gem.add_development_dependency "actionpack"
 end

data/spec/musterb/musterbifier_spec.rb

@@ -19,6 +19,10 @@ describe Musterb::Musterbifier do
     Musterb::Musterbifier.new("{{#cond}}foo{{/cond}}").to_erb.should eq "<% musterb.block_if musterb['cond'] do %>foo<% end %>"
   end
 
+  it "can do #." do
+    Musterb::Musterbifier.new("{{#.}}foo{{/.}}").to_erb.should eq "<% musterb.block_if musterb.current do %>foo<% end %>"
+  end
+
   it "replaces carrot correctly" do
     Musterb::Musterbifier.new("{{^cond}}foo{{/cond}}").to_erb.should eq "<% musterb.block_unless musterb['cond'] do %>foo<% end %>"
   end
@@ -36,11 +40,6 @@ describe Musterb::Musterbifier do
   end
 
   it "replaces calls for partials with an exception by default" do
-    Musterb::Musterbifier.new("{{> foo}}").to_erb.should eq "<%= raise NotImplementedError, 'Don't know how to render partial: foo' %>"
-  end
-
-  it "can be injected with an algorithm for creating partials" do
-    render_partial_template = lambda { |p| "render :partial => '#{p}', :current_context => musterb.context" }
-    Musterb::Musterbifier.new("{{> foo}}", render_partial_template).to_erb.should eq "<%= render :partial => 'foo', :current_context => musterb.context %>"
+    lambda { Musterb::Musterbifier.new("{{> foo}}").to_erb }.should raise_error NotImplementedError
   end
 end

data/spec/musterb/template_handler_spec.rb

@@ -0,0 +1,27 @@
+require 'musterb/template_handler'
+
+describe Musterb::TemplateHandler do
+  def evaluate(template, binding)
+    compiled = "output_buffer = nil; " + Musterb::TemplateHandler::compile_mustache(template)
+    binding.eval compiled
+  end
+
+  it "is wired up correctly" do
+    foo = "hi"
+    evaluate("{{foo}}", binding).should eq "hi"
+  end
+
+  it "renders partials corrects" do
+    Musterb::TemplateHandler::compile_mustache("{{>foo}}").should include "render :partial => 'foo', :locals => {:initial_context => musterb.context}"
+  end
+
+  it "escapes things by default" do
+    foo = "<br>"
+    evaluate("{{foo}}", binding).should eq "&lt;br&gt;"  
+  end
+
+  it "does not escape things in triple staches" do    
+    foo = "<br>"
+    evaluate("{{{foo}}}", binding).should eq "<br>"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The ability to compile mustache templates to erubis erb templates so
   that we can make use of the performance of compiling templates
 email:
@@ -129,6 +145,8 @@ files:
   c3BlYy9tdXN0ZXJiL211c3RlcmJpZmllcl9zcGVjLnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL29iamVjdF9leHRyYWN0b3Jfc3BlYy5yYg==
+- !binary |-
+  c3BlYy9tdXN0ZXJiL3RlbXBsYXRlX2hhbmRsZXJfc3BlYy5yYg==
 - !binary |-
   c3BlYy9tdXN0ZXJiX3NwZWMucmI=
 - !binary |-
@@ -170,6 +188,8 @@ test_files:
   c3BlYy9tdXN0ZXJiL211c3RlcmJpZmllcl9zcGVjLnJi
 - !binary |-
   c3BlYy9tdXN0ZXJiL29iamVjdF9leHRyYWN0b3Jfc3BlYy5yYg==
+- !binary |-
+  c3BlYy9tdXN0ZXJiL3RlbXBsYXRlX2hhbmRsZXJfc3BlYy5yYg==
 - !binary |-
   c3BlYy9tdXN0ZXJiX3NwZWMucmI=
 - !binary |-