rhino_project_core 0.21.0.beta.46 → 0.21.0.beta.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5523b3587da0f1a5099bb649e0f1243a716a85b27379372ab513c9beb759f3fa
-  data.tar.gz: be28497ecfe5fec48183bdddab3b5a13f4e4c0d4a3fa0e2c01bc9153509bf31e
+  metadata.gz: 6a0a1268174a345a44c60dd808ba573367ca96eb00ff851d924fd802c7374eee
+  data.tar.gz: ea08c48496d0a9e162fefcf2b2935abfedd04461a92c5f8cf75e7bc33d80ad2a
 SHA512:
-  metadata.gz: f5728dd8cc8a7cd570b01af965bd87365f216910ac66011b40023d1e8a632be9edf4275de5b66ed1d89ea054c741e6ea55b0393fd1f848c3ee2d8fa5933009f3
-  data.tar.gz: 5a10bba5d890d5f71d8930b34e65de0094130c7b477ffcfc5121877e432103107e45fbf2b360cd4b11bfb1e3741cebe78962b902a7edb47d4ebc554f6890d0cb
+  metadata.gz: acc3ec16ca3703b080b3550e14d705c74dc37bc1f8c83f40087c3636b26b754f515c50f02db9f64aeb7264bb3feb019726543085d98f0f126bd98bff105b8c96
+  data.tar.gz: 436788e9e25fb8d609b72c6b7c03327708cf87d7d3454f7def601908041a8db4014b9715b7c98d7d803de1e70d79622188687956c4520c9208add8c9dd39c1fe

data/app/controllers/concerns/rhino/error_handling.rb

@@ -23,14 +23,16 @@ module Rhino
 
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
-      def handle_uncaught_error(exception)
+      def handle_uncaught_error(e)
+        raise e if Rails.env.test?
+
         # Send to rollbar if available
-        Rollbar.error(exception) if defined? Rollbar
+        Rollbar.error(e) if defined? Rollbar
 
-        logger.error("Internal server error#{exception.class} #{exception.message} #{exception.backtrace.join("\n")}")
+        logger.error "There was an exception - #{e.class}(#{e.message})"
+        logger.error e.backtrace.join("\n")
 
-        render json: { errors: ['Internal server error.'] },
-               status: :internal_server_error
+        render json: { errors: ['Internal server error.'] }, status: :internal_server_error
       end
 
       def not_found

data/lib/rhino/resource/active_record_extension/params.rb

@@ -154,7 +154,7 @@ module Rhino
             # rubocop:todo Metrics/CyclomaticComplexity
             def transform_params_recursive(params, parent = self) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
               hash = {}
-              params.each do |param_key, param_value|
+              params.each do |param_key, param_value| # rubocop:todo Metrics/BlockLength
                 association = parent.reflect_on_association(param_key)
 
                 # Its a regular attribute
@@ -187,19 +187,24 @@ module Rhino
                   # if its a cardinal though, such as blog: 1 instead of blog: {name : 'my blog' }
                   # fallback to transforming to the foreign key
                   if param_value.is_a?(ActionController::Parameters)
+                    assoc = parent.reflections[param_key]
                     klasses = assoc_from_sym(param_key, parent)
 
+                    # We only want to transform the params for the klass that matches the foreign_type
+                    klasses.select! { |k| k.name == params[assoc.foreign_type] } if assoc.polymorphic?
+
                     next hash[attr_key] = klasses.map { |klass| parent.transform_params_recursive(param_value, klass) }.reduce(:merge)
                   end
                 end
 
                 # Map association name to foreign key, ie blog => blog_id
                 # or blog: { id: } => blog_id
-                if param_value.is_a?(ActionController::Parameters)
+                if param_value.is_a?(ActionController::Parameters) && !association.has_one?
                   next hash[association.foreign_key] = param_value[association.klass.identifier_property]
                 end
 
-                hash[association.foreign_key] = param_value
+                # If its a has_one, there is no foreign key on this model
+                hash[association.foreign_key] = param_value unless association.has_one?
               end
 
               # Force permit since we should have already been permitted at this point

data/lib/rhino/resource/active_record_extension/properties_describe.rb

@@ -8,6 +8,20 @@ module Rhino
       module PropertiesDescribe # rubocop:disable Metrics/ModuleLength
         extend ActiveSupport::Concern
 
+        class PolymorphicModelName
+          include ActiveSupport::Inflector
+
+          attr_reader :name
+
+          def initialize(name)
+            @name = name.to_s
+          end
+
+          def singular
+            underscore(name).tr("/", "_").singularize
+          end
+        end
+
         class_methods do # rubocop:disable Metrics/BlockLength
           def describe_property(property) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
             name = property_name(property).to_s
@@ -43,7 +57,7 @@ module Rhino
             def ref_descriptor(names)
               {
                 type: :reference,
-                anyOf: names.map { |name| { :$ref => "#/components/schemas/#{name.singularize}" } }
+                anyOf: names.map { |name| { :$ref => "#/components/schemas/#{name.singular}" } }
               }
             end
 
@@ -86,19 +100,19 @@ module Rhino
 
             # rubocop:todo Metrics/PerceivedComplexity
             # rubocop:todo Metrics/AbcSize
-            def property_type_and_format_ref(name) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+            def property_type_and_format_ref(name) # rubocop:todo Metrics/AbcSize
               assoc = reflections[name]
-              klasses = if assoc.options[:polymorphic]
-                # If its a delgated type it will have type introspection
+              klasses = if assoc.polymorphic?
+                # Delegated type
                 if assoc.active_record.respond_to?("#{assoc.name}_types")
-                  assoc.active_record.send("#{assoc.name}_types").map(&:constantize).map { |m| m.model_name.singular }
+                  assoc.active_record.send(:"#{assoc.name}_types").map { |x| x.constantize.model_name }
                 else
                   # FIXME: This is wrong, but there is no good way to introspect general polymorphic models
-                  [name]
+                  # FIXME: This should be an OpenAPI discriminator with all possible types (all models)
+                  [PolymorphicModelName.new(name)]
                 end
               else
-                # FIXME: The tr hack is to match how model_name in rails handles modularized classes
-                [assoc.options[:class_name]&.underscore&.tr("/", "_") || name]
+                [assoc.klass.model_name]
               end
 
               return ref_descriptor(klasses) unless reflections[name].macro == :has_many

data/lib/rhino/resource/active_record_tree.rb

@@ -20,7 +20,7 @@ module Rhino
         def describe_property(property)
           return super unless property == "children"
 
-          super.deep_merge({ type: :array, items: ref_descriptor([model_name.element]) })
+          super.deep_merge({ type: :array, items: ref_descriptor([model_name]) })
         end
 
         # FIXME: Need to recurse to a MAX DEPTH

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 21
     TINY  = 0
-    PRE   = "beta.46"
+    PRE   = "beta.49"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.21.0.beta.46
+  version: 0.21.0.beta.49
 platform: ruby
 authors:
 - JP Rosevear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails