hamlit 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46fa9efe505104cd9dbf51194e8a1cc21bf4219
-  data.tar.gz: 9d4482ab58838d4a8050e3f598aad02072cc14b6
+  metadata.gz: 9be0ee09a4585d8c871901afad043298e8eae2bc
+  data.tar.gz: f1a8f5bbbdaa2994e209a959b4ba2a1162c76317
 SHA512:
-  metadata.gz: 83051f74ebe3b2621ebc9439b678f1a2b967163a36354cfa0503de403736930b2fd7dd18bfcc49e6690b83bb970e629afde447b8ac4c3df889c07dcb992dc0fb
-  data.tar.gz: 4b07f8bca0e0ac486fb5c1313a6a70677bd7d6a68954304703f2244f5c537d4ba025537135d13d6a01fe84ba61d7e83125c06717ba6373b087fa925525052315
+  metadata.gz: e2e3d51b40f28322634436597711f45d3dade9c5ad252302fb593bda6996bf27c8ab2b1b644054971606e5c79627a4df4768d4745987272597dec0e814b6b77b
+  data.tar.gz: a3f96912395ad6b3ec047ae332e202b72c385fc28af8dcd7fac35488ba66175ca453ae2286a98b22afaf98dfa4d3132c3aedd22a0a8e73e34ee97e8aee26d835

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.4.1
+
+- Fix code mistake in 1.4.0
+
+## v1.4.0 (yanked)
+
+- Escape interpolated string in plain text
+
 ## v1.3.2
 
 - Render `begin`, `rescue` and `ensure`

data/lib/hamlit/compilers/text.rb

@@ -1,14 +1,91 @@
+require 'hamlit/concerns/escapable'
+require 'hamlit/concerns/included'
 require 'hamlit/concerns/string_interpolation'
 
 module Hamlit
   module Compilers
     module Text
+      extend Concerns::Included
       include Concerns::StringInterpolation
 
+      included do
+        include Concerns::Escapable
+      end
+
+      # To ask ripper to consider a given text as string literal,
+      # I change "foo" to "%!foo!".
+      # This constant is the candidates for the literal surrounder.
+      STRING_MARKERS = %w[' " ! @ $ % ^ & * | =].freeze
+
+      # Return static and dynamic temple ast.
+      # It splits expression to optimize because string interpolation is slow.
       def on_haml_text(exp)
-        return [:static, exp] unless contains_interpolation?(exp)
+        return static_text(exp) unless contains_interpolation?(exp)
+
+        marker = find_string_marker(exp)
+        return [:dynamic, string_literal(exp)] unless marker
+
+        open_pos, close_pos = find_interpolation(exp, marker)
+        return static_text(exp) unless open_pos && close_pos
+
+        pre  = exp.byteslice(0...open_pos)
+        body = exp.byteslice((open_pos + 2)...close_pos)
+        post = exp.byteslice((close_pos + 1)...exp.bytesize)
+        [:multi, [:static, pre], escape_html([:dynamic, body]), on_haml_text(post)]
+      end
+
+      def find_interpolation(exp, marker)
+        return unless contains_interpolation?(exp)
+
+        offset     = 2 # 2 is the length of '%' and marker
+        open_pos   = nil
+        close_pos  = nil
+        open_count = 0
+        literal    = literalify_string(exp, marker)
+
+        Ripper.lex(literal).each do |(row, col), type, str|
+          case type
+          when :on_embexpr_beg
+            open_pos = calc_position(exp, row, col, offset) if open_count == 0
+            open_count += 1
+          when :on_embexpr_end
+            open_count -= 1
+            return [open_pos, calc_position(exp, row, col, offset)] if open_count == 0
+          end
+          open_count
+        end
+
+        nil
+      end
+
+      private
+
+      # :static can't treat backslash properly
+      def static_text(exp)
+        return [:dynamic, string_literal(exp)] if exp.include?('\\')
+        [:static, exp]
+      end
+
+      def find_string_marker(text)
+        STRING_MARKERS.each do |marker|
+          return marker unless text.include?(marker)
+        end
+        nil
+      end
+
+      def literalify_string(exp, marker)
+        "%#{marker}#{exp}#{marker}"
+      end
+
+      def calc_position(exp, row, col, offset)
+        return col - offset if row <= 1
 
-        [:dynamic, string_literal(exp)]
+        pos   = col
+        lines = exp.split("\n")
+        (0..(row - 2)).each do |row_index|
+          pos += lines[row_index].bytesize + 1
+        end
+        pos
       end
     end
   end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.3.2"
+  VERSION = "1.4.1"
 end

data/spec/hamlit/engine/text_spec.rb

@@ -6,8 +6,8 @@ describe Hamlit::Engine do
         a#{{ a: 3 }}
         <ht#{2}ml>
       HAML
-        a3aa" ["1", 2] b " !
-        a{:a=>3}
+        a3aa" [&quot;1&quot;, 2] b " !
+        a{:a=&gt;3}
         <ht2ml>
       HTML
     end
@@ -42,5 +42,21 @@ describe Hamlit::Engine do
     it 'leaves empty spaces after backslash' do
       expect(render_string('\       a')).to eq("       a\n")
     end
+
+    describe 'string interpolation' do
+      specify { assert_render('#{}', "\n") }
+      specify { assert_render('1#{}', "1\n") }
+      specify { assert_render('1#{2}', "12\n") }
+      specify { assert_render('1#{2', "1\#{2\n") }
+      specify { assert_render('}#{1}', "}1\n") }
+      specify { assert_render('#{1}2', "12\n") }
+      specify { assert_render('1#{ "2#{3}4" }5', "12345\n") }
+      specify { assert_render('#{1}2#{3}4#{5}6#{7}8#{9}', "123456789\n") }
+      specify { assert_render(%q{'"!@$%^&*|=#{1}1#{1}2}, %Q{'"!@$%^&*|=1112\n}) }
+      specify { assert_render('あ#{1}', "あ1\n") }
+      specify { assert_render('あ#{"い"}う', "あいう\n") }
+      specify { assert_render('a#{"<b>"}c', "a&lt;b&gt;c\n") }
+      specify { assert_render(":plain\n  あ\n  \#{'い'}", "あ\nい\n\n") }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -569,4 +569,3 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
-has_rdoc: