musterb 0.0.1 → 0.0.2

data/lib/musterb.rb

@@ -3,6 +3,7 @@ require "musterb/musterbifier"
 require "musterb/binding_extractor"
 require "musterb/hash_extractor"
 require "musterb/object_extractor"
+require "musterb/null_extractor"
 require "musterb/evaluator"
 
 module Musterb

data/lib/musterb/evaluator.rb

@@ -4,7 +4,11 @@ class Musterb::Evaluator
   end
 
   def [](symbol)
-    @context[symbol]
+    return @context.value if symbol == "."    
+    final_context = symbol.split(".").inject(@context) do |con, symbol|      
+      new_context con[symbol], con
+    end
+    final_context.value
   end
 
   def block(symbol)
@@ -38,12 +42,14 @@ class Musterb::Evaluator
     end
   end
 
-  def new_context(value)
+  def new_context(value, old_context = @context)
     case value
     when Hash
-      HashExtractor.new(value, @context)
+      Musterb::HashExtractor.new(value, old_context)
+    when nil
+      Musterb::NullExtractor.new(old_context)
     else
-      ObjectExtractor.new(value, @context)
+      Musterb::ObjectExtractor.new(value, old_context)
     end
   end
 

data/lib/musterb/hash_extractor.rb

@@ -1,7 +1,7 @@
 require 'hashie'
 
-class HashExtractor
-  attr_reader :parent
+class Musterb::HashExtractor
+  attr_reader :parent, :value
 
   def initialize(value, parent)    
     @value = to_string_access(value)

data/lib/musterb/musterbifier.rb

@@ -8,15 +8,19 @@ class Musterb::Musterbifier
       match = $1
       case match[0]
       when '#'
-        "<% musterb.block '#{match[1..-1]}' do %>"
+        "<% musterb.block '#{match[1..-1].strip}' do %>"
       when '^'
-        "<% musterb.block_unless '#{match[1..-1]}' do %>"
+        "<% musterb.block_unless '#{match[1..-1].strip}' do %>"
       when "/"
         "<% end %>"
       when '{'
-        "<%= musterb['#{match[1..-2]}'] %>"
+        "<%= musterb['#{match[1..-2].strip}'] %>"
+      when '&'
+        "<%= musterb['#{match[1..-1].strip}'] %>"
+      when '!'
+        ""
       else
-        "<%== musterb['#{match}'] %>"
+        "<%== musterb['#{match.strip}'] %>"
       end
     end
   end

data/lib/musterb/null_extractor.rb

@@ -0,0 +1,11 @@
+class Musterb::NullExtractor
+  attr_reader :value, :parent
+
+  def initialize(parent)
+    @parent = parent
+  end
+
+  def [](value)
+    nil
+  end
+end

data/lib/musterb/object_extractor.rb

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

data/lib/musterb/version.rb

@@ -1,3 +1,3 @@
 module Musterb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/musterb/evaluator_spec.rb

@@ -5,6 +5,21 @@ describe Musterb::Evaluator do
     evaluator["foo"].should eq "bar"
   end
 
+  it "pulls out values from ." do
+    evaluator = Musterb::Evaluator.new Musterb::ObjectExtractor.new(2, nil)
+    evaluator["."].should eq 2
+  end
+
+  it "can do nested values" do
+    evaluator = Musterb::Evaluator.new Musterb::ObjectExtractor.new(2, nil)
+    evaluator["next.to_s"].should eq "3"
+  end
+
+  it "does not barf when pulling out a value on nil" do
+    evaluator = Musterb::Evaluator.new Musterb::HashExtractor.new({:foo => nil}, nil)
+    evaluator["foo.bar"].should eq nil
+  end
+
   context "block" do
     it "yields to the block if a value is set" do    
       foo = "bar"

data/spec/musterb/hash_extractor_spec.rb

@@ -1,16 +1,16 @@
-describe HashExtractor do
+describe Musterb::HashExtractor do
   it "can pull values out from a hash" do
-    extractor = HashExtractor.new({"foo" => "bar"}, nil)
+    extractor = Musterb::HashExtractor.new({"foo" => "bar"}, nil)
     extractor["foo"].should eq "bar"
   end
 
   it "can pull values out from a symbol" do
-    extractor = HashExtractor.new({:foo => "bar"}, nil)
+    extractor = Musterb::HashExtractor.new({:foo => "bar"}, nil)
     extractor["foo"].should eq "bar"
   end
 
   it "delegates to the parent if there is no match" do
-    extractor = HashExtractor.new({}, HashExtractor.new({:foo => "bar"}, nil))
+    extractor = Musterb::HashExtractor.new({}, Musterb::HashExtractor.new({:foo => "bar"}, nil))
     extractor["foo"].should eq "bar"
   end
 end

data/spec/musterb/musterbifier_spec.rb

@@ -11,6 +11,10 @@ describe Musterb::Musterbifier do
     Musterb::Musterbifier.new("Hello, {{{world}}}!").to_erb.should eq "Hello, <%= musterb['world'] %>!"
   end
 
+  it "does not escape if it starts with &" do
+    Musterb::Musterbifier.new("Hello, {{& world}}!").to_erb.should eq "Hello, <%= musterb['world'] %>!"
+  end
+
   it "replaces blocks correctly" do
     Musterb::Musterbifier.new("{{#cond}}foo{{/cond}}").to_erb.should eq "<% musterb.block 'cond' do %>foo<% end %>"
   end
@@ -18,4 +22,8 @@ describe Musterb::Musterbifier do
   it "replaces carrot correctly" do
     Musterb::Musterbifier.new("{{^cond}}foo{{/cond}}").to_erb.should eq "<% musterb.block_unless 'cond' do %>foo<% end %>"
   end
+
+  it "replaces comments with nothing" do
+    Musterb::Musterbifier.new("{{! foo\n bar}}").to_erb.should eq ""
+  end
 end

data/spec/musterb/object_extractor_spec.rb

@@ -1,11 +1,11 @@
-describe ObjectExtractor do
+describe Musterb::ObjectExtractor do
   it "calls methods on the object" do
-    extractor = ObjectExtractor.new(2, nil)
+    extractor = Musterb::ObjectExtractor.new(2, nil)
     extractor["to_s"].should eq "2"
   end
 
   it "delegates to the parent if there it doesn't respnd to something" do
-    extractor = ObjectExtractor.new(2, ObjectExtractor.new("string", nil))
+    extractor = Musterb::ObjectExtractor.new(2, Musterb::ObjectExtractor.new("string", nil))
     extractor["upcase"].should eq "STRING"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musterb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -89,6 +89,8 @@ files:
   bGliL211c3RlcmIvaGFzaF9leHRyYWN0b3IucmI=
 - !binary |-
   bGliL211c3RlcmIvbXVzdGVyYmlmaWVyLnJi
+- !binary |-
+  bGliL211c3RlcmIvbnVsbF9leHRyYWN0b3IucmI=
 - !binary |-
   bGliL211c3RlcmIvb2JqZWN0X2V4dHJhY3Rvci5yYg==
 - !binary |-