faml 0.2.16 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060e986d85d08a46e9341eb16d6998554f6839a1
-  data.tar.gz: 4883f1ddec473a08bbad24b2d739c6d0b5ed9c1f
+  metadata.gz: 23f087ba97e9ffb104d240af74b6704fd100a5e8
+  data.tar.gz: 2e5f8a48de615415b4343fa7f818106b26f8d3ae
 SHA512:
-  metadata.gz: 7593bc4d281142cb9c35d6bd097aba81c5476076614306bf102c46094c4f3327e61ac0df2d0695c59c3c58c177a9fd68c85ab399fdf8ed753614349ac47813eb
-  data.tar.gz: 17581ff5aec1be1dbab01809f8e3b4533e305fadf2985bf164c1e9fc3e5a46890d563a761730cd1185348145ffffebb673c54f91702f47a6fe10676ab4a0ece2
+  metadata.gz: 84c1f440f966f32e7163fe610317d5fa4da8d625204aa72b8e09488fd872c2b3d62ff26c2ff83ea3e743bc48d351257be80f02dbffcc44d219266417f6f6aa29
+  data.tar.gz: 4ff1f89b8bf2935abe157da73197c12614a32a7fadfb644b596d996868ebc4d99101243ae83b04833488734393522645125aabfb2b50409bd4d57fd35fa4644d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (2015-09-13)
+- Move Haml parser and AST definition to haml_parser
+    - https://github.com/eagletmt/haml_parser
+    - Remove `faml parse` subcommand
+
 ## 0.2.16 (2015-08-05)
 - Fix incompatibility to tilt 2.x
     - https://github.com/eagletmt/faml/issues/23

data/README.md

@@ -92,9 +92,9 @@ If you find other incompatibility, please report it to me :-p.
 I use [temple](https://github.com/judofyr/temple) to achieve faster template rendering.
 It's used by [slim](https://github.com/slim-template/slim) template language & engine which is known as fast.
 
-1. Faml::Parser converts source language (Haml template) to own AST (Faml::Ast) .
-    - You can see the Faml::Ast by running `faml parse template.haml` .
-2. Faml::Compiler compiles Faml::Ast into Temple AST.
+1. HamlParser::Parser converts source language (Haml template) to own AST (HamlParser::Ast) .
+    - You can see the HamlParser::Ast by running `haml_parser template.haml` .
+2. Faml::Compiler compiles HamlParser::Ast into Temple AST.
     - You can see the Temple AST by running `faml temple template.haml` .
 3. Temple compiles its AST into Ruby code.
     - You can see the Ruby code by running `faml compile template.haml` .

data/faml.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_dependency "escape_utils"
+  spec.add_dependency "haml_parser", ">= 0.1.0"
   spec.add_dependency "parser"
   spec.add_dependency "temple", ">= 0.7.0"
   spec.add_dependency "tilt"

data/incompatibilities/README.md

@@ -1,13 +1,13 @@
 # Incompatibilities
 ## Versions
-- Haml 4.0.6
-- Faml 0.2.15
-- Hamlit 1.7.1
+- Haml 4.0.7
+- Faml 0.3.0
+- Hamlit 1.7.2
 
 ## Table of contents
 - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)
 - [spec/render/attribute_spec.md](spec/render/attribute_spec.md)
-- [spec/render/comment_spec.md](spec/render/comment_spec.md)
+- [spec/render/comment_spec.md](spec/render/comment_spec.md) (Hamlit's incompatibility)
 - [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) (Hamlit's incompatibility)
@@ -17,7 +17,6 @@
 - [spec/render/filters/markdown_spec.md](spec/render/filters/markdown_spec.md)
 - [spec/render/filters/preserve_spec.md](spec/render/filters/preserve_spec.md) (Hamlit's incompatibility)
 - [spec/render/helpers_spec.md](spec/render/helpers_spec.md) (Hamlit's incompatibility)
-- [spec/render/indent_spec.md](spec/render/indent_spec.md)
 - [spec/render/multiline_spec.md](spec/render/multiline_spec.md) (Hamlit's incompatibility)
 - [spec/render/newline_spec.md](spec/render/newline_spec.md) (Hamlit's incompatibility)
 - [spec/render/plain_spec.md](spec/render/plain_spec.md) (Hamlit's incompatibility)

data/incompatibilities/spec/render/attribute_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/attribute_spec.rb:52](../../../spec/render/attribute_spec.rb#L52)
+# [./spec/render/attribute_spec.rb:48](../../../spec/render/attribute_spec.rb#L48)
 ## Input
 ```haml
 - h1 = {class: 'c1', id: ['id1', 'id3']}
@@ -19,7 +19,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:65](../../../spec/render/attribute_spec.rb#L65)
+# [./spec/render/attribute_spec.rb:61](../../../spec/render/attribute_spec.rb#L61)
 ## Input
 ```haml
 %span.foo{class: "foo bar"}
@@ -37,7 +37,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
+# [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
 ## Input
 ```haml
 %span{class: "x\"y'z"} hello
@@ -55,7 +55,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:92](../../../spec/render/attribute_spec.rb#L92)
+# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - foo = true
@@ -74,7 +74,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:92](../../../spec/render/attribute_spec.rb#L92)
+# [./spec/render/attribute_spec.rb:84](../../../spec/render/attribute_spec.rb#L84)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true, bar: 1}
@@ -93,7 +93,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:99](../../../spec/render/attribute_spec.rb#L99)
+# [./spec/render/attribute_spec.rb:91](../../../spec/render/attribute_spec.rb#L91)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -111,7 +111,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:103](../../../spec/render/attribute_spec.rb#L103)
+# [./spec/render/attribute_spec.rb:95](../../../spec/render/attribute_spec.rb#L95)
 ## Input
 ```haml
 - attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
@@ -137,7 +137,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:117](../../../spec/render/attribute_spec.rb#L117)
+# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
 ## Input
 ```haml
 - data = { foo: 1 }
@@ -157,7 +157,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:124](../../../spec/render/attribute_spec.rb#L124)
+# [./spec/render/attribute_spec.rb:116](../../../spec/render/attribute_spec.rb#L116)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -175,31 +175,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:157](../../../spec/render/attribute_spec.rb#L157)
-## Input
-```haml
-%span{foo: 1
-, bar: 2} hello
-
-```
-
-## Faml (Error)
-```html
-Unmatched brace
-```
-
-## Haml (Error)
-```html
-Unbalanced brackets.
-```
-
-## Hamlit
-```html
-<span bar='2' foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:166](../../../spec/render/attribute_spec.rb#L166)
+# [./spec/render/attribute_spec.rb:138](../../../spec/render/attribute_spec.rb#L138)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -217,7 +193,7 @@ Unbalanced brackets.
 
 ```
 
-# [./spec/render/attribute_spec.rb:174](../../../spec/render/attribute_spec.rb#L174)
+# [./spec/render/attribute_spec.rb:146](../../../spec/render/attribute_spec.rb#L146)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -235,7 +211,7 @@ Unbalanced brackets.
 
 ```
 
-# [./spec/render/attribute_spec.rb:178](../../../spec/render/attribute_spec.rb#L178)
+# [./spec/render/attribute_spec.rb:150](../../../spec/render/attribute_spec.rb#L150)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -255,7 +231,7 @@ Unbalanced brackets.
 
 ```
 
-# [./spec/render/attribute_spec.rb:186](../../../spec/render/attribute_spec.rb#L186)
+# [./spec/render/attribute_spec.rb:158](../../../spec/render/attribute_spec.rb#L158)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -275,185 +251,3 @@ Unbalanced brackets.
 
 ```
 
-# [./spec/render/attribute_spec.rb:212](../../../spec/render/attribute_spec.rb#L212)
-## Input
-```haml
-%span{data: {foo: 1,
-  bar: 2}}
-  %span hello
-
-```
-
-## Faml, Haml
-```html
-<span data-bar='2' data-foo='1'>
-<span>hello</span>
-</span>
-
-```
-
-## Hamlit
-```html
-<span data-foo='1' data-bar='2'>
-<span>hello</span>
-</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:220](../../../spec/render/attribute_spec.rb#L220)
-## Input
-```haml
-%span(foo=1
-
-bar=3) hello
-
-```
-
-## Faml, Haml
-```html
-<span bar='3' foo='1'>hello</span>
-
-```
-
-## Hamlit
-```html
-<span foo='3'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:237](../../../spec/render/attribute_spec.rb#L237)
-## Input
-```haml
-%span(foo bar=1) hello
-```
-
-## Faml, Haml
-```html
-<span bar='1' foo>hello</span>
-
-```
-
-## Hamlit
-```html
-<span = foo>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:241](../../../spec/render/attribute_spec.rb#L241)
-## Input
-```haml
-%span(foo=1 bar='baz#{1 + 2}') hello
-```
-
-## Faml, Haml
-```html
-<span bar='baz3' foo='1'>hello</span>
-
-```
-
-## Hamlit
-```html
-<span bar='baz#{1 + 2}' foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:246](../../../spec/render/attribute_spec.rb#L246)
-## Input
-```haml
-%span(foo=1 bar="ba\"z") hello
-```
-
-## Faml, Hamlit
-```html
-<span bar='ba&quot;z' foo='1'>hello</span>
-
-```
-
-## Haml
-```html
-<span bar='ba"z' foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:246](../../../spec/render/attribute_spec.rb#L246)
-## Input
-```haml
-%span(foo=1 bar='ba\'z') hello
-```
-
-## Faml, Hamlit
-```html
-<span bar='ba&#39;z' foo='1'>hello</span>
-
-```
-
-## Haml
-```html
-<span bar="ba'z" foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:255](../../../spec/render/attribute_spec.rb#L255)
-## Input
-```haml
-%span(foo=1 3.14=3) hello
-```
-
-## Faml (Error)
-```html
-Invalid attribute list (missing attribute name)
-```
-
-## Haml (Error)
-```html
-Invalid attribute list: "(foo=1 3.14=3)".
-```
-
-## Hamlit
-```html
-<span 3.14 foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:259](../../../spec/render/attribute_spec.rb#L259)
-## Input
-```haml
-%span(foo=1 bar=) hello
-```
-
-## Faml (Error)
-```html
-Invalid attribute list (invalid variable name)
-```
-
-## Haml (Error)
-```html
-Invalid attribute list: "(foo=1 bar=)".
-```
-
-## Hamlit
-```html
-<span bar foo='1'>hello</span>
-
-```
-
-# [./spec/render/attribute_spec.rb:271](../../../spec/render/attribute_spec.rb#L271)
-## Input
-```haml
-%span(b=__LINE__
-  a=__LINE__)
-
-```
-
-## Faml
-```html
-<span a='2' b='1'></span>
-
-```
-
-## Haml, Hamlit
-```html
-<span a='1' b='1'></span>
-
-```
-

data/incompatibilities/spec/render/comment_spec.md

@@ -17,26 +17,3 @@
 
 ```
 
-# [./spec/render/comment_spec.rb:51](../../../spec/render/comment_spec.rb#L51)
-## Input
-```haml
-/[[if IE]
-```
-
-## Faml (Error)
-```html
-Unmatched brackets in conditional comment
-```
-
-## Haml (Error)
-```html
-Unbalanced brackets.
-```
-
-## Hamlit
-```html
-<!--[[if IE]>
-<![endif]-->
-
-```
-

data/incompatibilities/spec/render/element_spec.md

@@ -1,4 +1,4 @@
-# [./spec/render/element_spec.rb:98](../../../spec/render/element_spec.rb#L98)
+# [./spec/render/element_spec.rb:56](../../../spec/render/element_spec.rb#L56)
 ## Input
 ```haml
 - @var = '</span>'

data/incompatibilities/spec/render/newline_spec.md

@@ -72,23 +72,6 @@
 
 ```
 
-# [./spec/render/newline_spec.rb:71](../../../spec/render/newline_spec.rb#L71)
-## Input
-```haml
-%div{foo: :bar} <b>hello</b>
-```
-
-## Faml, Haml
-```html
-<div foo='bar'><b>hello</b></div>
-
-```
-
-## Hamlit (Error)
-```html
-Generator supports only core expressions - found ["b>{foo: :bar}"]
-```
-
 # [./spec/render/newline_spec.rb:71](../../../spec/render/newline_spec.rb#L71)
 ## Input
 ```haml

data/lib/faml/cli.rb

@@ -18,12 +18,6 @@ module Faml
       puts compile_file(file, format: options[:format].to_sym)
     end
 
-    desc 'parse FILE', 'Render faml AST'
-    def parse(file)
-      require 'pp'
-      pp parse_file(file)
-    end
-
     desc 'temple FILE', 'Render temple AST'
     option :format, type: :string, default: :html, desc: 'HTML format'
     def temple(file)
@@ -48,7 +42,7 @@ module Faml
     end
 
     def parse_file(file)
-      Faml::Parser.new(filename: file).call(File.read(file))
+      HamlParser::Parser.new(filename: file).call(File.read(file))
     end
   end
 end