hamlit 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae467344339ea7b431086ed4b87764ae4b0a580e
-  data.tar.gz: 2fbd25588f7006d077e6dfd96ba2cf239dc49c0b
+  metadata.gz: bdbcd9855ceed711ca31e228ae8d9eb034868259
+  data.tar.gz: 7b0e66130cefe424a2463a283c6a930ad6ae2e60
 SHA512:
-  metadata.gz: 8e9fd2852146dc3e1a89d4a473ee2ab3be195c9fedd4b10f94b3dfc93bb9a9b093c3b8320658e1d658ed3b440dbdd8939d0e1f6dc6cb6ecfeca1dbc934bd89ab
-  data.tar.gz: d63c28302915ff6b297899f93a60e95fa587b99bef7ea4e12509e3a0c3f711f8c806a7c987401790a64e59e056c43bb952a2452508c945a844436fd7c1a3d06c
+  metadata.gz: da1b2dc6acad532b7983ad4fe19ff39a4dc3fe94869c7a90b68f0fb8f3d1689d1168edbcf8ba0eeae4ec43d1ad6ad9ee88394b604eaa723c371f01e3520e404c
+  data.tar.gz: 099914dd8eb91a102613b42290f5aa87bd0332c87f83fef8f74c88d0d0ac9848f2ad1644744f817d29efd5cd93da1940c5a33b43385bd4fa53433526aa4290a7

data/.travis.yml

@@ -7,8 +7,6 @@ script:
   - "bundle exec rake $TASK"
 matrix:
   include:
-    - rvm: 2.0.0
-      env: TASK=test
     - rvm: 2.1
       env: TASK=test
     - rvm: 2.2

data/CHANGELOG.md

@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
-## [2.2.1](https://github.com/k0kubun/hamlit/compare/v2.1.2...v2.2.0) - 2016-02-06
+## [2.2.2](https://github.com/k0kubun/hamlit/compare/v2.2.1...v2.2.2) - 2016-02-21
+
+### Added
+
+- Optimize performance of plain filter
+
+### Fixed
+
+- Escape only interpolated text for plain filter
+  [#58](https://github.com/k0kubun/hamlit/issues/58). *Thanks to @shaneog*
+
+## [2.2.1](https://github.com/k0kubun/hamlit/compare/v2.2.0...v2.2.1) - 2016-02-06
 
 ### Added
 

data/Gemfile

@@ -7,8 +7,7 @@ gem 'benchmark-ips', '2.3.0'
 gem 'minitest-line'
 gem 'pry-byebug'
 
-is_windows = RUBY_PLATFORM =~ /mswin|mingw|bccwin|wince/
-if RUBY_VERSION >= '2.1.0' && !is_windows
+if RUBY_PLATFORM !~ /mswin|mingw|bccwin|wince/
   gem 'faml'
   gem 'lineprof'
   gem 'stackprof'

data/benchmark/utils/benchmark_ips_extension.rb

@@ -16,7 +16,7 @@ module Benchmark
           end
         end
       end
-      Entry.send(:prepend, EntryExtension)
+      Entry.prepend(EntryExtension)
     end
   end
 

data/bin/test

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 VERSIONS=(
-  2.0.0
   2.1.7
   2.2.3
   2.3.0

data/lib/hamlit/filters/plain.rb

@@ -1,15 +1,26 @@
+require 'hamlit/string_splitter'
+
 module Hamlit
   class Filters
     class Plain < Base
       def compile(node)
-        text = node.value[:text].rstrip
-        if ::Hamlit::HamlUtil.contains_interpolation?(text)
-          # FIXME: Confirm whether this is correct or not
-          text << "\n".freeze
-          text = ::Hamlit::HamlUtil.slow_unescape_interpolation(text)
-          [:escape, true, [:dynamic, text]]
-        else
-          [:static, text]
+        text = node.value[:text]
+        text = text.rstrip unless ::Hamlit::HamlUtil.contains_interpolation?(text) # for compatibility
+        [:multi, *compile_plain(text)]
+      end
+
+      private
+
+      def compile_plain(text)
+        string_literal = ::Hamlit::HamlUtil.unescape_interpolation(text)
+        StringSplitter.compile(string_literal).map do |temple|
+          type, str = temple
+          case type
+          when :dynamic
+            [:escape, true, [:dynamic, str]]
+          else
+            temple
+          end
         end
       end
     end

data/lib/hamlit/parser/haml_util.rb

@@ -199,6 +199,8 @@ MSG
     end
 
     # Original Haml::Util.unescape_interpolation
+    # ex) slow_unescape_interpolation('foo#{bar}baz"', escape_html: true)
+    #   #=> "\"foo\#{::Hamlit::HamlHelpers.html_escape((bar))}baz\\\"\""
     def slow_unescape_interpolation(str, escape_html = nil)
       res = ''
       rest = ::Hamlit::HamlUtil.handle_interpolation str.dump do |scan|
@@ -223,7 +225,10 @@ MSG
       res + rest
     end
 
-    # Customized Haml::Util.unescape_interpolation to handle escape by Hamlit
+    # Customized Haml::Util.unescape_interpolation to handle escape by Hamlit.
+    # It wraps double quotes to given `str` with escaping `"`.
+    #
+    # ex) unescape_interpolation('foo#{bar}baz"') #=> "\"foo\#{bar}baz\\\"\""
     def unescape_interpolation(str)
       res = ''
       rest = ::Hamlit::HamlUtil.handle_interpolation str.dump do |scan|

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple