hamlit 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca12e0120f1176a67b7f89077b8f00b832cafe16
-  data.tar.gz: fe98fcc635527e47b22441eadb3409bbd4c5864e
+  metadata.gz: 50ca5880135de7cd06fcf6780fc4dbaffbf6ea43
+  data.tar.gz: 804e0196607cf692780d87ed61f6895391584cc1
 SHA512:
-  metadata.gz: f233e410357f3812775992bcfc6da6bfc27f6ed2b4153f60f050c34df4221084711da794ca22da329ae4665d43a2c9d1f700528038381bbd5ab56d9959b5658f
-  data.tar.gz: 200d020c6ed62d628aeeb03634b71f842f9d5ff245a4a6205b820b5293124fd622a766e843371fd7755096c185d8962c226463ffa796525cc354405aa18684d0
+  metadata.gz: be851f631b5d947500998063fa534d791c551e0c4bf21a12ae844919ac0dc8124906d397a4f905d484c1149c305d18719e1c02fae88ed2633c277eda2d84bbef
+  data.tar.gz: 722440d70b6da6048b9231f1094b6cdce48a7b7da00193b43ba125d4435a621df2b27344d54a97ac02b07bc28721215cf3332a14548a1b7c683e23f0f04e1db2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.7.1
+
+- Don't escape a block content of some helpers
+  - https://github.com/k0kubun/hamlit/issues/35
+  - Thanks to @felixbuenemann
+
 ## v1.7.0
 
 - Support Ruby 2.2.0 hash syntax

data/lib/hamlit/helpers.rb

@@ -1,5 +1,10 @@
 # This is a module compatible with Haml::Helpers.
 # It is included by ActionView in initializer.
+#
+# NOTE: currently Hamlit::Helpers is enabled by default
+# on only Rails environment.
+# And currently this Hamlit::Helpers depends on
+# ActionView internal implementation. (not desired)
 module Hamlit
   module Helpers
     extend self
@@ -32,19 +37,17 @@ module Hamlit
     def surround(front, back = front, &block)
       output = capture_haml(&block)
 
-      "#{front}#{output.chomp}#{back}\n"
+      "#{escape_once(front)}#{output.chomp}#{escape_once(back)}\n".html_safe
     end
 
     def precede(str, &block)
-      "#{str}#{capture_haml(&block).chomp}\n"
+      "#{escape_once(str)}#{capture_haml(&block).chomp}\n".html_safe
     end
 
     def succeed(str, &block)
-      "#{capture_haml(&block).chomp}#{str}\n"
+      "#{capture_haml(&block).chomp}#{escape_once(str)}\n".html_safe
     end
 
-    # NOTE: currently Hamlit::Helpers is enabled by default on only
-    # Rails environment. Thus you can use capture.
     def capture_haml(*args, &block)
       capture(*args, &block)
     end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/spec/rails/app/views/application/index.html.haml

@@ -1,3 +1,6 @@
+= surround '(', ')' do
+  %i foo
+
 %span Hamlit
 
 %table

data/spec/rails/app/views/users/helpers.html.haml

@@ -1,10 +1,10 @@
 = raw find_and_preserve "Foo\n<pre>Bar\nBaz</pre>"
 
-= succeed '.' do
-  succeed
+= succeed '&' do
+  %i succeed
 
-= precede ',' do
-  precede
+= precede '&' do
+  %i precede
 
-= surround '[', ']' do
-  surround
+= surround '<', '>' do
+  %i surround

data/spec/rails/spec/hamlit_spec.rb

@@ -107,17 +107,17 @@ describe 'Hamlit rails integration', type: :request do
 
     it 'renders succeed' do
       get helpers_users_path
-      expect(response.body).to include('succeed.')
+      expect(response.body).to include('<i>succeed</i>&amp;')
     end
 
     it 'renders precede' do
       get helpers_users_path
-      expect(response.body).to include(',precede')
+      expect(response.body).to include('&amp;<i>precede</i>')
     end
 
     it 'renders surround' do
       get helpers_users_path
-      expect(response.body).to include('[surround]')
+      expect(response.body).to include('&lt;<i>surround</i>&gt;')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -626,3 +626,4 @@ test_files:
 - spec/spec_helper/document_generator.rb
 - spec/spec_helper/render_helper.rb
 - spec/spec_helper/test_case.rb
+has_rdoc: