temple 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef295d25d34ef11abf1640d7240eedb8643e8107
-  data.tar.gz: a721340521044f953fec55f2b75b0d467b2bdab4
+  metadata.gz: 7cc2dd0179a2556cfac6a0ec0e2e0ec5d7fbec30
+  data.tar.gz: 9369dee44f625d68dccded5ad36ed6716262b5aa
 SHA512:
-  metadata.gz: e99dbeb234856873da69adb1460a123876f219e7c34d3c12bba379ee86fd60017cd56d17b5e5da6d2eff7d3e825135cfa57002232dc3e50d3676c59745b85dc9
-  data.tar.gz: 22c4e6d503c7a3272ba39a153b3e7cf0ea92cb0a4937c5e6e05121ac5fe1efdd3d0ca7e3650d4a6633358542bcf4322ea27e0638e119f991db44bf58cf779810
+  metadata.gz: b876aee2589c3948760859554766f139a431c5927fc164a6841d922b449f90e96ba8227ecf7f4ab9c8a300aed4f2f315975149ee075eba1fe47a7dfe184d10c1
+  data.tar.gz: 41890f26bab5d9d3886e62b16f825e611821f81db03684cb2e3ee194d4f7727af5cd24121b678edd405013a831c4c7442833b7b6d472fb0a68eda6d1f09d76fe

data/CHANGES

@@ -1,3 +1,9 @@
+master
+
+  * Use default encoding utf-8
+  * Escape also '
+  * Try to load escape_utils by default
+
 0.6.5
 
   * Added Filters::CodeMerger

data/lib/temple/filters/encoding.rb

@@ -4,7 +4,7 @@ module Temple
     #
     # @api public
     class Encoding < Parser
-      define_options :encoding
+      define_options :encoding => 'utf-8'
 
       def call(s)
         if options[:encoding] && s.respond_to?(:encoding)

data/lib/temple/utils.rb

@@ -1,3 +1,9 @@
+begin
+  require 'escape_utils'
+rescue LoadError
+  # Loading EscapeUtils failed
+end
+
 module Temple
   # @api public
   module Utils
@@ -20,30 +26,41 @@ module Temple
       def escape_html(html)
         EscapeUtils.escape_html(html.to_s, false)
       end
-    elsif RUBY_VERSION > '1.9'
+    else
       # Used by escape_html
       # @api private
       ESCAPE_HTML = {
-        '&' => '&',
-        '"' => '"',
-        '<' => '&lt;',
-        '>' => '&gt;',
+        '&'  => '&amp;',
+        '"'  => '&quot;',
+        '\'' => '&#39;',
+        '<'  => '&lt;',
+        '>'  => '&gt;'
       }.freeze
 
-      # Returns an escaped copy of `html`.
-      #
-      # @param html [String] The string to escape
-      # @return [String] The escaped string
-      def escape_html(html)
-        html.to_s.gsub(/[&\"<>]/, ESCAPE_HTML)
+      if //.respond_to?(:encoding)
+        ESCAPE_HTML_PATTERN = Regexp.union(*ESCAPE_HTML.keys)
+      else
+        # On 1.8, there is a kcode = 'u' bug that allows for XSS otherwise
+        # TODO doesn't apply to jruby, so a better condition above might be preferable?
+        ESCAPE_HTML_PATTERN = /#{Regexp.union(*ESCAPE_HTML.keys)}/n
       end
-    else
-      # Returns an escaped copy of `html`.
-      #
-      # @param html [String] The string to escape
-      # @return [String] The escaped string
-      def escape_html(html)
-        html.to_s.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+
+      if RUBY_VERSION > '1.9'
+        # Returns an escaped copy of `html`.
+        #
+        # @param html [String] The string to escape
+        # @return [String] The escaped string
+        def escape_html(html)
+          html.to_s.gsub(ESCAPE_HTML_PATTERN, ESCAPE_HTML)
+        end
+      else
+        # Returns an escaped copy of `html`.
+        #
+        # @param html [String] The string to escape
+        # @return [String] The escaped string
+        def escape_html(html)
+          html.to_s.gsub(ESCAPE_HTML_PATTERN) {|c| ESCAPE_HTML[c] }
+        end
       end
     end
 

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/temple.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.license       = 'MIT'
 
   # Tilt is only development dependency because most parts of Temple
   # can be used without it.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -139,7 +139,8 @@ files:
 - test/test_hash.rb
 - test/test_utils.rb
 homepage: https://github.com/judofyr/temple
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Template compilation framework in Ruby