tenjin 0.7.0 → 0.7.1

data/CHANGES.txt

@@ -2,7 +2,21 @@
 = CHANGES
 
 
-== Release 0.7.0
+== Release 0.7.1 (2011-11-27)
+
+* [bugfix] Tenjin::Template class now considers magic comment in template file.
+  For example:
+
+      <?rb # -*- coding: utf-8 -*- ?>
+      <p>This template file is treated as utf-8 string</p>
+
+* [bugfix] Add 'FollowSymLinks' option to 'public_html/.htaccess'.
+  That option is necessary to enable mod_rewrite.
+
+* [bugfix] Fix 'public_html/hello.rbhtml' to set empty string when request parameter is not set.
+
+
+== Release 0.7.0 (2011-11-24)
 
 * [enhance] Support Ruby 1.9.
 

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	0.7.0
+release::	0.7.1
 copyright::	copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 
 
@@ -34,11 +34,11 @@ See doc/*.html for details.
 
     $ sudo gem install tenjin
 
-* Else download rbtenjin-0.7.0.tar.bz2 and just copy 'lib/tenjin.rb' and
+* Else download rbtenjin-0.7.1.tar.bz2 and just copy 'lib/tenjin.rb' and
   'bin/rbtenjin' into proper directory.
 
-    $ tar xjf rbtenjin-0.7.0.tar.bz2
-    $ cd rbtenjin-0.7.0/
+    $ tar xjf rbtenjin-0.7.1.tar.bz2
+    $ cd rbtenjin-0.7.1/
     $ sudo copy lib/tenjin.rb /usr/local/lib/ruby/1.8/site_ruby/1.8/
     $ sudo copy bin/rbtenjin /usr/local/bin/
 

data/bin/rbtenjin

@@ -24,7 +24,7 @@
 ##
 
 ##
-## $Release: 0.7.0 $
+## $Release: 0.7.1 $
 ## copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ## $License: MIT License $
 ##

data/doc/users-guide.html

@@ -17,7 +17,7 @@
       </div>
 
       <div align="left">
-        release: 0.7.0<br>
+        release: 0.7.1<br>
       </div>
 
       <div class="toc"><span class="caption">Table of Contents:</span>

data/lib/tenjin.rb

@@ -24,14 +24,14 @@
 ##
 ## Tenjin -- a very fast and full-featured template engine
 ##
-## $Release: 0.7.0 $
+## $Release: 0.7.1 $
 ## copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ## $License: MIT License $
 ##
 
 module Tenjin
 
-  RELEASE = ('$Release: 0.7.0 $' =~ /[\d.]+/) && $&
+  RELEASE = ('$Release: 0.7.1 $' =~ /[\d.]+/) && $&
 
 
   ##
@@ -760,7 +760,18 @@ module Tenjin
 
     ## create proc object
     def _render()   # :nodoc:
-      return eval("proc { |_context| self._buf = _buf = #{init_buf_expr()}; #{@script}; #{finish_buf_expr()} }".untaint, nil, @filename || '(tenjin)')
+      return eval(_to_proc_code(@script).untaint, nil, @filename || '(tenjin)')
+    end
+
+    def _to_proc_code(script)
+      ## take care of magic comment when compiling script into proc object
+      m = /\A[ \t]*\#.*coding[:=][ \t]*[-.\w]+.*\n/.match(script)
+      if m
+        pos = m.end(0)
+        "#{script[0...pos]}proc do |_context| self._buf = _buf = #{init_buf_expr()}; #{@script[pos..-1]}; #{finish_buf_expr()} end"
+      else
+        "proc do |_context| self._buf = _buf = #{init_buf_expr()}; #{@script}; #{finish_buf_expr()} end"
+      end
     end
 
     public

data/public_html/hello.rbhtml

@@ -2,7 +2,7 @@
 
 require 'cgi'  # or 'cgialt' for performance
 cgi = CGI.new
-name = cgi.params['name'].first
+name = cgi.params['name'].first || ''
 name = 'World' if name.empty?
 lang = ENV['HTTP_ACCEPT_LANGUAGE'] =~ /ja/ ? 'ja' : 'en'
 ?>

data/public_html/rbtenjin.cgi

@@ -17,7 +17,7 @@
 ##
 ## and access to http://localhost/ (or http://localhost/~yourname/).
 ##
-## $Release: 0.7.0 $
+## $Release: 0.7.1 $
 ## copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ## $License: MIT License $
 ##

data/tenjin.gemspec

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   s.author      = "makoto kuwata"
   s.email       = "kwa(at)kuwata-lab.com"
   s.rubyforge_project = 'tenjin'
-  s.version     = "0.7.0"
+  s.version     = "0.7.1"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "http://www.kuwata-lab.com/tenjin/"
   s.summary     = "very fast and full-featured template engine"

data/test/oktest.rb

@@ -1,5 +1,5 @@
 ###
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ### $License: MIT License $
 ###

data/test/test_all.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_engine.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_examples.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_faq.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_htmlhelper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_main.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_safe.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_store.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_tcache.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/test_template.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 
@@ -161,6 +161,21 @@ END
     Tenjin::Template.TRACE = false
   end
 
+  def test_magic_comment
+    input = <<'END'
+<?rb   # -*- coding: euc-jp -*- ?>
+<p>hello ${@name}!</p>
+END
+    t = Tenjin::Template.new
+    t.convert(input)
+    s = t.__send__(:_to_proc_code, t.script)
+    ok_(s) =~ /\A  # -\*- coding: euc-jp -\*-\nproc do/
+    output = t.render({:name=>"Haruhi"})
+    if "".respond_to?(:encoding)
+      ok_(output.encoding.to_s) == 'EUC-JP'
+    end
+  end
+
 
 end
 

data/test/test_users_guide.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/testcase-helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 0.7.0 $
+### $Release: 0.7.1 $
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

data/test/testunit-assertions.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### 0.7.0
+### 0.7.1
 ### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tenjin
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  hash: 1
+  prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 +09:00
-default_executable: 
+date: 2011-11-27 00:00:00 Z
 dependencies: []
 
 description: "  Tenjin is a template engine and has the following features.\n  * Very fast and lightweight\n  * Small and only a file\n  * Auto escaping support\n  * Auto trimming spaces around embedded statements\n  * Context object available\n  * Able to load YAML data file\n  * Preprocessing support\n"
@@ -251,7 +256,6 @@ files:
 - public_html/hello.rbhtml
 - public_html/index.rbhtml
 - public_html/rbtenjin.cgi
-has_rdoc: true
 homepage: http://www.kuwata-lab.com/tenjin/
 licenses: []
 
@@ -261,21 +265,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: tenjin
-rubygems_version: 1.3.5
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: very fast and full-featured template engine