baby_erubis 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 86a6cc722ec2c51e207330c70c8202f7f6108b07
+  data.tar.gz: 9f0062ca834b2954323f772dc65e9cb4d8ba5055
+SHA512:
+  metadata.gz: 8f716b9a9866e7d4d9787208f5323cdf58e1c1c22d79ed1a605f4fc4b10f2ae98b3eb6d5a30c5125061497fa91448d2cfd51dd9ac5c9f7e2a960506c24efbc42
+  data.tar.gz: 2f2753b15878d8ae7dad9eaf3673e972ce970ec04aa1f1c4769c983fbe26ea2f4b354708eebbbb8cd29660d1180fa57906630b8d14016f610718246c65f2f29d

data/README.md

@@ -1,7 +1,7 @@
 BabyErubis.rb
 =============
 
-$Release: 1.0.0 $
+$Release: 2.0.0 $
 
 BabyErubis is an yet another eRuby implementation, based on Erubis.
 
@@ -9,6 +9,7 @@ BabyErubis is an yet another eRuby implementation, based on Erubis.
 * Easy to customize
 * Supports HTML as well as plain text
 * Accepts both template file and template string
+* Supports Ruby on Rails template
 
 BabyErubis supports Ruby >= 1.8 and Rubinius >= 2.0.
 
@@ -77,6 +78,19 @@ Expression in `<%= ... %>` is escaped according to template class.
 (Experimental) `<%- ... -%>` and `<%-= ... -%>` are handled same as
 `<% ... %>` and `<%= ... %>` respectively.
 
+(Experimental) Block argument expression supported since version 2.0.
+Example:
+
+    ## template
+    <%== form_for(:article) do |f| %>
+      ...
+    <% end %>
+
+    ## compiled ruby code
+     _buf << form_for(:article) do |f| _buf << '
+      ...
+    '; end;
+
 
 
 Advanced Topics
@@ -151,6 +165,40 @@ And you can control whether to use freeze() or not.
     # '.freeze; _buf.to_s
 
 
+Ruby on Rails Template
+----------------------
+
+`BabyErubis::RailsTemplate` class generates Rails-style ruby code.
+
+    require 'baby_erubis'
+    require 'baby_erubis/rails'
+    
+    t = BabyErubis::RailsTemplate.new.from_str <<'END'
+    <div>
+      <%= form_for :article do |f| %>
+        ...
+      <% end %>
+    </div>
+    END
+    print t.src
+
+Result:
+
+    @output_buffer = output_buffer || ActionView::OutputBuffer.new;@output_buffer.safe_append='<div>
+      ';@output_buffer.append= form_for :article do |f| ;@output_buffer.safe_append='
+        ...
+    '.freeze;   end;
+    @output_buffer.safe_append='</div>
+    ';@output_buffer.to_s
+
+You can check syntax of Rails template in command-line:
+
+    $ baby_erubis -Rx app/views/articles/index.html.erb | ruby -wc
+
+
+(TODO: How to use BabyErubis in Ruby on Rails instead of Erubis)
+
+
 
 Customizing
 ===========
@@ -313,7 +361,7 @@ Sample code:
 Todo
 ====
 
-* Support Rails syntax (= `<%= form_for do |f| %>`)
+* [Done] Support Rails syntax (= `<%= form_for do |f| %>`)
 
 
 
@@ -321,6 +369,14 @@ Changes
 =======
 
 
+Release 2.0.0 (2014-12-09)
+--------------------------
+
+* [enhance] Ruby on Rails template support
+* [enhance] Block argument expression support
+* [enhance] New command-line option '-R' and '--format=rails'
+
+
 Release 1.0.0 (2014-05-17)
 --------------------------
 

data/Rakefile

@@ -2,7 +2,7 @@
 
 ###
 
-RELEASE   = ENV['rel'] || '0.0.0'
+RELEASE   = ENV['rel'] || '2.0.0'
 COPYRIGHT = 'copyright(c) 2014 kuwata-lab.com all rights reserved'
 LICENSE   = 'MIT License'
 

data/baby_erubis.gemspec

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $License: MIT License $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ###
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   s.name        = "baby_erubis"
   s.author      = "makoto kuwata"
   s.email       = "kwa(at)kuwata-lab.com"
-  s.version     = "$Release: 1.0.0 $".split()[1]
+  s.version     = "$Release: 2.0.0 $".split()[1]
+  s.license     = "MIT License"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "https://github.com/kwatch/BabyErubis/tree/ruby"
   s.summary     = "yet another eRuby implementation based on Erubis"
@@ -30,7 +31,8 @@ END
 
   ## files
   files = []
-  files += Dir.glob('lib/*.rb')
+  files << 'lib/baby_erubis.rb'
+  files << 'lib/baby_erubis/rails.rb'
   files += Dir.glob('test/*.rb')
   files += ['bin/baby_erubis']
   files += %w[README.md MIT-LICENSE setup.rb baby_erubis.gemspec Rakefile]

data/bin/baby_erubis

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -245,10 +245,9 @@ module BabyErubis
 
   module HideTextEnhander
 
-    def build_text(text)
-      return text.to_s.gsub(/^.*\n/, "\n").gsub(/./, ' ')
+    def add_text(src, text)
+      src << text.to_s.gsub(/^.*\n/, "\n").gsub(/./, ' ')
     end
-    alias _t build_text
 
   end
 
@@ -284,7 +283,8 @@ class Main
       return
     end
     #
-    klass  = handle_format(options['format'] || (options['H'] ? 'html' : nil))
+    format = options['format'] || (options['H'] && 'html') || (options['R'] && 'rails')
+    klass  = handle_format(format)
     if options['X']
       klass = Class.new(klass)
       klass.class_eval { include BabyErubis::HideTextEnhander }
@@ -330,8 +330,9 @@ class Main
     parser.option("-c context      : context string (yaml inline style or ruby code)")
     parser.option("-f file         : context data file (*.yaml, *.json, or *.rb)")
     parser.option("-H              : same as --format=html")
-    parser.option("    --format={text|html}  : format (default: text)")\
-      .validation {|arg| "'text' or 'html' expected" if arg !~ /\A(text|html)\z/ }
+    parser.option("-R              : same as --format=rails")
+    parser.option("    --format=format  : 'text', 'html' or 'rails' (default: text)")\
+      .validation {|arg| "'text', 'html' or 'rails' expected" if arg !~ /\A(text|html|rails)\z/ }
     parser.option("    --encoding=name       : encoding (default: utf-8)")
     parser.option("    --freeze={true|false} : use String#freeze() or not")\
       .validation {|arg| "'true' or 'false' expected" if arg !~ /\A(true|false)\z/ }
@@ -341,7 +342,7 @@ class Main
 
   def build_help_message(parser)
     s = "Usage: #{@cmdname} [..options..] [erubyfile]\n"
-    s << parser.help_message(30)
+    s << parser.help_message(28)
     s << "\n"
     s << <<"END"
 Example:
@@ -365,6 +366,7 @@ END
     when nil   ;  return BabyErubis::Text
     when 'text';  return BabyErubis::Text
     when 'html';  return BabyErubis::Html
+    when 'rails'; require 'baby_erubis/rails'; return BabyErubis::RailsTemplate
     else
       raise "** unreachable: format=#{format.inspect}"
     end

data/lib/baby_erubis.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -25,7 +25,7 @@
 
 module BabyErubis
 
-  RELEASE = '$Release: 1.0.0 $'.split(' ')[1]
+  RELEASE = '$Release: 2.0.0 $'.split(' ')[1]
 
 
   class Template
@@ -54,8 +54,8 @@ module BabyErubis
 
     attr_reader :src
 
-    #PATTERN = /(^[ \t]*)?<%(==?|\#)?(.*?)%>([ \t]*\r?\n)?/m
-    PATTERN = /(^[ \t]*)?<%-?(==?|\#)? ?(.*?) ?-?%>([ \t]*\r?\n)?/m
+    #PATTERN = /(^[ \t]*)?<%(\#)?(==?)?(.*?)%>([ \t]*\r?\n)?/m
+    PATTERN = /(^[ \t]*)?<%-?(\#)?(==?)? ?(.*?) ?-?%>([ \t]*\r?\n)?/m
 
     def pattern
       return self.class.const_get(:PATTERN)
@@ -68,32 +68,37 @@ module BabyErubis
     end
 
     def parse(input)
-      src = "_buf = '';"       # preamble
+      src = ""
+      add_preamble(src)            # preamble
+      spc = ""
       pos = 0
-      input.scan(pattern()) do |lspace, ch, code, rspace|
+      input.scan(pattern()) do |lspace, sharp, ch, code, rspace|
         match = Regexp.last_match
         text  = input[pos, match.begin(0) - pos]
         pos   = match.end(0)
-        src << _t(text)
-        if ! ch                # statement
-          if lspace && rspace
-            src << "#{lspace} #{code};#{rspace}"
-          else
-            src << _t(lspace) << " #{code};" << _t(rspace)
+        if sharp                   # comment
+          code = ("\n" * code.count("\n"))
+          if ! ch && lspace && rspace   # trimmed statement
+            add_text(src, "#{spc}#{text}"); add_stmt(src, "#{code}#{rspace}")
+            rspace = ""
+          else                          # other statement or expression
+            add_text(src, "#{spc}#{text}#{lspace}"); add_stmt(src, code)
           end
-        elsif ch == '='        # expression (escaping)
-          src << _t(lspace) << " _buf << #{escaped_expr(code)};" << _t(rspace)
-        elsif ch == '=='       # expression (without escaping)
-          src << _t(lspace) << " _buf << (#{code}).to_s;" << _t(rspace)
-        elsif ch == '#'        # comment
-          src << _t(lspace) << ("\n" * code.count("\n")) << _t(rspace)
         else
-          raise "** unreachable: ch=#{ch.inspect}"
+          if ch                    # expression
+            add_text(src, "#{spc}#{text}#{lspace}"); add_expr(src, code, ch)
+          elsif lspace && rspace   # statement (trimming)
+            add_text(src, "#{spc}#{text}"); add_stmt(src, "#{lspace} #{code};#{rspace}")
+            rspace = ""
+          else                     # statement (without trimming)
+            add_text(src, "#{spc}#{text}#{lspace}"); add_stmt(src, " #{code};")
+          end
         end
+        spc = rspace
       end
       text = pos == 0 ? input : input[pos..-1]   # or $' || input
-      src << _t(text)
-      src << " _buf.to_s\n"    # postamble
+      add_text(src, "#{spc}#{text}")
+      add_postamble(src)           # postamble
       return src
     end
 
@@ -108,24 +113,47 @@ module BabyErubis
 
     protected
 
-    def escaped_expr(code)
-      return "(#{code}).to_s"
+    def add_preamble(src)
+      src << "_buf = '';"
     end
 
-    private
+    def add_postamble(src)
+      src << " _buf.to_s\n"
+    end
 
-    def build_text(text)
+    def add_text(src, text)
+      return if !text || text.empty?
       freeze = @freeze ? '.freeze' : ''
-      return text && !text.empty? ? " _buf << '#{escape_text(text)}'#{freeze};" : ''
-      #return text && !text.empty? ? " _buf << %q`#{escape_text(text)}`#{freeze};" : ''
+      text.gsub!(/['\\]/, '\\\\\&')
+      src << " _buf << '#{text}'#{freeze};"
+    end
+
+    def add_stmt(src, stmt)
+      return if !stmt || stmt.empty?
+      src << stmt
+    end
+
+    def add_expr(src, expr, indicator)
+      return if !expr || expr.empty?
+      if expr_has_block(expr)
+        src << " _buf << #{expr}"
+      elsif indicator == '='        # escaping
+        src << " _buf << #{escaped_expr(expr)};"
+      else                          # without escaping
+        src << " _buf << (#{expr}).to_s;"
+      end
+    end
+
+    def escaped_expr(code)
+      return "(#{code}).to_s"
     end
-    alias _t build_text
 
-    def escape_text(text)
-      return text.gsub!(/['\\]/, '\\\\\&') || text
-      #return text.gsub!(/[`\\]/, '\\\\\&') || text
+    def expr_has_block(expr)
+      return expr =~ /(\bdo|\{)\s*(\|[^|]*?\|\s*)?\z/
     end
 
+    private
+
     def empty_binding
       return binding()
     end

data/lib/baby_erubis/rails.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+
+###
+### $Release: 2.0.0 $
+### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
+### $License: MIT License $
+###
+
+require 'baby_erubis'
+
+
+module BabyErubis
+
+
+  class RailsTemplate < Template
+
+    protected
+
+    def add_preamble(src)
+      src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
+    end
+
+    def add_postamble(src)
+      src << "@output_buffer.to_s\n"
+    end
+
+    def add_text(src, text)
+      return if !text || text.empty?
+      freeze = @freeze ? '.freeze' : ''
+      text.gsub!(/['\\]/, '\\\\\&')
+      src << "@output_buffer.safe_append='#{text}'#{freeze};"
+    end
+
+    def add_stmt(src, stmt)
+      return if !stmt || stmt.empty?
+      src << stmt
+    end
+
+    def add_expr(src, expr, indicator)
+      return if !expr || expr.empty?
+      l = '('; r = ')'
+      l = r = ' ' if expr_has_block(expr)
+      if indicator == '='           # escaping
+        src << "@output_buffer.append=#{l}#{expr}#{r};"
+      else                          # without escaping
+        src << "@output_buffer.safe_append=#{l}#{expr}#{r};"
+      end
+    end
+
+  end
+
+
+end

data/test/context_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

data/test/rails_test.rb

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+###
+### $Release: 2.0.0 $
+### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
+### $License: MIT License $
+###
+
+libpath = File.class_eval { join(dirname(dirname(__FILE__)), 'lib') }
+$: << libpath unless $:.include?(libpath)
+
+require 'minitest/autorun'
+
+require 'baby_erubis/rails'
+
+
+
+describe 'BabyErubis::RailsTemplate' do
+
+  let(:tmpl) { BabyErubis::RailsTemplate.new }
+
+  def _modify(ruby_code)
+    if (''.freeze).equal?(''.freeze)
+      return ruby_code.gsub(/([^'])';/m, "\\1'.freeze;")
+    else
+      return ruby_code
+    end
+  end
+
+  eruby_template = <<'END'
+<h1>New Article</h1>
+
+<%= form_for :article, url: articles_path do |f| %>
+  <p>
+    <%= f.label :title %><br>
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= f.label :text %><br>
+    <%= f.text_area :text %>
+  </p>
+
+  <p>
+    <%= f.submit %>
+  </p>
+<% end %>
+END
+
+  ruby_code = <<'END'
+@output_buffer = output_buffer || ActionView::OutputBuffer.new;@output_buffer.safe_append='<h1>New Article</h1>
+
+';@output_buffer.append= form_for :article, url: articles_path do |f| ;@output_buffer.safe_append='
+  <p>
+    ';@output_buffer.append=(f.label :title);@output_buffer.safe_append='<br>
+    ';@output_buffer.append=(f.text_field :title);@output_buffer.safe_append='
+  </p>
+
+  <p>
+    ';@output_buffer.append=(f.label :text);@output_buffer.safe_append='<br>
+    ';@output_buffer.append=(f.text_area :text);@output_buffer.safe_append='
+  </p>
+
+  <p>
+    ';@output_buffer.append=(f.submit);@output_buffer.safe_append='
+  </p>
+'; end;
+@output_buffer.to_s
+END
+
+
+  describe '#parse()' do
+
+    it "converts eRuby template into ruby code with Rails style." do
+      tmpl = BabyErubis::RailsTemplate.new.from_str(eruby_template)
+      expected = _modify(ruby_code)
+      assert_equal expected, tmpl.src
+    end
+
+    it "can understand block such as <%= form_for do |x| %>." do
+      s = <<-'END'
+      <%= (1..3).each do %>
+        Hello
+      <% end %>
+      END
+      tmpl = BabyErubis::RailsTemplate.new.from_str(s)
+      assert_match /\@output_buffer.append= \(1\.\.3\)\.each do ;/, tmpl.src
+      #
+      s = <<-'END'
+      <%= (1..3).each do |x, y|%>
+        Hello
+      <% end %>
+      END
+      tmpl = BabyErubis::RailsTemplate.new.from_str(s)
+      assert_match /\@output_buffer.append= \(1\.\.3\)\.each do \|x, y\| ;/, tmpl.src
+    end
+
+    it "doesn't misunderstand <%= @todo %> as block" do
+      tmpl = BabyErubis::RailsTemplate.new.from_str("<b><%= @todo %></b>")
+      assert_match /\@output_buffer\.append=\(\@todo\);/, tmpl.src
+    end
+
+  end
+
+
+end

data/test/run_all.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
 here = File.dirname(File.expand_path(__FILE__))
-Dir.glob(here + '/**/*.rb').each do |fpath|
+Dir.glob(here + '/**/*_test.rb').each do |fpath|
   require fpath
 end

data/test/script_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -71,19 +71,20 @@ describe Main do
 
   help_message = <<'END'.gsub(/\$SCRIPT/, File.basename($0))
 Usage: $SCRIPT [..options..] [erubyfile]
-  -h, --help                  : help
-  -v, --version               : version
-  -x                          : show ruby code
-  -X                          : show ruby code only (no text part)
-  -N                          : numbering: add line numbers   (for '-x/-X')
-  -U                          : unique: compress empty lines  (for '-x/-X')
-  -C                          : compact: remove empty lines   (for '-x/-X')
-  -c context                  : context string (yaml inline style or ruby code)
-  -f file                     : context data file (*.yaml, *.json, or *.rb)
-  -H                          : same as --format=html
-      --format={text|html}    : format (default: text)
-      --encoding=name         : encoding (default: utf-8)
-      --freeze={true|false}   : use String#freeze() or not
+  -h, --help                : help
+  -v, --version             : version
+  -x                        : show ruby code
+  -X                        : show ruby code only (no text part)
+  -N                        : numbering: add line numbers   (for '-x/-X')
+  -U                        : unique: compress empty lines  (for '-x/-X')
+  -C                        : compact: remove empty lines   (for '-x/-X')
+  -c context                : context string (yaml inline style or ruby code)
+  -f file                   : context data file (*.yaml, *.json, or *.rb)
+  -H                        : same as --format=html
+  -R                        : same as --format=rails
+      --format=format       : 'text', 'html' or 'rails' (default: text)
+      --encoding=name       : encoding (default: utf-8)
+      --freeze={true|false} : use String#freeze() or not
 
 Example:
   ## convert eRuby file into Ruby code
@@ -145,6 +146,22 @@ _buf = ''; _buf << '<html>
   </body>
 </html>
 '; _buf.to_s
+END
+  SOURCE_RAILS = <<'END'
+@output_buffer = output_buffer || ActionView::OutputBuffer.new;@output_buffer.safe_append='<html>
+  <body>
+    <h1>';@output_buffer.append=(@title);@output_buffer.safe_append='</h1>
+    <h1>';@output_buffer.safe_append=(@title);@output_buffer.safe_append='</h1>
+    <div>
+      <ul>
+';         for item in @items;
+@output_buffer.safe_append='        <li>';@output_buffer.append=(item);@output_buffer.safe_append='</li>
+';         end;
+@output_buffer.safe_append='      </ul>
+    </div>
+  </body>
+</html>
+';@output_buffer.to_s
 END
   SOURCE_NO_TEXT = <<'END'
 _buf = '';
@@ -345,6 +362,19 @@ END
   end
 
 
+  describe '-R' do
+
+    it "uses Rails-style template." do
+      sout, serr = with_erubyfile do |fname|
+        dummy_stdio { Main.main(['-Rx', fname]) }
+      end
+      assert_equal _modify(SOURCE_RAILS), sout
+      assert_equal "", serr
+    end
+
+  end
+
+
   describe '-c cotnext' do
 
     it "can specify context data in YAML format." do
@@ -501,7 +531,7 @@ END
   end
 
 
-  describe '--format={text|html}' do
+  describe '--format={text|html|rails}' do
 
     it "can enforce text format." do
       ctx_str = "{title: Love&Peace, items: [A, B, C]}"
@@ -521,6 +551,14 @@ END
       assert_equal "", serr
     end
 
+    it "can enforce rails format." do
+      sout, serr = with_erubyfile do |fname|
+        dummy_stdio { Main.main(['--format=rails', '-x', fname]) }
+      end
+      assert_equal _modify(SOURCE_RAILS), sout
+      assert_equal "", serr
+    end
+
     it "reports error when argument is missng." do
       status = nil
       sout, serr = with_erubyfile do |fname|
@@ -537,7 +575,7 @@ END
         dummy_stdio { status = Main.main(['-x', '--format=json', fname]) }
       end
       assert_equal "", sout
-      assert_equal "#{File.basename($0)}: --format=json: 'text' or 'html' expected\n", serr
+      assert_equal "#{File.basename($0)}: --format=json: 'text', 'html' or 'rails' expected\n", serr
       assert_equal 1, status
     end
 

data/test/template_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
+### $Release: 2.0.0 $
 ### $Copyright: copyright(c) 2014 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -39,7 +39,7 @@ items:
 END
       expected = <<'END'
 _buf = ''; _buf << 'title: '; _buf << (@title).to_s; _buf << '
-'; _buf << 'items:
+items:
 '; for item in @items;
  _buf << '  - '; _buf << (item).to_s; _buf << '
 '; end;
@@ -107,14 +107,14 @@ END
       expected = <<'END'
 _buf = '';
 
- _buf << '
-'; _buf << 'x = ';
+
+ _buf << 'x = ';
 
  _buf << '
 ';
 
- _buf << '
-'; _buf.to_s
+
+ _buf.to_s
 END
       expected = _modify(expected)
       assert_equal expected, template.parse(input)
@@ -184,6 +184,62 @@ END
       assert_equal expected, template.parse(input)
     end
 
+    it "concats spaces around embedded expressions." do
+      input = <<'END'
+<form>
+  <%= f.text :email %>
+  <%= f.password :password %>
+  <%= f.submit 'Login' %>
+</form>
+END
+      expected = <<'END'
+_buf = ''; _buf << '<form>
+  '; _buf << (f.text :email).to_s; _buf << '
+  '; _buf << (f.password :password).to_s; _buf << '
+  '; _buf << (f.submit 'Login').to_s; _buf << '
+</form>
+'; _buf.to_s
+END
+      template = BabyErubis::Text.new(:freeze=>false)
+      assert_equal expected, template.parse(input)
+    end
+
+    it "can recognize block argument in embedded expression correctly." do
+      input = <<'END'
+<%= form_for(:article) do |f| %>
+  ...
+<% end %>
+END
+      expected = <<'END'
+_buf = ''; _buf << form_for(:article) do |f| _buf << '
+  ...
+'; end;
+ _buf.to_s
+END
+      template = BabyErubis::Text.new(:freeze=>false)
+      assert_equal expected, template.parse(input)
+      #
+      input = <<'END'
+<%= form_for :article do %>
+  ...
+<% end %>
+END
+      expected = <<'END'
+_buf = ''; _buf << form_for :article do _buf << '
+  ...
+'; end;
+ _buf.to_s
+END
+      template = BabyErubis::Text.new(:freeze=>false)
+      assert_equal expected, template.parse(input)
+    end
+
+    it "doesn't misunderstand <%= @todo %> as block" do
+      tmpl = BabyErubis::Text.new
+      src = tmpl.parse("<b><%= @todo %></b>")
+      assert_match /\ _buf << \(\@todo\)\.to_s;/, src
+    end
+
   end
 
 

metadata

@@ -1,31 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: baby_erubis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies: []
-description: ! 'BabyErubis is an yet another eRuby implementation, based on Erubis.
-
+description: |
+  BabyErubis is an yet another eRuby implementation, based on Erubis.
 
   * Small and fast
-
   * Supports HTML as well as plain text
-
   * Accepts both template file and template string
-
   * Easy to customize
 
-
   BabyErubis support Ruby 1.9 or higher, and will work on 1.8 very well.
-
-'
 email: kwa(at)kuwata-lab.com
 executables:
 - baby_erubis
@@ -33,7 +26,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/baby_erubis.rb
+- lib/baby_erubis/rails.rb
 - test/context_test.rb
+- test/rails_test.rb
 - test/run_all.rb
 - test/script_test.rb
 - test/template_test.rb
@@ -44,28 +39,28 @@ files:
 - baby_erubis.gemspec
 - Rakefile
 homepage: https://github.com/kwatch/BabyErubis/tree/ruby
-licenses: []
+licenses:
+- MIT License
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: yet another eRuby implementation based on Erubis
 test_files:
 - test/run_all.rb