subroutine 0.10.0.beta3 → 0.10.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad452be684c7aa5f556a1d203c5f6d02a8780600f74276743c164391a91d6fde
-  data.tar.gz: 3f2d5c3303bb579c3741a10e659af80b0adcb7c3a64373dcf6f7f2d82bb37703
+  metadata.gz: 9d7662863cde650cd9b5392a5c53c45a0b63db8f6ff5651dac88701c0e204505
+  data.tar.gz: 2ccdbc5c345686f95741848f72c3112363d8c2bd8d84899c2e66e4f65af10784
 SHA512:
-  metadata.gz: aa63944122d676ca984525137e05430766b767b20fee7f65c216b45c5ecf523781c9d4e35119d17d7fd99dd58580f43e67405b72a7027886c96166103dac6bc5
-  data.tar.gz: 21c97fa2d75c0fbbd85f691d89e90666cddf490b7dd37fc676a76543bb1b6a5c7654959a6ba2aa19640ccd658ea8f0786c405bafbb2e7f63d0ba7ce64496cd08
+  metadata.gz: 941c27d1b188ec739751ee9a7e396d64f63498215a1b946308dd8e70ec6537c2997312ead77ce09a2fa5f48d77211e15514d46905bb91ad8ccbaa02044d8b2f7
+  data.tar.gz: 02024556adf1ae6c76f16258613e18f58f23c46f11a5171201763b0d1546090710234d6d7ac08f96c330bb8bee032b4503bae72141ea01438d0efda85a48c4e5

data/lib/subroutine/association_fields/association_type_mismatch_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "subroutine/failure"
+
+module Subroutine
+  module AssociationFields
+    class AssociationTypeMismatchError < ::Subroutine::Failure
+    end
+  end
+end

data/lib/subroutine/association_fields.rb

@@ -3,6 +3,7 @@
 require "delegate"
 require "active_support/concern"
 require "subroutine/association_fields/configuration"
+require "subroutine/association_fields/association_type_mismatch_error"
 
 module Subroutine
   module AssociationFields
@@ -86,6 +87,7 @@ module Subroutine
       config = get_field_config(field_name)
 
       if config&.behavior == :association
+        maybe_raise_on_type_mismatch!(config, value)
         set_field(config.foreign_type_method, value&.class&.name, opts) if config.polymorphic?
         set_field(config.foreign_key_method, value&.id, opts)
       elsif config&.behavior == :association_component
@@ -154,5 +156,19 @@ module Subroutine
       scope.find(_fk)
     end
 
+    def maybe_raise_on_type_mismatch!(config, record)
+      return if config.polymorphic?
+      return if record.nil?
+
+      klass = config.inferred_class_name.constantize
+
+      return if record.class <= klass || record.class >= klass
+
+      message = "#{klass}(##{klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
+
+      errors.add(:base, message)
+      raise Subroutine::AssociationFields::AssociationTypeMismatchError, self
+    end
+
   end
 end

data/lib/subroutine/auth/authorization_not_declared_error.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Subroutine
+  module Auth
+    class AuthorizationNotDeclaredError < ::StandardError
+
+      def initialize(msg = nil)
+        super(msg || "Authorization management has not been declared on this class")
+      end
+
+    end
+  end
+end

data/lib/subroutine/auth/not_authorized_error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Subroutine
+  module Auth
+    class NotAuthorizedError < ::StandardError
+
+      def initialize(msg = nil)
+        msg = I18n.t("errors.#{msg}", default: "Sorry, you are not authorized to perform this action.") if msg.is_a?(Symbol)
+        msg ||= I18n.t("errors.unauthorized", default: "Sorry, you are not authorized to perform this action.")
+        super msg
+      end
+
+      def status
+        401
+      end
+
+    end
+  end
+end

data/lib/subroutine/auth.rb

@@ -1,32 +1,13 @@
 # frozen_string_literal: true
 
+require "subroutine/auth/authorization_not_declared_error"
+require "subroutine/auth/not_authorized_error"
+
 module Subroutine
   module Auth
 
     extend ActiveSupport::Concern
 
-    class NotAuthorizedError < ::StandardError
-
-      def initialize(msg = nil)
-        msg = I18n.t("errors.#{msg}", default: "Sorry, you are not authorized to perform this action.") if msg.is_a?(Symbol)
-        msg ||= I18n.t("errors.unauthorized", default: "Sorry, you are not authorized to perform this action.")
-        super msg
-      end
-
-      def status
-        401
-      end
-
-    end
-
-    class AuthorizationNotDeclaredError < ::StandardError
-
-      def initialize(msg = nil)
-        super(msg || "Authorization management has not been declared on this class")
-      end
-
-    end
-
     included do
       class_attribute :authorization_declared, instance_writer: false
       self.authorization_declared = false

data/lib/subroutine/version.rb

@@ -5,7 +5,7 @@ module Subroutine
   MAJOR = 0
   MINOR = 10
   PATCH = 0
-  PRE   = "beta3"
+  PRE   = "beta4"
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
 

data/test/subroutine/association_test.rb

@@ -13,6 +13,10 @@ module Subroutine
       @fred ||= ::User.new(id: 2, email_address: "fred@example.com")
     end
 
+    def account
+      @account ||= ::Account.new(id: 1)
+    end
+
     def test_it_sets_accessors_on_init
       op = SimpleAssociationOp.new user: doug
       assert_equal "User", op.user_type
@@ -143,5 +147,12 @@ module Subroutine
       assert_equal false, op.field_provided?(:admin_type)
     end
 
+    def test_it_ensures_the_correct_type_of_resource_is_provded_to_an_association
+      op = SimpleAssociationOp.new
+      assert_raises ::Subroutine::AssociationFields::AssociationTypeMismatchError do
+        op.user = account
+      end
+    end
+
   end
 end

data/test/support/ops.rb

@@ -27,6 +27,18 @@ class AdminUser < ::User
 
 end
 
+class Account
+
+  include ::ActiveModel::Model
+
+  attr_accessor :id
+
+  def self.find(id)
+    new(id: id)
+  end
+
+end
+
 ## Ops ##
 
 class SignupOp < ::Subroutine::Op

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta3
+  version: 0.10.0.beta4
 platform: ruby
 authors:
 - Mike Nelson
@@ -145,9 +145,12 @@ files:
 - gemfiles/am60.gemfile
 - lib/subroutine.rb
 - lib/subroutine/association_fields.rb
+- lib/subroutine/association_fields/association_type_mismatch_error.rb
 - lib/subroutine/association_fields/component_configuration.rb
 - lib/subroutine/association_fields/configuration.rb
 - lib/subroutine/auth.rb
+- lib/subroutine/auth/authorization_not_declared_error.rb
+- lib/subroutine/auth/not_authorized_error.rb
 - lib/subroutine/failure.rb
 - lib/subroutine/fields.rb
 - lib/subroutine/fields/configuration.rb