add invalid context error type

Author: enjaku4

lib/rabarber.rb

@@ -20,8 +20,9 @@
 
 module Rabarber
   class Error < StandardError; end
-  class ConfigurationError < Rabarber::Error; end
   class InvalidArgumentError < Rabarber::Error; end
+  class ConfigurationError < Rabarber::InvalidArgumentError; end
+  class InvalidContextError < Rabarber::InvalidArgumentError; end
   class NotFoundError < Rabarber::Error; end
 
   delegate :configure, to: Rabarber::Configuration

lib/rabarber/controllers/concerns/authorization.rb

@@ -35,6 +35,7 @@ def grant_access(action: nil, roles: nil, context: nil, if: nil, unless: nil)
           ).process,
           Rabarber::Inputs::Contexts::Authorizational.new(
             context,
+            error: Rabarber::InvalidContextError,
             message: "Expected a Class, an instance of ActiveRecord model, a symbol, a string, or a proc, got #{context.inspect}"
           ).resolve,
           Rabarber::Inputs::DynamicRule.new(

lib/rabarber/core/rule.rb

@@ -33,12 +33,17 @@ def execute_rule(controller_instance, rule)
       end
 
       def resolve_context(controller_instance)
-        resolved_context = case @context
-                           when Proc then controller_instance.instance_exec(&@context)
-                           when Symbol then controller_instance.send(@context)
-                           else @context
-                           end
-        Rabarber::Inputs::Context.new(resolved_context, message: "Expected an instance of ActiveRecord model, a Class, or nil, got #{resolved_context.inspect}").resolve
+        context = case @context
+                  when Proc then controller_instance.instance_exec(&@context)
+                  when Symbol then controller_instance.send(@context)
+                  else @context
+                  end
+
+        Rabarber::Inputs::Context.new(
+          context,
+          error: Rabarber::InvalidContextError,
+          message: "Expected an instance of ActiveRecord model, a Class, or nil, got #{context.inspect}"
+        ).resolve
       end
     end
   end

lib/rabarber/inputs/base.rb

@@ -18,14 +18,18 @@ def process
         type_checker = @optional ? type.optional : type
         type_checker[@value]
       rescue Dry::Types::CoercionError
-        raise @error, @message
+        raise_error
       end
 
       private
 
       def type
         raise NotImplementedError
       end
+
+      def raise_error
+        raise @error, @message
+      end
     end
   end
 end

lib/rabarber/inputs/context.rb

@@ -10,8 +10,7 @@ def resolve
         when Class
           { context_type: context.to_s, context_id: nil }
         when ActiveRecord::Base
-          raise @error, @message unless context.persisted?
-
+          raise_error unless context.persisted?
           { context_type: context.class.to_s, context_id: context.public_send(context.class.primary_key) }
         else
           context

lib/rabarber/models/concerns/has_roles.rb

@@ -90,6 +90,7 @@ def process_role_names(role_names)
     def process_context(context)
       Rabarber::Inputs::Context.new(
         context,
+        error: Rabarber::InvalidContextError,
         message: "Expected an instance of ActiveRecord model, a Class, or nil, got #{context.inspect}"
       ).resolve
     end

lib/rabarber/models/role.rb

@@ -82,6 +82,7 @@ def process_role_name(name)
       def process_context(context)
         Rabarber::Inputs::Context.new(
           context,
+          error: Rabarber::InvalidContextError,
           message: "Expected an instance of ActiveRecord model, a Class, or nil, got #{context.inspect}"
         ).resolve
       end

spec/rabarber/controllers/concerns/authorization_spec.rb

@@ -63,7 +63,7 @@
     context "when context is invalid" do
       let(:args) { { context: 1 } }
 
-      it_behaves_like "raises an error", Rabarber::InvalidArgumentError, "Expected a Class, an instance of ActiveRecord model, a symbol, a string, or a proc, got 1"
+      it_behaves_like "raises an error", Rabarber::InvalidContextError, "Expected a Class, an instance of ActiveRecord model, a symbol, a string, or a proc, got 1"
     end
 
     context "when dynamic rule is invalid" do

spec/rabarber/core/rule_spec.rb

@@ -84,7 +84,7 @@
       let(:rule) { described_class.new(roles, 123, nil, nil) }
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end

spec/rabarber/models/concerns/has_roles_spec.rb

@@ -81,7 +81,7 @@
       let(:context) { 123 }
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end
@@ -198,7 +198,7 @@
       let(:roles) { [:admin] }
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end
@@ -401,7 +401,7 @@
       let(:create_new) { true }
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end
@@ -467,7 +467,7 @@
       let(:context) { 123 }
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end
@@ -525,7 +525,7 @@
       end
 
       it "raises with correct message" do
-        expect { subject }.to raise_error(Rabarber::InvalidArgumentError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
+        expect { subject }.to raise_error(Rabarber::InvalidContextError, "Expected an instance of ActiveRecord model, a Class, or nil, got 123")
       end
     end
   end