hamlit 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8ab979e9c67463e76b46cba08d35e24ead7a1f
-  data.tar.gz: 4e162fbcb66071f515a64b97ac7d540fddd81042
+  metadata.gz: 79bcf89bde702278c1bdad3ee833aec2e94eb58a
+  data.tar.gz: d58885a682edc39e69a4027c4e0834f5d679a9e2
 SHA512:
-  metadata.gz: 9cdf077dc864d24d4bf71b4f17d5830d15f9cc940468ea26dbb7ba87932a249cd0ea764b51614d76cbf21b1ee0f413f8e6f48e4facafbceac37b851e299480ab
-  data.tar.gz: 0da6132ea58a728dd16ec662223328e46661844c3e02f61ff20608850902eb1af9bbce96bc86dad6fd7957628127aa6747843c10da67ecd2dfcfa2e99e935e50
+  metadata.gz: 44fd92f92e8752ed72e56e0d46a5eae2ee69aa12175476f7fa39c8423c86a730522a471b9d9664d2f2ec43cf59108951c284209cae49b24255a134ed9962d7ba
+  data.tar.gz: 6f20ddab502046ca46ab6fe61d8c04a8655f72ed917e1e51470ed2e26715491269100ba3c3125482a2215800ac919325e2c96c38cc50dba32e7d52e524c4a0f5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.2
+
+- Disable html escaping in CSS and JavaScript filter
+
 ## v1.5.1
 
 - Remove outer whitespace in the block

data/lib/hamlit/filters/css.rb

@@ -12,7 +12,7 @@ module Hamlit
       private
 
       def compile_html(lines)
-        ast = [:haml, :text, compile_lines(lines, indent_width: 2)]
+        ast = [:haml, :text, compile_lines(lines, indent_width: 2), false]
         ast = [:multi, [:static, "\n"], ast]
         ast = [:html, :tag, 'style', [:html, :attrs], ast]
         ast

data/lib/hamlit/filters/javascript.rb

@@ -12,7 +12,7 @@ module Hamlit
       private
 
       def compile_html(lines)
-        ast = [:haml, :text, compile_lines(lines, indent_width: 2)]
+        ast = [:haml, :text, compile_lines(lines, indent_width: 2), false]
         ast = [:multi, [:static, "\n"], ast]
         ast = [:html, :tag, 'script', [:html, :attrs], ast]
         ast

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/spec/hamlit/filters/coffee_spec.rb

@@ -37,5 +37,24 @@ describe Hamlit::Filters::Coffee do
         </script>
       HTML
     end
+
+    it 'renders coffeescript filter' do
+      assert_render(<<-'HAML', <<-HTML)
+        :coffee
+          foo = ->
+            alert("#{'<&>'}")
+      HAML
+        <script>
+          (function() {
+            var foo;
+          
+            foo = function() {
+              return alert("<&>");
+            };
+          
+          }).call(this);
+        </script>
+      HTML
+    end
   end
 end

data/spec/hamlit/filters/css_spec.rb

@@ -19,12 +19,12 @@ describe Hamlit::Filters::Css do
       assert_render(<<-'HAML', <<-HTML)
         :css
           .foo {
-            width: #{100 * 3}px;
+            content: "#{'<&>'}";
           }
       HAML
         <style>
           .foo {
-            width: 300px;
+            content: "<&>";
           }
         </style>
       HTML

data/spec/hamlit/filters/javascript_spec.rb

@@ -71,10 +71,10 @@ describe Hamlit::Filters::Javascript do
     it 'parses string interpolation' do
       assert_render(<<-'HAML', <<-HTML)
         :javascript
-          var a = #{[1, 2]};
+          var a = "#{'<&>'}";
       HAML
         <script>
-          var a = [1, 2];
+          var a = "<&>";
         </script>
       HTML
     end

data/spec/hamlit/filters/less_spec.rb

@@ -18,5 +18,20 @@ describe Hamlit::Filters::Less do
         </style>
       HTML
     end
+
+    it 'parses string interpolation' do
+      assert_render(<<-'HAML', <<-HTML)
+        :less
+          .foo {
+            content: "#{'<&>'}";
+          }
+      HAML
+        <style>
+          .foo {
+            content: "<&>";
+          }
+        </style>
+      HTML
+    end
   end
 end

data/spec/hamlit/filters/markdown_spec.rb

@@ -14,14 +14,16 @@ describe Hamlit::Filters::Markdown do
 
     it 'renders markdown filter with string interpolation' do
       assert_render(<<-'HAML', <<-HTML)
-        - project = 'Hamlit'
+        - project = '<Hamlit>'
         :markdown
           # #{project}
+          #{'<&>'}
           Yet another haml implementation
       HAML
-        <h1>Hamlit</h1>
+        <h1><Hamlit></h1>
 
-        <p>Yet another haml implementation</p>
+        <p>&lt;&amp;&gt;
+        Yet another haml implementation</p>
       HTML
     end
   end

data/spec/hamlit/filters/ruby_spec.rb

@@ -11,14 +11,14 @@ describe Hamlit::Filters::Ruby do
   end
 
   it 'renders ruby filter' do
-    assert_render(<<-HAML, <<-HTML)
+    assert_render(<<-'HAML', <<-HTML)
       :ruby
         hash = {
-          a: 3,
+          a: "#{'<&>'}",
         }
       = hash[:a]
     HAML
-      3
+      &lt;&amp;&gt;
     HTML
   end
 end

data/spec/hamlit/filters/sass_spec.rb

@@ -18,18 +18,14 @@ describe Hamlit::Filters::Sass do
 
     it 'renders sass filter with string interpolation' do
       assert_render(<<-'HAML', <<-HTML)
-        - width = 1200
-        - height = 800
         :sass
           .users_controller
             .show_action
-              width: #{width}px
-              height: #{height}px
+              content: "#{'<&>'}"
       HAML
         <style>
           .users_controller .show_action {
-            width: 1200px;
-            height: 800px; }
+            content: "<&>"; }
         </style>
       HTML
     end

data/spec/hamlit/filters/scss_spec.rb

@@ -17,5 +17,21 @@ describe Hamlit::Filters::Scss do
         </style>
       HTML
     end
+
+    it 'parses string interpolation' do
+      assert_render(<<-'HAML', <<-HTML)
+        :scss
+          .users_controller {
+            .show_action {
+              content: "#{'<&>'}";
+            }
+          }
+      HAML
+        <style>
+          .users_controller .show_action {
+            content: "<&>"; }
+        </style>
+      HTML
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils