haml_parser 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b06a7a145edcaee2bae05feafbd265c680a8e54
-  data.tar.gz: 70e85219456f494d6d3d0f8f337727ecbbede342
+  metadata.gz: 7419fb3e0cafc26ec4b25af1bbc614a22befe953
+  data.tar.gz: 8446c4f6c9535169f187f482ed012af5c324ce4b
 SHA512:
-  metadata.gz: 88b446fd2edd5507ec973dd5926fc8b12b118c4e07f30bcb93a080d546905095ff87c08e683535d648b8801452d06188e1b9a41685911e356e2215a1545c206d
-  data.tar.gz: 65583c26a71fe5890e5f78dc9f885b17b9c5c169f8cb6ff95767971c50e82b7d3f8ae2f64f3a967b1612216db5590d7bdfe140fd5189d1fd22f52ae9b135d961
+  metadata.gz: 6b59ff50da183f5ca981d745d38d2224c438374fc9e99acfd8d7e231541056292c54648e5d4682781c6bfa5bdbf0464227a4969c96ca130f6f872a809dbf52de
+  data.tar.gz: ec69c79bbdca9b31d33350e662562e1fa7ad8362fe3a0e077500aa600cbe7782fd8f4be11df655b562b14906e4cdbf7d73ac6de325b0e9adc3ee9c58cc01a559

data/.rubocop.yml

@@ -1,5 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.3
+
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
 
@@ -35,7 +39,10 @@ Style/Tab:
   Exclude:
     - 'spec/indent_spec.rb'
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   Enabled: false
 
 Style/TrailingWhitespace:
@@ -44,3 +51,6 @@ Style/TrailingWhitespace:
 
 Style/UnneededPercentQ:
   Enabled: false  # buggy
+
+Performance/RedundantBlockCall:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
 after_script:
   - bundle exec rake benchmark

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.1 (2016-07-02)
+- Raise error when the first line has indentation
+
 # 0.4.0 (2015-11-21)
 - Old attributes and new attributes are no longer merged
     - `Ast::Element#attributes` is left for compatibility

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in haml_parser.gemspec

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/gem_tasks'
 
 task :default => [:spec, :rubocop]

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'haml_parser'

data/exe/haml_parser

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'haml_parser/cli'
 
 HamlParser::CLI.start(ARGV)

data/haml_parser.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'haml_parser/version'

data/lib/haml_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'haml_parser/version'
 
 module HamlParser

data/lib/haml_parser/ast.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
   module Ast
     module HasChildren

data/lib/haml_parser/cli.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'optparse'
 require_relative 'version'
 

data/lib/haml_parser/element_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'strscan'
 require_relative 'ast'
 require_relative 'error'
@@ -99,12 +100,10 @@ module HamlParser
         if depth == 0
           attr = s.pre_match + s.matched
           return [attr[1, attr.size - 2], s.rest]
+        elsif /,\s*\z/ === text && @line_parser.has_next?
+          text << "\n" << @line_parser.next_line
         else
-          if /,\s*\z/ === text && @line_parser.has_next?
-            text << "\n" << @line_parser.next_line
-          else
-            syntax_error!('Unmatched brace')
-          end
+          syntax_error!('Unmatched brace')
         end
       end
     end
@@ -120,12 +119,10 @@ module HamlParser
         if depth == 0
           t = s.string.byteslice(pre_pos...s.pos - 1)
           return [parse_new_attribute_list(t), s.rest]
+        elsif @line_parser.has_next?
+          text << "\n" << @line_parser.next_line
         else
-          if @line_parser.has_next?
-            text << "\n" << @line_parser.next_line
-          else
-            syntax_error!('Unmatched paren')
-          end
+          syntax_error!('Unmatched paren')
         end
       end
     end

data/lib/haml_parser/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
   class Error < StandardError
     attr_accessor :lineno

data/lib/haml_parser/filter_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'ast'
 
 module HamlParser
@@ -35,15 +36,13 @@ module HamlParser
           @ast = nil
           return ast
         end
+      elsif indent_level > @indent_tracker.current_level
+        # Start filter
+        @indent_level = indent_level
       else
-        if indent_level > @indent_tracker.current_level
-          # Start filter
-          @indent_level = indent_level
-        else
-          # Empty filter
-          @ast = nil
-          return nil
-        end
+        # Empty filter
+        @ast = nil
+        return nil
       end
 
       text = line[@indent_level..-1]

data/lib/haml_parser/indent_tracker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'error'
 
 module HamlParser
@@ -36,7 +37,7 @@ module HamlParser
     end
 
     def process(line, lineno)
-      if line =~ /\A\t/
+      if line.start_with?("\t")
         raise HardTabNotAllowed.new(lineno)
       end
       indent, text = split(line)

data/lib/haml_parser/line_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
   class LineParser
     attr_reader :filename, :lineno

data/lib/haml_parser/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'ast'
 require_relative 'element_parser'
 require_relative 'error'
@@ -180,6 +181,8 @@ module HamlParser
         syntax_error!('nesting within plain text is illegal')
       when Ast::Doctype
         syntax_error!('nesting within a header command is illegal')
+      when nil
+        syntax_error!('Indenting at the beginning of the document is illegal')
       end
       @ast.children = empty_lines
       if @ast.is_a?(Ast::Element) && @ast.self_closing
@@ -202,8 +205,8 @@ module HamlParser
       nil
     end
 
-    MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when]
-    START_BLOCK_KEYWORDS = %w[if begin case unless]
+    MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when].freeze
+    START_BLOCK_KEYWORDS = %w[if begin case unless].freeze
     # Try to parse assignments to block starters as best as possible
     START_BLOCK_KEYWORD_REGEX = /(?:\w+(?:,\s*\w+)*\s*=\s*)?(#{Regexp.union(START_BLOCK_KEYWORDS)})/
     BLOCK_KEYWORD_REGEX = /^-?\s*(?:(#{Regexp.union(MID_BLOCK_KEYWORDS)})|#{START_BLOCK_KEYWORD_REGEX.source})\b/
@@ -224,7 +227,7 @@ module HamlParser
         node.filename = @line_parser.filename
         node.lineno = @line_parser.lineno
         if block
-          block.call(node)
+          yield(node)
         end
       end
     end

data/lib/haml_parser/ruby_multiline.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
   module RubyMultiline
     def self.read(line_parser, current_text)

data/lib/haml_parser/script_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'ast'
 require_relative 'error'
 require_relative 'ruby_multiline'
@@ -39,10 +40,9 @@ module HamlParser
     end
 
     def parse_sanitized(text)
-      case
-      when text.start_with?('&==')
+      if text.start_with?('&==')
         create_node(Ast::Text) { |t| t.text = text[3..-1].lstrip }
-      when text[1] == '=' || text[1] == '~'
+      elsif text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
         script = text[2..-1].lstrip
         if script.empty?
@@ -57,13 +57,12 @@ module HamlParser
     end
 
     def parse_unescape(text)
-      case
-      when text.start_with?('!==')
+      if text.start_with?('!==')
         create_node(Ast::Text) do |t|
           t.text = text[3..-1].lstrip
           t.escape_html = false
         end
-      when text[1] == '=' || text[1] == '~'
+      elsif text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
         node.escape_html = false
         script = text[2..-1].lstrip

data/lib/haml_parser/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
   module Utils
     module_function

data/lib/haml_parser/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module HamlParser
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_parser
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2016-07-02 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.6.6
 signing_key: 
 specification_version: 4
 summary: Parser of Haml template language