temple 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5698e0987714d41aa759069655a1c276a5aab1
-  data.tar.gz: 58ae7b8dca8c28264ae03e9136e017f8a6c2efbe
+  metadata.gz: 817a4564ae590c547798aa08afb03e970c7a1be0
+  data.tar.gz: 2d7de8792d73a9d207488a04f93f2cf52adbfdb7
 SHA512:
-  metadata.gz: b50a65d9d25973bf7470b3cc5d835bce94ff386e886570a3b6d9412b3aea312bf791bc70a6203025515a902dbe25a554d9ecf7f7ea81dcdf16322d6997e3b06a
-  data.tar.gz: c2e805cd2ba16d0a27af4686f0b50df4f2013b4ad146284ba952b1fe0146d4ff31d4c3954655d979ffb907b0c4eb1a4e1b81f966dbd96a5756ebc35115c80b49
+  metadata.gz: e96b8d1ff3cc0dd3b09c108ef167440bc5cb1229b7b66810e5ecec85c55de1ddf51c3a3548f960e2ebe51ed0dc93a1746dca8146cb44a700264287d1ea7c5535
+  data.tar.gz: 721be6c7597a773ac7ede0f9f7dba71dc61695c3a52805dc1580dc1aca9615698a621eaefc726311083ebd16afaff38ec9ebd856dd599ae78f4c71196486c4af

data/CHANGES

@@ -1,3 +1,8 @@
+0.7.4
+
+  * EngineDSL: allow to replace/remove with regexp
+  * Fix deprecation warning (#83)
+
 0.7.3
 
   * Temple::ERB::Trimming - replace option trim_mode with trim and switch to erubis-like trimming

data/lib/temple/html/fast.rb

@@ -38,8 +38,8 @@ module Temple
         @format = options[:format]
         unless [:xhtml, :html, :xml].include?(@format)
           if @format == :html4 || @format == :html5
-            @format = :html
             warn "Format #{@format.inspect} is deprecated, use :html"
+            @format = :html
           else
             raise ArgumentError, "Invalid format #{@format.inspect}"
           end

data/lib/temple/mixins/engine_dsl.rb

@@ -17,7 +17,7 @@ module Temple
 
       def remove(name)
         name = chain_name(name)
-        raise "#{name} not found" unless chain.reject! {|i| i.first == name }
+        raise "#{name} not found" unless chain.reject! {|i| name === i.first }
         chain_modified!
       end
 
@@ -26,7 +26,7 @@ module Temple
       def before(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        chain.map! {|f| f.first == name ? [e, f] : [f] }.flatten!(1)
+        chain.map! {|f| name === f.first ? [e, f] : [f] }.flatten!(1)
         raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
@@ -34,7 +34,7 @@ module Temple
       def after(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        chain.map! {|f| f.first == name ? [f, e] : [f] }.flatten!(1)
+        chain.map! {|f| name === f.first ? [f, e] : [f] }.flatten!(1)
         raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
@@ -42,7 +42,7 @@ module Temple
       def replace(name, *args, &block)
         name = chain_name(name)
         e = chain_element(args, block)
-        chain.map! {|f| f.first == name ? e : f }
+        chain.map! {|f| name === f.first ? e : f }
         raise "#{name} not found" unless chain.include?(e)
         chain_modified!
       end
@@ -59,9 +59,16 @@ module Temple
       private
 
       def chain_name(name)
-        name = Class === name ? name.name.to_sym : name
-        raise(ArgumentError, 'Name argument must be Class or Symbol') unless Symbol === name
-        name
+        case name
+        when Class
+          name.name.to_sym
+        when Symbol, String
+          name.to_sym
+        when Regexp
+          name
+        else
+          raise(ArgumentError, 'Name argument must be Class, Symbol, String or Regexp')
+        end
       end
 
       def chain_class_constructor(filter, local_options)

data/lib/temple/version.rb

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

data/test/test_engine.rb

@@ -147,6 +147,10 @@ describe Temple::Engine do
     engine.chain.size.should.equal 7
     engine.chain[0].first.should.equal :Parser
     engine.chain[1].first.should.equal :MyFilter2
+
+    engine = TestEngine.new
+    engine.remove /Last/
+    engine.chain.size.should.equal 6
   end
 
   it 'should have #replace' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -176,5 +176,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