diff options
38 files changed, 78 insertions, 69 deletions
@@ -1,5 +1,5 @@ # $Rev$ -# $Release: 0.0.0 $ +# $Release:$ # $Copyright$ diff --git a/ChangeLog.txt b/ChangeLog.txt index 8abaaeb..dd8e969 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,7 +2,11 @@ .?lastupdate: $Date$ .?version: $Rev$ -: Rev.76 (2007-05-16) +: Rev.77 (2007-05-18) + .- [refactor] remove RailsHelperEruby from helpers/rails.rb + .- [bugfix] change context key 'code' to 'symbol' in benchmark/bench_context.yaml + +: Rev.76 (2007-05-15) .- [enhance] new command-line option '-X', '-N', '-C', and '-U' support .- [change] command 'notext' has been removed .- [change] remove test/test-notext.{rb,yaml} diff --git a/Rookbook.yaml b/Rookbook.yaml index d409bf2..5a9bc2b 100644 --- a/Rookbook.yaml +++ b/Rookbook.yaml @@ -121,6 +121,7 @@ recipes: rm_rf dir if test(?d, dir) mkdir_p dir # + rm_f 'test/data/**/*.cache' #store 'lib/**/*', 'bin/*', 'test/**/*', text_files, dir store 'lib/**/*', 'bin/*', 'test/**/*', text_files, dir do |f| base = File.basename(f) @@ -146,7 +147,8 @@ recipes: cp_r '$(inline_require_script)', "#{dir}/contrib" # edit "#{dir}/**/*" do |content| - content.gsub!(/\$Release.*?\$/, "$Release: $(1) $") + content.gsub!(/\$Release\$/, "$(1)") + content.gsub!(/\$Release:.*?\$/, "$Release: $(1) $") content.gsub!(/\$Copyright.*?\$/, '$(copyright)') content end diff --git a/benchmark/bench.rb b/benchmark/bench.rb index dbf8ed4..7df11cf 100644 --- a/benchmark/bench.rb +++ b/benchmark/bench.rb @@ -2,7 +2,7 @@ ### ### $Rev$ -### $Release: $ +### $Release:$ ### $Copyright$ ### diff --git a/benchmark/bench_context.yaml b/benchmark/bench_context.yaml index e31b560..e0ab4e8 100644 --- a/benchmark/bench_context.yaml +++ b/benchmark/bench_context.yaml @@ -2,140 +2,140 @@ list: - name: Adobe Systems name2: Adobe Systems Inc. url: http://www.adobe.com - code: ADBE + symbol: ADBE price: 39.26 change: 0.13 ratio: 0.33 - name: Advanced Micro Devices name2: Advanced Micro Devices Inc. url: http://www.amd.com - code: AMD + symbol: AMD price: 16.22 change: 0.17 ratio: 1.06 - name: Amazon.com name2: Amazon.com Inc url: http://www.amazon.com - code: AMZN + symbol: AMZN price: 36.85 change: -0.23 ratio: -0.62 - name: Apple name2: Apple Inc. url: http://www.apple.com - code: AAPL + symbol: AAPL price: 85.38 change: -0.87 ratio: -1.01 - name: BEA Systems name2: BEA Systems Inc. url: http://www.bea.com - code: BEAS + symbol: BEAS price: 12.46 change: 0.09 ratio: 0.73 - name: CA name2: CA, Inc. url: http://www.ca.com - code: CA + symbol: CA price: 24.66 change: 0.38 ratio: 1.57 - name: Cisco Systems name2: Cisco Systems Inc. url: http://www.cisco.com - code: CSCO + symbol: CSCO price: 26.35 change: 0.13 ratio: 0.5 - name: Dell name2: Dell Corp. url: http://www.dell.com/ - code: DELL + symbol: DELL price: 23.73 change: -0.42 ratio: -1.74 - name: eBay name2: eBay Inc. url: http://www.ebay.com - code: EBAY + symbol: EBAY price: 31.65 change: -0.8 ratio: -2.47 - name: Google name2: Google Inc. url: http://www.google.com - code: GOOG + symbol: GOOG price: 495.84 change: 7.75 ratio: 1.59 - name: Hewlett-Packard name2: Hewlett-Packard Co. url: http://www.hp.com - code: HPQ + symbol: HPQ price: 41.69 change: -0.02 ratio: -0.05 - name: IBM name2: International Business Machines Corp. url: http://www.ibm.com - code: IBM + symbol: IBM price: 97.45 change: -0.06 ratio: -0.06 - name: Intel name2: Intel Corp. url: http://www.intel.com - code: INTC + symbol: INTC price: 20.53 change: -0.07 ratio: -0.34 - name: Juniper Networks name2: Juniper Networks, Inc url: http://www.juniper.net/ - code: JNPR + symbol: JNPR price: 18.96 change: 0.5 ratio: 2.71 - name: Microsoft name2: Microsoft Corp url: http://www.microsoft.com - code: MSFT + symbol: MSFT price: 30.6 change: 0.15 ratio: 0.49 - name: Oracle name2: Oracle Corp. url: http://www.oracle.com - code: ORCL + symbol: ORCL price: 17.15 change: 0.17 ratio: 1.0 - name: SAP name2: SAP AG url: http://www.sap.com - code: SAP + symbol: SAP price: 46.2 change: -0.16 ratio: -0.35 - name: Seagate Technology name2: Seagate Technology url: http://www.seagate.com/ - code: STX + symbol: STX price: 27.35 change: -0.36 ratio: -1.3 - name: Sun Microsystems name2: Sun Microsystems Inc. url: http://www.sun.com - code: SUNW + symbol: SUNW price: 6.33 change: -0.01 ratio: -0.16 - name: Yahoo name2: Yahoo! Inc. url: http://www.yahoo.com - code: YHOO + symbol: YHOO price: 28.04 change: -0.17 ratio: -0.6 @@ -2,7 +2,7 @@ ### ### $Rev$ -### $Release$ +### $Release:$ ### $Copyright$ ### diff --git a/doc/users-guide.html b/doc/users-guide.html index 1a93a38..451a7c4 100644 --- a/doc/users-guide.html +++ b/doc/users-guide.html @@ -2382,7 +2382,7 @@ try Erubis::TinyEruby class. <div class="program_caption"> config/environment.rb</div> <pre class="program">require 'erubis/helpers/rails_helper' -#Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby +#Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby # or Erubis::FastEruby #Erubis::Helpers::RailsHelper.init_properties = {} #Erubis::Helpers::RailsHelper.show_src = false </pre> diff --git a/doc/users-guide.txt b/doc/users-guide.txt index 16a5c12..a0d7b4a 100644 --- a/doc/users-guide.txt +++ b/doc/users-guide.txt @@ -2486,7 +2486,7 @@ Erubis supports Ruby on Rails. .? config/environment.rb .-------------------- require 'erubis/helpers/rails_helper' - #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby + #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby # or Erubis::FastEruby #Erubis::Helpers::RailsHelper.init_properties = {} #Erubis::Helpers::RailsHelper.show_src = false .-------------------- diff --git a/erubis.gemspec b/erubis.gemspec index b269230..79034e1 100644 --- a/erubis.gemspec +++ b/erubis.gemspec @@ -12,7 +12,7 @@ spec = Gem::Specification.new do |s| ## package information s.name = "erubis" s.author = "makoto kuwata" - s.version = ("$Release$" =~ /[\.\d]+/) && $& + s.version = "$Release$" s.platform = Gem::Platform::RUBY s.homepage = "http://rubyforge.org/projects/erubis" s.summary = "a fast and extensible eRuby implementation which supports multi-language" @@ -37,13 +37,14 @@ spec = Gem::Specification.new do |s| files += Dir.glob('bin/*') files += Dir.glob('examples/**/*') files += Dir.glob('test/*.rb') + files += Dir.glob('test/data/**/*') files += %w[doc/users-guide.html doc/docstyle.css] files += %w[README.txt CHANGES MIT-LICENSE setup.rb] files += Dir.glob('contrib/*') files += Dir.glob('benchmark/*') files += Dir.glob('doc-api/**/*') s.files = files - s.executables = ['erubis', 'notext'] + s.executables = ['erubis'] s.bindir = 'bin' s.test_file = 'test/test.rb' s.add_dependency('abstract', ['>= 1.0.0']) diff --git a/lib/erubis/context.rb b/lib/erubis/context.rb index 1f285f4..5378d01 100644 --- a/lib/erubis/context.rb +++ b/lib/erubis/context.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/converter.rb b/lib/erubis/converter.rb index 716dded..8ad0121 100644 --- a/lib/erubis/converter.rb +++ b/lib/erubis/converter.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine.rb b/lib/erubis/engine.rb index 20e767b..c1e1e79 100644 --- a/lib/erubis/engine.rb +++ b/lib/erubis/engine.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## @@ -80,7 +80,7 @@ module Erubis ## - ## helper method evaluate Proc object iwth contect object. + ## helper method evaluate Proc object with contect object. ## context may be Binding, Hash, or Object. ## def process_proc(proc_obj, context=nil, filename=nil) diff --git a/lib/erubis/engine/ec.rb b/lib/erubis/engine/ec.rb index 20d7ccc..316c096 100644 --- a/lib/erubis/engine/ec.rb +++ b/lib/erubis/engine/ec.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/ejava.rb b/lib/erubis/engine/ejava.rb index 66e6736..411ab50 100644 --- a/lib/erubis/engine/ejava.rb +++ b/lib/erubis/engine/ejava.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/ejavascript.rb b/lib/erubis/engine/ejavascript.rb index f8b35d2..910433f 100644 --- a/lib/erubis/engine/ejavascript.rb +++ b/lib/erubis/engine/ejavascript.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/enhanced.rb b/lib/erubis/engine/enhanced.rb index eddee48..f8cc820 100644 --- a/lib/erubis/engine/enhanced.rb +++ b/lib/erubis/engine/enhanced.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/eperl.rb b/lib/erubis/engine/eperl.rb index 2d9df37..7ffe9ee 100644 --- a/lib/erubis/engine/eperl.rb +++ b/lib/erubis/engine/eperl.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/ephp.rb b/lib/erubis/engine/ephp.rb index 5e20d14..bc93900 100644 --- a/lib/erubis/engine/ephp.rb +++ b/lib/erubis/engine/ephp.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/eruby.rb b/lib/erubis/engine/eruby.rb index 1491a32..b81b836 100644 --- a/lib/erubis/engine/eruby.rb +++ b/lib/erubis/engine/eruby.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/escheme.rb b/lib/erubis/engine/escheme.rb index 392ab9a..22f87d8 100644 --- a/lib/erubis/engine/escheme.rb +++ b/lib/erubis/engine/escheme.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/engine/optimized.rb b/lib/erubis/engine/optimized.rb index a4def3e..042d105 100644 --- a/lib/erubis/engine/optimized.rb +++ b/lib/erubis/engine/optimized.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/enhancer.rb b/lib/erubis/enhancer.rb index c7e125c..3b61975 100644 --- a/lib/erubis/enhancer.rb +++ b/lib/erubis/enhancer.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/error.rb b/lib/erubis/error.rb index 0fe2771..f3bf419 100644 --- a/lib/erubis/error.rb +++ b/lib/erubis/error.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/evaluator.rb b/lib/erubis/evaluator.rb index a5c57f1..b2100db 100644 --- a/lib/erubis/evaluator.rb +++ b/lib/erubis/evaluator.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/generator.rb b/lib/erubis/generator.rb index 9a26ddf..b2cf46d 100644 --- a/lib/erubis/generator.rb +++ b/lib/erubis/generator.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/helper.rb b/lib/erubis/helper.rb index 07cdbe1..489eaa2 100644 --- a/lib/erubis/helper.rb +++ b/lib/erubis/helper.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/helpers/rails_helper.rb b/lib/erubis/helpers/rails_helper.rb index 5f836c5..d006eca 100644 --- a/lib/erubis/helpers/rails_helper.rb +++ b/lib/erubis/helpers/rails_helper.rb @@ -1,6 +1,6 @@ ### ### $Rev$ -### $Release$ +### $Release:$ ### $Copyright$ ### @@ -10,6 +10,14 @@ require 'erubis' module Erubis + class Eruby + include ErboutEnhancer + end + + class FastEruby + include ErboutEnhancer + end + module Helpers ## @@ -20,9 +28,9 @@ module Erubis ## 1. add the folliwng code in your 'config/environment.rb' ## ## require 'erubis/helpers/rails_helper' - ## #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby + ## #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby # or Erubis::FastEruby ## #Erubis::Helpers::RailsHelper.init_properties = {} - ## #Erubis::Helpers::RailsHelper.show_src = false + ## #Erubis::Helpers::RailsHelper.show_src = false # set true for debugging ## ## 2. (optional) apply the patch for 'action_view/base.rb' ## @@ -36,15 +44,9 @@ module Erubis ## module RailsHelper - class RailsHelperEruby < Erubis::Eruby - include Erubis::ErboutEnhancer - #include Erubis::InterpolationEnhancer - #include Erubis::DeleteIndentEnhancer - end - #cattr_accessor :init_properties - @@engine_class = Erubis::RailsHelper::RailsHelperEruby - #@@engine_class = Erubis::Eruby + @@engine_class = Erubis::Eruby + #@@engine_class = Erubis::FastEruby def self.engine_class @@engine_class diff --git a/lib/erubis/local-setting.rb b/lib/erubis/local-setting.rb index c2f75e8..71aa662 100644 --- a/lib/erubis/local-setting.rb +++ b/lib/erubis/local-setting.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb index a0c601a..7f81b17 100644 --- a/lib/erubis/main.rb +++ b/lib/erubis/main.rb @@ -1,6 +1,6 @@ ### ### $Rev$ -### $Release$ +### $Release:$ ### $Copyright$ ### diff --git a/lib/erubis/tiny.rb b/lib/erubis/tiny.rb index 767de35..d3b3639 100644 --- a/lib/erubis/tiny.rb +++ b/lib/erubis/tiny.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/test/assert-text-equal.rb b/test/assert-text-equal.rb index b3e5749..d760fd6 100644 --- a/test/assert-text-equal.rb +++ b/test/assert-text-equal.rb @@ -1,6 +1,6 @@ ### ### $Rev$ -### $Release$ +### $Release:$ ### $Copyright$ ### diff --git a/test/test-engines.rb b/test/test-engines.rb index 45eaea8..705a682 100644 --- a/test/test-engines.rb +++ b/test/test-engines.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/test/test-enhancers.rb b/test/test-enhancers.rb index 0d20ace..5b9a47b 100644 --- a/test/test-enhancers.rb +++ b/test/test-enhancers.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/test/test-erubis.rb b/test/test-erubis.rb index 3fea2f9..9b699c2 100644 --- a/test/test-erubis.rb +++ b/test/test-erubis.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/test/test-main.rb b/test/test-main.rb index d3b672e..c1a63d9 100644 --- a/test/test-main.rb +++ b/test/test-main.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Date$ ## diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb index b7c0520..fc82a66 100644 --- a/test/test-users-guide.rb +++ b/test/test-users-guide.rb @@ -1,6 +1,6 @@ ### ### $Rev$ -### $Release: 0.0.0 $ +### $Release:$ ### $Copyright$ ### diff --git a/test/test.rb b/test/test.rb index 18590cb..f7dc2c5 100644 --- a/test/test.rb +++ b/test/test.rb @@ -1,6 +1,6 @@ ## ## $Rev$ -## $Release$ +## $Release:$ ## $Copyright$ ## diff --git a/test/testutil.rb b/test/testutil.rb index 586de8e..15cba2b 100644 --- a/test/testutil.rb +++ b/test/testutil.rb @@ -1,6 +1,6 @@ ### ### $Rev$ -### $Release$ +### $Release:$ ### $Copyright$ ### |