faml 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71da312b9097d26800c2431adb5d01cc26252276
-  data.tar.gz: acae87261e0f0650f0df3130eb8f97ba8326ae44
+  metadata.gz: f064e2ade70ffae1e981132413f02b123c6a80d8
+  data.tar.gz: b10afda81e0186e7c5c16f4ae74859f498cbbde7
 SHA512:
-  metadata.gz: f7cbeb2dd1d2e326cb4540c30a50bc12440d760b2e618374aab624170585d0d8f7765ff07eb5781798f7341ce8e3fd44f13032e9f1f9e6250d45e3ace026f7b8
-  data.tar.gz: 97ca3e26cd3493865f8300c2fa8b701ea854258849ac8eb99b90c493fdf9b5160ffd0e55d3d7e9cc5fb37120d42b3afe4063b34df7701a2de1474be41606a206
+  metadata.gz: 73e0d3b1457602502c81fcc6521a0596768a751a4f79af22e04c51003af7cebc4c93d9e47216867b6740240a7468014d09ef21c3f61e4731d86dc2f1e0a5e0b4
+  data.tar.gz: 201c731e3b02b14c0c92d2a0212790160cc5583e4984b8d6f08a07619147e4ba1c1d27ff6142496a0de5309457da125f98d0a6aff76fbd9ca5f95d5a909df3ee

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0 (2015-11-15)
+- Fix "end" insertion for empty else clause
+    = https://github.com/eagletmt/faml/pull/31
+    - It also requires haml_parser v0.2.0 or above.
+
 ## 0.3.6 (2015-11-06)
 - Fix attribute escape on forward slashes
     - https://github.com/eagletmt/faml/pull/30

data/faml.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'escape_utils'
-  spec.add_dependency 'haml_parser', '>= 0.1.0'
+  spec.add_dependency 'haml_parser', '>= 0.2.0'
   spec.add_dependency 'parser'
   spec.add_dependency 'temple', '>= 0.7.0'
   spec.add_dependency 'tilt'

data/lib/faml/compiler.rb

@@ -397,11 +397,17 @@ module Faml
       temple
     end
 
+    SKIP_END_KEYWORDS = %w[elsif else when].freeze
+
     def compile_silent_script(ast)
-      temple = [:multi, [:code, ast.script], [:newline]]
+      temple = [:multi]
+      if SKIP_END_KEYWORDS.include?(ast.keyword)
+        temple << [:rmend]
+      end
+      temple << [:code, ast.script] << [:newline]
       compile_children(ast, temple)
-      if !ast.children.empty? && !ast.mid_block_keyword
-        temple << [:code, 'end']
+      if !ast.children.empty? || ast.keyword
+        temple << [:mkend]
       end
       temple
     end

data/lib/faml/engine.rb

@@ -3,6 +3,7 @@ require 'temple'
 require_relative 'compiler'
 require_relative 'html'
 require_relative 'newline'
+require_relative 'script_end'
 
 module Faml
   class Engine < Temple::Engine
@@ -18,6 +19,7 @@ module Faml
     filter :ControlFlow
     filter :MultiFlattener
     use Newline
+    use ScriptEnd
     filter :StaticMerger
     use :Generator do
       options[:generator].new(options.to_hash.reject { |k, _| !options[:generator].options.valid_key?(k) })

data/lib/faml/script_end.rb

@@ -0,0 +1,27 @@
+require 'temple'
+
+module Faml
+  class ScriptEnd < Temple::Filter
+    def on_multi(*exprs)
+      i = exprs.size - 1
+      depth = 0
+      while i >= 0
+        case exprs[i]
+        when [:mkend]
+          if depth > 0
+            # Cancel :mkend
+            depth -= 1
+            exprs.delete_at(i)
+          else
+            exprs[i] = [:code, 'end'.freeze]
+          end
+        when [:rmend]
+          depth += 1
+          exprs.delete_at(i)
+        end
+        i -= 1
+      end
+      [:multi, *exprs]
+    end
+  end
+end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 end

data/spec/render/silent_script_spec.rb

@@ -84,6 +84,15 @@ HAML
     expect(render_string("%br\n-\n%br")).to eq("<br>\n<br>\n")
   end
 
+  it 'allows empty else body' do
+    expect(render_string(<<HAML)).to eq("ok\nfinish\n")
+- if true
+  ok
+- else
+finish
+HAML
+  end
+
   it 'checks indent levels' do
     expect(render_string(<<HAML)).to eq("<span>hello</span>\n")
 - if true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,7 @@ files:
 - lib/faml/rails_helpers.rb
 - lib/faml/railtie.rb
 - lib/faml/ruby_syntax_checker.rb
+- lib/faml/script_end.rb
 - lib/faml/static_hash_parser.rb
 - lib/faml/stats.rb
 - lib/faml/text_compiler.rb
@@ -511,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.