slimcop 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e411169bcf03ec8058dab2f6c316188b78cfda2ee5b10839f2bc89e0ffbcb7
-  data.tar.gz: 3081e815ee3f7ce7a518ab6a7b384042d4d96eda53bb8c5c776f3cbe21cd90e2
+  metadata.gz: 4b967da47ab7a5721d082f4d1a4e9bb84006431c5acb5992a27f8246bdcfd904
+  data.tar.gz: 6e260866461bc31ddef835279d647905f17f87890b63af229bd98557699e0d8f
 SHA512:
-  metadata.gz: adcd201a0fb01c9b40ec857f341bedec643648b463313433558bbc26564b2dc50742d771f68e40d8b9a4a829785e4e49cbbcda2d2ca147b94e8e61a9f5d3f183
-  data.tar.gz: 484b00bcf0e97e8980216cb70b0cd4badf5075eaf542f59657ceac2aa8de598c0059a58091210ee69c34bc09fdbe6df9ffc5d666169ccfa3da24a7a81bd10d44
+  metadata.gz: 62cbf9db3a9f0fc741714afdd4f886b61efb4bed1e3f4ca54e6e7caa03b3cf2e8f3141aec2456b3b13f7fe0999e5a7ab9a7578a6700225a220db08200f9b2f96
+  data.tar.gz: c6742245998d9fbd23dca47dbf55be3e8717722daa7515df5afab77baca05d1c2ddc26d80a62bbbc97a7cfa06332a5c6fb3bc078a7d3853479598f7cb86c36ea

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.11.0 - 2022-01-10
+
+### Changed
+
+- Use :offset instead of :begin_ at RubyExtractor.
+- Detect offenses from code that containing `if`, `unless`, `do`, etc.
+
 ## 0.10.0 - 2022-01-06
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimcop (0.10.0)
+    slimcop (0.11.0)
       rainbow
       rubocop (>= 0.87)
       slimi (>= 0.5.1)

data/lib/slimcop/ruby_clipper.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Slimcop
+  # Remove unnecessary part (e.g. `if`, `unless`, `do`, ...) from Ruby code.
+  class RubyClipper
+    # @param [String] code
+    def initialize(code)
+      @code = code
+    end
+
+    # @return [Hash]
+    def call
+      [
+        PrecedingKeywordRemover,
+        TrailingDoRemover
+      ].each_with_object(
+        code: @code,
+        offset: 0
+      ) do |klass, object|
+        result = klass.new(object[:code]).call
+        object[:code] = result[:code]
+        object[:offset] += result[:offset]
+      end
+    end
+
+    class PrecedingKeywordRemover
+      REGEXP = /
+        \A
+        (?:
+          begin
+          | case
+          | else
+          | elsif
+          | ensure
+          | if
+          | rescue
+          | unless
+          | until
+          | when
+          | while
+          | for[ \t]+\w+[ \t]+in
+        )
+        [ \t]
+      /x.freeze
+
+      # @param [String] code
+      def initialize(code)
+        @code = code
+      end
+
+      # @return [Hash]
+      def call
+        data = @code.match(REGEXP)
+        if data
+          offset = data[0].length
+          {
+            code: @code[offset..],
+            offset: offset
+          }
+        else
+          {
+            code: @code,
+            offset: 0
+          }
+        end
+      end
+    end
+
+    class TrailingDoRemover
+      REGEXP = /
+        [ \t]
+        do
+        [ \t]*
+        (\|[^|]*\|)?
+        [ \t]*
+        \Z
+      /x.freeze
+
+      # @param [String] code
+      def initialize(code)
+        @code = code
+      end
+
+      # @return [Hash]
+      def call
+        {
+          code: @code.sub(REGEXP, ''),
+          offset: 0
+        }
+      end
+    end
+  end
+end

data/lib/slimcop/ruby_extractor.rb

@@ -3,7 +3,7 @@
 require 'slimi'
 
 module Slimcop
-  # Extract codes from Slim source.
+  # Extract Ruby codes from Slim source.
   class RubyExtractor
     # @param [String, nil] file_path
     # @param [String] source
@@ -15,10 +15,10 @@ module Slimcop
     # @return [Array<Hash>]
     def call
       ranges.map do |(begin_, end_)|
+        clipped = RubyClipper.new(@source[begin_...end_]).call
         {
-          begin_: begin_,
-          code: @source[begin_...end_],
-          end_: end_
+          code: clipped[:code],
+          offset: begin_ + clipped[:offset]
         }
       end
     end

data/lib/slimcop/slim_offense_collector.rb

@@ -25,7 +25,7 @@ module Slimcop
         ).call.map do |rubocop_offense|
           Offense.new(
             file_path: @file_path,
-            offset: snippet[:begin_],
+            offset: snippet[:offset],
             rubocop_offense: rubocop_offense,
             source: @source
           )

data/lib/slimcop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slimcop
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/slimcop.rb

@@ -7,6 +7,7 @@ module Slimcop
   autoload :Offense, 'slimcop/offense'
   autoload :PathFinder, 'slimcop/path_finder'
   autoload :RuboCopConfigGenerator, 'slimcop/rubo_cop_config_generator'
+  autoload :RubyClipper, 'slimcop/ruby_clipper'
   autoload :RubyExtractor, 'slimcop/ruby_extractor'
   autoload :RubyOffenseCollector, 'slimcop/ruby_offense_collector'
   autoload :SlimCorrector, 'slimcop/slim_corrector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimcop
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -78,6 +78,7 @@ files:
 - lib/slimcop/offense.rb
 - lib/slimcop/path_finder.rb
 - lib/slimcop/rubo_cop_config_generator.rb
+- lib/slimcop/ruby_clipper.rb
 - lib/slimcop/ruby_extractor.rb
 - lib/slimcop/ruby_offense_collector.rb
 - lib/slimcop/slim_corrector.rb