hamlit 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6af6b57be662141cab0bb717a24bdaf2e2406f
-  data.tar.gz: 65ce818ede5672f94b126ec19cc3a210a28c705e
+  metadata.gz: e5cc29adeedc23941351000259c916d89cdea442
+  data.tar.gz: affff05b7d78d2c7af5dd23a7c1d7ecd01e15bd1
 SHA512:
-  metadata.gz: b1e3e8153d7f4978de1ab3992d46b67dd00399d7bb789a93a8d2b6e7c6c91a20e7662d93d99369f7f7faf4f7f12b260b499d98c34dea286fede0177ee81548e0
-  data.tar.gz: 04d290e8d75dc51ecd31e5c0f404bdb200b7d42fb528f2612054a05efeb59f8fb09c37b9297c780bf22087de3174070a5e51d1febca667c2a45080fd73eec1b1
+  metadata.gz: ea281451bd2d83164bd6a6d8b40c129d8551d06ebc64403e2bcbe5c9f4777dc7c911b385ef7077107a5e05b325e1fbcd844729569b2db6f8d4217bc6bf480268
+  data.tar.gz: 906d0de6f993ffc61831c3660399a8186e8d17a89bb89f3fff9af07d46e90ccdad7575a90c4630cf172d09ae6dd01e4bcb577837672a7949866a4e4c3990b4e3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.6.5
+
+- Don't duplicate element class and attribute class
+- Raise an error for an empty tag name
+
 ## v1.6.4
 
 - Show human-friendly error messages

data/doc/engine/old_attributes.md

@@ -30,6 +30,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ## Input
 ```haml
 .foo{ class: ['bar'] }
+.foo{ class: ['bar', 'foo'] }
 .foo{ class: ['bar', nil] }
 .foo{ class: ['bar', 'baz'] }
 
@@ -40,6 +41,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```html
 <div class='bar foo'></div>
 <div class='bar foo'></div>
+<div class='bar foo'></div>
 <div class='bar baz foo'></div>
 
 ```
@@ -47,13 +49,14 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ### Faml
 ```html
 <div class='bar foo'></div>
+<div class='bar foo'></div>
 <div class=' bar foo'></div>
 <div class='bar baz foo'></div>
 
 ```
 
 
-# [old\_attributes\_spec.rb:201](/spec/hamlit/engine/old_attributes_spec.rb#L201)
+# [old\_attributes\_spec.rb:203](/spec/hamlit/engine/old_attributes_spec.rb#L203)
 ## Input
 ```haml
 / wontfix: Non-boolean attributes are not escaped for optimization.
@@ -94,7 +97,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:226](/spec/hamlit/engine/old_attributes_spec.rb#L226)
+# [old\_attributes\_spec.rb:228](/spec/hamlit/engine/old_attributes_spec.rb#L228)
 ## Input
 ```haml
 %a{title: "'"}
@@ -121,7 +124,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:238](/spec/hamlit/engine/old_attributes_spec.rb#L238)
+# [old\_attributes\_spec.rb:240](/spec/hamlit/engine/old_attributes_spec.rb#L240)
 ## Input
 ```haml
 - title = "'\""
@@ -147,7 +150,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:250](/spec/hamlit/engine/old_attributes_spec.rb#L250)
+# [old\_attributes\_spec.rb:252](/spec/hamlit/engine/old_attributes_spec.rb#L252)
 ## Input
 ```haml
 - title = { title: "'\"" }
@@ -173,7 +176,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:273](/spec/hamlit/engine/old_attributes_spec.rb#L273)
+# [old\_attributes\_spec.rb:275](/spec/hamlit/engine/old_attributes_spec.rb#L275)
 ## Input
 ```haml
 %span{ data: { disable: true } } bar

data/doc/faml/engine/old_attributes.md

@@ -22,6 +22,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ## Input
 ```haml
 .foo{ class: ['bar'] }
+.foo{ class: ['bar', 'foo'] }
 .foo{ class: ['bar', nil] }
 .foo{ class: ['bar', 'baz'] }
 
@@ -31,6 +32,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ### Faml
 ```html
 <div class='bar foo'></div>
+<div class='bar foo'></div>
 <div class=' bar foo'></div>
 <div class='bar baz foo'></div>
 
@@ -40,12 +42,13 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```html
 <div class='bar foo'></div>
 <div class='bar foo'></div>
+<div class='bar foo'></div>
 <div class='bar baz foo'></div>
 
 ```
 
 
-# [old\_attributes\_spec.rb:201](/spec/hamlit/engine/old_attributes_spec.rb#L201)
+# [old\_attributes\_spec.rb:203](/spec/hamlit/engine/old_attributes_spec.rb#L203)
 ## Input
 ```haml
 / wontfix: Non-boolean attributes are not escaped for optimization.
@@ -86,7 +89,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:273](/spec/hamlit/engine/old_attributes_spec.rb#L273)
+# [old\_attributes\_spec.rb:275](/spec/hamlit/engine/old_attributes_spec.rb#L275)
 ## Input
 ```haml
 %span{ data: { disable: true } } bar

data/doc/haml/engine/old_attributes.md

@@ -21,7 +21,7 @@ Haml::SyntaxError: (haml):1: syntax error, unexpected tSTRING_DEND, expecting ')
 ```
 
 
-# [old\_attributes\_spec.rb:201](/spec/hamlit/engine/old_attributes_spec.rb#L201)
+# [old\_attributes\_spec.rb:203](/spec/hamlit/engine/old_attributes_spec.rb#L203)
 ## Input
 ```haml
 / wontfix: Non-boolean attributes are not escaped for optimization.
@@ -62,7 +62,7 @@ Haml::SyntaxError: (haml):1: syntax error, unexpected tSTRING_DEND, expecting ')
 ```
 
 
-# [old\_attributes\_spec.rb:226](/spec/hamlit/engine/old_attributes_spec.rb#L226)
+# [old\_attributes\_spec.rb:228](/spec/hamlit/engine/old_attributes_spec.rb#L228)
 ## Input
 ```haml
 %a{title: "'"}
@@ -89,7 +89,7 @@ Haml::SyntaxError: (haml):1: syntax error, unexpected tSTRING_DEND, expecting ')
 ```
 
 
-# [old\_attributes\_spec.rb:238](/spec/hamlit/engine/old_attributes_spec.rb#L238)
+# [old\_attributes\_spec.rb:240](/spec/hamlit/engine/old_attributes_spec.rb#L240)
 ## Input
 ```haml
 - title = "'\""
@@ -115,7 +115,7 @@ Haml::SyntaxError: (haml):1: syntax error, unexpected tSTRING_DEND, expecting ')
 ```
 
 
-# [old\_attributes\_spec.rb:250](/spec/hamlit/engine/old_attributes_spec.rb#L250)
+# [old\_attributes\_spec.rb:252](/spec/hamlit/engine/old_attributes_spec.rb#L252)
 ## Input
 ```haml
 - title = { title: "'\"" }

data/lib/hamlit/attribute.rb

@@ -62,7 +62,7 @@ module Hamlit
           when :id
             result[key] = [base[key], target[key]].compact.join('_')
           when :class
-            result[key] = [base[key], target[key]].flatten.compact.map(&:to_s).sort.join(' ')
+            result[key] = [base[key], target[key]].flatten.compact.map(&:to_s).sort.uniq.join(' ')
           end
         else
           result[key] = base[key].nil? ? target[key] : base[key]

data/lib/hamlit/parsers/tag.rb

@@ -15,8 +15,13 @@ module Hamlit
       DEFAULT_TAG = 'div'
 
       def parse_tag(scanner)
-        tag = DEFAULT_TAG
-        tag = scanner.scan(TAG_REGEXP) if scanner.scan(/%/)
+        if scanner.scan(/%/)
+          tag = scanner.scan(TAG_REGEXP)
+          unless tag
+            syntax_error!(%Q{Invalid tag: "#{scanner.string}".})
+          end
+        end
+        tag ||= DEFAULT_TAG
 
         attrs = [:haml, :attrs]
         attrs += parse_tag_id_and_class(scanner)

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end

data/spec/hamlit/engine/old_attributes_spec.rb

@@ -124,9 +124,11 @@ describe Hamlit::Engine do
       it 'joins attribute class and element class' do
         assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
           .foo{ class: ['bar'] }
+          .foo{ class: ['bar', 'foo'] }
           .foo{ class: ['bar', nil] }
           .foo{ class: ['bar', 'baz'] }
         HAML
+          <div class='bar foo'></div>
           <div class='bar foo'></div>
           <div class='bar foo'></div>
           <div class='bar baz foo'></div>

data/spec/hamlit/engine/text_spec.rb

@@ -219,5 +219,21 @@ describe Hamlit::Engine do
       specify { assert_render('あ#{"い"}う', "あいう\n") }
       specify { assert_render('a#{"<b>"}c', "a&lt;b&gt;c\n") }
     end
+
+    describe 'illegal inputs' do
+      it 'rejects an invalid tag' do
+        expect { render_string(<<-HAML.unindent) }.
+          % a
+        HAML
+          to raise_error(Hamlit::SyntaxError, 'Invalid tag: "% a".')
+      end
+
+      it 'rejects an invalid tag' do
+        expect { render_string(<<-HAML.unindent) }.
+          %.foo
+        HAML
+          to raise_error(Hamlit::SyntaxError, 'Invalid tag: "%.foo".')
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Takashi Kokubun