controller_policies 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 876b65cbe173231e141e578fd2e650dcbbcbbba02b0ece615c3ddf80395ba96f
-  data.tar.gz: bcf69abce9066f2b99fa99d21481ecca033e2408d2ed0ec752f2b5cf080a482f
+  metadata.gz: 85d80d00d5bb31de269ac2190cd44a77e9d2aa1623aa7d6e00cf86de12565baa
+  data.tar.gz: ec23ef9100a962f17386693889903182f84cbb247c9dc275da54cec789acc445
 SHA512:
-  metadata.gz: 8031665a97f07ab1e47534f38376eb4b5170538ffa9da42bc69d7e6c2de847e855d64acfdc2db32bbe5fbaee6d1f709e4be147fba9912e39c0089d3d72cecd24
-  data.tar.gz: 2b30ca3aae95937a5625268853a9caa5697c460f1b24b7cffa5dc8dd875d5dee6005e367fb8029627227f7829b808c5f1485914869159e18e9d6545dccc1682f
+  metadata.gz: 9ec83f851cc09988e4664c404b2e99b2a8c48e954f3804652fb0477f66545d75b12887261e4b72c265da16dd3c8ce277e5fdcf6d170eea535b7dfe07c53aa2e8
+  data.tar.gz: 6afa4ececa6d5c04164eafc5c66a578290d6ff3edfcffff76260f6bb645450000b2177d33b49a9d3105eb8f6463a0cda3902a7caee3baa4acfa665b0395e9f39

data/lib/ability.rb

@@ -34,41 +34,28 @@ class Ability
 
     # Filter abilities based on namespace.
     def where(*queries)
-      results = []
-      queries.each do |query|
-        case query.class.to_s
-        when 'String'
-          # Handle empty string or root namespace
-          if query.empty? || query == '/'
-            results += all.select { |ability| ability.namespace == Policies }
-          else
-            results += all.select { |ability| ability.namespace.to_s == "Policies::#{trim(query).camelize}" }
-          end
-        when 'Module', 'Class'
-          results += all.select { |ability| ability.namespace == query }
+      queries.flat_map do |query|
+        case query
+        when String
+          filter_by_string_query(query)
+        when Module, Class
+          all.select { |ability| ability.namespace == query }
+        else
+          []
         end
       end
-      results
     end
 
-    # Find an ability within a namespace.
-    # def find(query_string)
-    #   where(query_string).first
-    # end
-
     # Match abilities based on a matching string or regex. The matcher is based on the namespace.
     def match(expression)
-      case expression.class.to_s
-      when 'String' then all.select { |ability| ability.namespace.to_s.match?(/#{trim(expression).camelize}/) }
-      when 'Regexp' then regex_matcher(expression)
+      case expression
+      when String
+        all.select { |ability| ability.namespace.to_s.match?(/#{trim(expression).camelize}/) }
+      when Regexp
+        regex_matcher(expression)
       end
     end
 
-    # Find an ability based on a matching string or regex. The matcher is based on the namespace.
-    # def mill(expression)
-    #   match(expression).first
-    # end
-
     # Path to the policy folder.
     def policy_path
       @policy_path ||= Rails.root.join('app/policies')
@@ -76,6 +63,15 @@ class Ability
 
     private
 
+    def filter_by_string_query(query)
+      if query.empty? || query == '/'
+        all.select { |ability| ability.namespace == Policies }
+      else
+        target_namespace = "Policies::#{trim(query).camelize}"
+        all.select { |ability| ability.namespace.to_s == target_namespace }
+      end
+    end
+
     def definitions
       @definitions ||= begin
         data = []
@@ -88,19 +84,17 @@ class Ability
 
     def definition_files_post_processing(file_path)
       namespace_path = convert_namespace(file_path)
+      module_constant = resolve_module_constant(namespace_path)
 
-      if namespace_path.empty?
-        # Handle root-level definitions.rb file
-        module_constant = Policies
-      else
-        module_constant = "Policies::#{namespace_path}".constantize
+      module_constant::DEFINITIONS.map do |policy_definition|
+        policy_definition.merge(namespace: module_constant)
       end
+    end
 
-      policy_definitions = module_constant::DEFINITIONS
-      policy_definitions.map do |policy_definition|
-        policy_definition[:namespace] = module_constant
-        policy_definition
-      end
+    def resolve_module_constant(namespace_path)
+      return Policies if namespace_path.empty?
+
+      "Policies::#{namespace_path}".constantize
     end
 
     def regex_matcher(expression)

data/lib/controller_policies/enforcement.rb

@@ -35,19 +35,22 @@ module ControllerPolicies
       # If it finds a match, it will be an applicable definition to check abilities for.
       def applicable_abilities
         @applicable_abilities ||= begin
-          # Get abilities for the current controller namespace, or root if no namespace
-          namespace_abilities = if controller_namespace.empty?
-            Ability.where('')  # This will get root-level policies
-          else
-            Ability.where(controller_namespace)
-          end
-
-          namespace_abilities.select do |ability|
-            matching_actions = ability.actions.select { |action| /#{action}/.match?("#{controller_path}##{action_name}") }
-            matching_actions.present?
-          end
+          namespace_abilities = fetch_namespace_abilities
+          namespace_abilities.select { |ability| ability_matches_current_action?(ability) }
         end
       end
+
+      # Get abilities for the current controller namespace, or root if no namespace
+      def fetch_namespace_abilities
+        namespace = controller_namespace.empty? ? '' : controller_namespace
+        Ability.where(namespace)
+      end
+
+      # Check if an ability matches the current controller action
+      def ability_matches_current_action?(ability)
+        current_controller_action = "#{controller_path}##{action_name}"
+        ability.actions.any? { |action| /#{action}/.match?(current_controller_action) }
+      end
     end
   end
 end

data/lib/controller_policies/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ControllerPolicies
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controller_policies
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tien