rhino_project_core 0.21.0.beta.47 → 0.21.0.beta.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a96de885bbf31a18ef367c6139c3cb78a25f37102a6d980b65fd170c9bc8a2
-  data.tar.gz: ec3d9a80aba2a6fdc53692299640d07968c1d157b3ad4b15ea54ccab00431032
+  metadata.gz: c1b7f68ae4e2c0c7329a629b27b7066d998be5d3644da8c19dafb35b582bc6de
+  data.tar.gz: dd08f384dee74cfea82940c8871771ffc670dacc7bdb30ebe39943117a778933
 SHA512:
-  metadata.gz: 63b1fa716e6bf30d664d18376b73885cdaf1505752f7b9cc68854a2d1e4a08b997b1e3c5e3b2684aac108c957e566a8e82e70be46dbf2e49c6219023044785c5
-  data.tar.gz: 9bdbb9d79a108d6920a2c3e5a0ac53fedb11bb7d006b910ca4a26893d6d7cdc713ec2d26f55c5e3c6410d4a07f00c7264b1923aa7f757ab3d653c62b994133eb
+  metadata.gz: 698a1c7aceb4e0cb879467ef14d9097db425bd67de34bba52cb74e1f6c57fe5415a13611ef33e94e989b3c2c53d81e7c5315ebfe52837c9218d31e8635135661
+  data.tar.gz: 9fd1a98e8584be9cc5f3a90b967b143b6f542a5579c40a5015b9fd01725ec501ea338d112be44930348f8841c2a2cf7a437cca7a88f468b746d398743cf5b6d4

data/app/helpers/rhino/omniauth_helper.rb

@@ -50,7 +50,8 @@ module Rhino
       [
         client_id: ENV["AUTH_AZURE_OAUTH2_CLIENT_ID"],
         client_secret: ENV["AUTH_AZURE_OAUTH2_SECRET_KEY"],
-        tenant_id: ENV["AUTH_AZURE_OAUTH2_TENANT_ID"]
+        # common is the default for multi-tenant applications
+        tenant_id: ENV.fetch("AUTH_AZURE_OAUTH2_TENANT_ID", "common"),
       ]
     end
 

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.47"
+    PRE   = "beta.52"
 
     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.47
+  version: 0.21.0.beta.52
 platform: ruby
 authors:
 - JP Rosevear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails