hamlit 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bfb9ad9ffecfdff23622a518e793277666c95dc
-  data.tar.gz: 0ce26c8bf5d259d79af24b18d5c5fd4f83a4d862
+  metadata.gz: 5175b4fea185d08238f003ae8669fe7747418b7e
+  data.tar.gz: 304e17d39d4cc0a6f7c04f0688f882d8375e5969
 SHA512:
-  metadata.gz: 04fd200583dd12ef868addaddbd6d0e85d76ffd96bd6ca29010d853acb6ffd8844ace8888d8d2948aa38379349df76ee054b53014c7bd16417af4b61f4a63426
-  data.tar.gz: 73bfe1a5b717565904aac6e0dc1fc07bb27a44f8b1507624c607bc8a240989b8f80ebee8345c65648163f4cfe069cb4cd05d06458406805763fc23a864655cc7
+  metadata.gz: a45f5ebd7c99d9cd79b9651e409390cfac808b3c6cd87de51150dc86a613bf274be9183ba8328f4f8fc1af983337663641b0d784db7339074a692aecacf298fe
+  data.tar.gz: 064d03cfc93d24e066b6efadc24a73e422deb1a845542fb5dfe7890c1df362bcb1cbd522560258d1c86e78c185adb64e62be27df0bf4ca3fa2b7c220c400f303

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.5.2
+
+- Bugfix for silent script without block
+  - https://github.com/k0kubun/hamlit/issues/16
+  - Thanks to @eagletmt
+
 ## v0.5.1
 
 - Bugfix about duplicated id and class

data/README.md

@@ -85,7 +85,6 @@ to optimize performance such as string interpolation.
 Currently there are some important incompatibilities that should be fixed.
 
 - Remove falsy attributes [#2](https://github.com/k0kubun/hamlit/issues/2)
-- Escape attribute values [#10](https://github.com/k0kubun/hamlit/issues/10)
 
 ## License
 

data/lib/hamlit/parsers/script.rb

@@ -48,14 +48,19 @@ module Hamlit
           return [:multi]
         end
 
-        ast = [:multi, [:code, scan_code(scanner)]]
+        code = scan_code(scanner)
+        ast = [:multi, [:code, code]]
         unless has_block?
-          ast << [:code, 'end'] if @current_indent > next_indent
+          if internal_statement?(code) && !statement_continuing?
+            ast << [:code, 'end']
+          end
           return ast
         end
 
         ast += with_indented { parse_lines }
-        ast << [:code, 'end'] unless same_indent?(next_line) && internal_statement?(next_line)
+        unless statement_continuing?
+          ast << [:code, 'end']
+        end
         ast
       end
 
@@ -93,12 +98,18 @@ module Hamlit
         next_indent == @current_indent + 1
       end
 
-      def internal_statement?(line)
+      def statement_continuing?
+        same_indent?(next_line) && internal_statement?(next_line, silent_script: true)
+      end
+
+      def internal_statement?(line, silent_script: false)
         return false unless line
 
         scanner = StringScanner.new(line)
         scanner.scan(/ +/)
-        return false unless scanner.scan(/-/)
+        if silent_script
+          return false unless scanner.scan(/-/)
+        end
 
         scanner.scan(/ +/)
         statement = scanner.scan(/[^ ]+/)

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/hamlit/engine/silent_script_spec.rb

@@ -1,5 +1,14 @@
 describe Hamlit::Engine do
   describe 'silent script' do
+    it 'renders nothing' do
+      assert_render(<<-HAML, <<-HTML)
+        - nil
+        - 3
+        - 'foo'
+      HAML
+      HTML
+    end
+
     it 'renders silent script' do
       assert_render(<<-HAML, <<-HTML)
         - foo = 3
@@ -67,6 +76,17 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders empty elsif statement' do
+      assert_render(<<-'HAML', <<-HTML)
+        %span
+          - if false
+          - elsif false
+      HAML
+        <span>
+        </span>
+      HTML
+    end
+
     it 'renders empty else statement' do
       assert_render(<<-'HAML', <<-HTML)
         %span
@@ -79,6 +99,17 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders empty when statement' do
+      assert_render(<<-'HAML', <<-HTML)
+        %span
+          - case
+          - when false
+      HAML
+        <span>
+        </span>
+      HTML
+    end
+
     it 'accept if inside if-else' do
       assert_render(<<-'HAML', <<-HTML)
         - if false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Takashi Kokubun