momocop 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7bbeea4b66a57e0dd2768cd593c653501cc745e73439d254dfa6ff56d26ad7a
-  data.tar.gz: 3181561d6c590050106bcf13a1c6b6cec2f22179e2b1c8bcbb5b126630fd27d5
+  metadata.gz: 2f8ebe27766e45fdc287845e8dc4d8015b13b279a34ba58a0b85f3daa0406dd6
+  data.tar.gz: c991e08f8256f641657868520293b117b694d7177142d8d9e82c226e18f85305
 SHA512:
-  metadata.gz: 19113cb5c6945b125d1688553deb24933b111ebe9d43521212fad4b38ca495676635c3047250e07a8a4b784c68f4d9b51a76ae8b0f56a167f5dc60d60939a78d
-  data.tar.gz: c9841b2375bdd3e81682e73da8dd42f45174de77c27c265b10e7a7f7750bd8424c804bb2bea1e3f02f287d52926cd4895670988dac7d19f6d3b5d72c6a3a7314
+  metadata.gz: d44b953c25c50ca2da56043dceb78b41db565f5226d84bf091ca1cc32bb886d08b93791751c511bc37eda7d1f509b27645f1ce4202e7c5e7b47656f53e963995
+  data.tar.gz: '0348eb2e208e147158a837934efadeb796bbc0d4169a2c9dfb050eba282488ea6c28e96ed57d2deae4dd6202a996487162ecaad06a94faa537693b7b49edf49d'

data/.rubocop.yml

@@ -41,6 +41,10 @@ Security:
 Style:
   Enabled: true
 
+Style/BlockDelimiters:
+  EnforcedStyle: semantic
+  AllowBracesOnProceduralOneLiners: false
+
 Style/Documentation:
   Enabled: false
 
@@ -49,6 +53,9 @@ Style/FrozenStringLiteralComment:
   EnforcedStyle: always_true
   SafeAutoCorrect: true
 
+Style/IfUnlessModifier:
+  Enabled: false
+
 Style/RequireOrder:
   Enabled: true
   SafeAutoCorrect: true

data/lib/momocop/association_extractor.rb

@@ -22,9 +22,23 @@ module Momocop
     end
 
     private def extract_associations(node, associations = [])
-      if node.type == :send && ASSOCIATION_METHODS.include?(node.children[1])
-        association_name = node.children[2].type == :sym ? node.children[2].children[0] : node.children[2]
-        associations << { type: node.children[1], name: association_name }
+      association_type = node.children[1]
+      options = {}
+      if node.type == :send && ASSOCIATION_METHODS.include?(association_type)
+        association_name = node.children[2].children[0].to_sym
+
+        # Extract some options
+        if association_type == :belongs_to
+          option_hash = node.children[3]
+          option_hash&.children&.each do |option|
+            key_node, value_node = option.children
+            if value_node.type == :sym || value_node.type == :str
+              options[key_node.children[0]] = value_node.children[0]
+            end
+          end
+        end
+
+        associations << { type: association_type, name: association_name, options: }
       elsif node.children.is_a? Array
         node.children.each do |child|
           extract_associations(child, associations) if child.is_a? Parser::AST::Node

data/lib/momocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Momocop
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/rubocop/cop/momocop/factory_bot_rails_factory_properties_coverage.rb

@@ -49,11 +49,24 @@ module RuboCop
           block_node = node.block_node
 
           # Check missing associations
+
+          # Exclude defined sequences
           defined_sequences = get_defined_sequence_names(block_node)
+          # Exclude defined properties
           defined_properties = get_defined_property_names(block_node)
+          # Exclude foreign keys
+          model_foreign_keys = get_model_foreign_key_column_names(class_name)
+          # All available properties
           model_properties = get_model_property_names(class_name)
+          # Calc missing properties
+          missing_properties = (
+            model_properties -
+            (defined_sequences + defined_properties) -
+            model_foreign_keys
+          ).sort
+
+          # for definition block generation
           model_enum_properties = get_model_enum_property_names(class_name)
-          missing_properties = (model_properties - (defined_sequences + defined_properties)).sort
 
           # Add offense for missing properties
           return unless missing_properties.any?
@@ -101,8 +114,28 @@ module RuboCop
           return [] unless source
 
           extractor = ::Momocop::EnumExtractor.new
+          enums = extractor.extract(source)
+          return enums.map(&:to_sym)
+        end
+
+        private def get_model_foreign_key_column_names(class_name)
+          source = model_file_source(class_name)
+          return [] unless source
+
+          extractor = ::Momocop::AssociationExtractor.new
           associations = extractor.extract(source)
-          return associations.map(&:to_sym)
+          foreign_key_names =
+            associations
+            .map { |association|
+              options = association[:options]
+              if options[:foreign_key]
+                options[:foreign_key]
+              elsif options[:class_name]
+                foreign_key_name(options[:class_name])
+              end
+            }
+            .compact
+          return foreign_key_names.map(&:to_sym)
         end
 
         RESTRICTED_COLUMNS = %w[created_at updated_at].freeze
@@ -123,6 +156,14 @@ module RuboCop
           class_name.tableize.gsub('/', '_')
         end
 
+        # e.g.)
+        # 'User' -> ['users']
+        # 'Admin::User' -> ['admin_users', 'users']
+        private def foreign_key_name(class_name)
+          # TODO: parse model class file and try to get table_name_prefix and table_name_suffix
+          "#{class_name.underscore.gsub('/', '_')}_id"
+        end
+
         private def get_defined_sequence_names(block_node)
           body_node = block_node&.children&.last
           return [] unless body_node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: momocop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - supermomonga