haml_parser 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ee2e978b5969cf7f28d4b58df013a97988d26e
-  data.tar.gz: 2c18d9f3232488d668794f0c920b2fd3fc58a989
+  metadata.gz: 2018bdc583b86d3e184e4f98d1ac356d41641ef7
+  data.tar.gz: ce85adf4d59e27557bfa16670094a771be76d6bd
 SHA512:
-  metadata.gz: 70f270214c9c7bf34807e4b30fe70bed2d6e67c21f1d94541257739b3cddc6c012dbacd6a41d9feba25e8647c3c7bb13cf79cb1f9f6b47a0d5de4cb737cee1b6
-  data.tar.gz: 77c69264173959110a1e28661c06c1694d5f73b5c37306d6f205d2e7a08187f4d37c94ac091c5c2edd9c8f04c9e203ba43e969d3fa1b4414f6de253d08ac0315
+  metadata.gz: adf34f95177de3d6cedc65536405fe387b5b9ff10ffd9b7a3fc21344731d692253468629ddc87aa2b2d536163462e71e3323f529710f402fd05375e9cef98b28
+  data.tar.gz: 5cee1370ebfa90524568fec5948549b7cbd890872eb6a538ba7c5825e5d12450859ff5b3547da54d94fb31e7d3cad29570fefbc7b9fa192269135c49a89db75a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.0 (2015-11-15)
+- Remove `Ast::SilentScript#mid_block_keyword` attribute
+- Add `Ast::Script#keyword` and `Ast::SilentScript#keyword` attribute
+
 # 0.1.1 (2015-10-13)
 - Fix missing require in CLI
 

data/lib/haml_parser/ast.rb

@@ -65,6 +65,7 @@ module HamlParser
     Script = Struct.new(
       :children,
       :script,
+      :keyword,
       :escape_html,
       :preserve,
       :filename,
@@ -87,16 +88,9 @@ module HamlParser
       end
     end
 
-    SilentScript = Struct.new(:children, :script, :mid_block_keyword, :filename, :lineno) do
+    SilentScript = Struct.new(:children, :script, :keyword, :filename, :lineno) do
       include HasChildren
 
-      def initialize(*)
-        super
-        if mid_block_keyword.nil?
-          self.mid_block_keyword = false
-        end
-      end
-
       def to_h
         super.merge(type: 'silent_script')
       end

data/lib/haml_parser/parser.rb

@@ -141,7 +141,11 @@ module HamlParser
     end
 
     def parse_script(text)
-      @ast << ScriptParser.new(@line_parser).parse(text)
+      node = ScriptParser.new(@line_parser).parse(text)
+      if node.is_a?(Ast::Script)
+        node.keyword = block_keyword(node.script)
+      end
+      @ast << node
     end
 
     def parse_silent_script(text)
@@ -152,6 +156,7 @@ module HamlParser
       node = create_node(Ast::SilentScript)
       script = text[/\A- *(.*)\z/, 1]
       node.script = [script, *RubyMultiline.read(@line_parser, script)].join("\n")
+      node.keyword = block_keyword(node.script)
       @ast << node
     end
 
@@ -191,14 +196,8 @@ module HamlParser
       nil
     end
 
-    def indent_leave(indent_level, text)
+    def indent_leave(_indent_level, _text)
       parent_ast = @stack.pop
-      case @ast
-      when Ast::SilentScript
-        if indent_level == @indent_tracker.current_level
-          @ast.mid_block_keyword = mid_block_keyword?(text)
-        end
-      end
       @ast = parent_ast
       nil
     end
@@ -216,10 +215,6 @@ module HamlParser
       end
     end
 
-    def mid_block_keyword?(text)
-      MID_BLOCK_KEYWORDS.include?(block_keyword(text))
-    end
-
     def syntax_error!(message)
       raise Error.new(message, @line_parser.lineno)
     end

data/lib/haml_parser/version.rb

@@ -1,3 +1,3 @@
 module HamlParser
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -191,7 +191,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: Parser of Haml template language