hamlit 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930fc5e028d874b28cbf4c78e7d9434d3f41d73a
-  data.tar.gz: a8bab06e6c9d0f6af1da12913e843b8582ad778d
+  metadata.gz: 7de4f077471615790e1d0d4993e8fe0926ef84be
+  data.tar.gz: b404e0b74b3a0857287424f22d530a5923eaa2f8
 SHA512:
-  metadata.gz: 2d7dc13fd325f3586af88a73214afc60f55392d67fa3dfbbe4f13d7a8a639cc2217eba60618c1db6f12eefa1eebaa23756a6ae9f8270df5400d5268b57de98ff
-  data.tar.gz: 8d028d23a2e55d4b3c923bc299a3d4aa02793da3826ad76a37f4b1829c291b62eb49da5f8dc3a0e26e9bc846bb1d99b2177a2493674ca7e1600db475bc45b8de
+  metadata.gz: f53a569a02a7aa2163559e29793f3a3890e1c6aff8f69e64864a296f738d770c99dc75196cc76643ac8bd209ada3887d916b2660ae63b97c0b7853c43424fcca
+  data.tar.gz: a21d15241aef3b22a3419ac27561b2b020abb342cb5a01357efa2451dea4f06419a35d22a03379b6b47941b513ed98efbb822f3e9f3d6d7712aca32b04a709cd

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.4.5
+
+- Support Ruby 2.0 and 2.1 for v1.4.4
+
+## v1.4.4 (yanked)
+
+- Fix old attribute parser to be more flexible
+  - Accept multiple hashes as old attributes
+  - Accept old attributes with hash and literal
+
 ## v1.4.3
 
 - Allow `when` to have multiple candidates

data/lib/hamlit/attribute.rb

@@ -10,18 +10,22 @@ module Hamlit
   class Attribute
     include Concerns::AttributeBuilder
 
-    def self.build(quote, base, attributes = {})
+    def self.build(quote, *args)
       builder = self.new(quote)
-      builder.build(base, attributes)
+      builder.build(*args)
     end
 
     def initialize(quote)
       @quote = quote
     end
 
-    def build(base, attributes)
+    def build(*args)
       result = ''
-      merge_attributes(base, attributes).each do |key, value|
+      attributes = args.inject({}) do |attributes, arg|
+        merge_attributes(attributes, arg)
+      end
+
+      attributes.each do |key, value|
         if value == true
           result += " #{key}"
           next

data/lib/hamlit/compilers/old_attribute.rb

@@ -32,7 +32,7 @@ module Hamlit
                            truespeed typemustmatch data].freeze
 
       def compile_old_attribute(str)
-        raise RuntimeBuild unless Ripper.sexp(str)
+        raise RuntimeBuild unless valid_hash?(str)
 
         attrs = parse_old_attributes(str)
         assert_no_boolean_attributes!(attrs)
@@ -51,6 +51,13 @@ module Hamlit
 
       private
 
+      def valid_hash?(str)
+        sexp = Ripper.sexp(str)
+        return false unless sexp
+
+        sexp.flatten[1] == :hash
+      end
+
       def format_attributes(attributes)
         attributes = flatten_attributes(attributes)
         ignore_falsy_values(attributes)

data/lib/hamlit/concerns/balanceable.rb

@@ -11,6 +11,11 @@ module Hamlit
         fetch_balanced_tokens(all_tokens, :on_lparen, :on_rparen)
       end
 
+      def fetch_balanced_embexprs(all_tokens)
+        tokens = all_tokens[1..-1] # ignore first `"`
+        fetch_balanced_tokens(tokens, :on_embexpr_beg, :on_embexpr_end)
+      end
+
       def balanced_braces_exist?(tokens)
         balanced_tokens_exist?(tokens, :on_lbrace, :on_rbrace)
       end
@@ -19,6 +24,11 @@ module Hamlit
         balanced_tokens_exist?(tokens, :on_lparen, :on_rparen)
       end
 
+      def balanced_embexprs_exist?(tokens)
+        tokens = tokens[1..-1] # ignore first `"`
+        balanced_tokens_exist?(tokens, :on_embexpr_beg, :on_embexpr_end)
+      end
+
       private
 
       def fetch_balanced_tokens(all_tokens, open_token, close_token)

data/lib/hamlit/parsers/attribute.rb

@@ -6,6 +6,8 @@ module Hamlit
     module Attribute
       include Concerns::Balanceable
 
+      EMBEXPR_PREFIX = '"#'.freeze
+
       def parse_attributes(scanner)
         if scanner.match?(/{/)
           parse_old_attributes(scanner) + parse_new_attributes(scanner)
@@ -16,20 +18,24 @@ module Hamlit
 
       private
 
+      # NOTE: Old attributes are not valid as Ruby expression.
+      # So Ripper is broken if you give an original expression to it.
+      # This method bypasses it by changing expression to string interpolation.
+      # Ideally you should implement an original lexer for haml old attributes.
       def parse_old_attributes(scanner)
         return [] unless scanner.match?(/{/)
 
-        tokens = Ripper.lex(scanner.rest)
-        until balanced_braces_exist?(tokens)
+        tokens = try_lex(EMBEXPR_PREFIX + scanner.rest)
+        until balanced_embexprs_exist?(tokens)
           @current_lineno += 1
           break unless @lines[@current_lineno]
           scanner.concat(current_line)
-          tokens = Ripper.lex(scanner.rest)
+          tokens = try_lex(EMBEXPR_PREFIX + scanner.rest)
         end
 
-        tokens = fetch_balanced_braces(tokens)
-        scanner.pos += tokens.last.first.last + 1
-        [tokens.map(&:last).join]
+        tokens = fetch_balanced_embexprs(tokens)
+        scanner.pos += tokens.last.first.last - 1 # remove EMBEXPR_PREFIX's offset
+        [tokens.map(&:last).join.gsub(/\A#/, '')]
       end
 
       def parse_new_attributes(scanner)
@@ -47,6 +53,15 @@ module Hamlit
         scanner.pos += tokens.last.first.last + 1
         [tokens.map(&:last).join]
       end
+
+      # Ripper.lex and reject tokens whose row is 0 (invalid).
+      # This should be used only for an expression which can
+      # be invalid as Ruby and valid as haml.
+      def try_lex(str)
+        Ripper.lex(str).reject do |(row, col), type, str|
+          row == 0
+        end
+      end
     end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.3"
+  VERSION = "1.4.5"
 end

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -56,15 +56,6 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'renders runtime hash attribute' do
-      assert_render(<<-'HAML', <<-HTML)
-        - hash = { foo: 'bar' }
-        %span{ hash }
-      HAML
-        <span foo='bar'></span>
-      HTML
-    end
-
     it 'renders multi-byte chars as static attribute value' do
       assert_render(<<-'HAML', <<-HTML)
         %img{ alt: 'こんにちは' }
@@ -73,6 +64,39 @@ describe Hamlit::Engine do
       HTML
     end
 
+    describe 'runtime attributes' do
+      it 'renders runtime hash attribute' do
+        assert_render(<<-'HAML', <<-HTML)
+          - hash = { foo: 'bar' }
+          %span{ hash }
+        HAML
+          <span foo='bar'></span>
+        HTML
+      end
+
+      it 'renders multiples hashes' do
+        assert_render(<<-'HAML', <<-HTML)
+          - h1 = { a: 'b' }
+          - h2 = { c: 'd' }
+          - h3 = { e: 'f' }
+          %span{ h1, h2, h3 }
+        HAML
+          <span a='b' c='d' e='f'></span>
+        HTML
+      end
+
+      it 'renders multiples hashes and literal hash' do
+        assert_render(<<-'HAML', <<-HTML)
+          - h1 = { a: 'b' }
+          - h2 = { c: 'd' }
+          - h3 = { e: 'f' }
+          %span{ h1, h2, h3, g: 'h', i: 'j' }
+        HAML
+          <span a='b' c='d' e='f' g='h' i='j'></span>
+        HTML
+      end
+    end
+
     describe 'joinable attributes' do
       it 'joins class with a space' do
         assert_render(<<-'HAML', <<-HTML)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils