faml 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfe97f1920b0da9005f0e09220d9f3d393745ca
-  data.tar.gz: 5dce79fe5a3e5c7b5e68a42d6e672fc05421c6ff
+  metadata.gz: 1d652850576bf5cf793a6874da846585cdf945c1
+  data.tar.gz: 2a5c5ae9dbc17ee19b60943ed74b2e1c98579bfe
 SHA512:
-  metadata.gz: 1ceaa306c2e15b603aecb0d47d191705d14602025d1f5601f08c10361a59f0ba67b404dce3ff00346d2263aa845cfbabfcccaf45f74d65a7eca52229ac829031
-  data.tar.gz: d119b8acd2a51a1a7f68deeb9afbf2ff1428d890fd8fde036cb5f0b52e52117b11eb27df8245ff9c1913bfc5bf7c7601835a92d04cf1a7450682ff4e107860e1
+  metadata.gz: ac04ddecd7219d7a82d382d2453f02f9217b3c93f63f23d2aa6bbc8768f707086dda9cdc3c8c77472d7b87e46b624c1a4945b76bd5aa48cf609bad5c38b522af
+  data.tar.gz: b0eb9b5903cd6270c5feba30fc60db06e1b070b654f527fb536a0667f8aa9eddc6d4b845e6471e9f0a5005b77234bc690fd3d1958a4e1b9cb8b6178b86a21d7a

data/Appraisals

@@ -2,12 +2,14 @@ appraise 'rails-4.0' do
   gem 'rails', '~> 4.0.0'
   gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
+  gem 'nokogiri'
 end
 
 appraise 'rails-4.1' do
   gem 'rails', '~> 4.1.0'
   gem 'rspec-rails', '>= 3.2.0'
   gem 'sqlite3'
+  gem 'nokogiri'
 end
 
 appraise 'rails-4.2' do

data/CHANGELOG.md

@@ -1,5 +1,10 @@
+## 0.8.1 (2016-02-28)
+- Fix attribute escaping of html_safe string
+    - https://github.com/eagletmt/faml/issues/48
+
 ## 0.8.0 (2016-01-22)
 - Drop Ruby 2.0.0 support
+    - Ruby 2.0.0 is End of Life http://www.ruby-lang.org/en/news/2016/02/24/support-plan-of-ruby-2-0-0-and-2-1/
 
 ## 0.7.3 (2016-01-22)
 - Fix build error when `$CXXFLAGS` is unavailable

data/gemfiles/rails_4.0.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rails", "~> 4.0.0"
 gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
+gem "nokogiri"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rails", "~> 4.1.0"
 gem "rspec-rails", ">= 3.2.0"
 gem "sqlite3"
+gem "nokogiri"
 
 gemspec :path => "../"

data/incompatibilities/README.md

@@ -1,8 +1,8 @@
 # Incompatibilities
 ## Versions
 - Haml 4.1.0.beta.1
-- Faml 0.7.2
-- Hamlit 2.0.2
+- Faml 0.8.1
+- Hamlit 2.2.2
 
 ## Table of contents
 - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)

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

@@ -51,7 +51,7 @@ abc
 
 ```
 
-## Haml
+## Haml, Hamlit
 ```html
 <span>
 hello
@@ -64,15 +64,3 @@ abc
 
 ```
 
-## Hamlit
-```html
-<span>
-hello
-
-abc
-
-<span>world</span>
-</span>
-
-```
-

data/lib/faml/html.rb

@@ -33,7 +33,7 @@ module Faml
           ['false, nil', [:multi]],
           [:else, [:multi,
                    [:static, " #{name}=#{options[:attr_quote]}"],
-                   [:escape, true, [:dynamic, sym]],
+                   [:dynamic, "::Temple::Utils.escape_html(#{sym})"],
                    [:static, options[:attr_quote]],
                   ]],
          ],

data/lib/faml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Faml
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

data/spec/rails/app/views/books/html_safe_attribute.html.haml

@@ -0,0 +1,2 @@
+- html = %q{<b>"don't skip escape"</b>}.html_safe
+%span{'data-html' => html}

data/spec/rails/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
     get :with_capture
     get :escaped
     get :preserve
+    get :html_safe_attribute
 
     get :syntax_error
     get :indent_error

data/spec/rails/spec/requests/faml_spec.rb

@@ -46,6 +46,13 @@ RSpec.describe 'Faml with Rails', type: :request do
     expect(response.body).to include('<marquee>escape me</marquee>')
   end
 
+  it 'escapes html_safe string in attribute values' do
+    get '/books/html_safe_attribute'
+    expect(response).to be_ok
+    html = Nokogiri::HTML.parse(response.body)
+    expect(html.at_css('span')['data-html']).to eq(%q{<b>"don't skip escape"</b>})
+  end
+
   describe 'object reference' do
     it 'works with new object' do
       get '/books/object_ref'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -404,6 +404,7 @@ files:
 - spec/rails/app/views/books/filter_invalid_interpolation.html.haml
 - spec/rails/app/views/books/filter_not_found.html.haml
 - spec/rails/app/views/books/hello.html.haml
+- spec/rails/app/views/books/html_safe_attribute.html.haml
 - spec/rails/app/views/books/indent_error.html.haml
 - spec/rails/app/views/books/invalid_interpolation.html.haml
 - spec/rails/app/views/books/object_ref.html.haml
@@ -521,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.
@@ -566,6 +567,7 @@ test_files:
 - spec/rails/app/views/books/filter_invalid_interpolation.html.haml
 - spec/rails/app/views/books/filter_not_found.html.haml
 - spec/rails/app/views/books/hello.html.haml
+- spec/rails/app/views/books/html_safe_attribute.html.haml
 - spec/rails/app/views/books/indent_error.html.haml
 - spec/rails/app/views/books/invalid_interpolation.html.haml
 - spec/rails/app/views/books/object_ref.html.haml