hamlit 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9176878aecdc9d91f66537557f147dc8978d5003
-  data.tar.gz: 117ba8f39ed072c6964536add0336be21c44d391
+  metadata.gz: 1c8ab979e9c67463e76b46cba08d35e24ead7a1f
+  data.tar.gz: 4e162fbcb66071f515a64b97ac7d540fddd81042
 SHA512:
-  metadata.gz: 172e4743255392ecf60944c2820173cc6fbbb3e1f539f91380a0490fce09bc62d62ad0a239422502190f15ec55e8870200d5b574dbdc92bf0895a87c8f542902
-  data.tar.gz: 5af7251fa167c35448565ff8612f4a5c175ab3b389f72e1f55c75f52d2d2acbb5447288211525f50ff19de470eb9bc80b5525cbd0df3c33dfc7327f54c016759
+  metadata.gz: 9cdf077dc864d24d4bf71b4f17d5830d15f9cc940468ea26dbb7ba87932a249cd0ea764b51614d76cbf21b1ee0f413f8e6f48e4facafbceac37b851e299480ab
+  data.tar.gz: 0da6132ea58a728dd16ec662223328e46661844c3e02f61ff20608850902eb1af9bbce96bc86dad6fd7957628127aa6747843c10da67ecd2dfcfa2e99e935e50

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.5.1
+
+- Remove outer whitespace in the block
+
 ## v1.5.0
 
 - Remake implementation of outer whitespace removal

data/lib/hamlit/compilers/strip.rb

@@ -1,3 +1,5 @@
+# This module is created to compile [:haml, :strip],
+# which is sexp for whitespace inner removal.module Hamlit
 module Hamlit
   module Compilers
     module Strip
@@ -10,7 +12,6 @@ module Hamlit
 
       def strip_newline(content)
         indexes = newline_indexes(content)
-        return content if indexes.length < 2
 
         content = content.dup
         content.delete_at(indexes.last)

data/lib/hamlit/parsers/whitespace.rb

@@ -16,26 +16,36 @@ module Hamlit
         inner_removal
       end
 
-      def remove_last_outer_space!(ast)
-        index = find_last_newline_index(ast)
-        return unless index
-
-        ast.delete_at(index)
+      def remove_last_outer_space!(exps)
+        exps.reverse!
+        remove_first_outer_space!(exps)
+      ensure
+        exps.reverse!
       end
 
       private
 
-      # Find [:static, "\n"]'s position ignoring [:code].
-      # If it is not found, return nil.
-      def find_last_newline_index(ast)
-        ast.reverse_each.with_index do |node, index|
-          sexp, *args = node
-          next if sexp == :code
-          return if node != [:static, "\n"]
+      def remove_first_outer_space!(exps)
+        deleted = false
+        exps.delete_if do |exp|
+          break if deleted
 
-          return ast.length - index - 1
+          name, *args = exp
+          case name
+          when :static
+            break if args != ["\n"]
+            deleted = true
+            next true
+          when :code
+            next false
+          when :newline
+            next false
+          when :haml
+            remove_last_outer_space!(exp) if args.first == :script
+          end
+          break
         end
-        nil
+        remove_last_outer_space!(exps) if deleted
       end
 
       def reset_outer_removal

data/lib/hamlit/version.rb

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

data/spec/hamlit/engine/tag_spec.rb

@@ -186,42 +186,55 @@ describe Hamlit::Engine do
       HTML
     end
 
-    it 'removes outer whitespace by >' do
-      assert_render(<<-HAML, <<-HTML)
-        %span> a
-        %span b
-        %span c
-        %span>
+    describe 'whitespace removal' do
+      it 'removes outer whitespace by >' do
+        assert_render(<<-HAML, <<-HTML)
+          %span> a
+          %span b
+          %span c
+          %span>
+            d
+          %span
+            e
+          %span f
+        HAML
+          <span>a</span><span>b</span>
+          <span>c</span><span>
           d
-        %span
+          </span><span>
           e
-        %span f
-      HAML
-        <span>a</span><span>b</span>
-        <span>c</span><span>
-        d
-        </span><span>
-        e
-        </span>
-        <span>f</span>
-      HTML
-    end
-
-    it 'removes outer whitespace by > from inside of block' do
-      assert_render(<<-HAML, <<-HTML)
-        %span a
-        - if true
-          %span>
-            b
-        %span
+          </span>
+          <span>f</span>
+        HTML
+      end
+
+      it 'removes outer whitespace by > from inside of block' do
+        assert_render(<<-HAML, <<-HTML)
+          %span a
+          - if true
+            %span>
+              b
+          %span
+            c
+        HAML
+          <span>a</span><span>
+          b
+          </span><span>
           c
-      HAML
-        <span>a</span><span>
-        b
-        </span><span>
-        c
-        </span>
-      HTML
+          </span>
+        HTML
+      end
+
+      it 'removes whitespaces inside block script' do
+        assert_render(<<-HAML, <<-HTML)
+          %span<
+            = 2.times do
+              = 'foo'
+            %span> bar
+        HAML
+          <span>foofoo2<span>bar</span></span>
+        HTML
+      end
     end
   end
 end

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

@@ -0,0 +1,4 @@
+%span<
+  = link_to '#' do
+    = 'foo'
+  %span> bar

data/spec/rails/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
       get :helpers
       get :safe_buffer
       get :old_attributes
+      get :whitespace
     end
   end
 end

data/spec/rails/spec/hamlit_spec.rb

@@ -72,6 +72,11 @@ describe 'Hamlit rails integration', type: :request do
       get form_users_path
       expect(response.body).to include('row')
     end
+
+    it 'renders whitespace removal inside #capture' do
+      get whitespace_users_path
+      expect(response.body).to include('<a href="#">foo</a>')
+    end
   end
 
   describe 'haml helpers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -417,6 +417,7 @@ files:
 - spec/rails/app/views/users/index.html.haml
 - spec/rails/app/views/users/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
+- spec/rails/app/views/users/whitespace.html.haml
 - spec/rails/bin/bundle
 - spec/rails/bin/rails
 - spec/rails/bin/rake
@@ -529,6 +530,7 @@ test_files:
 - spec/rails/app/views/users/index.html.haml
 - spec/rails/app/views/users/old_attributes.html.haml
 - spec/rails/app/views/users/safe_buffer.html.haml
+- spec/rails/app/views/users/whitespace.html.haml
 - spec/rails/bin/bundle
 - spec/rails/bin/rails
 - spec/rails/bin/rake