faml 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad03dfd0077214679b01a81f9f23e38681e5ba09
-  data.tar.gz: 4f845eab154e7fefc437be4a4b6e7e9d781e7e5f
+  metadata.gz: 8ed579db6f39d551ff46f78f0407f8c239ac8b96
+  data.tar.gz: 7016eb2f48eccaaa9181ead1ef45f86f5c0e71d7
 SHA512:
-  metadata.gz: 03eb904bc291e05ab14219d83c940a51c7b44c91cd42cd6b6b5b78a7d4774a0df35e5dadc84dc5fc92a324006c65681de3ebe0f6ca4ee95bbc26babff5fae0d0
-  data.tar.gz: 9785e68c585d85301896f83e1b332d75423a6fa8b66194f2caa6384dccfe768ac52aa9860717776512ff3e933ce9a4f1c3e85c21dd0886007aa31cfea5923933
+  metadata.gz: f4eedb5026603869991eb3831d92ab71025152c1ab156a4bd96ca29bb925bf3abe80f7c73656f24c520b35ea11f5deb959b7603453c2b8955951e2f65b4d30fe
+  data.tar.gz: 0a5a7b8f98b4f9f5910e3296ec328e54bd394b7b75dfcd862f9b0902c08cea5aed51468f7db2812f3a44e6ac73d720203435cb899c39c075b30ad18146399aaf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.15 (2015-06-14)
+- Improve compatibility of tilt filter indentations
+- Raise error when ids or classes don't have values
+
 ## 0.2.14 (2015-06-11)
 - Check indent size consistency for compatibility with Haml
 - Intentionally prohibit indentations with hard tabs

data/incompatibilities/README.md

@@ -1,8 +1,8 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.6
-- Faml 0.2.13
-- Hamlit 1.6.0
+- Faml 0.2.15
+- Hamlit 1.6.5
 
 ## Table of contents
 - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)
@@ -11,14 +11,11 @@
 - [spec/render/doctype_spec.md](spec/render/doctype_spec.md)
 - [spec/render/element_spec.md](spec/render/element_spec.md)
 - [spec/render/filters/cdata_spec.md](spec/render/filters/cdata_spec.md)
-- [spec/render/filters/coffee_spec.md](spec/render/filters/coffee_spec.md)
 - [spec/render/filters/css_spec.md](spec/render/filters/css_spec.md)
 - [spec/render/filters/escaped_spec.md](spec/render/filters/escaped_spec.md)
 - [spec/render/filters/javascript_spec.md](spec/render/filters/javascript_spec.md)
 - [spec/render/filters/markdown_spec.md](spec/render/filters/markdown_spec.md)
 - [spec/render/filters/preserve_spec.md](spec/render/filters/preserve_spec.md)
-- [spec/render/filters/sass_spec.md](spec/render/filters/sass_spec.md)
-- [spec/render/filters/scss_spec.md](spec/render/filters/scss_spec.md)
 - [spec/render/helpers_spec.md](spec/render/helpers_spec.md)
 - [spec/render/indent_spec.md](spec/render/indent_spec.md)
 - [spec/render/multiline_spec.md](spec/render/multiline_spec.md)

data/incompatibilities/spec/render/attribute_spec.md

@@ -89,24 +89,6 @@ Hamlit::SyntaxError
 
 ```
 
-# [./spec/render/attribute_spec.rb:65](../../../spec/render/attribute_spec.rb#L65)
-## Input
-```haml
-%span.foo{class: :foo}
-```
-
-## Faml, Haml
-```html
-<span class='foo'></span>
-
-```
-
-## Hamlit
-```html
-<span class='foo foo'></span>
-
-```
-
 # [./spec/render/attribute_spec.rb:65](../../../spec/render/attribute_spec.rb#L65)
 ## Input
 ```haml
@@ -125,46 +107,6 @@ Hamlit::SyntaxError
 
 ```
 
-# [./spec/render/attribute_spec.rb:65](../../../spec/render/attribute_spec.rb#L65)
-## Input
-```haml
-%span.foo{class: %w[foo bar]}
-```
-
-## Faml, Haml
-```html
-<span class='bar foo'></span>
-
-```
-
-## Hamlit
-```html
-<span class='bar foo foo'></span>
-
-```
-
-# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
-## Input
-```haml
-%span.#foo{id: :bar} hello
-```
-
-## Faml
-```html
-<span id='foo_bar'>hello</span>
-
-```
-
-## Haml (Error)
-```html
-Illegal element: classes and ids must have values.
-```
-
-## Hamlit (Error)
-```html
-Expected to scan (?-mix:[a-zA-Z0-9_-]+) but got nil
-```
-
 # [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
 ## Input
 ```haml

data/incompatibilities/spec/render/element_spec.md

@@ -1,26 +1,4 @@
-# [./spec/render/element_spec.rb:63](../../../spec/render/element_spec.rb#L63)
-## Input
-```haml
-%.foo
-```
-
-## Faml (Error)
-```html
-Invalid element declaration
-```
-
-## Haml (Error)
-```html
-Invalid tag: "%.foo".
-```
-
-## Hamlit
-```html
-< class='foo'></>
-
-```
-
-# [./spec/render/element_spec.rb:84](../../../spec/render/element_spec.rb#L84)
+# [./spec/render/element_spec.rb:98](../../../spec/render/element_spec.rb#L98)
 ## Input
 ```haml
 - @var = '</span>'
@@ -45,51 +23,3 @@ hello <span> #@var </span>
 
 ```
 
-# [./spec/render/element_spec.rb:117](../../../spec/render/element_spec.rb#L117)
-## Input
-```haml
-%p/ hello
-```
-
-## Faml (Error)
-```html
-Self-closing tags can't have content
-```
-
-## Haml (Error)
-```html
-Self-closing tags can't have content.
-```
-
-## Hamlit
-```html
-<p>
-
-```
-
-# [./spec/render/element_spec.rb:121](../../../spec/render/element_spec.rb#L121)
-## Input
-```haml
-%p/
-  hello
-
-```
-
-## Faml (Error)
-```html
-Illegal nesting: nesting within a self-closing tag is illegal
-```
-
-## Haml (Error)
-```html
-Illegal nesting: nesting within a self-closing tag is illegal.
-```
-
-## Hamlit
-```html
-<p>
-hello
-</p>
-
-```
-

data/incompatibilities/spec/render/helpers_spec.md

@@ -12,6 +12,6 @@
 
 ## Hamlit (Error)
 ```html
-undefined method `preserve' for #<Object:0x00000003ec3a58>
+undefined method `preserve' for #<Object:0x0000000436a0c0>
 ```
 

data/lib/faml/element_parser.rb

@@ -39,12 +39,16 @@ module Faml
     def parse_class_and_id(class_and_id)
       classes = []
       id = ''
-      class_and_id.scan(/([#.])([-:_a-zA-Z0-9]+)/) do |type, prop|
-        case type
+      scanner = StringScanner.new(class_and_id)
+      until scanner.eos?
+        unless scanner.scan(/([#.])([-:_a-zA-Z0-9]+)/)
+          syntax_error!('Illegal element: classes and ids must have values.')
+        end
+        case scanner[1]
         when '.'
-          classes << prop
+          classes << scanner[2]
         when '#'
-          id = prop
+          id = scanner[2]
         end
       end
 

data/lib/faml/filter_compilers/coffee.rb

@@ -5,7 +5,7 @@ module Faml
     class Coffee < TiltBase
       def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'coffee', ast)
+        compile_with_tilt(temple, 'coffee', ast, indent_width: 2)
         temple << [:static, "\n"]
         [:haml, :tag, 'script', false, [:html, :attrs], [:html, :js, temple]]
       end

data/lib/faml/filter_compilers/markdown.rb

@@ -10,6 +10,7 @@ module Faml
       def compile(ast)
         temple = [:multi, [:newline]]
         compile_with_tilt(temple, 'markdown', ast)
+        temple << [:static, "\n"]
       end
     end
 

data/lib/faml/filter_compilers/sass.rb

@@ -5,7 +5,8 @@ module Faml
     class Sass < TiltBase
       def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'sass', ast)
+        compile_with_tilt(temple, 'sass', ast, indent_width: 2)
+        temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end
     end

data/lib/faml/filter_compilers/scss.rb

@@ -5,7 +5,7 @@ module Faml
     class Scss < TiltBase
       def compile(ast)
         temple = [:multi, [:static, "\n"], [:newline]]
-        compile_with_tilt(temple, 'scss', ast)
+        compile_with_tilt(temple, 'scss', ast, indent_width: 2)
         temple << [:static, "\n"]
         [:haml, :tag, 'style', false, [:html, :attrs], temple]
       end

data/lib/faml/filter_compilers/tilt_base.rb

@@ -8,22 +8,24 @@ module Faml
     class TiltBase < Base
       include Temple::Utils
 
-      def self.render_with_tilt(name, source)
-        ::Tilt["t.#{name}"].new { source }.render
+      def self.render_with_tilt(name, source, indent_width: 0)
+        text = ::Tilt["t.#{name}"].new { source }.render
+        indent = ' ' * indent_width
+        "#{indent}#{text.rstrip.gsub("\n", "\n#{indent}")}"
       end
 
       protected
 
-      def compile_with_tilt(temple, name, ast)
+      def compile_with_tilt(temple, name, ast, indent_width: 0)
         source = ast.texts.join("\n")
         if TextCompiler.contains_interpolation?(source)
           text_temple = [:multi]
           compile_texts(text_temple, ast.lineno, ast.texts)
           sym = unique_name
           temple << [:capture, sym, text_temple]
-          temple << [:dynamic, "::Faml::FilterCompilers::TiltBase.render_with_tilt(#{name.inspect}, #{sym})"]
+          temple << [:dynamic, "::Faml::FilterCompilers::TiltBase.render_with_tilt(#{name.inspect}, #{sym}, indent_width: #{indent_width})"]
         else
-          compiled = self.class.render_with_tilt(name, source)
+          compiled = self.class.render_with_tilt(name, source, indent_width: indent_width)
           temple << [:static, compiled]
           temple.concat([[:newline]] * (ast.texts.size - 1))
         end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/spec/render/attribute_spec.rb

@@ -69,7 +69,7 @@ HAML
   end
 
   it 'strigify non-string ids' do
-    expect(render_string('%span.#foo{id: :bar} hello')).to eq("<span id='foo_bar'>hello</span>\n")
+    expect(render_string('%span#foo{id: :bar} hello')).to eq("<span id='foo_bar'>hello</span>\n")
   end
 
   it 'escapes' do

data/spec/render/element_spec.rb

@@ -65,6 +65,20 @@ HAML
     end
   end
 
+  context 'with invalid classes' do
+    it 'raises error' do
+      expect { render_string('%span. hello') }.to raise_error(Faml::SyntaxError)
+      expect { render_string('%span.{foo: "bar"} hello') }.to raise_error(Faml::SyntaxError)
+    end
+  end
+
+  context 'with invalid ids' do
+    it 'raises error' do
+      expect { render_string('%span# hello') }.to raise_error(Faml::SyntaxError)
+      expect { render_string('%span#{foo: "bar"} hello') }.to raise_error(Faml::SyntaxError)
+    end
+  end
+
   it 'parses #' do
     expect(render_string('#main')).to eq(%Q{<div id='main'></div>\n})
   end

data/spec/support/incompatibilities_generator.rb

@@ -7,6 +7,28 @@ class IncompatibilitiesGenerator
   include Singleton
 
   class Record < Struct.new(:template, :options, :spec_path, :line_number, :faml_result, :haml_result, :hamlit_result)
+    def incompatible?
+      !all_error? && (faml_result != haml_result || faml_result != hamlit_result || haml_result != hamlit_result)
+    end
+
+    def grouped_difference
+      case
+      when faml_result != haml_result && faml_result != hamlit_result && haml_result != hamlit_result
+        { 'Faml' => faml_result, 'Haml' => haml_result, 'Hamlit' => hamlit_result }
+      when faml_result == haml_result
+        { 'Faml, Haml' => faml_result, 'Hamlit' => hamlit_result }
+      when faml_result == hamlit_result
+        { 'Faml, Hamlit' => faml_result, 'Haml' => haml_result }
+      else
+        { 'Faml' => faml_result, 'Haml, Hamlit' => haml_result }
+      end
+    end
+
+    private
+
+    def all_error?
+      [faml_result, haml_result, hamlit_result].all? { |r| r.is_a?(Exception) }
+    end
   end
 
   def initialize
@@ -23,9 +45,7 @@ class IncompatibilitiesGenerator
 
     incompatibilities = Hash.new { |h, k| h[k] = [] }
     @records.each do |record|
-      if record.faml_result.is_a?(Exception) && record.haml_result.is_a?(Exception) && record.hamlit_result.is_a?(Exception)
-        # All errored, not an incompatibility.
-      elsif record.faml_result != record.haml_result || record.faml_result != record.hamlit_result || record.haml_result != record.hamlit_result
+      if record.incompatible?
         incompatibilities[record.spec_path] << record
       end
     end
@@ -70,15 +90,7 @@ class IncompatibilitiesGenerator
 ```
 
 EOS
-    if record.faml_result != record.haml_result && record.faml_result != record.hamlit_result && record.haml_result != record.hamlit_result
-      render_grouped_difference(file, 'Faml' => record.faml_result, 'Haml' => record.haml_result, 'Hamlit' => record.hamlit_result)
-    elsif record.faml_result == record.haml_result
-      render_grouped_difference(file, 'Faml, Haml' => record.faml_result, 'Hamlit' => record.hamlit_result)
-    elsif record.faml_result == record.hamlit_result
-      render_grouped_difference(file, 'Faml, Hamlit' => record.faml_result, 'Haml' => record.haml_result)
-    else
-      render_grouped_difference(file, 'Faml' => record.faml_result, 'Haml, Hamlit' => record.haml_result)
-    end
+    render_grouped_difference(file, record.grouped_difference)
   end
 
   def render_input_title(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -305,14 +305,11 @@ files:
 - incompatibilities/spec/render/doctype_spec.md
 - incompatibilities/spec/render/element_spec.md
 - incompatibilities/spec/render/filters/cdata_spec.md
-- incompatibilities/spec/render/filters/coffee_spec.md
 - incompatibilities/spec/render/filters/css_spec.md
 - incompatibilities/spec/render/filters/escaped_spec.md
 - incompatibilities/spec/render/filters/javascript_spec.md
 - incompatibilities/spec/render/filters/markdown_spec.md
 - incompatibilities/spec/render/filters/preserve_spec.md
-- incompatibilities/spec/render/filters/sass_spec.md
-- incompatibilities/spec/render/filters/scss_spec.md
 - incompatibilities/spec/render/helpers_spec.md
 - incompatibilities/spec/render/indent_spec.md
 - incompatibilities/spec/render/multiline_spec.md
@@ -484,14 +481,11 @@ test_files:
 - incompatibilities/spec/render/doctype_spec.md
 - incompatibilities/spec/render/element_spec.md
 - incompatibilities/spec/render/filters/cdata_spec.md
-- incompatibilities/spec/render/filters/coffee_spec.md
 - incompatibilities/spec/render/filters/css_spec.md
 - incompatibilities/spec/render/filters/escaped_spec.md
 - incompatibilities/spec/render/filters/javascript_spec.md
 - incompatibilities/spec/render/filters/markdown_spec.md
 - incompatibilities/spec/render/filters/preserve_spec.md
-- incompatibilities/spec/render/filters/sass_spec.md
-- incompatibilities/spec/render/filters/scss_spec.md
 - incompatibilities/spec/render/helpers_spec.md
 - incompatibilities/spec/render/indent_spec.md
 - incompatibilities/spec/render/multiline_spec.md

data/incompatibilities/spec/render/filters/coffee_spec.md

@@ -1,88 +0,0 @@
-# [./spec/render/filters/coffee_spec.rb:4](../../../../spec/render/filters/coffee_spec.rb#L4)
-## Input
-```haml
-:coffee
-  square = (x) -> x * x
-  square(3)
-
-```
-
-## Faml
-```html
-<script>
-(function() {
-  var square;
-
-  square = function(x) {
-    return x * x;
-  };
-
-  square(3);
-
-}).call(this);
-
-</script>
-
-```
-
-## Haml, Hamlit
-```html
-<script>
-  (function() {
-    var square;
-  
-    square = function(x) {
-      return x * x;
-    };
-  
-    square(3);
-  
-  }).call(this);
-</script>
-
-```
-
-# [./spec/render/filters/coffee_spec.rb:15](../../../../spec/render/filters/coffee_spec.rb#L15)
-## Input
-```haml
-:coffee
-  square = (x) -> x * x
-  square(#{1 + 2})
-
-```
-
-## Faml
-```html
-<script>
-(function() {
-  var square;
-
-  square = function(x) {
-    return x * x;
-  };
-
-  square(3);
-
-}).call(this);
-
-</script>
-
-```
-
-## Haml, Hamlit
-```html
-<script>
-  (function() {
-    var square;
-  
-    square = function(x) {
-      return x * x;
-    };
-  
-    square(3);
-  
-  }).call(this);
-</script>
-
-```
-

data/incompatibilities/spec/render/filters/sass_spec.md

@@ -1,59 +0,0 @@
-# [./spec/render/filters/sass_spec.rb:4](../../../../spec/render/filters/sass_spec.rb#L4)
-## Input
-```haml
-:sass
-  nav
-    ul
-      margin: 0
-      content: "hello"
-
-```
-
-## Faml
-```html
-<style>
-nav ul {
-  margin: 0;
-  content: "hello"; }
-</style>
-
-```
-
-## Haml, Hamlit
-```html
-<style>
-  nav ul {
-    margin: 0;
-    content: "hello"; }
-</style>
-
-```
-
-# [./spec/render/filters/sass_spec.rb:17](../../../../spec/render/filters/sass_spec.rb#L17)
-## Input
-```haml
-:sass
-  nav
-    ul
-      margin: #{0 + 5}px
-
-```
-
-## Faml
-```html
-<style>
-nav ul {
-  margin: 5px; }
-</style>
-
-```
-
-## Haml, Hamlit
-```html
-<style>
-  nav ul {
-    margin: 5px; }
-</style>
-
-```
-

data/incompatibilities/spec/render/filters/scss_spec.md

@@ -1,65 +0,0 @@
-# [./spec/render/filters/scss_spec.rb:4](../../../../spec/render/filters/scss_spec.rb#L4)
-## Input
-```haml
-:scss
-  nav {
-    ul {
-      margin: 0;
-      content: "hello";
-    }
-  }
-
-```
-
-## Faml
-```html
-<style>
-nav ul {
-  margin: 0;
-  content: "hello"; }
-
-</style>
-
-```
-
-## Haml, Hamlit
-```html
-<style>
-  nav ul {
-    margin: 0;
-    content: "hello"; }
-</style>
-
-```
-
-# [./spec/render/filters/scss_spec.rb:19](../../../../spec/render/filters/scss_spec.rb#L19)
-## Input
-```haml
-:scss
-  nav {
-    ul {
-      margin: #{0 + 5}px;
-    }
-  }
-
-```
-
-## Faml
-```html
-<style>
-nav ul {
-  margin: 5px; }
-
-</style>
-
-```
-
-## Haml, Hamlit
-```html
-<style>
-  nav ul {
-    margin: 5px; }
-</style>
-
-```
-