temple 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ca8f3e947dac83c75a1a000ee6704e648b5b2b
-  data.tar.gz: 61b7cc39adfe732535a96b6c3e7f9f8876233869
+  metadata.gz: f7c1968702feac9a8f7896e4e008493532566765
+  data.tar.gz: 630b90231c21489a501190a82814803d48fe5e48
 SHA512:
-  metadata.gz: c2bdfd18f5484eb9af801a382d518d02a04bb7944171203ecafa358b81095c1ddbc17288ba1d2de0417159a56d90207584b5da8499e74dcce08924e1d53e885d
-  data.tar.gz: 29159d5eab3f95322e5a8b6058ae095df229667c0e9fcdb769070eb6874713e32ad0cacf326be483503b864c3e7e27d12aa0601c4ea48a4d9be7cb04ffe9512a
+  metadata.gz: 4d9cce38ee024916f18e3ee79f1c4db8d99a52d03abbf51c01c60b91c13fb64259736484281470bf5244e12775083338797dc3c99f44908e05ce63ccc2a79356
+  data.tar.gz: e462b1b2b1acab154556ec0dc5edf3a57004fde0075ee1856e40a54e9e6446f7826a2bdf2c14dbb5d598ea66641e101c99035e5ce2be8185cdf50596d3a01ed7

data/CHANGES

@@ -1,3 +1,7 @@
+0.7.2
+
+  * Remove Filters::StaticFreezer, the generator does the freezing
+
 0.7.1
 
   * Rename *Hash to *Map

data/lib/temple.rb

@@ -44,7 +44,6 @@ module Temple
     autoload :ControlFlow,        'temple/filters/control_flow'
     autoload :MultiFlattener,     'temple/filters/multi_flattener'
     autoload :StaticMerger,       'temple/filters/static_merger'
-    autoload :StaticFreezer,      'temple/filters/static_freezer'
     autoload :DynamicInliner,     'temple/filters/dynamic_inliner'
     autoload :Escapable,          'temple/filters/escapable'
     autoload :Eraser,             'temple/filters/eraser'

data/lib/temple/erb/engine.rb

@@ -8,7 +8,7 @@ module Temple
       use Temple::ERB::Trimming
       filter :Escapable
       filter :MultiFlattener
-      filter :DynamicInliner
+      filter :StaticMerger
       generator :ArrayBuffer
     end
   end

data/lib/temple/generator.rb

@@ -11,7 +11,8 @@ module Temple
 
     define_options :save_buffer,
                    capture_generator: 'StringBuffer',
-                   buffer: '_buf'
+                   buffer: '_buf',
+                   freeze_static: RUBY_VERSION >= '2.1'
 
     def call(exp)
       [preamble, compile(exp), postamble].flatten.compact.join('; ')
@@ -57,7 +58,7 @@ module Temple
     end
 
     def on_static(text)
-      concat(text.inspect)
+      concat(options[:freeze_static] ? "#{text.inspect}.freeze" : text.inspect)
     end
 
     def on_dynamic(code)

data/lib/temple/generators/erb.rb

@@ -20,10 +20,6 @@ module Temple
         text
       end
 
-      def on_newline
-        "<%\n%>"
-      end
-
       def on_dynamic(code)
         "<%= #{code} %>"
       end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/test/test_generator.rb

@@ -77,7 +77,7 @@ end
 
 describe Temple::Generators::Array do
   it 'should compile simple expressions' do
-    gen = Temple::Generators::Array.new
+    gen = Temple::Generators::Array.new(freeze_static: false)
     gen.call([:static,  'test']).should.equal '_buf = []; _buf << ("test"); _buf'
     gen.call([:dynamic, 'test']).should.equal '_buf = []; _buf << (test); _buf'
     gen.call([:code,    'test']).should.equal '_buf = []; test; _buf'
@@ -85,11 +85,16 @@ describe Temple::Generators::Array do
     gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = []; _buf << ("a"); _buf << ("b"); _buf'
     gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = []; _buf << ("a"); _buf << (b); _buf'
   end
+
+  it 'should freeze static' do
+    gen = Temple::Generators::Array.new(freeze_static: true)
+    gen.call([:static,  'test']).should.equal '_buf = []; _buf << ("test".freeze); _buf'
+  end
 end
 
 describe Temple::Generators::ArrayBuffer do
   it 'should compile simple expressions' do
-    gen = Temple::Generators::ArrayBuffer.new
+    gen = Temple::Generators::ArrayBuffer.new(freeze_static: false)
     gen.call([:static,  'test']).should.equal '_buf = "test"'
     gen.call([:dynamic, 'test']).should.equal '_buf = (test).to_s'
     gen.call([:code,    'test']).should.equal '_buf = []; test; _buf = _buf.join'
@@ -97,11 +102,17 @@ describe Temple::Generators::ArrayBuffer do
     gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = []; _buf << ("a"); _buf << ("b"); _buf = _buf.join'
     gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = []; _buf << ("a"); _buf << (b); _buf = _buf.join'
   end
+
+  it 'should freeze static' do
+    gen = Temple::Generators::ArrayBuffer.new(freeze_static: true)
+    gen.call([:static,  'test']).should.equal '_buf = "test"'
+    gen.call([:multi, [:dynamic, '1'], [:static,  'test']]).should.equal '_buf = []; _buf << (1); _buf << ("test".freeze); _buf = _buf.join'
+  end
 end
 
 describe Temple::Generators::StringBuffer do
   it 'should compile simple expressions' do
-    gen = Temple::Generators::StringBuffer.new
+    gen = Temple::Generators::StringBuffer.new(freeze_static: false)
     gen.call([:static,  'test']).should.equal '_buf = "test"'
     gen.call([:dynamic, 'test']).should.equal '_buf = (test).to_s'
     gen.call([:code,    'test']).should.equal '_buf = \'\'; test; _buf'
@@ -109,6 +120,12 @@ describe Temple::Generators::StringBuffer do
     gen.call([:multi, [:static, 'a'], [:static,  'b']]).should.equal '_buf = \'\'; _buf << ("a"); _buf << ("b"); _buf'
     gen.call([:multi, [:static, 'a'], [:dynamic, 'b']]).should.equal '_buf = \'\'; _buf << ("a"); _buf << ((b).to_s); _buf'
   end
+
+  it 'should freeze static' do
+    gen = Temple::Generators::StringBuffer.new(freeze_static: true)
+    gen.call([:static,  'test']).should.equal '_buf = "test"'
+    gen.call([:multi, [:dynamic, '1'], [:static,  'test']]).should.equal '_buf = \'\'; _buf << ((1).to_s); _buf << ("test".freeze); _buf'
+  end
 end
 
 describe Temple::Generators::ERB do
@@ -125,7 +142,7 @@ end
 
 describe Temple::Generators::RailsOutputBuffer do
   it 'should compile simple expressions' do
-    gen = Temple::Generators::RailsOutputBuffer.new
+    gen = Temple::Generators::RailsOutputBuffer.new(freeze_static: false)
     gen.call([:static,  'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
       '@output_buffer.safe_concat(("test")); @output_buffer'
     gen.call([:dynamic, 'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
@@ -133,4 +150,9 @@ describe Temple::Generators::RailsOutputBuffer do
     gen.call([:code,    'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; ' +
       'test; @output_buffer'
   end
+
+  it 'should freeze static' do
+    gen = Temple::Generators::RailsOutputBuffer.new(freeze_static: true)
+    gen.call([:static,  'test']).should.equal '@output_buffer = ActiveSupport::SafeBuffer.new; @output_buffer.safe_concat(("test".freeze)); @output_buffer'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -86,7 +86,6 @@ files:
 - lib/temple/filters/escapable.rb
 - lib/temple/filters/multi_flattener.rb
 - lib/temple/filters/remove_bom.rb
-- lib/temple/filters/static_freezer.rb
 - lib/temple/filters/static_merger.rb
 - lib/temple/filters/validator.rb
 - lib/temple/generator.rb
@@ -123,7 +122,6 @@ files:
 - test/filters/test_eraser.rb
 - test/filters/test_escapable.rb
 - test/filters/test_multi_flattener.rb
-- test/filters/test_static_freezer.rb
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/html/test_attribute_merger.rb
@@ -164,5 +162,26 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby
-test_files: []
-has_rdoc: 
+test_files:
+- test/filters/test_code_merger.rb
+- test/filters/test_control_flow.rb
+- test/filters/test_dynamic_inliner.rb
+- test/filters/test_eraser.rb
+- test/filters/test_escapable.rb
+- test/filters/test_multi_flattener.rb
+- test/filters/test_static_merger.rb
+- test/helper.rb
+- test/html/test_attribute_merger.rb
+- test/html/test_attribute_remover.rb
+- test/html/test_attribute_sorter.rb
+- test/html/test_fast.rb
+- test/html/test_pretty.rb
+- test/mixins/test_dispatcher.rb
+- test/mixins/test_grammar_dsl.rb
+- test/test_engine.rb
+- test/test_erb.rb
+- test/test_filter.rb
+- test/test_generator.rb
+- test/test_grammar.rb
+- test/test_map.rb
+- test/test_utils.rb

data/lib/temple/filters/static_freezer.rb

@@ -1,11 +0,0 @@
-module Temple
-  module Filters
-    class StaticFreezer < Filter
-      define_options freeze_static: RUBY_VERSION >= '2.1'
-
-      def on_static(s)
-        options[:freeze_static] ? [:dynamic, "#{s.inspect}.freeze"] : [:static, s]
-      end
-    end
-  end
-end

data/test/filters/test_static_freezer.rb

@@ -1,25 +0,0 @@
-require 'helper'
-
-describe Temple::Filters::StaticFreezer do
-  if RUBY_VERSION >= '2.1'
-    it 'should freeze static on new ruby' do
-      filter = Temple::Filters::StaticFreezer.new
-      filter.call([:static, 'hi']).should.equal [:dynamic, '"hi".freeze']
-    end
-  else
-    it 'should not freeze static on old ruby' do
-      filter = Temple::Filters::StaticFreezer.new
-      filter.call([:static, 'hi']).should.equal [:static, 'hi']
-    end
-  end
-
-  it 'should freeze static if free_static==true' do
-    filter = Temple::Filters::StaticFreezer.new(freeze_static: true)
-    filter.call([:static, 'hi']).should.equal [:dynamic, '"hi".freeze']
-  end
-
-  it 'should not freeze static if free_static==false' do
-    filter = Temple::Filters::StaticFreezer.new(freeze_static: false)
-    filter.call([:static, 'hi']).should.equal [:static, 'hi']
-  end
-end