active_policy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c04bf53faa989871a87e71b0bb039b4d658cfd1814e2e8e998c5912a9219f126
-  data.tar.gz: a7af843ee06a3183fbdac52d15bf156366f7bec0a926394603409adb0039f5e0
+  metadata.gz: aba281fd2452e0f5a1a9a1229741be4d36f7b4b7d7dd10df5b92d01a47793604
+  data.tar.gz: 494536e3f2a094f8be21d134308c32434b0d1df040cc3d9fd40da275cc4f4a82
 SHA512:
-  metadata.gz: 69aca67ba2de7e1a2acbb3be8c05f6102f2888bc1b4cf34d943f5d644c518848424ae9a1010222af646ddb8a7695d285ef14c4816182011c3e25f8e05e347026
-  data.tar.gz: ef32c5d997e12714bf9c8e24ad33d6df58236491200903a2470223c66d5f20e25a74823faacb7ac7d3a0130eeeb9dc309c7049c103ea0c419170a7f5699031c8
+  metadata.gz: 00ec0450b766d36b07daec701d38ba793cab8379ec83113cb33dd1277ee06f58aa65d1eae9bdba0bab1cb2601a3eba81c6a3c32564414d228b8331339302c0e4
+  data.tar.gz: ab9651ddc4c0d27d1a1606ca7d2f41f0574f5f57e95f745a8460e2dfc3e591d74e7547b0286283593aea30111f91498b9d12e254ee67cf0716baa9dafa0c9851

data/lib/active_policy/active_policy_middleware.rb

@@ -3,7 +3,6 @@ class ActivePolicyMiddleware
   ENV_KEY_REQUEST_METHOD = 'REQUEST_METHOD'
   ENV_KEY_WARDEN = 'warden'
 
-  # @param [Class] app
   def initialize(app)
     @app = app
   end
@@ -17,28 +16,46 @@ class ActivePolicyMiddleware
         Rails.application.routes
     )
 
-    if params.key?(:policy)
-      # @type [ActivePolicy::Base] policy
-      policy = params[:policy].new(current_user(env), request, params)
-      method_name = params[:action] + '?'
-      models = ActivePolicy::Utilities.models_from_route_params(params)
-      result = policy.send(method_name, *models)
-
-      if result
-        @app.call(env)
-      else
-        response = response()
-        response.finish
-      end
-    else
-      @app.call(env)
-    end
+    return next_middleware(env) unless run_middleware?(params)
+
+    method_name = method_name_from_params(params)
+    models = ActivePolicy::Utilities.models_from_route_params(params)
+    policy = policy_name(params).new(current_user(env), request, params)
+
+    return next_middleware(env) unless policy.respond_to?(method_name)
+
+    result = policy.send(method_name, *models)
+
+    return next_middleware(env) if result
+
+    response
   end
 
   private
 
+  # @param [Hash] params
+  # @return [String]
+  def method_name_from_params(params)
+    return params[:method] if params.key(:method)
+
+    params[:action] + '?'
+  end
+
+  # @param [Hash] params
+  # @return [String]
+  def policy_name(params)
+    if params[:policy].is_a?(Class)
+      return params[:policy]
+    end
+
+    if params[:policy].key?(:class)
+      return params[:policy][:class]
+    end
+
+    params[:policy]
+  end
+
   # @param [Hash] env
-  #
   # @return [User, nil]
   def current_user(env)
     if env.key?(ENV_KEY_WARDEN)
@@ -50,6 +67,17 @@ class ActivePolicyMiddleware
 
   # @param [Rack::Response]
   def response(status_code = 401, headers = {'content_type': 'application/json'}, body = [])
-    Rack::Response.new(body, status_code, headers)
+    Rack::Response.new(body, status_code, headers).finish
+  end
+
+  # @param [Hash] env
+  def next_middleware(env)
+    @app.call(env)
+  end
+
+  # @param [Hash] params
+  # @return [TrueClass, FalseClass]
+  def run_middleware?(params)
+    params.key?(:policy)
   end
 end

data/lib/active_policy/utilities/utilities.rb

@@ -1,8 +1,8 @@
 module ActivePolicy
   class Utilities
-  # @param [ActionDispatch::Routing::RouteSet] route_set
   # @param [String] path
   # @param [String] method
+  # @param [ActionDispatch::Routing::RouteSet] route_set
   #
   # @return [Hash]
   def self.route_params(path, method, route_set)
@@ -14,10 +14,10 @@ module ActivePolicy
   # @return [Array<ActiveRecord>]
   def self.models_from_route_params(params)
     models = []
-    raise 'policy_models is missing from route' if params[:policy_models].nil?
-    return [] if params[:policy_models].empty?
-    params[:policy_models].each do |key, value|
-      models << value.find(params[key])
+    if params.key?(:policy_models)
+      params[:policy_models].each do |key, value|
+        models << value.find(params[key])
+      end
     end
     models
   end

data/lib/active_policy/version.rb

@@ -1,3 +1,3 @@
 module ActivePolicy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_policy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Panos Dalitsouris
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Active policy is meant to be a way to authorize a request before hitting
   the controller.