subroutine 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1e060b5a23f95d926f8df63e2eb9fc12745a93
-  data.tar.gz: 1205b94faff4d024aa9670cbd0cee003ea3bff5f
+  metadata.gz: 2703769996395de8478c8c16b7eb8f2826c903b3
+  data.tar.gz: 42bf18f9555f5977ffcb93508468d399fe62d993
 SHA512:
-  metadata.gz: c3313881107db6835f530a41b17f0702f407a2c83413cd7705c00ef4b02017b54566037ad464231651e04948a8416ad4fc02c6939e36d2ac814383fb542829ba
-  data.tar.gz: 75a5d2fe57b634ff5d4e84e105621c769679f065bc1f72c49b835b988972c39fe2d041fbda7f8c8ff99e3c51d79df51ab01ce63299a3b46d88e2a39096d73f2f
+  metadata.gz: d7be70968a4c5a9bbc85feabdcef6a1ded8fd04b797acd62266bdab558a51d64cafb93229d220222e5515978c187f328c24f337c0572c135b5b6f6f20e7e9c16
+  data.tar.gz: 6c04f8721942a5ff271d06065a4b9ebce38f830b5727d0c3b31d7734da379ba613ecab9ee6a319794442fa641ed5c5d7383cb7a07ba5b6814c5c54e5a26f06be

data/lib/subroutine/association.rb

@@ -8,6 +8,9 @@ module Subroutine
         alias_method :field_without_associations, :field
         alias_method :field, :field_with_associations
       end
+
+      base.send(:alias_method, :setup_fields_without_association, :setup_fields)
+      base.send(:alias_method, :setup_fields, :setup_fields_with_association)
     end
 
     module ClassMethods
@@ -99,8 +102,8 @@ module Subroutine
       end
     end
 
-    def initialize(*args)
-      super(*args)
+    def setup_fields_with_association(*args)
+      setup_fields_without_association(*args)
 
       _fields.each_pair do |field, config|
         next unless config[:association]

data/lib/subroutine/auth.rb

@@ -24,12 +24,21 @@ module Subroutine
       base.instance_eval do
         extend ::Subroutine::Auth::ClassMethods
 
-        class_attribute :authorization_declared
+        class_attribute :authorization_declared, instance_writer: false
         self.authorization_declared = false
+
+        class_attribute :user_class_name, instance_writer: false
+        self.user_class_name = "User"
       end
     end
 
     module ClassMethods
+
+      def supported_user_class_names
+        [user_class_name, "Integer", "NilClass"].compact
+      end
+
+
       def authorize(validation_name)
         validate validation_name, unless: :skip_auth_checks?
       end
@@ -95,6 +104,10 @@ module Subroutine
       super(args.extract_options!)
       @skip_auth_checks = false
       @current_user = args.shift
+
+      unless self.class.supported_user_class_names.include?(@current_user.class.name)
+        raise ArgumentError, "current_user must be one of the following types {#{self.class.supported_user_class_names.join(",")}} but was #{@current_user.class.name}"
+      end
     end
 
     def skip_auth_checks!
@@ -107,7 +120,7 @@ module Subroutine
     end
 
     def current_user
-      @current_user = ::User.find(@current_user) if ::Integer === @current_user
+      @current_user = self.user_class_name.constantize.find(@current_user) if ::Integer === @current_user
       @current_user
     end
 

data/lib/subroutine/version.rb

@@ -3,7 +3,7 @@
 module Subroutine
   MAJOR = 0
   MINOR = 8
-  PATCH = 0
+  PATCH = 1
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/subroutine/auth_test.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 
 module Subroutine
   class AuthTest < TestCase
+
     def user
       @user ||= ::User.new(email_address: 'doug@example.com')
     end
@@ -50,6 +51,25 @@ module Subroutine
       end
     end
 
+    def test_the_current_user_can_be_defined_by_an_id
+      user = CustomAuthorizeOp.new(1).current_user
+      assert_equal 1, user.id
+      assert_equal true, user.is_a?(::User)
+      assert_equal false, user.is_a?(::AdminUser)
+    end
+
+    def test_the_user_class_can_be_overridden
+      user = DifferentUserClassOp.new(1).current_user
+      assert_equal 1, user.id
+      assert_equal true, user.is_a?(::AdminUser)
+    end
+
+    def test_another_class_cant_be_used_as_the_user
+      assert_raises "current_user must be one of the following types {AdminUser,Integer,NilClass} but was String" do
+        DifferentUserClassOp.new("doug")
+      end
+    end
+
     def test_it_does_not_run_authorizations_if_explicitly_bypassed
       op = CustomAuthorizeOp.new User.new(email_address: 'foo@bar.com')
       op.skip_auth_checks!

data/test/support/ops.rb

@@ -13,6 +13,10 @@ class User
   attr_accessor :password
 
   validates :email_address, presence: true
+
+  def self.find(id)
+    new(id: id)
+  end
 end
 
 class AdminUser < ::User
@@ -137,6 +141,11 @@ class NoUserRequirementsOp < OpWithAuth
   no_user_requirements!
 end
 
+class DifferentUserClassOp < OpWithAuth
+  self.user_class_name = "AdminUser"
+  require_user!
+end
+
 class CustomAuthorizeOp < OpWithAuth
   require_user!
   authorize :authorize_user_is_correct

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel