preloader.rb in cancannible-2.0.0

- old
+ new

@@ -1,21 +1,21 @@
 class Cancannible::Preloader
-
-  def self.preload_abilities!(grantee,cancan_ability_object)
-    new(grantee,cancan_ability_object).preload!
+  def self.preload_abilities!(grantee, cancan_ability_object)
+    new(grantee, cancan_ability_object).preload!
   end
 
   attr_accessor :grantee
   attr_accessor :cancan_ability_object
 
-  def initialize(grantee,cancan_ability_object)
+  def initialize(grantee, cancan_ability_object)
     self.grantee = grantee
     self.cancan_ability_object = cancan_ability_object
   end
 
   def preload!
     return unless grantee.respond_to?(:inherited_permissions)
+
     # load inherited permissions to CanCan Abilities
     preload_abilities_from_permissions(grantee.inherited_permissions)
     # load user-based permissions from database to CanCan Abilities
     preload_abilities_from_permissions(grantee.permissions.reload)
     # return the ability object
@@ -37,48 +37,43 @@
         # model-based resource types: skip if we cannot get a model instance
         next unless model_resource
       end
 
       if permission.resource_id.nil?
-
         if action == :cannot
           # apply generic unrestricted permission to the class
-          cancan_ability_object.send( action, ability, resource_type )
+          cancan_ability_object.send(action, ability, resource_type)
         else
-
           refinements = resolve_resource_refinements(ability,model_resource)
 
           if refinements.empty?
             # apply generic unrestricted permission to the class
-            cancan_ability_object.send( action, ability, resource_type )
+            cancan_ability_object.send(action, ability, resource_type)
           else
             secondary_refinements = resolve_resource_refinements(ability,model_resource,2).presence || [{}]
             refinements.each do |refinement|
               secondary_refinements.each do |secondary_refinement|
                 cancan_ability_object.send( action,  ability, resource_type, refinement.merge(secondary_refinement))
               end
             end
           end
-
         end
-
       elsif resource_type.find_by_id(permission.resource_id)
         cancan_ability_object.send( action,  ability, resource_type, id: permission.resource_id)
       end
-
     end
   end
 
   def resolve_resource_type(given_resource_type)
     model_resource = nil
     resource_type = given_resource_type
-    resource_type = resource_type==resource_type.downcase ? resource_type.to_sym : resource_type.constantize rescue nil
+    resource_type = resource_type == resource_type.downcase ? resource_type.to_sym : resource_type.constantize rescue nil
     model_resource = resource_type.respond_to?(:new) ? resource_type.new : resource_type rescue nil
     [resource_type,model_resource]
   end
 
-  def resolve_resource_refinements(ability,model_resource,stage=1)
+  def resolve_resource_refinements(ability, model_resource, stage=1)
     Array(Cancannible.refinements[stage-1]).each_with_object([]) do |refinement,memo|
       refinement_attributes = refinement.dup
 
       allow_nil = !!(refinement_attributes.delete(:allow_nil))
 
@@ -109,7 +104,6 @@
         end
       end
       memo.push(restriction) if restriction.present?
     end
   end
-
-end
\ No newline at end of file
+end