rdoc_rubocop 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7dd7e8471a9d59a7668685147fb01cca5e276e5d11bf2ac53db9be878ac69e
-  data.tar.gz: 8ba0104b9af90e5ef95795e41c7ca47bc668e7eaf933db7eaea50ff6ba2ced16
+  metadata.gz: 13ec1f1f83f72d7d0d3a52826863bde165b9591a6c2de4c65e3e0d8e1d171304
+  data.tar.gz: 3d7d930cfe7fdbd1be58116536bb25a4977ce37f3fb13bfea7d36286b2a04da1
 SHA512:
-  metadata.gz: 581b246e948d31063d973ff5c3ef8bf767fc1be7859815b4a7c90317d55239177cabf20df7ab8d3c916a966d61e32c1144babcb52d6b4731d7b6bff7f12c404c
-  data.tar.gz: d7e5fb782c2282cd52063d5fa685bfea0ff5c801e584f096320d330be125676f4f76ca7cf8caa606ce176feb0a2cfba2e851b4e63044083f825fec3d8fe5e43e
+  metadata.gz: 77e715471260f29ed62a3def4673bc4060bf043965c572393c52db3d7e6d34861a34d3d74ebf5d41c2e66724d66c6b85759ad221077f6818865bce3c3fc1157b
+  data.tar.gz: 948ba86f073bd6c9205540116e96026f9c59a5591d4f1381f7ef2a8335e70800df426346615c772bdc3b72a177477db707ac2b9666d66ce43f79e7a09936748d

data/lib/rdoc_rubocop/comment_extractor.rb

@@ -12,22 +12,42 @@ module RDocRuboCop
     end
 
     def extract
-      @comments =
-        comment_tokens.
-          slice_when { |token_before, token_after| token_after.lineno - token_before.lineno > 1 }.
-          map { |comment_tokens| Comment.new(comment_tokens, @source_file) }
+      @comments = extract_comments
     end
 
     private
 
-    def comment_tokens
-      tokens.select(&:on_comment?)
+    def extract_comments
+      chunk = []
+      comments = []
+
+      tokens.each do |tokens_in_line|
+        token = tokens_in_line.pop
+
+        if token.comment?
+          if tokens_in_line.all?(&:sp?)
+            chunk << token
+          else
+            comments << Comment.new(chunk, @source_file) if chunk.any?
+            chunk = [token]
+          end
+        else
+          if chunk.any?
+            comments << Comment.new(chunk, @source_file)
+            chunk = []
+          end
+        end
+      end
+      comments << Comment.new(chunk, @source_file) if chunk.any?
+
+      comments
     end
 
     def tokens
       Ripper.
         lex(@source_file.source).
-        map { |token| Token.build(*token) }
+        map { |token| Token.build(*token) }.
+        slice_when { |token_before, token_after| token_before.lineno != token_after.lineno }
     end
   end
 end

data/lib/rdoc_rubocop/token/comment_token.rb

@@ -10,7 +10,7 @@ module RDocRuboCop
           SPACE_CHAR * indent_after_comment
       end
 
-      def on_comment?
+      def comment?
         true
       end
 

data/lib/rdoc_rubocop/token.rb

@@ -26,8 +26,12 @@ module RDocRuboCop
       @locate[1]
     end
 
-    def on_comment?
-      false
+    %i(on_sp on_comment).each do |type|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{type.to_s.sub(/^on_/, "")}? # def sp?
+          type == :#{type}                #   type == :on_sp
+        end                               # end
+      RUBY
     end
   end
 end

data/lib/rdoc_rubocop/version.rb

@@ -1,3 +1,3 @@
 module RDocRuboCop
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Loose Coupling