baby_erubis 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168d382d8838cb51ab8a7d4965573adbf56426ff
-  data.tar.gz: 446c12313a2cbc4c15d8373f69c99cea8b6503a6
+  metadata.gz: 7e3946547c49a8fd5ad9ad33de2b6d61165a0487
+  data.tar.gz: ff43eac6d25883186a8f8d988dc7fb4161971523
 SHA512:
-  metadata.gz: fa2d86791075cc09060f7bc679cec2fba4aefb8f04b115bda1c8c87b7ecab6e5f63f3e6711a762e4ce37228bfe3bb935057de90084492f00c8b827e4853d74a5
-  data.tar.gz: bf4cffef71cfc69d8145cf5539c734a675dd8456f709b24ef40bdc0ac6291ac49b31874e963dc21a0d7ad3feeb5d6de706b4d2d2527b1e31004782094923237f
+  metadata.gz: 60f8642bba8c12bebba15efed89be961768672adee6bc8b79217507fef598989b438811400521dad48986f38bff4ff908fdd9227fe5da39467ea6ac83121f92b
+  data.tar.gz: 11e3199d574a989877dfecef610b29328f951a0ccb8dba3165faf71a973c80c8e6b04d063cd572fa32fcda4a2b62facc8fb0c058d94c65e07045c32214aad04a

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 kuwata-lab.com
+Copyright (c) 2014-2016 kuwata-lab.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,7 +1,7 @@
 BabyErubis.rb
 =============
 
-$Release: 2.1.2 $
+$Release: 2.2.0 $
 
 BabyErubis is an yet another eRuby implementation, based on Erubis.
 
@@ -226,7 +226,7 @@ because `BabyErubis/Renderer` module defines rendering methods:
       def index
         @items = ['A', 'B', 'C']
         ## renders 'templates/welcome.html.eruby'
-        html = render_html(:welcome)
+        html = render_html(:index)   # renders 'index.html.eruby'
         return html
       end
 
@@ -241,6 +241,15 @@ because `BabyErubis/Renderer` module defines rendering methods:
 * `eruby_render_text(template_name, layout: false, encoding: 'utf-8')` --
   renders plain template.
 
+Template name can be Symbol or String:
+
+    html = render_html(:foo)              # renders 'foo.html.eruby'
+    html = render_html("foo.html.eruby")  # renders 'foo.html.eruby'
+
+    text = render_text(:foo)              # renders 'foo.eruby'
+    text = render_text(:'foo.txt')        # renders 'foo.txt.eruby'
+    text = render_text("foo.txt.eruby")   # renders 'foo.txt.eruby'
+
 Layout template example:
 
     <%
@@ -430,6 +439,29 @@ Changes
 =======
 
 
+Release 2.2.0 (2016-09-19)
+--------------------------
+
+* [change] `BabyErubis::Renderer#eruby_render_html()` and
+  `#eruby_render_text()` distinguish symbol and string template name:
+
+  ```
+  ## previous
+  html = eruby_render_html(:foo)              # render 'foo.html.eruby'
+  html = eruby_render_html("foo")             # render 'foo.html.eruby'
+  html = eruby_render_html("foo.html.eruby")  # render 'foo.html.eruby.html.eruby'
+
+  ## current
+  html = eruby_render_html(:foo)              # render 'foo.html.eruby'
+  html = eruby_render_html("foo")             # render 'foo'
+  html = eruby_render_html("foo.html.eruby")  # render 'foo.html.eruby'
+
+  text = eruby_render_text(:foo)              # render 'foo.eruby'
+  text = eruby_render_text(:'foo.txt')        # render 'foo.txt.eruby'
+  text = eruby_render_text("foo.txt.eruby")   # render 'foo.txt.eruby'
+  ```
+
+
 Release 2.1.2 (2015-10-30)
 --------------------------
 
@@ -482,4 +514,4 @@ $License: MIT License $
 Copyright
 =========
 
-$Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+$Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $

data/Rakefile

@@ -2,8 +2,8 @@
 
 ###
 
-RELEASE   = ENV['rel'] || '2.1.1'
-COPYRIGHT = 'copyright(c) 2014-2015 kuwata-lab.com all rights reserved'
+RELEASE   = ENV['rel'] || '0.0.0'
+COPYRIGHT = 'copyright(c) 2014-2016 kuwata-lab.com all rights reserved'
 LICENSE   = 'MIT License'
 
 ###
@@ -35,6 +35,28 @@ task :clean do
 end
 
 
+desc "udpate release number"
+task :edit do
+  require_release_number()
+  spec_src = File.open('baby_erubis.gemspec') {|f| f.read }
+  spec = eval spec_src
+  spec.files.each do |fpath|
+    content = File.open(fpath, 'r+b:utf-8') do |f|
+      content = f.read
+      new_content = edit_content(content)
+      if new_content == content
+        puts "[ ] #{fpath}"
+      else
+        puts "[C] #{fpath}"
+        f.rewind()
+        f.truncate(0)
+        f.write(new_content)
+      end
+    end
+  end
+end
+
+
 desc "copy files into 'dist/#{RELEASE}'"
 task :dist => :clean do
   require_release_number()

data/baby_erubis.gemspec

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
 ###
-### $Release: 2.1.2 $
+### $Release: 2.2.0 $
 ### $License: MIT License $
-### $Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+### $Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $
 ###
 
 require 'rubygems'
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.name        = "baby_erubis"
   s.author      = "makoto kuwata"
   s.email       = "kwa(at)kuwata-lab.com"
-  s.version     = "$Release: 2.1.2 $".split()[1]
+  s.version     = "$Release: 2.2.0 $".split()[1]
   s.license     = "MIT License"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "https://github.com/kwatch/BabyErubis/tree/ruby"

data/bin/baby_erubis

@@ -2,8 +2,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 2.1.2 $
-### $Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+### $Release: 2.2.0 $
+### $Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/lib/baby_erubis.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 2.1.2 $
-### $Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+### $Release: 2.2.0 $
+### $Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -25,7 +25,7 @@
 
 module BabyErubis
 
-  RELEASE = '$Release: 2.1.2 $'.split(' ')[1]
+  RELEASE = '$Release: 2.2.0 $'.split(' ')[1]
 
 
   class TemplateError < StandardError

data/lib/baby_erubis/rails.rb

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

data/lib/baby_erubis/renderer.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 2.1.2 $
-### $Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+### $Release: 2.2.0 $
+### $Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -35,6 +35,12 @@ module BabyErubis
   ##   end
   ##
   ##
+  ## Notice:
+  ##
+  ##   eruby_render_html(:welcome)              # render 'welcome.html.eruby'
+  ##   eruby_render_html('welcome')             # render 'welcome'
+  ##   eruby_render_html('welcome.html.eruby')  # render 'welcome.html.eruby'
+  ##
   module Renderer
 
     ERUBY_PATH         = ['.']
@@ -46,20 +52,22 @@ module BabyErubis
     ERUBY_CACHE        = {}
 
     def eruby_render_html(template_name, layout: true, encoding: 'utf-8')
+      ext        = self.class.const_get :ERUBY_HTML_EXT
+      tmpl_class = self.class.const_get :ERUBY_HTML
       return _eruby_render_template(template_name, layout) {|tmpl_name|
-        ext = self.class.const_get :ERUBY_HTML_EXT
-        _eruby_find_template("#{tmpl_name}#{ext}") {|fpath|
-          tmpl_class = self.class.const_get :ERUBY_HTML
+        filename = tmpl_name.is_a?(Symbol) ? "#{tmpl_name}#{ext}" : tmpl_name
+        _eruby_find_template(filename) {|fpath|
           tmpl_class.new.from_file(fpath, encoding)
         }
       }
     end
 
     def eruby_render_text(template_name, layout: false, encoding: 'utf-8')
+      ext        = self.class.const_get :ERUBY_TEXT_EXT
+      tmpl_class = self.class.const_get :ERUBY_TEXT
       return _eruby_render_template(template_name, layout) {|tmpl_name|
-        ext = self.class.const_get :ERUBY_TEXT_EXT
-        _eruby_find_template("#{tmpl_name}#{ext}") {|fpath|
-          tmpl_class = self.class.const_get :ERUBY_TEXT
+        filename = tmpl_name.is_a?(Symbol) ? "#{tmpl_name}#{ext}" : tmpl_name
+        _eruby_find_template(filename) {|fpath|
           tmpl_class.new.from_file(fpath, encoding)
         }
       }

data/test/context_test.rb

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

data/test/rails_test.rb

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

data/test/renderer_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 2.1.2 $
-### $Copyright: copyright(c) 2014-2015 kuwata-lab.com all rights reserved $
+### $Release: 2.2.0 $
+### $Copyright: copyright(c) 2014-2016 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -92,8 +92,6 @@ END
   describe '#eruby_render_html()' do
 
     it "renders html template." do
-      obj = HelloClass.new(:items=>[10, 20, 30])
-      actual = obj.eruby_render_html(:'welcome', layout: false)
       expected = <<'END'
 <h1>Example</h1>
 <ul>
@@ -102,6 +100,13 @@ END
   <li>30</li>
 </ul>
 END
+      #
+      obj = HelloClass.new(:items=>[10, 20, 30])
+      actual = obj.eruby_render_html(:'welcome', layout: false)
+      assert_equal expected, actual
+      #
+      obj = HelloClass.new(:items=>[10, 20, 30])
+      actual = obj.eruby_render_html('welcome.html.erb', layout: false)
       assert_equal expected, actual
     end
 
@@ -137,12 +142,17 @@ END
   describe '#eruby_render_text()' do
 
     it "renders text template" do
-      obj = HelloClass.new(:title=>"Homhom", :date=>"2015-01-01")
-      actual = obj.eruby_render_text(:'example.text', layout: false)
       expected = <<'END'
 title: Homhom
 date:  2015-01-01
 END
+      #
+      obj = HelloClass.new(:title=>"Homhom", :date=>"2015-01-01")
+      actual = obj.eruby_render_text(:'example.text', layout: false)
+      assert_equal expected, actual
+      #
+      obj = HelloClass.new(:title=>"Homhom", :date=>"2015-01-01")
+      actual = obj.eruby_render_text('example.text.erb', layout: false)
       assert_equal expected, actual
     end
 

data/test/run_all.rb

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

data/test/script_test.rb

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

data/test/template_test.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baby_erubis
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies: []
 description: |
   BabyErubis is an yet another eRuby implementation, based on Erubis.
@@ -25,21 +25,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.md
-- Rakefile
-- baby_erubis.gemspec
-- bin/baby_erubis
 - lib/baby_erubis.rb
 - lib/baby_erubis/rails.rb
 - lib/baby_erubis/renderer.rb
-- setup.rb
 - test/context_test.rb
 - test/rails_test.rb
 - test/renderer_test.rb
 - test/run_all.rb
 - test/script_test.rb
 - test/template_test.rb
+- bin/baby_erubis
+- README.md
+- MIT-LICENSE
+- setup.rb
+- baby_erubis.gemspec
+- Rakefile
 homepage: https://github.com/kwatch/BabyErubis/tree/ruby
 licenses:
 - MIT License
@@ -50,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: yet another eRuby implementation based on Erubis