temple 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7c1968702feac9a8f7896e4e008493532566765
-  data.tar.gz: 630b90231c21489a501190a82814803d48fe5e48
+  metadata.gz: 7a5698e0987714d41aa759069655a1c276a5aab1
+  data.tar.gz: 58ae7b8dca8c28264ae03e9136e017f8a6c2efbe
 SHA512:
-  metadata.gz: 4d9cce38ee024916f18e3ee79f1c4db8d99a52d03abbf51c01c60b91c13fb64259736484281470bf5244e12775083338797dc3c99f44908e05ce63ccc2a79356
-  data.tar.gz: e462b1b2b1acab154556ec0dc5edf3a57004fde0075ee1856e40a54e9e6446f7826a2bdf2c14dbb5d598ea66641e101c99035e5ce2be8185cdf50596d3a01ed7
+  metadata.gz: b50a65d9d25973bf7470b3cc5d835bce94ff386e886570a3b6d9412b3aea312bf791bc70a6203025515a902dbe25a554d9ecf7f7ea81dcdf16322d6997e3b06a
+  data.tar.gz: c2e805cd2ba16d0a27af4686f0b50df4f2013b4ad146284ba952b1fe0146d4ff31d4c3954655d979ffb907b0c4eb1a4e1b81f966dbd96a5756ebc35115c80b49

data/CHANGES

@@ -1,3 +1,7 @@
+0.7.3
+
+  * Temple::ERB::Trimming - replace option trim_mode with trim and switch to erubis-like trimming
+
 0.7.2
 
   * Remove Filters::StaticFreezer, the generator does the freezing

data/lib/temple/engine.rb

@@ -57,7 +57,11 @@ module Temple
     end
 
     def call_chain
-      @call_chain ||= @chain.map {|name, constructor| constructor.call(self) }.compact
+      @call_chain ||= @chain.map do |name, constructor|
+        f = constructor.call(self)
+        raise "Constructor #{name} must return callable object" if f && !f.respond_to?(:call)
+        f
+      end.compact
     end
   end
 end

data/lib/temple/erb/trimming.rb

@@ -1,38 +1,23 @@
 module Temple
   module ERB
-    # ERB trimming
-    # Set option :trim_mode to
-    #    <> - omit newline for lines starting with <% and ending in %>
-    #    >  - omit newline for lines ending in %>
-    #
+    # ERB trimming like in erubis
+    # Deletes spaces around '<% %>' and leave spaces around '<%= %>'.
     # @api public
     class Trimming < Filter
-      define_options :trim_mode
+      define_options trim: true
 
       def on_multi(*exps)
-        case options[:trim_mode]
-        when '>'
-          i = 0
-          while i < exps.size
-            exps.delete_at(i + 1) if code?(exps[i]) && exps[i+1] == [:static, "\n"]
-            i += 1
+        exps = exps.each_with_index.map do |e,i|
+          if e.first == :static && i > 0 && exps[i-1].first == :code
+            [:static, e.last.lstrip]
+          elsif e.first == :static && i < exps.size-1 && exps[i+1].first == :code
+            [:static, e.last.rstrip]
+          else
+            e
           end
-        when '<>'
-          i = 0
-          while i < exps.size
-            exps.delete_at(i + 1) if code?(exps[i]) && exps[i+1] == [:static, "\n"] &&
-                                     (!exps[i-1] || (exps[i-1] == [:newline]))
-            i += 1
-          end
-        end
+        end if options[:trim]
         [:multi, *exps]
       end
-
-      protected
-
-      def code?(exp)
-        exp[0] == :escape || exp[0] == :code
-      end
     end
   end
 end

data/lib/temple/mixins/engine_dsl.rb

@@ -17,15 +17,7 @@ module Temple
 
       def remove(name)
         name = chain_name(name)
-        found = false
-        chain.reject! do |i|
-          if i.first == name
-            found = true
-          else
-            false
-          end
-        end
-        raise "#{name} not found" unless found
+        raise "#{name} not found" unless chain.reject! {|i| i.first == name }
         chain_modified!
       end
 
@@ -34,47 +26,24 @@ module Temple
       def before(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        found, i = false, 0
-        while i < chain.size
-          if chain[i].first == name
-            found = true
-            chain.insert(i, e)
-            i += 2
-          else
-            i += 1
-          end
-        end
-        raise "#{name} not found" unless found
+        chain.map! {|f| f.first == name ? [e, f] : [f] }.flatten!(1)
+        raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
 
       def after(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        found, i = false, 0
-        while i < chain.size
-          if chain[i].first == name
-            found = true
-            i += 1
-            chain.insert(i, e)
-          end
-          i += 1
-        end
-        raise "#{name} not found" unless found
+        chain.map! {|f| f.first == name ? [f, e] : [f] }.flatten!(1)
+        raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
 
       def replace(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        found = false
-        chain.each_with_index do |c, i|
-          if c.first == name
-            found = true
-            chain[i] = e
-          end
-        end
-        raise "#{name} not found" unless found
+        chain.map! {|f| f.first == name ? e : f }
+        raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
 
@@ -108,28 +77,9 @@ module Temple
       def chain_proc_constructor(name, filter)
         raise(ArgumentError, 'Proc or blocks must have arity 0 or 1') if filter.arity > 1
         method_name = "FILTER #{name}"
-        if Class === self
-          define_method(method_name, &filter)
-          filter = instance_method(method_name)
-          if filter.arity == 1
-            proc {|engine| filter.bind(engine) }
-          else
-            proc do |engine|
-              f = filter.bind(engine).call
-              raise 'Constructor must return callable object' unless f.respond_to?(:call)
-              f
-            end
-          end
-        else
-          (class << self; self; end).class_eval { define_method(method_name, &filter) }
-          filter = method(method_name)
-          proc {|engine| filter }
-        end
-      end
-
-      def chain_callable_constructor(filter)
-        raise(ArgumentError, 'Class or callable argument is required') unless filter.respond_to?(:call)
-        proc {|engine| filter }
+        c = Class === self ? self : singleton_class
+        filter = c.class_eval { define_method(method_name, &filter); instance_method(method_name) }
+        proc {|engine| filter.arity == 1 ? filter.bind(engine) : filter.bind(engine).call }
       end
 
       def chain_element(args, block)
@@ -164,7 +114,8 @@ module Temple
           # Other callable argument (e.g. Object of class which implements #call or Method)
           # The callable has no access to the option hash of the engine.
           raise(ArgumentError, 'Too many arguments') unless args.empty?
-          [name, chain_callable_constructor(filter)]
+          raise(ArgumentError, 'Class or callable argument is required') unless filter.respond_to?(:call)
+          [name, proc { filter }]
         end
       end
     end

data/lib/temple/version.rb

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

data/temple.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('tilt')
   s.add_development_dependency('bacon')
   s.add_development_dependency('rake')
+  s.add_development_dependency('erubis')
 end

data/test/helper.rb

@@ -19,6 +19,10 @@ module TestHelper
   def erb(src, options = {})
     Temple::ERB::Template.new(options) { src }.render
   end
+
+  def erubis(src, options = {})
+    Tilt::ErubisTemplate.new(options) { src }.render
+  end
 end
 
 class Bacon::Context

data/test/test_erb.rb

@@ -1,6 +1,5 @@
 require 'helper'
-require 'erb'
-require 'tilt'
+require 'tilt/erubis'
 
 describe Temple::ERB::Engine do
   it 'should compile erb' do
@@ -12,7 +11,7 @@ describe Temple::ERB::Engine do
 <% end %>
 }
 
-    erb(src).should.equal ERB.new(src).result
+    erb(src).should.equal erubis(src)
   end
 
   it 'should recognize comments' do
@@ -21,7 +20,7 @@ hello
   <%# comment -- ignored -- useful in testing %>
 world}
 
-    erb(src).should.equal ERB.new(src).result
+    erb(src).should.equal erubis(src)
   end
 
   it 'should recognize <%% and %%>' do
@@ -32,7 +31,7 @@ world}
 <% end %>
 }
 
-    erb(src).should.equal "\n<%\n\n  %>\n\n" #ERB.new(src).result
+    erb(src).should.equal "\n<%\n  %>\n"
   end
 
   it 'should escape automatically' do
@@ -56,7 +55,7 @@ world}
 <% end %>
 }
 
-    erb(src, trim_mode: '>').should.equal ERB.new(src, nil, '>').result
-    erb(src, trim_mode: '<>').should.equal ERB.new(src, nil, '<>').result
+    erb(src, trim: true).should.equal erubis(src, trim: true)
+    erb(src, trim: false).should.equal erubis(src, trim: false)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - judofyr@gmail.com
@@ -162,26 +176,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby
-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
+test_files: []
+has_rdoc: