temple 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7a5f291f7511f72860f051904f76a53789d165
-  data.tar.gz: 8d879f88faf0ea956abaaeac2cc65d1c26669098
+  metadata.gz: 1bcc7e8bd7f61ec9c8e2f023f0fb53688b0df1c2
+  data.tar.gz: 6b409c3649bf823b1cf844c9604929ee51b42dab
 SHA512:
-  metadata.gz: 5c98e7222a80e362cb7570a9c5ca3a9db3f99082d8a8fe756f3420863e215faeccfd7b7b1063d845c695c9262b15746deed73f94a40ddb323f2548b51a58b189
-  data.tar.gz: da695941eb653ca94f4fb039b757c4fafe05ee9dc7c83dc11428cb6c05b31d72213d5a9d7dbfa70ef2fbadcd73446f17982ff5f9bb329bc06b97cffd21ab8295
+  metadata.gz: a3a07bb7ec8d123a48c659771f3c59d09e183519cefcb47b9fc7af5c869d77271da4773906652e97cf5d6c6b3b6b6d937641fcacd00a491a02fdfebbd33899c6
+  data.tar.gz: 5061b599c57d49d77f48bde5b89c8aac6b20df3038de15386f12913e2c7122f107af38500073fd76ff76c77001b55312fbd9629c447a3399a81a90121f1b3758

data/CHANGES

@@ -1,3 +1,14 @@
+0.6.9
+
+  * HTML::Pretty: Fix wrong line numbers
+  * Tilt template: Don't overwrite buffer always
+  * Generator: add preamble and postamble which do nothing
+  * Tilt template: don't overwrite streaming option
+  * OptionHash: inherit valid keys
+  * temple/html/safe: add poor man's html_safe? implementation (not required automatically)
+  * Temple::Mixins::GrammarDSL - Add some missing match? methods
+  * Temple::Utils.escape_html_safe - Add parameter safe
+
 0.6.8
 
   * HTML::Fast add svg doctype
@@ -177,7 +188,7 @@
 
 0.1.1
 
-  * Test added  
+  * Test added
 
 0.1.0
 

data/lib/temple/generator.rb

@@ -11,6 +11,13 @@ module Temple
     define_options :capture_generator => 'StringBuffer',
                    :buffer => '_buf'
 
+    def preamble
+    end
+
+    def postamble
+      'nil'
+    end
+
     def call(exp)
       [preamble, compile(exp), postamble].join('; ')
     end

data/lib/temple/hash.rb

@@ -71,7 +71,8 @@ module Temple
     end
 
     def valid_keys
-      keys.concat(@valid.keys).uniq
+      (keys + @valid.keys +
+       @hash.map {|h| h.valid_keys if h.respond_to?(:valid_keys) }.compact.flatten).uniq
     end
 
     def add_valid_keys(*keys)

data/lib/temple/html/pretty.rb

@@ -39,7 +39,7 @@ module Temple
           tmp = unique_name
           indent_code = ''
           indent_code << "#{tmp} = #{tmp}.sub(/\\A\\s*\\n?/, \"\\n\"); " if options[:indent_tags].include?(@last)
-          indent_code << "#{tmp} = #{tmp}.gsub(\"\n\", #{indent.inspect}); "
+          indent_code << "#{tmp} = #{tmp}.gsub(\"\\n\", #{indent.inspect}); "
           if ''.respond_to?(:html_safe)
             safe = unique_name
             # we have to first save if the string was html_safe

data/lib/temple/html/safe.rb

@@ -0,0 +1,23 @@
+module Temple
+  module HTML
+    class SafeString < String
+      def html_safe?; true end
+      def html_safe;  self end
+      def to_s;       self end
+    end
+  end
+end
+
+class Object
+  def html_safe?; false end
+end
+
+class Numeric
+  def html_safe?; true end
+end
+
+class String
+  def html_safe
+    Temple::HTML::SafeString.new(self)
+  end
+end

data/lib/temple/mixins/grammar_dsl.rb

@@ -7,6 +7,12 @@ module Temple
           @grammar = grammar
         end
 
+        def match?(exp)
+          match(exp, [])
+        end
+        alias === match?
+        alias =~ match?
+
         def |(rule)
           Or.new(@grammar, self, rule)
         end
@@ -53,10 +59,6 @@ module Temple
           success
         end
 
-        def match?(exp)
-          match(exp, [])
-        end
-
         def validate!(exp)
           unmatched = []
           unless match(exp, unmatched)
@@ -120,14 +122,13 @@ module Temple
       def match?(exp)
         const_get(:Expression).match?(exp)
       end
+      alias === match?
+      alias =~ match?
 
       def validate!(exp)
         const_get(:Expression).validate!(exp)
       end
 
-      alias === match?
-      alias =~ match?
-
       def Value(value)
         Value.new(self, value)
       end

data/lib/temple/templates/tilt.rb

@@ -21,10 +21,9 @@ module Temple
       #
       # @return [void]
       def prepare
-        # Overwrite option: No streaming support in Tilt
-        opts = {}.update(self.class.default_options).update(options).update(:file => eval_file, :streaming => false)
+        opts = {}.update(self.class.default_options).update(options).update(:file => eval_file)
         opts.delete(:mime_type)
-        opts.delete(:outvar) # Sinatra gives us this invalid variable
+        opts[:buffer] ||= opts.delete(:outvar) if opts.include?(:outvar) # HACK Sinatra gives us outvar instead of buffer
         @src = self.class.compile(data, opts)
       end
 

data/lib/temple/utils.rb

@@ -13,9 +13,10 @@ module Temple
     # Strings which are declared as html_safe are not escaped.
     #
     # @param html [String] The string to escape
+    # @param safe [Boolean] If false use escape_html
     # @return [String] The escaped string
-    def escape_html_safe(html)
-      html.html_safe? ? html : escape_html(html)
+    def escape_html_safe(html, safe = true)
+      safe && html.html_safe? ? html : escape_html(html)
     end
 
     if defined?(EscapeUtils)

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

data/test/filters/test_escapable.rb

@@ -34,7 +34,7 @@ describe Temple::Filters::Escapable do
   it 'should have use_html_safe option' do
     filter = Temple::Filters::Escapable.new(:use_html_safe => true)
     filter.call([:escape, true,
-      [:static, HtmlSafeString.new("a < b")]
+      [:static, Temple::HTML::SafeString.new("a < b")]
     ]).should.equal [:static, "a < b"]
   end
 

data/test/helper.rb

@@ -1,20 +1,11 @@
 require 'bacon'
 require 'temple'
 
-class HtmlSafeString < String
-  def html_safe?
-    true
-  end
-
-  def to_s
-    self
-  end
-end
-
 module TestHelper
   def with_html_safe
+    require 'temple/html/safe'
     String.send(:define_method, :html_safe?) { false }
-    String.send(:define_method, :html_safe) { HtmlSafeString.new(self) }
+    String.send(:define_method, :html_safe) { Temple::HTML::SafeString.new(self) }
     yield
   ensure
     String.send(:undef_method, :html_safe?) if String.method_defined?(:html_safe?)

data/test/html/test_pretty.rb

@@ -22,7 +22,7 @@ describe Temple::HTML::Pretty do
                         [:static, "\n    text"],
                         [:multi,
                          [:code, "_temple_html_pretty2 = (code).to_s"],
-                         [:code, "if _temple_html_pretty1 !~ _temple_html_pretty2; _temple_html_pretty2 = _temple_html_pretty2.gsub(\"\n\", \"\\n    \"); end"],
+                         [:code, "if _temple_html_pretty1 !~ _temple_html_pretty2; _temple_html_pretty2 = _temple_html_pretty2.gsub(\"\\n\", \"\\n    \"); end"],
                          [:dynamic, "_temple_html_pretty2"]]],
                        [:static, "\n  </p>"]],
                       [:static, "\n</div>"]]]
@@ -54,7 +54,7 @@ describe Temple::HTML::Pretty do
                       [:code, "_temple_html_pretty1 = /<code|<pre|<textarea/"],
                       [:multi,
                        [:code, "_temple_html_pretty2 = (\"text<\".html_safe).to_s"],
-                       [:code, "if _temple_html_pretty1 !~ _temple_html_pretty2; _temple_html_pretty3 = _temple_html_pretty2.html_safe?; _temple_html_pretty2 = _temple_html_pretty2.gsub(\"\n\", \"\\n\"); _temple_html_pretty2 = _temple_html_pretty2.html_safe if _temple_html_pretty3; end"],
+                       [:code, "if _temple_html_pretty1 !~ _temple_html_pretty2; _temple_html_pretty3 = _temple_html_pretty2.html_safe?; _temple_html_pretty2 = _temple_html_pretty2.gsub(\"\\n\", \"\\n\"); _temple_html_pretty2 = _temple_html_pretty2.html_safe if _temple_html_pretty3; end"],
                        [:dynamic, "_temple_html_pretty2"]]]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   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'
 - !ruby/object:Gem::Dependency
   name: bacon
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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: 
@@ -61,9 +61,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGES
 - EXPRESSIONS.md
 - Gemfile
@@ -103,6 +103,7 @@ files:
 - lib/temple/html/fast.rb
 - lib/temple/html/filter.rb
 - lib/temple/html/pretty.rb
+- lib/temple/html/safe.rb
 - lib/temple/mixins/dispatcher.rb
 - lib/temple/mixins/engine_dsl.rb
 - lib/temple/mixins/grammar_dsl.rb
@@ -147,40 +148,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+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_hash.rb
-- test/test_utils.rb
+test_files: []
+has_rdoc: