ducalis 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc58534f3d61b3f00faf32d15c18fd4ade02b01d
-  data.tar.gz: e2e5523eab7bd5dfe942f0e09722e718148ff6c4
+  metadata.gz: 75bd9a05b686683a5a460a113fc81089795ddc36
+  data.tar.gz: 88fccc0c3fec65985a012b90c303ee6ae907b80e
 SHA512:
-  metadata.gz: d84c6cbef793f301ce284c6325f992ea20672f6f01938f9a0feeef6cc76b8b564992aa552d1433a6960e893c08d3aada0682ec6a1eb3f28a8c0d942797f4c6e5
-  data.tar.gz: cbf69b4a43714b164e21ea3f19b08634504c563ca7f008b030fa625bed221bea0efba9f14bb917e96af25d4c1e180c53634bd9fb0f01f0fd73c443bd26bfdffb
+  metadata.gz: 8085d59b75d50d3db357845b7104e5cce09e3712b9fc76d0bbc1ceff63456335888d947395fda9089fc3421f87f243c537ac46fb617217775e5ed75dbc93fd9e
+  data.tar.gz: 5925c8c9286eb4b6fc758e818782e8467a9390c51897a56eccd7b6dac53145b0a11494f6b7901b11bdc524461ae182bc6fc5b5393638ec03f3f267f0ad2fd954

data/DOCUMENTATION.md

@@ -295,7 +295,7 @@ class TaskJournal
 end
 
 ```
-## Ducalis::OnlyDefsCope
+## Ducalis::OnlyDefs
 
 Prefer object instances to class methods because class methods resist refactoring. Begin with an object instance, even if it doesn’t have state or multiple methods right away. If you come back to change it later, you will be more likely to refactor. If it never changes, the difference between the class method approach and the instance is negligible, and you certainly won’t be any worse off.
 Related article: https://codeclimate.com/blog/why-ruby-class-methods-resist-refactoring/
@@ -344,6 +344,40 @@ class TaskJournal
   end
 end
 
+```
+
+![](https://placehold.it/10/f03c15/000000?text=+) raises error for class with ONLY class << self
+```ruby
+
+class TaskJournal
+  class << self
+    def call(task)
+      # ...
+    end
+
+    def find(args)
+      # ...
+    end
+  end
+end
+
+```
+
+![](https://placehold.it/10/2cbe4e/000000?text=+) ignores instance methods mixed with ONLY class << self
+```ruby
+
+class TaskJournal
+  class << self
+    def call(task)
+      # ...
+    end
+  end
+
+  def find(args)
+    # ...
+  end
+end
+
 ```
 ## Ducalis::OptionsArgument
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ducalis (0.5.12)
+    ducalis (0.5.13)
       git (~> 1.3, >= 1.3.0)
       policial (= 0.0.4)
       regexp-examples (~> 1.3, >= 1.3.2)

data/config/.ducalis.yml

@@ -51,7 +51,7 @@ Ducalis/TooLongWorkers:
   Enabled: true
   Max: 25
 
-Ducalis/OnlyDefsCope:
+Ducalis/OnlyDefs:
   Enabled: true
 
 Ducalis/UselessOnly:

data/lib/ducalis.rb

@@ -35,7 +35,7 @@ require 'ducalis/cops/black_list_suffix'
 require 'ducalis/cops/callbacks_activerecord'
 require 'ducalis/cops/case_mapping'
 require 'ducalis/cops/controllers_except'
-require 'ducalis/cops/only_defs_cope'
+require 'ducalis/cops/only_defs'
 require 'ducalis/cops/keyword_defaults'
 require 'ducalis/cops/module_like_class'
 require 'ducalis/cops/options_argument'

data/lib/ducalis/cops/{only_defs_cope.rb → only_defs.rb}

@@ -3,7 +3,7 @@
 require 'rubocop'
 
 module Ducalis
-  class OnlyDefsCope < RuboCop::Cop::Cop
+  class OnlyDefs < RuboCop::Cop::Cop
     include RuboCop::Cop::DefNode
 
     OFFENSE = <<-MESSAGE.gsub(/^ +\|\s/, '').strip
@@ -17,15 +17,22 @@ module Ducalis
     def on_class(node)
       _name, inheritance, body = *node
       return if !inheritance.nil? || body.nil?
-      instance_methods = children(body).select(&public_method_definition?)
-      class_methods    = children(body).select(&class_method_definition?)
-
-      return unless instance_methods.empty? && class_methods.any?
+      return unless !instance_methods_definitions?(body) &&
+                    class_methods_defintions?(body)
       add_offense(node, :expression, OFFENSE)
     end
 
     private
 
+    def instance_methods_definitions?(body)
+      children(body).any?(&public_method_definition?)
+    end
+
+    def class_methods_defintions?(body)
+      children(body).any?(&class_method_definition?) ||
+        children(body).any?(&method(:self_class_defs?))
+    end
+
     def public_method_definition?
       lambda do |node|
         node.type == :def && !non_public?(node) && !initialize?(node)
@@ -43,5 +50,6 @@ module Ducalis
     end
 
     def_node_search :initialize?, '(def :initialize ...)'
+    def_node_search :self_class_defs?, '  (sclass (self) (begin ...))'
   end
 end

data/lib/ducalis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ducalis
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ducalis
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Ignat Zakrevsky
@@ -136,7 +136,7 @@ files:
 - lib/ducalis/cops/controllers_except.rb
 - lib/ducalis/cops/keyword_defaults.rb
 - lib/ducalis/cops/module_like_class.rb
-- lib/ducalis/cops/only_defs_cope.rb
+- lib/ducalis/cops/only_defs.rb
 - lib/ducalis/cops/options_argument.rb
 - lib/ducalis/cops/params_passing.rb
 - lib/ducalis/cops/possible_tap.rb