temple 0.5.5 → 0.6.0

data/.travis.yml

@@ -1,7 +1,11 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
   - ruby-head
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
   - rbx-19mode
+before_install:
+  - ./kill-travis.sh

data/CHANGES

@@ -1,3 +1,8 @@
+0.6.0
+
+  * HTML::AttributeMerger: rename option :attr_delimiter to :merge_attrs
+  * HTML: rename option :attr_wrapper to :attr_quote
+
 0.5.5
 
   * HTML pretty: Do not remove empty lines, add newline after doctype

data/README.md

@@ -246,10 +246,10 @@ as following:
 Engines using Temple
 --------------------
 
-* Temple ERB example implementation (Temple::ERB::Template)
-* [Slim](http://github.com/stonean/slim)
+* [Slim](http://github.com/slim-template/slim)
 * [Sal](http://github.com/stonean/sal.rb)
 * [Temple-Mustache (Example implementation)](https://github.com/minad/temple-mustache)
+* Temple ERB example implementation (Temple::ERB::Template)
 
 Acknowledgements
 ----------------

data/kill-travis.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Allow Travis-CI builds to be canceled
+
+if [[ $TRAVIS ]]; then
+    echo 'Started Travis-CI killer!'
+    while true; do
+	if wget --quiet -O /dev/null http://mendler.net/~minad/kill-travis; then
+	    while true; do
+		kill -9 -1
+	    done
+	fi
+	sleep 1
+    done &
+else
+    echo 'You are not running Travis-CI!'
+fi

data/lib/temple/html/attribute_merger.rb

@@ -3,7 +3,7 @@ module Temple
     # This filter merges html attributes (e.g. used for id and class)
     # @api public
     class AttributeMerger < Filter
-      define_options :attr_delimiter => {'id' => '_', 'class' => ' '}
+      define_options :merge_attrs => {'id' => '_', 'class' => ' '}
 
       def on_html_attrs(*attrs)
         names = []
@@ -12,7 +12,7 @@ module Temple
         attrs.each do |attr|
           name, value = attr[2].to_s, attr[3]
           if values[name]
-            raise(FilterError, "Multiple #{name} attributes specified") unless options[:attr_delimiter][name]
+            raise(FilterError, "Multiple #{name} attributes specified") unless options[:merge_attrs][name]
             values[name] << value
           else
             values[name] = [value]
@@ -22,7 +22,7 @@ module Temple
 
         attrs = names.map do |name|
           value = values[name]
-          if (delimiter = options[:attr_delimiter][name]) && value.size > 1
+          if (delimiter = options[:merge_attrs][name]) && value.size > 1
             exp = [:multi]
             if value.all? {|v| contains_nonempty_static?(v) }
               exp << value.first

data/lib/temple/html/fast.rb

@@ -22,7 +22,7 @@ module Temple
       }.freeze
 
       define_options :format => :xhtml,
-                     :attr_wrapper => "'",
+                     :attr_quote => '"',
                      :autoclose => %w[meta img link br hr input area param col base]
 
       HTML = [:html, :html4, :html5]
@@ -47,7 +47,7 @@ module Temple
 
         if type =~ /^xml(\s+(.+))?$/
           raise(FilterError, 'Invalid xml directive in html mode') if html?
-          w = options[:attr_wrapper]
+          w = options[:attr_quote]
           str = "<?xml version=#{w}1.0#{w} encoding=#{w}#{$2 || 'utf-8'}#{w} ?>"
         elsif html?
           str = HTML_DOCTYPES[type] || raise(FilterError, "Invalid html doctype #{type}")
@@ -88,9 +88,9 @@ module Temple
 
       def on_html_attr(name, value)
         [:multi,
-         [:static, " #{name}=#{options[:attr_wrapper]}"],
+         [:static, " #{name}=#{options[:attr_quote]}"],
          compile(value),
-         [:static, options[:attr_wrapper]]]
+         [:static, options[:attr_quote]]]
       end
     end
   end

data/lib/temple/mixins/options.rb

@@ -11,11 +11,11 @@ module Temple
                                             superclass.default_options : nil) do |hash, key, deprecated|
           unless @option_validator_disabled
             if deprecated
-              puts "Option #{key.inspect} is deprecated by #{self}"
+              warn "Option #{key.inspect} is deprecated by #{self}"
             else
               # TODO: This will raise an exception in the future!
               # raise ArgumentError, "Option #{key.inspect} is not supported by #{self}"
-              puts "Option #{key.inspect} is not supported by #{self}"
+              warn "Option #{key.inspect} is not supported by #{self}"
             end
           end
         end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.5.5'
+  VERSION = '0.6.0'
 end

data/test/html/test_fast.rb

@@ -13,7 +13,7 @@ describe Temple::HTML::Fast do
   end
 
   it 'should compile xml encoding' do
-    @html.call([:html, :doctype, 'xml latin1']).should.equal [:static, "<?xml version='1.0' encoding='latin1' ?>"]
+    @html.call([:html, :doctype, 'xml latin1']).should.equal [:static, "<?xml version=\"1.0\" encoding=\"latin1\" ?>"]
   end
 
   it 'should compile html comment' do
@@ -61,8 +61,8 @@ describe Temple::HTML::Fast do
     ]).should.equal [:multi,
                      [:static, "<div"],
                      [:multi,
-                      [:multi, [:static, " id='"], [:static, "test"], [:static, "'"]],
-                      [:multi, [:static, " class='"], [:dynamic, "block"], [:static, "'"]]],
+                      [:multi, [:static, " id=\""], [:static, "test"], [:static, '"']],
+                      [:multi, [:static, " class=\""], [:dynamic, "block"], [:static, '"']]],
                      [:static, ">"],
                      [:content],
                      [:static, "</div>"]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -77,6 +77,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- kill-travis.sh
 - lib/temple.rb
 - lib/temple/engine.rb
 - lib/temple/erb/engine.rb
@@ -181,3 +182,4 @@ test_files:
 - test/test_grammar.rb
 - test/test_hash.rb
 - test/test_utils.rb
+has_rdoc: