rails_best_practices 0.5.1 → 0.5.2

data/lib/rails_best_practices/checks/always_add_db_index_check.rb

@@ -43,7 +43,7 @@ module RailsBestPractices
           @foreign_keys.each do |table, foreign_key|
             table_node = @table_nodes[table]
             foreign_key.each do |column|
-              unless @index_columns[table] && @index_columns[table].include?(column)
+              if indexed?(table, column)
                 add_error "always add db index (#{table} => [#{Array(column).join(', ')}])", table_node.file, table_node.line
               end
             end
@@ -66,14 +66,27 @@ module RailsBestPractices
         end
 
         def add_foreign_key_column(table_name, foreign_key_column)
+          @foreign_keys[table_name] ||= []
           if foreign_key_column =~ /_id$/
-            @foreign_keys[table_name] ||= []
-            @foreign_keys[table_name] << foreign_key_column
+            unless @foreign_keys[table_name].find { |foreign_key| foreign_key.include? foreign_key_column }
+              @foreign_keys[table_name] << foreign_key_column
+            end
           elsif foreign_key_column =~ /(.*?)_type$/
             @foreign_keys[table_name].delete("#{$1}_id")
             @foreign_keys[table_name] << ["#{$1}_id", foreign_key_column]
           end
         end
+
+        def indexed?(table, column)
+          index_columns = @index_columns[table]
+          !index_columns || !index_columns.any? { |e| greater_than(Array(e), Array(column)) }
+        end
+
+        def greater_than(more_array, less_array)
+          more_size = more_array.size
+          less_size = less_array.size
+          (more_array - less_array).size == more_size - less_size
+        end
     end
   end
 end

data/lib/rails_best_practices/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_best_practices
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Richard Huang