slim_lint 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86da209f2562c02d7253cc14507c80a0dd60c6d
-  data.tar.gz: f58d40f174c24e38e5e2d9d302f9a47c8db4b27a
+  metadata.gz: b31bbab7032a0b6e0da094200bf36f78e3c432db
+  data.tar.gz: 8d431de357a8880ea02697529fb6b59aa96a26b1
 SHA512:
-  metadata.gz: f927bfb9459f35098a870fd794c596fcd2d12afb42ee30689ef3acf20d0356a60805e746968a7d546d0e36a5da949f48046a079395b1636ddbe58f260008805f
-  data.tar.gz: 174c88e5772cec3338a1f4abddfb5dbdfe57e361904eca042ed922534ee6be4a257ea62698d6ff8205a683d75f1dea7548fde43cc3e5191fc2175eb8895102d6
+  metadata.gz: 083c79d40d3c6aadf7329d052f834b951041caf439659c608df155cff0a89f4239bcb2d0924b3beb2804278e13e1c72f496b6c870407506bf96df8f78dc747e4
+  data.tar.gz: 2aa7a953372da42bc9562a91839a0cece3da71c4189875afc2ef0c7dd5856882964b9cea6c9e6803a0e3f172025ae95a60d2883e44378f4fd2f7e05925942be0

data/LICENSE.md

@@ -0,0 +1,21 @@
+Slim-Lint is released under the MIT license.
+
+> Copyright (c) 2015 Shane da Silva. http://shane.io
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.

data/lib/slim_lint/atom.rb

@@ -20,12 +20,7 @@ module SlimLint
     # @param other [Object]
     # @return [Boolean]
     def ==(other)
-      case other
-      when Atom
-        @value == other.instance_variable_get(:@value)
-      else
-        @value == other
-      end
+      @value == (other.is_a?(Atom) ? other.instance_variable_get(:@value) : other)
     end
 
     # Returns whether this atom matches the given Sexp pattern.

data/lib/slim_lint/configuration.rb

@@ -32,7 +32,6 @@ module SlimLint
     def ==(other)
       super || @hash == other.hash
     end
-    alias_method :eql?, :==
 
     # Returns a non-modifiable configuration for the specified linter.
     #

data/lib/slim_lint/configuration_loader.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'yaml'
 
 module SlimLint
   # Manages configuration file loading.
   class ConfigurationLoader
-    DEFAULT_CONFIG_PATH = File.join(SlimLint::HOME, 'config', 'default.yml')
-    CONFIG_FILE_NAME = '.slim-lint.yml'
+    DEFAULT_CONFIG_PATH = File.join(SlimLint::HOME, 'config', 'default.yml').freeze
+    CONFIG_FILE_NAME = '.slim-lint.yml'.freeze
 
     class << self
       # Load configuration file given the current working directory the

data/lib/slim_lint/constants.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Global application constants.
 module SlimLint
-  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-  APP_NAME = 'slim-lint'
+  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+  APP_NAME = 'slim-lint'.freeze
 
-  REPO_URL = 'https://github.com/sds/slim-lint'
-  BUG_REPORT_URL = "#{REPO_URL}/issues"
+  REPO_URL = 'https://github.com/sds/slim-lint'.freeze
+  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
 end

data/lib/slim_lint/document.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SlimLint
   # Represents a parsed Slim document and its associated metadata.
   class Document
     # File name given to source code parsed from just a string.
-    STRING_SOURCE = '(string)'
+    STRING_SOURCE = '(string)'.freeze
 
     # @return [SlimLint::Configuration] Configuration used to parse template
     attr_reader :config

data/lib/slim_lint/file_finder.rb

@@ -6,7 +6,7 @@ module SlimLint
   class FileFinder
     # List of extensions of files to include under a directory when a directory
     # is specified instead of a file.
-    VALID_EXTENSIONS = %w[.slim]
+    VALID_EXTENSIONS = %w[.slim].freeze
 
     # Create a file finder using the specified configuration.
     #

data/lib/slim_lint/linter/line_length.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module SlimLint
   # Checks for lines longer than a maximum number of columns.
   class Linter::LineLength < Linter
     include LinterRegistry
 
-    MSG = 'Line is too long. [%d/%d]'
+    MSG = 'Line is too long. [%d/%d]'.freeze
 
     on_start do |_sexp|
       max_length = config['max']

data/lib/slim_lint/linter/redundant_div.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module SlimLint
   # Checks for unnecessary uses of the `div` tag where a class name or ID
   # already implies a div.
   class Linter::RedundantDiv < Linter
     include LinterRegistry
 
-    MESSAGE = '`div` is redundant when %s attribute shortcut is present'
+    MESSAGE = '`div` is redundant when %s attribute shortcut is present'.freeze
 
     on [:html, :tag, 'div',
          [:html, :attrs,

data/lib/slim_lint/linter_selector.rb

@@ -29,13 +29,13 @@ module SlimLint
     # @param options [Hash]
     # @return [Array<SlimLint::Linter>]
     def extract_enabled_linters(config, options)
-      included_linters = LinterRegistry
-        .extract_linters_from(options.fetch(:included_linters, []))
+      included_linters =
+        LinterRegistry.extract_linters_from(options.fetch(:included_linters, []))
 
       included_linters = LinterRegistry.linters if included_linters.empty?
 
-      excluded_linters = LinterRegistry
-        .extract_linters_from(options.fetch(:excluded_linters, []))
+      excluded_linters =
+        LinterRegistry.extract_linters_from(options.fetch(:excluded_linters, []))
 
       # After filtering out explicitly included/excluded linters, only include
       # linters which are enabled in the configuration

data/lib/slim_lint/ruby_extractor.rb

@@ -51,18 +51,19 @@ module SlimLint
       @source_lines = []
       @source_map = {}
       @line_count = 0
+      @dummy_puts_count = 0
     end
 
     on [:html, :doctype] do |sexp|
-      append('puts', sexp)
+      append_dummy_puts(sexp)
     end
 
     on [:html, :tag] do |sexp|
-      append('puts', sexp)
+      append_dummy_puts(sexp)
     end
 
     on [:static] do |sexp|
-      append('puts', sexp)
+      append_dummy_puts(sexp)
     end
 
     on [:dynamic] do |sexp|
@@ -94,5 +95,10 @@ module SlimLint
         @source_map[@line_count] = original_line + index
       end
     end
+
+    def append_dummy_puts(sexp)
+      append("_slim_lint_puts_#{@dummy_puts_count}", sexp)
+      @dummy_puts_count += 1
+    end
   end
 end

data/lib/slim_lint/ruby_parser.rb

@@ -1,4 +1,5 @@
-require 'astrolabe/builder'
+require 'rubocop'
+require 'rubocop/ast_node/builder'
 require 'parser/current'
 
 module SlimLint
@@ -10,7 +11,7 @@ module SlimLint
   class RubyParser
     # Creates a reusable parser.
     def initialize
-      @builder = ::Astrolabe::Builder.new
+      @builder = ::RuboCop::Node::Builder.new
       @parser = ::Parser::CurrentRuby.new(@builder)
     end
 

data/lib/slim_lint/sexp.rb

@@ -84,11 +84,12 @@ module SlimLint
         output << "\n"
         output += indentation
 
-        if nested_sexp.is_a?(SlimLint::Sexp)
-          output += nested_sexp.display(depth + 1)
-        else
-          output += nested_sexp.inspect
-        end
+        output +=
+          if nested_sexp.is_a?(SlimLint::Sexp)
+            nested_sexp.display(depth + 1)
+          else
+            nested_sexp.inspect
+          end
 
         # Add trailing comma unless this is the last item
         output += ',' if index < length - 1

data/lib/slim_lint/utils.rb

@@ -57,9 +57,9 @@ module SlimLint
     #   inclusion
     # @yieldreturn [Boolean] whether to include the item
     # @return [Integer]
-    def count_consecutive(items, offset = 0, &block)
+    def count_consecutive(items, offset = 0)
       count = 1
-      count += 1 while (offset + count < items.count) && block.call(items[offset + count])
+      count += 1 while (offset + count < items.count) && yield(items[offset + count])
       count
     end
 

data/lib/slim_lint/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Defines the gem version.
 module SlimLint
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: sysexits
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
 - bin/slim-lint
 - config/default.yml
 - lib/slim_lint.rb
@@ -157,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Slim template linting tool