hamlit 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda4c6ff22c6943b23ebaf8358f66b2f6f01fb66
-  data.tar.gz: 9db2e3e2d27fa2efd0c485cd8441ab07c83478d4
+  metadata.gz: ed569855be3cfd062957586173c438777bbad1bf
+  data.tar.gz: cb9f5d24e5290a801e38a9c1558e01e18dfd2c8b
 SHA512:
-  metadata.gz: bb8134311dd9d4cf6aa281abfbf5070093bb887c65a18a37a6c6e152720b1f20a6b88074ea908e8fb6b50ad0fb3c512745d9d54b01ff48246c9312518a37738a
-  data.tar.gz: 4a42cdc7aac2be14ca3f575dec01d7a29add11edff720b0f8a74e94d0227bda47efd4d71b6e79d0fa278cfe99085f6d5b743b1fe011da52c985c6a7e109020b1
+  metadata.gz: c599f0dcbac927f422137f528949f4ee6111a3f8104caf062e7abe1e23dc861f8ba4f3aae4119bf4dc72b2b5d86265250e7d7dd1d8a967d1d0d887fa2f04c98c
+  data.tar.gz: 8f53b9e6279a35eb5430846173017b09a3b88350b8c29c8f113c2bef31735524760ea9b19e8a12d185f7b35df5fd8e4a3b5938af6f8a705ca71d9259c3be260e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.6.7
+
+- Remove unused variables and avoid shadowing
+  - To suppress warnings in application using `rspec --warnings`
+
 ## v1.6.6
 
 - Allow hyphenated HTML-style attributes

data/README.md

@@ -1,4 +1,9 @@
-# Hamlit [![Build Status](https://travis-ci.org/k0kubun/hamlit.svg?branch=master)](https://travis-ci.org/k0kubun/hamlit)
+# Hamlit
+
+[![Gem Version](https://badge.fury.io/rb/hamlit.svg)](http://badge.fury.io/rb/hamlit)
+[![Build Status](https://travis-ci.org/k0kubun/hamlit.svg?branch=master)](https://travis-ci.org/k0kubun/hamlit)
+[![Coverage Status](https://coveralls.io/repos/k0kubun/hamlit/badge.svg?branch=master)](https://coveralls.io/r/k0kubun/hamlit?branch=master)
+[![Code Climate](https://codeclimate.com/github/k0kubun/hamlit/badges/gpa.svg)](https://codeclimate.com/github/k0kubun/hamlit)
 
 Hamlit is a high performance [haml](https://github.com/haml/haml) implementation.
 

data/hamlit.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coffee-script"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "erubis"
   spec.add_development_dependency "faml"
   spec.add_development_dependency "haml"
@@ -35,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "redcarpet"
   spec.add_development_dependency "rspec", ">= 3"
   spec.add_development_dependency "sass"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "slim"
   spec.add_development_dependency "therubyracer"
   spec.add_development_dependency "unindent"

data/lib/hamlit/attribute.rb

@@ -21,8 +21,8 @@ module Hamlit
 
     def build(*args)
       result = ''
-      attributes = args.inject({}) do |attributes, arg|
-        merge_attributes(attributes, arg)
+      attributes = args.inject({}) do |attrs, arg|
+        merge_attributes(attrs, arg)
       end
 
       attributes.each do |key, value|

data/lib/hamlit/compilers/new_attribute.rb

@@ -58,7 +58,7 @@ module Hamlit
 
       def read_value!(tokens)
         skip_tokens!(tokens, :on_sp)
-        (row, col), type, str = tokens.shift
+        _, _, str = tokens.shift
         return nil if str != '='
 
         skip_tokens!(tokens, :on_sp)
@@ -79,8 +79,7 @@ module Hamlit
         open_count = 0
 
         all_tokens.each do |token|
-          (row, col), type, str = token
-          case type
+          case type_of(token)
           when :on_tstring_beg then open_count += 1
           when :on_tstring_end then open_count -= 1
           end

data/lib/hamlit/compilers/old_attribute.rb

@@ -73,16 +73,16 @@ module Hamlit
       # Give up static compilation when variables are detected.
       def assert_static_value!(value)
         tokens = Ripper.lex(value)
-        tokens.each do |(row, col), type, str|
-          raise RuntimeBuild if type == :on_ident
+        tokens.each do |token|
+          raise RuntimeBuild if type_of(token) == :on_ident
         end
       end
 
       # Give up static compilation when the value is a variable or an array.
       def detect_joinable_value!(value)
         tokens = Ripper.lex(value)
-        tokens.each do |(row, col), type, str|
-          raise RuntimeBuild if JOINABLE_TOKENS.include?(type)
+        tokens.each do |token|
+          raise RuntimeBuild if JOINABLE_TOKENS.include?(type_of(token))
         end
       end
 
@@ -138,7 +138,7 @@ module Hamlit
       end
 
       def read_string!(tokens)
-        (row, col), type, str = tokens.shift
+        _, type, str = tokens.shift
         return '' if type == :on_tstring_end
 
         raise SyntaxError if type_of(tokens.shift) != :on_tstring_end
@@ -147,7 +147,7 @@ module Hamlit
 
       def assert_rocket!(tokens, *types)
         skip_tokens!(tokens, :on_sp)
-        (row, col), type, str = tokens.shift
+        _, type, str = tokens.shift
 
         raise SyntaxError unless type == :on_op && str == '=>'
       end
@@ -175,7 +175,7 @@ module Hamlit
           bracket: 0,
         }
 
-        Ripper.lex(str).each do |(row, col), type, str|
+        Ripper.lex(str).each do |(_, col), type, _|
           if columns.include?(col) && open_count == 1 && count.values.all?(&:zero?)
             result << col
           end

data/lib/hamlit/compilers/text.rb

@@ -46,7 +46,6 @@ module Hamlit
 
         offset     = 2 # 2 is the length of '%' and marker
         open_pos   = nil
-        close_pos  = nil
         open_count = 0
         literal    = literalify_string(exp, marker)
 
@@ -74,7 +73,7 @@ module Hamlit
         literal = literalify_string(exp, marker)
         open_count = 0
 
-        Ripper.lex(literal).each do |(row, col), type, str|
+        Ripper.lex(literal).each do |_, type, str|
           case type
           when :on_embexpr_beg
             open_count += 1

data/lib/hamlit/concerns/balanceable.rb

@@ -1,8 +1,11 @@
 require 'ripper'
+require 'hamlit/concerns/lexable'
 
 module Hamlit
   module Concerns
     module Balanceable
+      include Lexable
+
       def fetch_balanced_braces(all_tokens)
         fetch_balanced_tokens(all_tokens, :on_lbrace, :on_rbrace)
       end
@@ -34,8 +37,7 @@ module Hamlit
         open_count = start_count
 
         all_tokens.each_with_index do |token, index|
-          (row, col), type, str = token
-          case type
+          case type_of(token)
           when open_token  then open_count += 1
           when close_token then open_count -= 1
           end
@@ -51,8 +53,7 @@ module Hamlit
         open_count = start_count
 
         tokens.each do |token|
-          (row, col), type, str = token
-          case type
+          case type_of(token)
           when open_token  then open_count += 1
           when close_token then open_count -= 1
           end

data/lib/hamlit/concerns/indentable.rb

@@ -15,7 +15,7 @@ module Hamlit
       # Return nearest line's indent level since next line. This method ignores
       # empty line. It returns -1 if next_line does not exist.
       def next_indent
-        return 1 if !@indent_space && fetch_indent(next_line).length > 0
+        return 1 if !defined?(@indent_space) && fetch_indent(next_line).length > 0
         count_indent(next_line)
       end
 
@@ -48,7 +48,7 @@ module Hamlit
         end
         @indent_logs << indent
 
-        if !@indent_space && @indent_logs.last != ''
+        if !defined?(@indent_space) && @indent_logs.last != ''
           @indent_space = @indent_logs.last
         end
         validate_indentation_consistency!(indent)
@@ -59,7 +59,7 @@ module Hamlit
 
       def has_block?
         return false unless next_line
-        return fetch_indent(next_line).length > 0 unless @indent_space
+        return fetch_indent(next_line).length > 0 unless defined?(@indent_space)
 
         next_indent > @current_indent
       end
@@ -69,7 +69,7 @@ module Hamlit
       # Validate the template is using consitent indentation, 2 spaces or a tab.
       def validate_indentation_consistency!(indent)
         return false if indent.empty?
-        return false if !@indent_space || @indent_space.empty?
+        return false if !defined?(@indent_space) || @indent_space.empty?
 
         unless acceptable_indent?(indent)
           syntax_error!("Inconsistent indentation: #{indent_label(indent)} used for indentation, "\
@@ -105,7 +105,8 @@ module Hamlit
       end
 
       def indent_rule
-        (@indent_space || '').length
+        return 0 unless defined?(@indent_space)
+        @indent_space.length
       end
 
       def fetch_indent(str)

data/lib/hamlit/parsers/script.rb

@@ -82,7 +82,7 @@ module Hamlit
         prefix       = find_prefix(code)
         code         = "#{prefix}#{code}"
 
-        Ripper.lex(code).each do |(row, col), type, str|
+        Ripper.lex(code).each do |_, type, str|
           if type == :on_comment
             with_comment = true
             next

data/lib/hamlit/parsers/tag.rb

@@ -65,8 +65,8 @@ module Hamlit
         end
 
         ast = []
-        attributes.each do |name, values|
-          ast << [:html, :attr, name, [:static, values.join(' ')]]
+        attributes.each do |attr, values|
+          ast << [:html, :attr, attr, [:static, values.join(' ')]]
         end
         ast
       end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 end

data/spec/spec_helper.rb

@@ -1,8 +1,16 @@
+require 'coveralls'
+require 'simplecov'
 require 'unindent'
 require_relative 'spec_helper/document_generator'
 require_relative 'spec_helper/render_helper'
 require_relative 'spec_helper/test_case'
 
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 RSpec.configure do |config|
   config.include RenderHelper
 

data/spec/spec_helper/render_helper.rb

@@ -80,7 +80,7 @@ module RenderHelper
 
   def expect_implementation(impl, test, options, type, &block)
     if type == :error
-      expect { block.call(test, options) }.to raise_error
+      expect_any_error { block.call(test, options) }
       begin
         block.call(test, options)
       rescue Exception => e
@@ -101,6 +101,14 @@ module RenderHelper
     end
   end
 
+  def expect_any_error(&block)
+    origin = RSpec::Expectations.configuration.warn_about_potential_false_positives?
+    RSpec::Expectations.configuration.warn_about_potential_false_positives = false
+    expect { block.call(test, options) }.to raise_error
+  ensure
+    RSpec::Expectations.configuration.warn_about_potential_false_positives = origin
+  end
+
   def array_wrap(arr)
     return arr if arr.is_a?(Array)
     [arr]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: slim
   requirement: !ruby/object:Gem::Requirement