slim_lint 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e3790d144eb2141cb93b53835a447cfe9e1db8
-  data.tar.gz: 7b07131e272e1b913926061eb37703d7e0738f01
+  metadata.gz: 3389992065a4202ee3f1541ccade01b424df4115
+  data.tar.gz: 27e0e7ef9d0155dd54b5729ecf237b72f4b24464
 SHA512:
-  metadata.gz: d776fde028a429d5a44ae2cdc4092705e759a96f82dca6c2b59ad6a3fc1280823e86ecee38fa642f3720d048567ab31a3dd1bd5bf72a48ef3737c2b1d300843f
-  data.tar.gz: e617bc89440a83feefec3beabaa186ef57fb8c5433fd7b134610deaf631a4b4ad3c0e1e70474255145d2b40fc5d19ee3f19191ab102329b4f5a5dc27d9995717
+  metadata.gz: f419a7cd896f9dec484719c95e4b7ceb6fac3b3c37cdf7432de40ce9581381256d4b108dc20da1e30391bf6128bbe3519ae6cfac6875669dac7b39e4851779ef
+  data.tar.gz: adc31508f162b7182d79eb81641d8ac5648f498d43f4decbbd38240fd720def57349979cfb9eba76504a9e3c4f97336b9d65fe7d9a25b14530762661a817fb28

data/config/default.yml

@@ -34,9 +34,11 @@ linters:
       - Lint/EndAlignment
       - Lint/Void
       - Metrics/LineLength
+      - Style/AlignHash
       - Style/AlignParameters
       - Style/BlockNesting
       - Style/FileName
+      - Style/FirstParameterIndentation
       - Style/IfUnlessModifier
       - Style/IndentationConsistency
       - Style/IndentationWidth

data/lib/slim_lint/filters/attribute_processor.rb

@@ -0,0 +1,29 @@
+module SlimLint::Filters
+  # A dumbed-down version of {Slim::CodeAttributes} which doesn't introduce any
+  # temporary variables or other cruft.
+  class AttributeProcessor < Slim::Filter
+    define_options :merge_attrs
+
+    # Handle attributes expression `[:html, :attrs, *attrs]`
+    #
+    # @param attrs [Array]
+    # @return [Array]
+    def on_html_attrs(*attrs)
+      [:multi, *attrs.map { |a| compile(a) }]
+    end
+
+    # Handle attribute expression `[:html, :attr, name, value]`
+    #
+    # @param name [String] name of the attribute
+    # @param value [Array] Sexp representing the value
+    def on_html_attr(name, value)
+      if value[0] == :slim && value[1] == :attrvalue
+        code = value[3]
+        [:code, code]
+      else
+        @attr = name
+        super
+      end
+    end
+  end
+end

data/lib/slim_lint/filters/control_processor.rb

@@ -0,0 +1,45 @@
+module SlimLint::Filters
+  # A dumbed-down version of {Slim::Controls} which doesn't introduce temporary
+  # variables and other cruft (which in the context of extracting Ruby code,
+  # results in a lot of weird cops reported by RuboCop).
+  class ControlProcessor < Slim::Filter
+    BLOCK_RE = /\A(if|unless)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+
+    # Handle control expression `[:slim, :control, code, content]`
+    #
+    # @param code [String]
+    # @param content [Array]
+    def on_slim_control(code, content)
+      [:multi,
+        [:code, code],
+        compile(content)]
+    end
+
+    # Handle output expression `[:slim, :output, escape, code, content]`
+    #
+    # @param _escape [Boolean]
+    # @param code [String]
+    # @param content [Array]
+    # @return [Array
+    def on_slim_output(_escape, code, content)
+      if code[BLOCK_RE]
+        [:multi,
+          [:code, code, compile(content)],
+          [:code, 'end']]
+      else
+        [:multi, [:dynamic, code], compile(content)]
+      end
+    end
+
+    # Handle text expression `[:slim, :text, type, content]`
+    #
+    # @param _type [Symbol]
+    # @param content [Array]
+    # @return [Array]
+    def on_slim_text(_type, content)
+      # Ensures :newline expressions from static output are still represented in
+      # the final expression
+      compile(content)
+    end
+  end
+end

data/lib/slim_lint/filters/splat_processor.rb

@@ -0,0 +1,13 @@
+module SlimLint::Filters
+  # A dumbed-down version of {Slim::Splat::Filter} which doesn't introduced
+  # temporary variables or other cruft.
+  class SplatProcessor < Slim::Filter
+    # Handle slim splat expressions `[:slim, :splat, code]`
+    #
+    # @param code [String]
+    # @return [Array]
+    def on_slim_splat(code)
+      [:code, code]
+    end
+  end
+end

data/lib/slim_lint/linter/consecutive_control_statements.rb

@@ -6,12 +6,19 @@ module SlimLint
 
     on [:multi] do |sexp|
       Utils.for_consecutive_items(sexp,
-                                  ->(nested_sexp) { nested_sexp.match?([:slim, :control]) },
+                                  method(:flat_control_statement?),
                                   config['max_consecutive'] + 1) do |group|
         report_lint(group.first,
                     "#{group.count} consecutive control statements can be " \
                     'merged into a single `ruby:` filter')
       end
     end
+
+    private
+
+    def flat_control_statement?(sexp)
+      sexp.match?([:slim, :control]) &&
+        sexp[3] == [:multi, [:newline]]
+    end
   end
 end

data/lib/slim_lint/linter/rubocop.rb

@@ -12,9 +12,11 @@ module SlimLint
       processed_sexp = SlimLint::RubyExtractEngine.new.call(document.source)
 
       extractor = SlimLint::RubyExtractor.new
-      extracted_ruby = extractor.extract(processed_sexp)
+      extracted_source = extractor.extract(processed_sexp)
 
-      find_lints(extracted_ruby, extractor.source_map) unless extracted_ruby.empty?
+      next if extracted_source.source.empty?
+
+      find_lints(extracted_source.source, extracted_source.source_map)
     end
 
     private

data/lib/slim_lint/ruby_extract_engine.rb

@@ -5,12 +5,6 @@ module SlimLint
   # This is mostly copied from Slim::Engine, with some filters and generators
   # omitted.
   class RubyExtractEngine < Temple::Engine
-    define_options sort_attrs: true,
-                   format: :xhtml,
-                   attr_quote: '"',
-                   merge_attrs: { 'class' => ' ' },
-                   default_tag: 'div'
-
     filter :Encoding
     filter :RemoveBOM
 
@@ -23,14 +17,11 @@ module SlimLint
     # matter in this case.
     use Slim::Embedded
     use Slim::Interpolation
-    use Slim::Splat::Filter
+    use SlimLint::Filters::SplatProcessor
     use Slim::DoInserter
     use Slim::EndInserter
-    use Slim::Controls
-    html :AttributeSorter
-    html :AttributeMerger
-    use Slim::CodeAttributes
-    filter :ControlFlow
+    use SlimLint::Filters::ControlProcessor
+    use SlimLint::Filters::AttributeProcessor
     filter :MultiFlattener
     filter :StaticMerger
 

data/lib/slim_lint/ruby_extractor.rb

@@ -30,16 +30,20 @@ module SlimLint
     include SexpVisitor
     extend SexpVisitor::DSL
 
-    # Map of generated Ruby source code lines and their corresponding lines in
-    # the original document.
-    attr_reader :source_map
+    # Stores the extracted source and a map of lines of generated source to the
+    # original source that created them.
+    #
+    # @attr_reader source [String] generated source code
+    # @attr_reader source_map [Hash] map of line numbers from generated source
+    #   to original source line number
+    RubySource = Struct.new(:source, :source_map)
 
     # Extracts Ruby code from Sexp representing a Slim document.
     #
     # @param sexp [SlimLint::Sexp]
     def extract(sexp)
       trigger_pattern_callbacks(sexp)
-      @source_lines.join("\n")
+      RubySource.new(@source_lines.join("\n"), @source_map)
     end
 
     on_start do |_sexp|
@@ -79,14 +83,14 @@ module SlimLint
     def append(code, sexp)
       return if code.empty?
 
-      @source_lines << code
       original_line = sexp.line
 
       # For code that spans multiple lines, the resulting code will span
       # multiple lines, so we need to create a mapping for each line.
-      (code.count("\n") + 1).times do
+      code.split("\n").each_with_index do |line, index|
+        @source_lines << line
         @line_count += 1
-        @source_map[@line_count] = original_line
+        @source_map[@line_count] = original_line + index
       end
     end
   end

data/lib/slim_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SlimLint
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -101,8 +101,11 @@ files:
 - lib/slim_lint/engine.rb
 - lib/slim_lint/exceptions.rb
 - lib/slim_lint/file_finder.rb
+- lib/slim_lint/filters/attribute_processor.rb
+- lib/slim_lint/filters/control_processor.rb
 - lib/slim_lint/filters/inject_line_numbers.rb
 - lib/slim_lint/filters/sexp_converter.rb
+- lib/slim_lint/filters/splat_processor.rb
 - lib/slim_lint/lint.rb
 - lib/slim_lint/linter.rb
 - lib/slim_lint/linter/comment_control_statement.rb
@@ -159,3 +162,4 @@ signing_key:
 specification_version: 4
 summary: Slim template linting tool
 test_files: []
+has_rdoc: