dark_finger 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2f553cbf220a141518443aac11bc359fbac54837b91fbba09abf183fa1dda2cb
-  data.tar.gz: eacb634ce062545ada20f0a558fb7150f2c3ae807e1ad1100653880b3de5959d
+SHA1:
+  metadata.gz: e6c89d85d00daa4de08f8ff85f9beb0e6a5bcd29
+  data.tar.gz: e969f72b56a52533992b579bd16944e3da275c85
 SHA512:
-  metadata.gz: 18f364c93516c2f54153e0c3f6dab2b9e4a5181fd2efde6a5a6015092073c92658fa4479fb10d7d8b6818d3ac9ff8d087a6f454acbafa79f8eb63903e41101b5
-  data.tar.gz: 99fc159a3641f0fda730389e5f5467030f865b59e3de7dfd59ac7a8508d62b726bc30acfae3f3885c956c969132dc33bddbc8fe82aa867232ebd3351e15a267b
+  metadata.gz: a72344c208f7cf1064a75054a384e8e7a11c1eb02fa8d9835741dbdc30c623b7bb7da614c60ab43122dd3c00155384068ead03b2349b8533c94ead24cc63a521
+  data.tar.gz: b9e7340a802adb0e5b2bd05cbe741685859e823f85595ef2688197d91b0deed505f25b6ccafd207712c422617004af644f7f4a807b576c7f92250e1b88b9a4bf

data/lib/dark_finger/version.rb

@@ -1,3 +1,3 @@
 module DarkFinger
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/rubocop/cop/dark_finger/active_model_node_decorator.rb

@@ -2,9 +2,13 @@ module RuboCop
   module Cop
     module DarkFinger
       class ActiveModelNodeDecorator < SimpleDelegator
-        def initialize(node)
-          super
+
+        attr_reader :misc_method_names
+
+        def initialize(node, misc_method_names: [])
+          super(node)
           raise "Cannot decorate nil node" if node.nil?
+          @misc_method_names = misc_method_names
         end
 
         def node_type
@@ -22,6 +26,8 @@ module RuboCop
             ModelStructure::ENUM
           elsif attributes?
             ModelStructure::ATTRIBUTES
+          elsif misc_method?
+            ModelStructure::MISC
           else
             nil
           end
@@ -119,6 +125,10 @@ module RuboCop
         def attributes?
           method_name =~ /^attr_/
         end
+
+        def misc_method?
+          misc_method_names.include?(method_name)
+        end
       end
 
     end

data/lib/rubocop/cop/dark_finger/model_structure.rb

@@ -1,10 +1,3 @@
-# bundle exec rubocop -d  -r ./path/to/this/cop.rb --only DarkFinger/ModelStructure ./app/models/foo.rb
-#
-# TODO:
-#
-# * Constructors
-# * Handle "Misc" stuff
-
 require File.dirname(__FILE__) + '/active_model_node_decorator'
 
 module RuboCop
@@ -16,9 +9,11 @@ module RuboCop
         CALLBACK = :callback
         CLASS_METHOD = :class_method
         CONSTANT = :constant
+        CONSTRUCTOR = :constructor
         ENUM = :enum
         INCLUDE = :include
         INSTANCE_METHOD = :instance_method
+        MISC = :misc
         MODULE = :module
         SCOPE = :scope
         VALIDATION = :validation
@@ -33,6 +28,8 @@ module RuboCop
           SCOPE,
           ATTRIBUTES,
           CALLBACK,
+          MISC,
+          CONSTRUCTOR,
           CLASS_METHOD,
           INSTANCE_METHOD,
         ]
@@ -49,17 +46,21 @@ module RuboCop
           VALIDATION => '# Validations'
         }
 
-        attr_reader :required_order, :required_comments
+        DEFAULT_MISC_METHOD_NAMES = []
+
+        attr_reader :required_order, :required_comments, :misc_method_names
 
-        def initialize(*args, required_order: nil, required_comments: nil, **_)
+        def initialize(*args, required_order: nil, required_comments: nil, misc_method_names: nil, **_)
           super
           @class_elements_seen = []
           @required_order = required_order || cop_config['required_order'] || DEFAULT_REQUIRED_ORDER
           @required_comments = required_comments || cop_config['required_comments'] || DEFAULT_REQUIRED_COMMENTS
+          @misc_method_names = misc_method_names || cop_config['misc_method_names'] || DEFAULT_MISC_METHOD_NAMES
 
-          # symbolize order/comments
+          # symbolize configs
           @required_order.map!(&:to_sym)
           @required_comments = Hash[ @required_comments.map {|k,v| [k.to_sym, v]} ]
+          @misc_method_names.map!(&:to_sym)
         end
 
         def on_send(node)
@@ -75,7 +76,12 @@ module RuboCop
         end
 
         def on_def(node)
-          process_node(node, seen_element: INSTANCE_METHOD)
+          seen_element = if node.method_name == :initialize
+                           CONSTRUCTOR
+                         else
+                           INSTANCE_METHOD
+                         end
+          process_node(node, seen_element: seen_element)
         end
 
         def on_defs(node)
@@ -89,7 +95,7 @@ module RuboCop
         def process_node(node, seen_element: nil)
           return if @order_violation_reported
 
-          node = ActiveModelNodeDecorator.new(node)
+          node = ActiveModelNodeDecorator.new(node, misc_method_names: misc_method_names)
           seen_element ||= node.node_type
 
           return unless seen_element

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dark_finger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Professor Wang Matrix PhD
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: ActiveModel layout cop for Rubocop