faml 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed579db6f39d551ff46f78f0407f8c239ac8b96
-  data.tar.gz: 7016eb2f48eccaaa9181ead1ef45f86f5c0e71d7
+  metadata.gz: 060e986d85d08a46e9341eb16d6998554f6839a1
+  data.tar.gz: 4883f1ddec473a08bbad24b2d739c6d0b5ed9c1f
 SHA512:
-  metadata.gz: f4eedb5026603869991eb3831d92ab71025152c1ab156a4bd96ca29bb925bf3abe80f7c73656f24c520b35ea11f5deb959b7603453c2b8955951e2f65b4d30fe
-  data.tar.gz: 0a5a7b8f98b4f9f5910e3296ec328e54bd394b7b75dfcd862f9b0902c08cea5aed51468f7db2812f3a44e6ac73d720203435cb899c39c075b30ad18146399aaf
+  metadata.gz: 7593bc4d281142cb9c35d6bd097aba81c5476076614306bf102c46094c4f3327e61ac0df2d0695c59c3c58c177a9fd68c85ab399fdf8ed753614349ac47813eb
+  data.tar.gz: 17581ff5aec1be1dbab01809f8e3b4533e305fadf2985bf164c1e9fc3e5a46890d563a761730cd1185348145ffffebb673c54f91702f47a6fe10676ab4a0ece2

data/.travis.yml

@@ -10,6 +10,9 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_edge.gemfile
+branches:
+  only:
+    - master
 after_script:
   - bundle exec rake benchmark
 matrix:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.16 (2015-08-05)
+- Fix incompatibility to tilt 2.x
+    - https://github.com/eagletmt/faml/issues/23
+
 ## 0.2.15 (2015-06-14)
 - Improve compatibility of tilt filter indentations
 - Raise error when ids or classes don't have values

data/incompatibilities/README.md

@@ -2,7 +2,7 @@
 ## Versions
 - Haml 4.0.6
 - Faml 0.2.15
-- Hamlit 1.6.5
+- Hamlit 1.7.1
 
 ## Table of contents
 - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)
@@ -10,17 +10,17 @@
 - [spec/render/comment_spec.md](spec/render/comment_spec.md)
 - [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/cdata_spec.md](spec/render/filters/cdata_spec.md) (Hamlit's incompatibility)
 - [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/escaped_spec.md](spec/render/filters/escaped_spec.md) (Hamlit's incompatibility)
 - [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/helpers_spec.md](spec/render/helpers_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)
-- [spec/render/newline_spec.md](spec/render/newline_spec.md)
-- [spec/render/plain_spec.md](spec/render/plain_spec.md)
-- [spec/render/sanitize_spec.md](spec/render/sanitize_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)
+- [spec/render/sanitize_spec.md](spec/render/sanitize_spec.md) (Hamlit's incompatibility)
 - [spec/render/silent_script_spec.md](spec/render/silent_script_spec.md)
 - [spec/render/unescape_spec.md](spec/render/unescape_spec.md)

data/incompatibilities/spec/render/attribute_spec.md

@@ -1,73 +1,3 @@
-# [./spec/render/attribute_spec.rb:23](../../../spec/render/attribute_spec.rb#L23)
-## Input
-```haml
-%span{"foo": 'bar'}
-```
-
-## Faml, Haml
-```html
-<span foo='bar'></span>
-
-```
-
-## Hamlit (Error)
-```html
-Hamlit::SyntaxError
-```
-
-# [./spec/render/attribute_spec.rb:23](../../../spec/render/attribute_spec.rb#L23)
-## Input
-```haml
-- x = 'bar'
-%span{"foo": x}
-```
-
-## Faml, Haml
-```html
-<span foo='bar'></span>
-
-```
-
-## Hamlit (Error)
-```html
-Hamlit::SyntaxError
-```
-
-# [./spec/render/attribute_spec.rb:23](../../../spec/render/attribute_spec.rb#L23)
-## Input
-```haml
-%span{'foo': 'bar'}
-```
-
-## Faml, Haml
-```html
-<span foo='bar'></span>
-
-```
-
-## Hamlit (Error)
-```html
-Hamlit::SyntaxError
-```
-
-# [./spec/render/attribute_spec.rb:23](../../../spec/render/attribute_spec.rb#L23)
-## Input
-```haml
-- x = 'bar'
-%span{'foo': x}
-```
-
-## Faml, Haml
-```html
-<span foo='bar'></span>
-
-```
-
-## Hamlit (Error)
-```html
-Hamlit::SyntaxError
-```
-
 # [./spec/render/attribute_spec.rb:52](../../../spec/render/attribute_spec.rb#L52)
 ## Input
 ```haml
@@ -471,7 +401,7 @@ bar=3) hello
 
 ## Faml (Error)
 ```html
-Invalid attribute list (missing attributename)
+Invalid attribute list (missing attribute name)
 ```
 
 ## Haml (Error)

data/incompatibilities/spec/render/helpers_spec.md

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

data/incompatibilities/spec/render/newline_spec.md

@@ -72,6 +72,23 @@
 
 ```
 
+# [./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/element_parser.rb

@@ -155,7 +155,7 @@ module Faml
     def scan_key(scanner)
       scanner.scan(/[-:\w]+/).tap do |name|
         unless name
-          syntax_error!('Invalid attribute list (missing attributename)')
+          syntax_error!('Invalid attribute list (missing attribute name)')
         end
       end
     end

data/lib/faml/tilt.rb

@@ -1,5 +1,11 @@
 require 'tilt'
-require 'tilt/haml'
+# Load tilt/haml only when haml is available
+begin
+  require 'haml'
+rescue LoadError
+else
+  require 'tilt/haml'
+end
 require 'faml/engine'
 
 module Faml

data/lib/faml/version.rb

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

data/spec/support/incompatibilities_generator.rb

@@ -24,6 +24,10 @@ class IncompatibilitiesGenerator
       end
     end
 
+    def only_hamlit?
+      faml_result == haml_result && faml_result != hamlit_result
+    end
+
     private
 
     def all_error?
@@ -59,7 +63,7 @@ class IncompatibilitiesGenerator
         end
       end
     end
-    render_toc(markdown_root, incompatibilities.keys)
+    render_toc(markdown_root, incompatibilities)
   end
 
   private
@@ -125,7 +129,7 @@ EOS
     markdown_root.join(spec_path).sub_ext('.md')
   end
 
-  def render_toc(markdown_root, spec_paths)
+  def render_toc(markdown_root, incompatibilities)
     toc_path = markdown_root.join('README.md')
     toc_path.open('w') do |f|
       f.puts '# Incompatibilities'
@@ -135,9 +139,14 @@ EOS
       f.puts "- Hamlit #{Hamlit::VERSION}"
       f.puts
       f.puts '## Table of contents'
-      spec_paths.sort.each do |spec_path|
+      incompatibilities.keys.sort.each do |spec_path|
         path = markdown_path(markdown_root, spec_path).relative_path_from(markdown_root)
-        f.puts "- [#{path}](#{path})"
+        link = "[#{path}](#{path})"
+        comment =
+          if incompatibilities[spec_path].all?(&:only_hamlit?)
+            " (Hamlit's incompatibility)"
+          end
+        f.puts "- #{link}#{comment}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.