faml 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde0bb641367cd51b35eeeb6d1d5b02211d57054
-  data.tar.gz: 82f60f95e10a5d7b40fd6c2a16f5504a569a9fc2
+  metadata.gz: 71da312b9097d26800c2431adb5d01cc26252276
+  data.tar.gz: acae87261e0f0650f0df3130eb8f97ba8326ae44
 SHA512:
-  metadata.gz: 5a6f81803cfcc97363081929acf0720d511602fe1057d5057b46de50498559004a162b894b5a809c2a6c9d4258f089689d1544feff72c5968436ada5623f9d61
-  data.tar.gz: e49cfef05e71d400b49c6367e21f1878237fdac8c2798ff34b2a034aa155f416a7f50e51780963181bf11b96f00efe1d0433ea5ffe7b9fd7ea58ae8585b190ad
+  metadata.gz: f7cbeb2dd1d2e326cb4540c30a50bc12440d760b2e618374aab624170585d0d8f7765ff07eb5781798f7341ce8e3fd44f13032e9f1f9e6250d45e3ace026f7b8
+  data.tar.gz: 97ca3e26cd3493865f8300c2fa8b701ea854258849ac8eb99b90c493fdf9b5160ffd0e55d3d7e9cc5fb37120d42b3afe4063b34df7701a2de1474be41606a206

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.6 (2015-11-06)
+- Fix attribute escape on forward slashes
+    - https://github.com/eagletmt/faml/pull/30
+    - It's regression in v0.3.2
+
 ## 0.3.5 (2015-10-19)
 - Fix empty class or id rendering
     - It's a regression in v0.3.4.

data/ext/attribute_builder/attribute_builder.c

@@ -187,7 +187,7 @@ put_attribute(VALUE buf, VALUE attr_quote, VALUE key, VALUE value)
   gh_buf ob = GH_BUF_INIT;
 
   Check_Type(value, T_STRING);
-  if (houdini_escape_html(&ob, (const uint8_t *)RSTRING_PTR(value), RSTRING_LEN(value))) {
+  if (houdini_escape_html0(&ob, (const uint8_t *)RSTRING_PTR(value), RSTRING_LEN(value), 0)) {
     value = rb_enc_str_new(ob.ptr, ob.size, rb_utf8_encoding());
     gh_buf_free(&ob);
   }

data/incompatibilities/README.md

@@ -1,7 +1,7 @@
 # Incompatibilities
 ## Versions
 - Haml 4.0.7
-- Faml 0.3.5
+- Faml 0.3.6
 - Hamlit 1.7.2
 
 ## Table of contents

data/incompatibilities/spec/render/attribute_spec.md

@@ -58,8 +58,7 @@
 # [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
 ## Input
 ```haml
-- v = [1, nil, false, true]
-%span{class: v}
+%span{class: [1, nil, false, true]}
 ```
 
 ## Faml, Haml
@@ -77,8 +76,8 @@
 # [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
 ## Input
 ```haml
-- h = { class: [1, nil, false, true] }
-%span{h}
+- v = [1, nil, false, true]
+%span{class: v}
 ```
 
 ## Faml, Haml
@@ -96,7 +95,8 @@
 # [./spec/render/attribute_spec.rb:71](../../../spec/render/attribute_spec.rb#L71)
 ## Input
 ```haml
-%span{class: [1, nil, false, true]}
+- h = { class: [1, nil, false, true] }
+%span{h}
 ```
 
 ## Faml, Haml
@@ -132,8 +132,7 @@
 # [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
 ## Input
 ```haml
-- v = [1, nil, false, true]
-%span{id: v}
+%span{id: [1, nil, false, true]}
 ```
 
 ## Faml, Haml
@@ -151,8 +150,8 @@
 # [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
 ## Input
 ```haml
-- h = { id: [1, nil, false, true] }
-%span{h}
+- v = [1, nil, false, true]
+%span{id: v}
 ```
 
 ## Faml, Haml
@@ -170,7 +169,8 @@
 # [./spec/render/attribute_spec.rb:85](../../../spec/render/attribute_spec.rb#L85)
 ## Input
 ```haml
-%span{id: [1, nil, false, true]}
+- h = { id: [1, nil, false, true] }
+%span{h}
 ```
 
 ## Faml, Haml
@@ -203,7 +203,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
+# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - foo = true
@@ -222,7 +222,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:104](../../../spec/render/attribute_spec.rb#L104)
+# [./spec/render/attribute_spec.rb:109](../../../spec/render/attribute_spec.rb#L109)
 ## Input (with options={:format=>:xhtml})
 ```haml
 - h = {foo: true, bar: 1}
@@ -241,7 +241,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:111](../../../spec/render/attribute_spec.rb#L111)
+# [./spec/render/attribute_spec.rb:116](../../../spec/render/attribute_spec.rb#L116)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -259,7 +259,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:115](../../../spec/render/attribute_spec.rb#L115)
+# [./spec/render/attribute_spec.rb:120](../../../spec/render/attribute_spec.rb#L120)
 ## Input
 ```haml
 - attrs = { foo: 1, bar: { hoge: :fuga }, baz: true }
@@ -285,7 +285,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:129](../../../spec/render/attribute_spec.rb#L129)
+# [./spec/render/attribute_spec.rb:134](../../../spec/render/attribute_spec.rb#L134)
 ## Input
 ```haml
 - data = { foo: 1 }
@@ -305,7 +305,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:136](../../../spec/render/attribute_spec.rb#L136)
+# [./spec/render/attribute_spec.rb:141](../../../spec/render/attribute_spec.rb#L141)
 ## Input
 ```haml
 %span{foo: {bar: 1+2}} hello
@@ -323,7 +323,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:159](../../../spec/render/attribute_spec.rb#L159)
+# [./spec/render/attribute_spec.rb:164](../../../spec/render/attribute_spec.rb#L164)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
@@ -341,7 +341,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:167](../../../spec/render/attribute_spec.rb#L167)
+# [./spec/render/attribute_spec.rb:172](../../../spec/render/attribute_spec.rb#L172)
 ## Input
 ```haml
 %span{data: {foo: 1, bar: 2+3}} hello
@@ -359,7 +359,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:171](../../../spec/render/attribute_spec.rb#L171)
+# [./spec/render/attribute_spec.rb:176](../../../spec/render/attribute_spec.rb#L176)
 ## Input
 ```haml
 - data = { foo: 1, bar: 2 }
@@ -379,7 +379,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:189](../../../spec/render/attribute_spec.rb#L189)
+# [./spec/render/attribute_spec.rb:194](../../../spec/render/attribute_spec.rb#L194)
 ## Input
 ```haml
 %span{b: __LINE__,
@@ -399,7 +399,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
+# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
 ## Input
 ```haml
 %span{"foo\0bar" => "hello"}
@@ -417,7 +417,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
+# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
 ## Input
 ```haml
 - val = "hello"
@@ -437,7 +437,7 @@
 
 ```
 
-# [./spec/render/attribute_spec.rb:196](../../../spec/render/attribute_spec.rb#L196)
+# [./spec/render/attribute_spec.rb:201](../../../spec/render/attribute_spec.rb#L201)
 ## Input
 ```haml
 - key = "foo\0bar"

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/render/attribute_spec.rb

@@ -92,6 +92,11 @@ HAML
     expect(render_string(%q|%span{class: "x\"y'z"} hello|)).to eq(%Q{<span class='x&quot;y&#39;z'>hello</span>\n})
   end
 
+  it 'does not escape slash' do
+    expect(render_string(%q|%a{ href: 'http://example.com/' }|)).to eq(%Q{<a href='http://example.com/'></a>\n})
+    expect(render_string(%q|%a{ {}, href: 'http://example.com/' }|)).to eq(%Q{<a href='http://example.com/'></a>\n})
+  end
+
   it 'renders only name if value is true' do
     expect(render_string(%q|%span{foo: true, bar: 1} hello|)).to eq(%Q{<span bar='1' foo>hello</span>\n})
   end

data/spec/spec_helper.rb

@@ -16,11 +16,12 @@ module RenderSpecHelper
     require_relative 'support/incompatibilities_generator'
 
     def render_string(str, options = {})
+      loc = caller_locations(1..1)[0]
       eval(Faml::Engine.new(options).call(str)).tap do |html|
-        IncompatibilitiesGenerator.instance.record(str, options, html, RSpec.current_example)
+        IncompatibilitiesGenerator.instance.record(str, options, html, RSpec.current_example, loc.lineno)
       end
     rescue => e
-      IncompatibilitiesGenerator.instance.record(str, options, e, RSpec.current_example)
+      IncompatibilitiesGenerator.instance.record(str, options, e, RSpec.current_example, loc.lineno)
       raise e
     end
   else

data/spec/support/incompatibilities_generator.rb

@@ -6,7 +6,7 @@ require 'hamlit/version'
 class IncompatibilitiesGenerator
   include Singleton
 
-  Record = Struct.new(:template, :options, :spec_path, :line_number, :faml_result, :haml_result, :hamlit_result) do
+  Record = Struct.new(:template, :options, :spec_path, :line_number, :caller_lineno, :faml_result, :haml_result, :hamlit_result) do
     def incompatible?
       !all_error? && (faml_result != haml_result || faml_result != hamlit_result || haml_result != hamlit_result)
     end
@@ -39,9 +39,9 @@ class IncompatibilitiesGenerator
     @records = []
   end
 
-  def record(template, options, faml_result, example)
+  def record(template, options, faml_result, example, caller_lineno)
     m = example.location.match(/\A(.+):(\d+)\z/)
-    @records.push(Record.new(template, options, m[1], m[2].to_i, faml_result, render_haml(template, options), render_hamlit(template, options)))
+    @records.push(Record.new(template, options, m[1], m[2].to_i, caller_lineno, faml_result, render_haml(template, options), render_hamlit(template, options)))
   end
 
   def write_to(markdown_root)

metadata

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