rubocop-rails-order_model_macros 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc9bf8c57cc0de265607581da6801a8090916e8
-  data.tar.gz: 8ef29e5f3e5b21259ad1122f9aa09d1485e3f375
+  metadata.gz: f1cf6a78cde681a59c03c26779f90d39c9f27880
+  data.tar.gz: f737f605debac36c695a8a627832bff2cd44dced
 SHA512:
-  metadata.gz: 12809e6050b6984492fbd0962c5ec473e827c91c32a7d4a946d433b71b298cabd69241ffeb2dec75a23292cb4ea0fae4a0c37bd9741266314438639b55c8c63a
-  data.tar.gz: 501ac2fe37215468be5214aca5a938ddae797df0a9bf3fbedc18fa1454a2fbbbab7a0d48cd66c478476b5dcf5f959cb7eba8b378f273d3525654c44128ffec74
+  metadata.gz: f572bd385d15cb5d5f760a5e8a678b556e6f2d6c311177fe3b9729b61ea352391fe8da190eb1a79fba54914a3788b606a7be0fd42bd49080a757e7bc499b3747
+  data.tar.gz: fe8ca0c319a23b15d72d1441de57479e81a6fc71910a095f4d5e71173c7d6a584c140fa9546f2ab7cb5bc951d332a30b60ea85a2ec4d0a159a3b46367b869de7

data/Gemfile

@@ -1,9 +1,12 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rubocop-rails-order_model_declarative_methods.gemspec
-# gem 'rubocop', git: "https://github.com/bbatsov/rubocop.git"
-gem 'rubocop', '~> 0.47.1'
-gem 'pry'
 gemspec
 
-gem "awesome_print", require: false
+gem "awesome_print"
+gem 'pry'
+gem "pry-byebug"
+gem "pry-doc"
+gem "pry-inline"
+gem "pry-rescue"
+gem "pry-stack_explorer"
+gem "pry-state"

data/README.md

@@ -103,7 +103,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rubocop-rails-order_model_macros. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/carolineartz/rubocop-rails-order_model_macros. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/bin/console

@@ -7,8 +7,6 @@ require "rubocop/rails/order_model_macros"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
 
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/lib/rubocop/cop/rails/order_model_macros.rb

@@ -7,6 +7,8 @@ module RuboCop
         MSG = "Macros are not properly sorted."
         MSG_OUTER_GROUPS = "Macro method groups not sorted. Move %{group1} above %{group2}.".freeze
         MSG_WITHIN_GROUP = "Not sorted within %{type}. Move %{method1} above %{method2}.".freeze
+        MSG_MIXED_WITHIN_GROUP = "Not sorted within %{types}. Group %{type} types together."
+        MSG_MIXED_OUTER_GROUPS = "Macro method groups not sorted. Group %{types} together."
 
         DEFAULT_SCOPE = :default_scope
         CLASS_METHODS = /^[mc]attr_(reader|writer|accessor)/
@@ -40,22 +42,17 @@ module RuboCop
         end
 
         def correct_within_groups?(targets)
-          grouped = targets
-            .group_by { |target| method_type(target) }
-            .keep_if { |type, _targets| GROUPED.include?(type) }
+          grouped = targets.group_by { |target| method_type(target) }.keep_if { |type, _targets| GROUPED.include?(type) }
 
           grouped.all? do |type, targets_for_type|
             ordered_for_type = preferred_group_ordering[type]
             squeezed = squeeze(targets_for_type.map(&:method_name))
 
             mixed = squeezed != squeezed.uniq
-
             a = (ordered_for_type & squeezed)
             b = (squeezed & ordered_for_type)
 
-            a = squeezed.drop_while { |el| squeezed.count(el) > 1 } if mixed
-
-            a == b or set_within_group_error_message(type, a, b) && false
+            (!mixed && a == b) or set_within_group_error_message(type, a, b, mixed: mixed) && false
           end
         end
 
@@ -65,7 +62,6 @@ module RuboCop
 
         def correct_grouping?(targets)
           target_types = target_types(targets)
-          return false unless single_groups?(target_types)
 
           type_order = preferred_group_ordering.keys
           squeezed = squeeze(target_types)
@@ -73,6 +69,7 @@ module RuboCop
           a = type_order & squeezed
           b = squeezed & type_order
 
+          single_groups?(squeezed) or set_outer_group_error_message(a, b, types: squeezed.select { |type| squeezed.count(type) > 1 }.uniq) && return
           a == b or set_outer_group_error_message(a, b) && false
         end
 
@@ -91,8 +88,9 @@ module RuboCop
         end
 
         def match(child)
-          return child if child.send_type? && matches_targets?(child.method_name)
-          child.children && child.children.first.is_a?(RuboCop::AST::Node) && match(child.children.first)
+          return false unless child && child.respond_to?(:send_type?)
+          return child if matches_targets?(child.method_name)
+          child.children && match(child.children.first)
         end
 
         def matches_targets?(declared)
@@ -144,12 +142,14 @@ module RuboCop
           end
         end
 
-        def set_outer_group_error_message(a, b)
+        def set_outer_group_error_message(a, b, types: [])
+          return @message = MSG_MIXED_OUTER_GROUPS % { types: types.join(", ") } if types.any?
           first_error = a.zip(b).find { |x, y| x != y }
           @message = MSG_OUTER_GROUPS % {group1: plural_form(first_error.first), group2: plural_form(first_error.last)}
         end
 
-        def set_within_group_error_message(type, a, b)
+        def set_within_group_error_message(type, a, b, mixed:)
+          return @message = MSG_MIXED_WITHIN_GROUP % { types: plural_form(type), type: type } if mixed
           first_error = a.zip(b).find { |x, y| x != y }
           @message = MSG_WITHIN_GROUP % {type: plural_form(type), method1: first_error.first, method2: first_error.last}
         end

data/lib/rubocop/rails/order_model_macros/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     module OrderModelMacros
       module Version
-        STRING = "0.1.23".freeze
+        STRING = "0.1.24".freeze
 
         def self.gem_version
           Gem::Version.new(STRING)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails-order_model_macros
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Caroline Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop