hamlit 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5cc29adeedc23941351000259c916d89cdea442
-  data.tar.gz: affff05b7d78d2c7af5dd23a7c1d7ecd01e15bd1
+  metadata.gz: bda4c6ff22c6943b23ebaf8358f66b2f6f01fb66
+  data.tar.gz: 9db2e3e2d27fa2efd0c485cd8441ab07c83478d4
 SHA512:
-  metadata.gz: ea281451bd2d83164bd6a6d8b40c129d8551d06ebc64403e2bcbe5c9f4777dc7c911b385ef7077107a5e05b325e1fbcd844729569b2db6f8d4217bc6bf480268
-  data.tar.gz: 906d0de6f993ffc61831c3660399a8186e8d17a89bb89f3fff9af07d46e90ccdad7575a90c4630cf172d09ae6dd01e4bcb577837672a7949866a4e4c3990b4e3
+  metadata.gz: bb8134311dd9d4cf6aa281abfbf5070093bb887c65a18a37a6c6e152720b1f20a6b88074ea908e8fb6b50ad0fb3c512745d9d54b01ff48246c9312518a37738a
+  data.tar.gz: 4a42cdc7aac2be14ca3f575dec01d7a29add11edff720b0f8a74e94d0227bda47efd4d71b6e79d0fa278cfe99085f6d5b743b1fe011da52c985c6a7e109020b1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.6.6
+
+- Allow hyphenated HTML-style attributes
+  - https://github.com/k0kubun/hamlit/pull/29
+  - Thanks to @babelfish
+
 ## v1.6.5
 
 - Don't duplicate element class and attribute class

data/doc/README.md

@@ -12,11 +12,8 @@ Showing incompatibilities against [Haml](https://github.com/haml/haml) and [Faml
 
 
 ## filters
-- [filters/coffee\_spec.rb](filters/coffee.md)
 - [filters/erb\_spec.rb](filters/erb.md)
 - [filters/javascript\_spec.rb](filters/javascript.md)
 - [filters/less\_spec.rb](filters/less.md)
 - [filters/markdown\_spec.rb](filters/markdown.md)
 - [filters/plain\_spec.rb](filters/plain.md)
-- [filters/sass\_spec.rb](filters/sass.md)
-- [filters/scss\_spec.rb](filters/scss.md)

data/doc/engine/text.md

@@ -18,13 +18,7 @@ Haml::SyntaxError: Illegal element: classes and ids must have values.
 
 ### Faml
 ```html
-<div></div>
-<div>*</div>
-<div></div>
-<div></div>
-<div>+</div>
-<div></div>
-
+Faml::SyntaxError: Illegal element: classes and ids must have values.
 ```
 
 ### Hamlit

data/doc/faml/README.md

@@ -10,10 +10,7 @@ Showing incompatibilities against [Faml](https://github.com/eagletmt/faml).
 
 
 ## filters
-- [filters/coffee\_spec.rb](filters/coffee.md)
 - [filters/erb\_spec.rb](filters/erb.md)
 - [filters/javascript\_spec.rb](filters/javascript.md)
 - [filters/less\_spec.rb](filters/less.md)
 - [filters/plain\_spec.rb](filters/plain.md)
-- [filters/sass\_spec.rb](filters/sass.md)
-- [filters/scss\_spec.rb](filters/scss.md)

data/doc/faml/engine/text.md

@@ -13,13 +13,7 @@
 ## Output
 ### Faml
 ```html
-<div></div>
-<div>*</div>
-<div></div>
-<div></div>
-<div>+</div>
-<div></div>
-
+Faml::SyntaxError: Illegal element: classes and ids must have values.
 ```
 
 ### Hamlit

data/lib/hamlit/compilers/new_attribute.rb

@@ -44,6 +44,15 @@ module Hamlit
       def read_key!(tokens)
         skip_tokens!(tokens, :on_sp, :on_nl, :on_ignored_nl)
         (row, col), type, key = tokens.shift
+
+        while tokens.any? && tokens.first[2] == '-'
+          tokens.shift
+
+          (row, col), type, part = tokens.shift
+
+          key = "#{key}-#{part}"
+        end
+
         key
       end
 

data/lib/hamlit/concerns/balanceable.rb

@@ -11,9 +11,8 @@ 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)
+      def fetch_balanced_embexprs(all_tokens, start_count: 0)
+        fetch_balanced_tokens(all_tokens, :on_embexpr_beg, :on_embexpr_end, start_count: start_count)
       end
 
       def balanced_braces_exist?(tokens)
@@ -24,16 +23,15 @@ 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)
+      def balanced_embexprs_exist?(tokens, start_count: 0)
+        balanced_tokens_exist?(tokens, :on_embexpr_beg, :on_embexpr_end, start_count: start_count)
       end
 
       private
 
-      def fetch_balanced_tokens(all_tokens, open_token, close_token)
+      def fetch_balanced_tokens(all_tokens, open_token, close_token, start_count: 0)
         tokens     = []
-        open_count = 0
+        open_count = start_count
 
         all_tokens.each_with_index do |token, index|
           (row, col), type, str = token
@@ -49,8 +47,8 @@ module Hamlit
         tokens
       end
 
-      def balanced_tokens_exist?(tokens, open_token, close_token)
-        open_count = 0
+      def balanced_tokens_exist?(tokens, open_token, close_token, start_count: 0)
+        open_count = start_count
 
         tokens.each do |token|
           (row, col), type, str = token

data/lib/hamlit/parsers/attribute.rb

@@ -8,7 +8,9 @@ module Hamlit
       include Concerns::Balanceable
       include Concerns::Lexable
 
-      EMBEXPR_PREFIX = '"#'.freeze
+      ATTRIBUTE_BEGIN     = '{'.freeze
+      METHOD_CALL_PREFIX  = 'a('.freeze
+      BALANCE_START_COUNT = 1
 
       def parse_attributes(scanner)
         if scanner.match?(/{/)
@@ -22,22 +24,22 @@ module Hamlit
 
       # 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.
+      # This method bypasses it by changing expression to method call.
       # Ideally you should implement an original lexer for haml old attributes.
       def parse_old_attributes(scanner)
         return [] unless scanner.match?(/{/)
 
-        tokens = try_lex(EMBEXPR_PREFIX + scanner.rest)
-        until balanced_embexprs_exist?(tokens)
+        tokens = Ripper.lex(scanner.rest.sub(ATTRIBUTE_BEGIN, METHOD_CALL_PREFIX))
+        until balanced_embexprs_exist?(tokens, start_count: BALANCE_START_COUNT)
           @current_lineno += 1
           break unless @lines[@current_lineno]
           scanner.concat(current_line)
-          tokens = try_lex(EMBEXPR_PREFIX + scanner.rest)
+          tokens = Ripper.lex(scanner.rest.sub(ATTRIBUTE_BEGIN, METHOD_CALL_PREFIX))
         end
 
-        tokens = fetch_balanced_embexprs(tokens)
-        scanner.pos += tokens.last.first.last - 1 # remove EMBEXPR_PREFIX's offset
-        [tokens.map(&:last).join.gsub(/\A#/, '')]
+        tokens = fetch_balanced_embexprs(tokens, start_count: BALANCE_START_COUNT)
+        scanner.pos += tokens.last.first.last
+        [tokens.map(&:last).join.sub(METHOD_CALL_PREFIX, ATTRIBUTE_BEGIN)]
       end
 
       def parse_new_attributes(scanner)
@@ -56,15 +58,6 @@ module Hamlit
         scanner.pos += convert_position(text, *tokens.last.first) + 1
         [text]
       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.6.5"
+  VERSION = "1.6.6"
 end

data/spec/hamlit/engine/new_attribute_spec.rb

@@ -27,6 +27,22 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders hyphenated attributes properly' do
+      assert_render(<<-HAML, <<-HTML)
+        %p(data-foo='bar') bar
+      HAML
+        <p data-foo='bar'>bar</p>
+      HTML
+    end
+
+    it 'renders multiply hyphenated attributes properly' do
+      assert_render(<<-HAML, <<-HTML)
+        %p(data-x-foo='bar') bar
+      HAML
+        <p data-x-foo='bar'>bar</p>
+      HTML
+    end
+
     describe 'html escape' do
       it 'escapes attribute values on static attributes' do
         assert_render(<<-'HAML', <<-HTML, compatible_only: :faml)

data/spec/hamlit/engine/text_spec.rb

@@ -13,7 +13,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders . or # which is not continued by tag name' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: [], error_with: :haml)
+      assert_render(<<-HAML, <<-HTML, error_with: [:haml, :faml])
         .
         .*
         ..

data/spec/hamlit/filters/coffee_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Coffee do
   describe '#compile' do
     it 'renders coffee filter' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML)
         :coffee
           foo = ->
             alert('hello')
@@ -20,7 +20,7 @@ describe Hamlit::Filters::Coffee do
     end
 
     it 'renders coffeescript filter' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML)
         :coffee
           foo = ->
             alert('hello')
@@ -39,7 +39,7 @@ describe Hamlit::Filters::Coffee do
     end
 
     it 'renders coffeescript filter' do
-      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
+      assert_render(<<-'HAML', <<-HTML)
         :coffee
           foo = ->
             alert("#{'<&>'}")

data/spec/hamlit/filters/sass_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Sass do
   describe '#compile' do
     it 'renders sass filter' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML)
         :sass
           .users_controller
             .show_action
@@ -17,7 +17,7 @@ describe Hamlit::Filters::Sass do
     end
 
     it 'renders sass filter with string interpolation' do
-      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
+      assert_render(<<-'HAML', <<-HTML)
         :sass
           .users_controller
             .show_action

data/spec/hamlit/filters/scss_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Filters::Scss do
   describe '#compile' do
     it 'renders scss filter' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML)
         :scss
           .users_controller {
             .show_action {
@@ -19,7 +19,7 @@ describe Hamlit::Filters::Scss do
     end
 
     it 'parses string interpolation' do
-      assert_render(<<-'HAML', <<-HTML, compatible_only: :haml)
+      assert_render(<<-'HAML', <<-HTML)
         :scss
           .users_controller {
             .show_action {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -311,21 +311,15 @@ files:
 - doc/faml/engine/old_attributes.md
 - doc/faml/engine/silent_script.md
 - doc/faml/engine/text.md
-- doc/faml/filters/coffee.md
 - doc/faml/filters/erb.md
 - doc/faml/filters/javascript.md
 - doc/faml/filters/less.md
 - doc/faml/filters/plain.md
-- doc/faml/filters/sass.md
-- doc/faml/filters/scss.md
-- doc/filters/coffee.md
 - doc/filters/erb.md
 - doc/filters/javascript.md
 - doc/filters/less.md
 - doc/filters/markdown.md
 - doc/filters/plain.md
-- doc/filters/sass.md
-- doc/filters/scss.md
 - doc/haml/README.md
 - doc/haml/engine/new_attribute.md
 - doc/haml/engine/old_attributes.md
@@ -604,3 +598,4 @@ test_files:
 - spec/spec_helper/document_generator.rb
 - spec/spec_helper/render_helper.rb
 - spec/spec_helper/test_case.rb
+has_rdoc: 

data/doc/faml/filters/coffee.md

@@ -1,125 +0,0 @@
-# [coffee\_spec.rb:3](/spec/hamlit/filters/coffee_spec.rb#L3)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert('hello')
-
-```
-
-## Output
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert('hello');
-  };
-
-}).call(this);
-
-</script>
-
-```
-
-### Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert('hello');
-    };
-  
-  }).call(this);
-</script>
-
-```
-
-
-# [coffee\_spec.rb:22](/spec/hamlit/filters/coffee_spec.rb#L22)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert('hello')
-
-```
-
-## Output
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert('hello');
-  };
-
-}).call(this);
-
-</script>
-
-```
-
-### Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert('hello');
-    };
-  
-  }).call(this);
-</script>
-
-```
-
-
-# [coffee\_spec.rb:41](/spec/hamlit/filters/coffee_spec.rb#L41)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert("#{'<&>'}")
-
-```
-
-## Output
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert("<&>");
-  };
-
-}).call(this);
-
-</script>
-
-```
-
-### Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert("<&>");
-    };
-  
-  }).call(this);
-</script>
-
-```
-

data/doc/faml/filters/sass.md

@@ -1,62 +0,0 @@
-# [sass\_spec.rb:3](/spec/hamlit/filters/sass_spec.rb#L3)
-## Input
-```haml
-:sass
-  .users_controller
-    .show_action
-      margin: 10px
-      padding: 20px
-
-```
-
-## Output
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  margin: 10px;
-  padding: 20px; }
-</style>
-
-```
-
-### Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    margin: 10px;
-    padding: 20px; }
-</style>
-
-```
-
-
-# [sass\_spec.rb:19](/spec/hamlit/filters/sass_spec.rb#L19)
-## Input
-```haml
-:sass
-  .users_controller
-    .show_action
-      content: "#{'<&>'}"
-
-```
-
-## Output
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  content: "<&>"; }
-</style>
-
-```
-
-### Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    content: "<&>"; }
-</style>
-
-```
-

data/doc/faml/filters/scss.md

@@ -1,68 +0,0 @@
-# [scss\_spec.rb:3](/spec/hamlit/filters/scss_spec.rb#L3)
-## Input
-```haml
-:scss
-  .users_controller {
-    .show_action {
-      margin: 10px;
-      padding: 20px;
-    }
-  }
-
-```
-
-## Output
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  margin: 10px;
-  padding: 20px; }
-
-</style>
-
-```
-
-### Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    margin: 10px;
-    padding: 20px; }
-</style>
-
-```
-
-
-# [scss\_spec.rb:21](/spec/hamlit/filters/scss_spec.rb#L21)
-## Input
-```haml
-:scss
-  .users_controller {
-    .show_action {
-      content: "#{'<&>'}";
-    }
-  }
-
-```
-
-## Output
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  content: "<&>"; }
-
-</style>
-
-```
-
-### Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    content: "<&>"; }
-</style>
-
-```
-

data/doc/filters/coffee.md

@@ -1,125 +0,0 @@
-# [coffee\_spec.rb:3](/spec/hamlit/filters/coffee_spec.rb#L3)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert('hello')
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert('hello');
-    };
-  
-  }).call(this);
-</script>
-
-```
-
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert('hello');
-  };
-
-}).call(this);
-
-</script>
-
-```
-
-
-# [coffee\_spec.rb:22](/spec/hamlit/filters/coffee_spec.rb#L22)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert('hello')
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert('hello');
-    };
-  
-  }).call(this);
-</script>
-
-```
-
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert('hello');
-  };
-
-}).call(this);
-
-</script>
-
-```
-
-
-# [coffee\_spec.rb:41](/spec/hamlit/filters/coffee_spec.rb#L41)
-## Input
-```haml
-:coffee
-  foo = ->
-    alert("#{'<&>'}")
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<script>
-  (function() {
-    var foo;
-  
-    foo = function() {
-      return alert("<&>");
-    };
-  
-  }).call(this);
-</script>
-
-```
-
-### Faml
-```html
-<script>
-(function() {
-  var foo;
-
-  foo = function() {
-    return alert("<&>");
-  };
-
-}).call(this);
-
-</script>
-
-```
-

data/doc/filters/sass.md

@@ -1,62 +0,0 @@
-# [sass\_spec.rb:3](/spec/hamlit/filters/sass_spec.rb#L3)
-## Input
-```haml
-:sass
-  .users_controller
-    .show_action
-      margin: 10px
-      padding: 20px
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    margin: 10px;
-    padding: 20px; }
-</style>
-
-```
-
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  margin: 10px;
-  padding: 20px; }
-</style>
-
-```
-
-
-# [sass\_spec.rb:19](/spec/hamlit/filters/sass_spec.rb#L19)
-## Input
-```haml
-:sass
-  .users_controller
-    .show_action
-      content: "#{'<&>'}"
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    content: "<&>"; }
-</style>
-
-```
-
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  content: "<&>"; }
-</style>
-
-```
-

data/doc/filters/scss.md

@@ -1,68 +0,0 @@
-# [scss\_spec.rb:3](/spec/hamlit/filters/scss_spec.rb#L3)
-## Input
-```haml
-:scss
-  .users_controller {
-    .show_action {
-      margin: 10px;
-      padding: 20px;
-    }
-  }
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    margin: 10px;
-    padding: 20px; }
-</style>
-
-```
-
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  margin: 10px;
-  padding: 20px; }
-
-</style>
-
-```
-
-
-# [scss\_spec.rb:21](/spec/hamlit/filters/scss_spec.rb#L21)
-## Input
-```haml
-:scss
-  .users_controller {
-    .show_action {
-      content: "#{'<&>'}";
-    }
-  }
-
-```
-
-## Output
-### Haml, Hamlit
-```html
-<style>
-  .users_controller .show_action {
-    content: "<&>"; }
-</style>
-
-```
-
-### Faml
-```html
-<style>
-.users_controller .show_action {
-  content: "<&>"; }
-
-</style>
-
-```
-