Fix rubocop

Author: coorasse

lib/cancan/model_adapters/conditions_normalizer.rb

@@ -5,35 +5,38 @@
 module CanCan
   module ModelAdapters
     class ConditionsNormalizer
-      def self.normalize(model_class, rules)
-        rules.each { |rule| rule.conditions = normalize_conditions(model_class, rule.conditions) }
-      end
+      class << self
+        def normalize(model_class, rules)
+          rules.each { |rule| rule.conditions = normalize_conditions(model_class, rule.conditions) }
+        end
 
-      def self.normalize_conditions(model_class, conditions)
-        return conditions unless conditions.is_a? Hash
+        def normalize_conditions(model_class, conditions)
+          return conditions unless conditions.is_a? Hash
 
-        conditions.each_with_object({}) do |(key, value), result_hash|
-          if value.is_a? Hash
-            result_hash.merge!(calculate_result_hash(model_class, key, value))
-          else
-            result_hash[key] = value
+          conditions.each_with_object({}) do |(key, value), result_hash|
+            if value.is_a? Hash
+              result_hash.merge!(calculate_result_hash(model_class, key, value))
+            else
+              result_hash[key] = value
+            end
+            result_hash
           end
-          result_hash
         end
-      end
 
-      private
+        private
 
-      def self.calculate_result_hash(model_class, key, value)
-        reflection = model_class.reflect_on_association(key)
-        raise WrongAssociationName, "Association '#{key}' not defined in model '#{model_class.name}'" unless reflection
+        def calculate_result_hash(model_class, key, value)
+          reflection = model_class.reflect_on_association(key)
+          unless reflection
+            raise WrongAssociationName, "Association '#{key}' not defined in model '#{model_class.name}'"
+          end
+
+          if reflection.options[:through].present?
+            key = reflection.options[:through]
+            value = { reflection.source_reflection_name => value }
+            reflection = model_class.reflect_on_association(key)
+          end
 
-        if reflection.options[:through].present?
-          normalized_key = reflection.options[:through]
-          normalized_value = { reflection.source_reflection_name => value }
-          reflection_klass = model_class.reflect_on_association(normalized_key).klass.name.constantize
-          { normalized_key => normalize_conditions(reflection_klass, normalized_value) }
-        else
           { key => normalize_conditions(reflection.klass.name.constantize, value) }
         end
       end

spec/cancan/model_adapters/active_record_adapter_spec.rb

@@ -306,8 +306,8 @@ class User < ActiveRecord::Base
     @ability.cannot :read, Article, published: false, secret: true
     expect(@ability.model_adapter(Article, :read).conditions)
       .to orderlessly_match(
-            %["not (#{@article_table}"."published" = #{false_v} AND "#{@article_table}"."secret" = #{true_v})]
-          )
+        %["not (#{@article_table}"."published" = #{false_v} AND "#{@article_table}"."secret" = #{true_v})]
+      )
   end
 
   it 'returns appropriate sql conditions in complex case' do