starapor-slippers 0.0.0 → 0.0.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'spec/rake/spectask'
 
 desc "Run all examples"
 Spec::Rake::SpecTask.new('examples') do |t|
-  t.spec_files = FileList['engine/spec/**/*.rb']
+  t.spec_files = FileList['spec/**/*.rb']
 end
 
 desc "Generate HTML report for failing examples"
@@ -25,6 +25,8 @@ begin
     gem.authors = ["Sarah Taraporewalla"]
     gem.files =  FileList["[A-Z]*", "{bin,lib,spec,examples}/**/*"]
     gem.add_dependency 'schacon-git'
+    gem.add_dependency 'active_support'
+    gem.add_dependency 'treetop'
   end
 rescue LoadError
   puts "Slippers, or one of its dependencies, is not available. Install it with: sudo gem install starapor-slippers -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
-:major: 0
 :minor: 0
+:patch: 1
+:major: 0

data/lib/engine/engine.rb

@@ -11,7 +11,9 @@ module Slippers
     
     def render(object_to_render=nil)
       parser = SlippersParser.new
-      parser.parse(@main_template.template).eval(object_to_render, @template_group) 
+      parse_tree = parser.parse(@main_template.template)
+      return '' unless parse_tree
+      parse_tree.eval(object_to_render, @template_group) 
     end
     
     def eql?(other)

data/lib/engine/slippers.treetop

@@ -5,7 +5,7 @@ grammar Slippers
   end
   
   rule templated_expression
-    "$" foo "$" <TemplatedExpressionNode>
+    delimiter foo delimiter <TemplatedExpressionNode>
   end
   
   rule foo
@@ -21,7 +21,7 @@ grammar Slippers
   end
   
   rule known_template
-    template_path "()" <TemplateNode>
+    template_path brackets <TemplateNode>
   end
   
   rule anonymous_template
@@ -29,22 +29,14 @@ grammar Slippers
   end
 	  
   rule attribute
-  	word <AttributeNode>
+  	anything_except_keywords <AttributeNode>
   end
 	
   rule some_text
     not_delimiter* {
- 	  def eval(*args)
- 	   to_s
- 	  end
-      def to_s
-        text_value
-      end
-    }
-  end
-  
-  rule not_delimiter 
-    !"$" . {
+ 	    def eval(*args)
+   	   to_s
+   	  end
       def to_s
         text_value
       end
@@ -60,25 +52,28 @@ grammar Slippers
   end
 	
   rule template_path
-    word_with_underscore ("/" word_with_underscore)? {
+    anything_except_keywords {
       def to_s
         text_value
       end
     }
   end
   
-  rule word_with_underscore
-    word ("_" word)*
-  end
-  
-  rule not_curly
-    !("{" / "}") . {
+  rule anything_except_keywords
+    not_keyword* {
+ 	    def eval(*args)
+   	   to_s
+   	  end
       def to_s
         text_value
       end
     }
   end
   
+  rule word_with_underscore
+    word ("_" word)*
+  end
+  
   rule word
 	[a-zA-Z]+ {
       def to_s
@@ -105,5 +100,57 @@ grammar Slippers
       end
    }
   end
+  
+  rule delimiter
+   '$' {
+      def to_s
+        text_value
+      end
+   }
+  end
+  
+  rule brackets
+   '()' {
+      def to_s
+        text_value
+      end
+   }
+  end
+  
+  rule escape 
+    '\\'
+  end
+  
+  rule not_delimiter 
+    escape delimiter / !delimiter . {
+      def to_s
+        text_value
+      end
+    }
+  end
+
+  rule not_apply_op 
+    !apply_op . {
+      def to_s
+        text_value
+      end
+    }
+  end
+  
+  rule not_keyword
+  !(apply_op / delimiter / brackets) . {
+    def to_s
+      text_value
+    end
+  }
+  end
+  
+  rule not_curly
+    !("{" / "}") . {
+      def to_s
+        text_value
+      end
+    }
+  end
 	
 end

data/lib/engine/slippers_nodes.rb

@@ -6,6 +6,7 @@ module Slippers
     end
 
     def value_of(item)
+      return '' if to_s == ''
       return item.send(to_s) if item.respond_to?(to_s)
       return item[to_sym] if item.respond_to?('[]'.to_sym) && item[to_sym]
       ''
@@ -83,7 +84,7 @@ module Slippers
   class ExpressionNode < Treetop::Runtime::SyntaxNode
 
     def eval(object_to_render, template_group=nil)
-      before.eval + templated_expression.eval(object_to_render, template_group) + space.eval + after.eval(object_to_render, template_group)
+      before.eval(object_to_render, template_group) + templated_expression.eval(object_to_render, template_group) + space.eval + after.eval(object_to_render, template_group)
     end
 
   end

data/lib/ramazeTemplates/0001-SarahTaraporewalla-adding-new-template-file-for-sli.patch

@@ -1,11 +1,11 @@
 From 5a6c869d4709ce84d7c07b5dd33cf06e39c0111e Mon Sep 17 00:00:00 2001
 From: Sarah Taraporewalla <sarah.tarap@gmail.com>
 Date: Mon, 16 Feb 2009 20:44:08 +0000
-Subject: [PATCH] SarahTaraporewalla: adding new template file for slippers template engine
+Subject: [PATCH 1] SarahTaraporewalla: adding new template file for slippers template engine
 
 ---
  lib/ramaze/template.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 2 files changed, 26 insertions(+), 1 deletions(-)
 
 diff --git a/lib/ramaze/template.rb b/lib/ramaze/template.rb
 index 096816b..99f1f94 100644
@@ -21,5 +21,38 @@ index 096816b..99f1f94 100644
  
      AVAILABLE_ENGINES.each do |const|
 -- 
+
+diff --git a/lib/ramaze/template/slippers.rb b/lib/ramaze/template/slippers.rb
+new file mode 100755
+index 0000000..e9981b4
+--- /dev/null
++++ b/lib/ramaze/template/slippers.rb
+@@ -0,0 +1,25 @@
++require 'slippers'
++
++module Ramaze
++  module Template
++    class Slippers < Template
++
++      ENGINES[self] = %w[ st ]
++      class << self
++        def transform(action)
++          slippers = wrap_compile(action)
++          object_to_render = ::Slippers::BindingWrapper.new(action.binding)
++          slippers.render(object_to_render)
++        end
++
++        def compile(action, template)
++          subtemplates = action.controller.trait[:slippers_options] || {}
++         
++          template_group_directory = ::Slippers::TemplateGroupDirectory.new(Global.view_root)
++          template_group = ::Slippers::TemplateGroup.new(:super_group => template_group_directory, :templates => subtemplates)
++          ::Slippers::Engine.new(template, :template_group => template_group)
++        end
++      end
++    end
++  end
++end
+-- 
 1.6.1
 

data/lib/ramazeTemplates/slippers.rb

@@ -1,4 +1,4 @@
-require '/Users/starapor/Development/slippers/slippers'
+require 'slippers'
 
 module Ramaze
   module Template

data/spec/engine.rb

@@ -66,6 +66,11 @@ describe Slippers::Engine do
     engine = Slippers::Engine.new(template, :template_group => template_group)
     engine.render(Slippers::BindingWrapper.new(binding)).should eql('Say: Hello fred flinstone Hello barney rubble ')
   end
+  
+  it 'should render empty string if the template can not be evaluated' do
+    engine = Slippers::Engine.new('$this_is_bad')
+    engine.render(stub('object')).should eql('')
+  end
 end
 
 class AgeRenderer  

data/spec/parser.rb

@@ -5,6 +5,9 @@ class Person
     @first, @last = first, last
   end
   attr_reader :first, :last
+  def full_name
+    to_s
+  end
   def to_s
     first + ' ' + last
   end
@@ -26,19 +29,23 @@ describe SlippersParser do
   end
   
   it 'should find the keyword within the delimiters' do
-    message = OpenStruct.new({:message => 'the message', :name => 'fred'})
+    message = OpenStruct.new({:message => 'the message', :message2 => 'the second message', :name => 'fred', :full_name => 'fred flinstone'})
     @parser.parse('$message$').eval(message).should eql('the message')
     @parser.parse('$message$ for $name$').eval(message).should eql('the message for fred')
     @parser.parse('we want to find $message$').eval(message).should eql('we want to find the message')
     @parser.parse('$message$ has spoken').eval(message).should eql('the message has spoken')
     @parser.parse('Yes! $message$ has spoken').eval(message).should eql('Yes! the message has spoken')
+    @parser.parse('Yes! $full_name$ has spoken').eval(message).should eql('Yes! fred flinstone has spoken')
+    @parser.parse('Yes! $message2$ has spoken').eval(message).should eql('Yes! the second message has spoken')
+    @parser.parse('$$').eval(message).should eql('')
   end
   
   it 'should parse the subtemplate found within the delimiters' do
     template = Slippers::Engine.new('template for this')
     template_with_underscore = Slippers::Engine.new('template with underscore')
-    template_group = Slippers::TemplateGroup.new(:templates => {:template => template, :template_with_underscore => template_with_underscore})
+    template_group = Slippers::TemplateGroup.new(:templates => {:template => template, :template_with_underscore => template_with_underscore, :template2 => template})
     @parser.parse('$template()$').eval(nil, template_group).should eql('template for this')
+    @parser.parse('$template2()$').eval(nil, template_group).should eql('template for this')
     @parser.parse('Stuff before $template()$ and after').eval(nil, template_group).should eql('Stuff before template for this and after')
     @parser.parse('then there is $template_with_underscore()$').eval(nil, template_group).should eql('then there is template with underscore')
   end 
@@ -56,7 +63,7 @@ describe SlippersParser do
   end
   
   it 'should not match on escaped delimiters' do
-    #@parser.parse('stuff \$notmatched\$').eval.should eql('stuff \$notmatched\$')
+    @parser.parse('stuff \$notmatched\$').eval(stub(:nothing)).should eql('stuff \$notmatched\$')
   end
   
   it "should render a list of objects" do
@@ -105,6 +112,14 @@ describe SlippersParser do
     template_group = Slippers::TemplateGroup.new(:templates => {:not_a_renderer => stub('renderer')})    
     @parser.parse("$not_a_renderer()$").eval(stub('object'), template_group).should eql('')
   end
+  
+  it 'should return an empty string if the template is not correctly formed' do
+    @parser.parse("$not_properly_formed").should eql(nil)
+  end
+  
+  it 'should render an empty string if it cannot find the attribute to render' do
+    @parser.parse("$not_me$").eval(Person.new('fred', 'flinestone')).should eql('')
+  end
    
 end
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'slippers'
+require 'lib/slippers'
 require 'ostruct'
 require 'date'
 require 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: starapor-slippers
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Sarah Taraporewalla
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: active_support
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A strict templating library for ruby
 email: me@sarahtaraporewalla.com
 executables: []