haml_parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8e1da7981dd07cc815bdbc297e870a4ac6112b
-  data.tar.gz: 2194786147cc3fd76d711695ab52e94fa4aafdf6
+  metadata.gz: d1ee2e978b5969cf7f28d4b58df013a97988d26e
+  data.tar.gz: 2c18d9f3232488d668794f0c920b2fd3fc58a989
 SHA512:
-  metadata.gz: 3e43dcd816b101a1809c61cc64a8bd49e1505cbc8b78df5daa565c377717227b003853fea553a89ed017c1513a5a0fecebe3a7341bb2fa7dbe42c279e0c1f4fe
-  data.tar.gz: a9a087e3f0969c6b221cca84234c32cc9d3f7cb7ad4b958144996396996d0551f27783567fca63b56d4078507c55952bb6c2cfe6f32e247dc5b008741ddb3b37
+  metadata.gz: 70f270214c9c7bf34807e4b30fe70bed2d6e67c21f1d94541257739b3cddc6c012dbacd6a41d9feba25e8647c3c7bb13cf79cb1f9f6b47a0d5de4cb737cee1b6
+  data.tar.gz: 77c69264173959110a1e28661c06c1694d5f73b5c37306d6f205d2e7a08187f4d37c94ac091c5c2edd9c8f04c9e203ba43e969d3fa1b4414f6de253d08ac0315

data/.rubocop.yml

@@ -0,0 +1,46 @@
+inherit_from: .rubocop_todo.yml
+
+Style/BarePercentLiterals:
+  EnforcedStyle: percent_q
+
+Style/CaseEquality:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/Next:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/SignalException:
+  Enabled: false
+
+Style/Tab:
+  Exclude:
+    - 'spec/indent_spec.rb'
+
+Style/TrailingComma:
+  Enabled: false
+
+Style/TrailingWhitespace:
+  Exclude:
+    - 'spec/multiline_spec.rb'
+
+Style/UnneededPercentQ:
+  Enabled: false  # buggy

data/.rubocop_todo.yml

@@ -0,0 +1,28 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/PredicateName:
+  Exclude:
+    - 'lib/haml_parser/line_parser.rb'
+    - 'lib/haml_parser/ruby_multiline.rb'

data/.travis.yml

@@ -5,6 +5,8 @@ rvm:
   - 2.1
   - 2.2
   - ruby-head
+after_script:
+  - bundle exec rake benchmark
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 0.1.1 (2015-10-13)
+- Fix missing require in CLI
+
+# 0.1.0 (2015-09-13)
+- Initial release. Extracted from faml v0.2.16.
+    - Fix preserve flag in `~ foobar` syntax
+    - Set filename correctly to `Ast::Filter`
+    - Remove `Ast::Script#mid_block_keyword` attribute

data/Rakefile

@@ -1,6 +1,27 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
-task :default => :spec
+task :default => [:spec, :rubocop]
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+desc 'Run all benchmarks'
+task :benchmark => ['benchmark:sample', 'benchmark:haml']
+
+namespace :benchmark do
+  desc "Run benchmark with haml_parser's sample"
+  task :sample do
+    sample_haml_path = File.join(__dir__, 'spec', 'fixtures', 'sample.haml')
+    sh 'ruby', 'benchmark/parse.rb', sample_haml_path
+  end
+
+  desc "Run benchmark with haml's sample"
+  task :haml do
+    haml_gem = Gem::Specification.find_by_name('haml')
+    standard_haml_path = File.join(haml_gem.gem_dir, 'test', 'templates', 'standard.haml')
+    sh 'ruby', 'benchmark/parse.rb', standard_haml_path
+  end
+end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "haml_parser"
+require 'bundler/setup'
+require 'haml_parser'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "haml_parser"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/haml_parser.gemspec

@@ -4,26 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'haml_parser/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "haml_parser"
+  spec.name          = 'haml_parser'
   spec.version       = HamlParser::VERSION
-  spec.authors       = ["Kohei Suzuki"]
-  spec.email         = ["eagletmt@gmail.com"]
+  spec.authors       = ['Kohei Suzuki']
+  spec.email         = ['eagletmt@gmail.com']
 
-  spec.summary       = %q{Parser of Haml template language}
-  spec.description   = %q{Parser of Haml template language}
-  spec.homepage      = "https://github.com/eagletmt/haml_parser"
-  spec.license       = "MIT"
+  spec.summary       = 'Parser of Haml template language'
+  spec.description   = 'Parser of Haml template language'
+  spec.homepage      = 'https://github.com/eagletmt/haml_parser'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|benchmark)/}) }
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.3.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency 'benchmark-ips'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'haml'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
 end

data/lib/haml_parser.rb

@@ -1,4 +1,4 @@
-require "haml_parser/version"
+require_relative 'haml_parser/version'
 
 module HamlParser
   # Your code goes here...

data/lib/haml_parser/ast.rb

@@ -15,7 +15,7 @@ module HamlParser
       end
     end
 
-    class Root < Struct.new(:children)
+    Root = Struct.new(:children) do
       include HasChildren
 
       def to_h
@@ -23,13 +23,13 @@ module HamlParser
       end
     end
 
-    class Doctype < Struct.new(:doctype, :filename, :lineno)
+    Doctype = Struct.new(:doctype, :filename, :lineno) do
       def to_h
         super.merge(type: 'doctype')
       end
     end
 
-    class Element < Struct.new(
+    Element = Struct.new(
       :children,
       :tag_name,
       :static_class,
@@ -41,7 +41,7 @@ module HamlParser
       :nuke_outer_whitespace,
       :filename,
       :lineno,
-    )
+    ) do
       include HasChildren
 
       def initialize(*)
@@ -62,22 +62,22 @@ module HamlParser
       end
     end
 
-    class Script < Struct.new(
+    Script = Struct.new(
       :children,
       :script,
       :escape_html,
       :preserve,
       :filename,
       :lineno,
-    )
+    ) do
       include HasChildren
 
       def initialize(*)
         super
-        if self.escape_html.nil?
+        if escape_html.nil?
           self.escape_html = true
         end
-        if self.preserve.nil?
+        if preserve.nil?
           self.preserve = false
         end
       end
@@ -87,12 +87,12 @@ module HamlParser
       end
     end
 
-    class SilentScript < Struct.new(:children, :script, :mid_block_keyword, :filename, :lineno)
+    SilentScript = Struct.new(:children, :script, :mid_block_keyword, :filename, :lineno) do
       include HasChildren
 
       def initialize(*)
         super
-        if self.mid_block_keyword.nil?
+        if mid_block_keyword.nil?
           self.mid_block_keyword = false
         end
       end
@@ -102,7 +102,7 @@ module HamlParser
       end
     end
 
-    class HtmlComment < Struct.new(:children, :comment, :conditional, :filename, :lineno)
+    HtmlComment = Struct.new(:children, :comment, :conditional, :filename, :lineno) do
       include HasChildren
 
       def initialize(*)
@@ -116,7 +116,7 @@ module HamlParser
       end
     end
 
-    class HamlComment < Struct.new(:children, :filename, :lineno)
+    HamlComment = Struct.new(:children, :filename, :lineno) do
       include HasChildren
 
       def to_h
@@ -124,10 +124,10 @@ module HamlParser
       end
     end
 
-    class Text < Struct.new(:text, :escape_html, :filename, :lineno)
+    Text = Struct.new(:text, :escape_html, :filename, :lineno) do
       def initialize(*)
         super
-        if self.escape_html.nil?
+        if escape_html.nil?
           self.escape_html = true
         end
       end
@@ -137,7 +137,7 @@ module HamlParser
       end
     end
 
-    class Filter < Struct.new(:name, :texts, :filename, :lineno)
+    Filter = Struct.new(:name, :texts, :filename, :lineno) do
       def initialize(*)
         super
         self.texts ||= []
@@ -148,7 +148,7 @@ module HamlParser
       end
     end
 
-    class Empty < Struct.new(:filename, :lineno)
+    Empty = Struct.new(:filename, :lineno) do
       def to_h
         super.merge(type: 'empty')
       end

data/lib/haml_parser/cli.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require_relative 'version'
 
 module HamlParser
   class CLI
@@ -13,7 +14,7 @@ module HamlParser
         parser.on('-f FORMAT', '--format FORMAT', 'Select formatter') { |v| formatter = v }
       end.parse!(argv)
 
-      require 'haml_parser/parser'
+      require_relative 'parser'
       argv.each do |file|
         format(parse_file(file), formatter)
       end

data/lib/haml_parser/element_parser.rb

@@ -1,9 +1,9 @@
 require 'strscan'
-require 'haml_parser/ast'
-require 'haml_parser/utils'
-require 'haml_parser/ruby_multiline'
-require 'haml_parser/script_parser'
-require 'haml_parser/error'
+require_relative 'ast'
+require_relative 'error'
+require_relative 'ruby_multiline'
+require_relative 'script_parser'
+require_relative 'utils'
 
 module HamlParser
   class ElementParser
@@ -84,7 +84,7 @@ module HamlParser
         if attributes.empty?
           attributes = new_attributes
         else
-          attributes << ", " << new_attributes
+          attributes << ', ' << new_attributes
         end
       end
       [attributes, rest]
@@ -99,7 +99,7 @@ module HamlParser
         depth = Utils.balance(s, '{', '}', depth)
         if depth == 0
           attr = s.pre_match + s.matched
-          return [attr[1, attr.size-2], s.rest]
+          return [attr[1, attr.size - 2], s.rest]
         else
           if /,\s*\z/ === text && @line_parser.has_next?
             text << "\n" << @line_parser.next_line
@@ -119,7 +119,7 @@ module HamlParser
         pre_pos = s.pos
         depth = Utils.balance(s, '(', ')', depth)
         if depth == 0
-          t = s.string.byteslice(pre_pos ... s.pos-1)
+          t = s.string.byteslice(pre_pos...s.pos - 1)
           return [parse_new_attribute_list(t), s.rest]
         else
           if @line_parser.has_next?
@@ -165,7 +165,8 @@ module HamlParser
     end
 
     def scan_value(scanner)
-      if quote = scanner.scan(/["']/)
+      quote = scanner.scan(/["']/)
+      if quote
         scan_quoted_value(scanner, quote)
       else
         scan_variable_value(scanner)
@@ -187,7 +188,7 @@ module HamlParser
           syntax_error!('Invalid attribute list (mismatched interpolation)')
         end
       end
-      str = scanner.string.byteslice(pos-1 .. scanner.pos-1)
+      str = scanner.string.byteslice(pos - 1..scanner.pos - 1)
 
       # Even if the quote is single, string interpolation is performed in Haml.
       str[0] = '"'

data/lib/haml_parser/filter_parser.rb

@@ -1,4 +1,4 @@
-require 'haml_parser/ast'
+require_relative 'ast'
 
 module HamlParser
   class FilterParser
@@ -9,7 +9,7 @@ module HamlParser
     end
 
     def enabled?
-      !!@ast
+      !@ast.nil?
     end
 
     def start(name, filename, lineno)
@@ -46,7 +46,7 @@ module HamlParser
         end
       end
 
-      text = line[@indent_level .. -1]
+      text = line[@indent_level..-1]
       @ast.texts << text
       nil
     end

data/lib/haml_parser/indent_tracker.rb

@@ -1,4 +1,4 @@
-require 'haml_parser/error'
+require_relative 'error'
 
 module HamlParser
   class IndentTracker
@@ -30,8 +30,8 @@ module HamlParser
 
     def initialize(on_enter: nil, on_leave: nil)
       @indent_levels = [0]
-      @on_enter = on_enter || lambda { |level, text| }
-      @on_leave = on_leave || lambda { |level, text| }
+      @on_enter = on_enter || lambda { |_level, _text| }
+      @on_leave = on_leave || lambda { |_level, _text| }
       @comment_level = nil
     end
 
@@ -85,7 +85,7 @@ module HamlParser
       end
     end
 
-    def indent_enter(indent_level, text, lineno)
+    def indent_enter(indent_level, text, _lineno)
       unless @comment_level
         @indent_levels.push(indent_level)
         @on_enter.call(indent_level, text)

data/lib/haml_parser/line_parser.rb

@@ -49,12 +49,12 @@ module HamlParser
     end
 
     def next_multiline(line)
-      buf = [line[0, line.size-1]]
+      buf = [line[0, line.size - 1]]
       while @lineno < @lines.size
         line = move_next
 
         if is_multiline?(line)
-          line = line[0, line.size-1]
+          line = line[0, line.size - 1]
           buf << line.lstrip
         else
           move_back

data/lib/haml_parser/parser.rb

@@ -1,12 +1,12 @@
-require 'haml_parser/ast'
-require 'haml_parser/element_parser'
-require 'haml_parser/error'
-require 'haml_parser/filter_parser'
-require 'haml_parser/indent_tracker'
-require 'haml_parser/line_parser'
-require 'haml_parser/ruby_multiline'
-require 'haml_parser/script_parser'
-require 'haml_parser/utils'
+require_relative 'ast'
+require_relative 'element_parser'
+require_relative 'error'
+require_relative 'filter_parser'
+require_relative 'indent_tracker'
+require_relative 'line_parser'
+require_relative 'ruby_multiline'
+require_relative 'script_parser'
+require_relative 'utils'
 
 module HamlParser
   class Parser
@@ -79,7 +79,7 @@ module HamlParser
 
       case text[0]
       when ESCAPE_PREFIX
-        parse_plain(text[1 .. -1])
+        parse_plain(text[1..-1])
       when ELEMENT_PREFIX
         parse_element(text)
       when DOCTYPE_PREFIX
@@ -106,11 +106,11 @@ module HamlParser
     end
 
     def parse_doctype(text)
-      @ast << create_node(Ast::Doctype) { |d| d.doctype = text[3 .. -1].strip }
+      @ast << create_node(Ast::Doctype) { |d| d.doctype = text[3..-1].strip }
     end
 
     def parse_comment(text)
-      text = text[1, text.size-1].strip
+      text = text[1, text.size - 1].strip
       comment = create_node(Ast::HtmlComment)
       comment.comment = text
       if text[0] == '['
@@ -123,7 +123,7 @@ module HamlParser
     CONDITIONAL_COMMENT_REGEX = /[\[\]]/o
 
     def parse_conditional_comment(text)
-      s = StringScanner.new(text[1 .. -1])
+      s = StringScanner.new(text[1..-1])
       depth = Utils.balance(s, '[', ']')
       if depth == 0
         [s.pre_match, s.rest.lstrip]
@@ -163,7 +163,7 @@ module HamlParser
       @filter_parser.start(filter_name, @line_parser.filename, @line_parser.lineno)
     end
 
-    def indent_enter(_, text)
+    def indent_enter(_, _text)
       empty_lines = []
       while @ast.children.last.is_a?(Ast::Empty)
         empty_lines << @ast.children.pop
@@ -213,8 +213,6 @@ module HamlParser
       m = text.match(BLOCK_KEYWORD_REGEX)
       if m
         m[1] || m[2]
-      else
-        nil
       end
     end
 

data/lib/haml_parser/ruby_multiline.rb

@@ -15,8 +15,8 @@ module HamlParser
     #   (however, "x?," is a method call and not a literal)
     # - and not "?\," which is a character literal
     def self.is_ruby_multiline?(text)
-      text && text.length > 1 && text[-1] == ?, &&
-        !((text[-3, 2] =~ /\W\?/) || text[-3, 2] == "?\\")
+      text && text.length > 1 && text[-1] == ',' &&
+        !((text[-3, 2] =~ /\W\?/) || text[-3, 2] == '?\\')
     end
     private_class_method :is_ruby_multiline?
   end

data/lib/haml_parser/script_parser.rb

@@ -1,6 +1,6 @@
-require 'haml_parser/ast'
-require 'haml_parser/ruby_multiline'
-require 'haml_parser/error'
+require_relative 'ast'
+require_relative 'error'
+require_relative 'ruby_multiline'
 
 module HamlParser
   class ScriptParser
@@ -25,10 +25,10 @@ module HamlParser
 
     def parse_script(text)
       if text[1] == '='
-        create_node(Ast::Text) { |t| t.text = text[2 .. -1].strip }
+        create_node(Ast::Text) { |t| t.text = text[2..-1].strip }
       else
         node = create_node(Ast::Script)
-        script = text[1 .. -1].lstrip
+        script = text[1..-1].lstrip
         if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
@@ -41,10 +41,10 @@ module HamlParser
     def parse_sanitized(text)
       case
       when text.start_with?('&==')
-        create_node(Ast::Text) { |t| t.text = text[3 .. -1].lstrip }
+        create_node(Ast::Text) { |t| t.text = text[3..-1].lstrip }
       when text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
-        script = text[2 .. -1].lstrip
+        script = text[2..-1].lstrip
         if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
@@ -52,7 +52,7 @@ module HamlParser
         node.preserve = text[1] == '~'
         node
       else
-        create_node(Ast::Text) { |t| t.text = text[1 .. -1].strip }
+        create_node(Ast::Text) { |t| t.text = text[1..-1].strip }
       end
     end
 
@@ -60,13 +60,13 @@ module HamlParser
       case
       when text.start_with?('!==')
         create_node(Ast::Text) do |t|
-          t.text = text[3 .. -1].lstrip
+          t.text = text[3..-1].lstrip
           t.escape_html = false
         end
       when text[1] == '=' || text[1] == '~'
         node = create_node(Ast::Script)
         node.escape_html = false
-        script = text[2 .. -1].lstrip
+        script = text[2..-1].lstrip
         if script.empty?
           syntax_error!('No Ruby code to evaluate')
         end
@@ -75,7 +75,7 @@ module HamlParser
         node
       else
         create_node(Ast::Text) do |t|
-          t.text = text[1 .. -1].lstrip
+          t.text = text[1..-1].lstrip
           t.escape_html = false
         end
       end

data/lib/haml_parser/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: haml_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +146,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Parser of Haml template language