rhino_project_core 0.21.0.beta.9 → 0.21.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b837d1a61d9db93628d44b08d2857cb43b5bacad39d5c04620904ba8cf7c77b
-  data.tar.gz: 57bfbc41e00928f40767952277b9aecf735753e2c95eb4186fdf5cc081563a19
+  metadata.gz: d956b01e70ce6ab2cd9541f6199bef97adeb0641829ad9f9794736f7685d823b
+  data.tar.gz: 672d03cbebda971049761f3cea1edecd0ca622fe321399490ec59554a120a2ab
 SHA512:
-  metadata.gz: dd91669dce9c1edf16b0992f9a4a09d5631461bef719a2a1ff45da3c2fb7cf281240987fbb053fd3bc8aa7e59e85d2641ff99b894a8e433865774505e5d814f9
-  data.tar.gz: af761b00e4492958253f0bd775d0ee00a45e75253a301d76bb23d25d09ab2d65cdf3eb8bb06dcbd8b5c17ae1acd97dfb12cb456e67ad649cdc8ccd00eec4d9cd
+  metadata.gz: 59b847bd102beae256eb2a9325f4c31d371ba0e9d61c086889824c62a7b55db2c61ee7020c8360ea2987281c2ffcf3c9d9dcb2cec87b4a97d6ca5383c4059abf
+  data.tar.gz: b7acc68436e1de4b91955edcb07b052f0c420f918cdf4023576c85cbc44b53e3ceb14ea4c51265845bd693bb5ff505c95077e4750f1dc3c05300627b8ffbac44

data/lib/generators/rhino/model/model_generator.rb

@@ -48,7 +48,7 @@ module Rhino
       return if global_owner?
 
       inject_into_file model_file, after: /#{owner_call}/ do
-        "\n  rhino_references %i[#{owner_name}]"
+        "\n  rhino_references %i[#{reference_attributes.map(&:name).join(' ')}]\n"
       end
     end
 

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

@@ -33,194 +33,200 @@ module Rhino
           end
 
           private
-          # FIXME: It can be a hash if passed in from a reference which might have something like
-          # rhino_references %i[{blog_posts: [:comments]}]
-          # but I cannot find current spot where it is used like that currently
-          def property_name(property)
-            property.is_a?(Hash) ? property.keys.first : property
-          end
-
-          def ref_descriptor(names)
-            {
-              type: :reference,
-              anyOf: names.map { |name| { :$ref => "#/components/schemas/#{name.singularize}" } }
-            }
-          end
-
-          def property_type_and_format_attr(name) # rubocop:todo Metrics/MethodLength
-            atype = attribute_types[name.to_s].type
-
-            # The PG array delegates type to "subtype" which is the actual type of the array elements
-            if attribute_types[name.to_s].is_a? ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
-              return {
-                type: :array,
-                items: {
-                  type: atype
-                }
-              }
+            # FIXME: It can be a hash if passed in from a reference which might have something like
+            # rhino_references %i[{blog_posts: [:comments]}]
+            # but I cannot find current spot where it is used like that currently
+            def property_name(property)
+              property.is_a?(Hash) ? property.keys.first : property
             end
 
-            if %i[datetime date time].include?(atype)
-              return {
-                type: 'string',
-                format: atype
+            def ref_descriptor(names)
+              {
+                type: :reference,
+                anyOf: names.map { |name| { :$ref => "#/components/schemas/#{name.singularize}" } }
               }
             end
 
-            { type: atype }
-          end
+            def property_type_and_format_attr(name) # rubocop:todo Metrics/MethodLength
+              atype = attribute_types[name.to_s].type
 
-          def nested_array_options(name)
-            ref_sym = name.to_sym
+              # The PG array delegates type to "subtype" which is the actual type of the array elements
+              if attribute_types[name.to_s].is_a? ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
+                return {
+                  type: :array,
+                  items: {
+                    type: atype
+                  }
+                }
+              end
 
-            array_options = {}
+              if %i[datetime date time].include?(atype)
+                return {
+                  type: "string",
+                  format: atype
+                }
+              end
 
-            if nested_attributes_options[ref_sym]
-              array_options[:creatable] = true
-              array_options[:updatable] = true
-              array_options[:destroyable] = nested_attributes_options[ref_sym][:allow_destroy]
+              { type: atype }
             end
 
-            { "x-rhino-attribute-array": array_options.merge(_properties_array[ref_sym] || {}) }
-          end
+            def nested_array_options(name)
+              ref_sym = name.to_sym
 
-          # rubocop:todo Metrics/PerceivedComplexity
-          # rubocop:todo Metrics/AbcSize
-          def property_type_and_format_ref(name) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
-            assoc = reflections[name]
-            klasses = if assoc.options[:polymorphic]
-             assoc.active_record.send("#{assoc.name}_types").map(&:constantize).map { |m| m.model_name.singular }
-            else
-              # FIXME: The tr hack is to match how model_name in rails handles modularized classes
-              [assoc.options[:class_name]&.underscore&.tr('/', '_') || name]
-            end
+              array_options = {}
 
-            return ref_descriptor(klasses) unless reflections[name].macro == :has_many
+              if nested_attributes_options[ref_sym]
+                array_options[:creatable] = true
+                array_options[:updatable] = true
+                array_options[:destroyable] = nested_attributes_options[ref_sym][:allow_destroy]
+              end
 
-            {
-              type: :array,
-              items: ref_descriptor(klasses).merge(nested_array_options(name))
-            }
-          end
-          # rubocop:enable Metrics/AbcSize
-          # rubocop:enable Metrics/PerceivedComplexity
+              { "x-rhino-attribute-array": array_options.merge(_properties_array[ref_sym] || {}) }
+            end
+
+            # rubocop:todo Metrics/PerceivedComplexity
+            # rubocop:todo Metrics/AbcSize
+            def property_type_and_format_ref(name) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+              assoc = reflections[name]
+              klasses = if assoc.options[:polymorphic]
+                # If its a delgated type it will have type introspection
+                if assoc.active_record.respond_to?("#{assoc.name}_types")
+                  assoc.active_record.send("#{assoc.name}_types").map(&:constantize).map { |m| m.model_name.singular }
+                else
+                  # FIXME: This is wrong, but there is no good way to introspect general polymorphic models
+                  [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]
+              end
 
-          def property_type_and_format(name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-            # Special cases
-            return { type: :identifier } if name == identifier_property
-            return { type: :string } if defined_enums.key?(name)
+              return ref_descriptor(klasses) unless reflections[name].macro == :has_many
 
-            # FIXME: Hack for tags for now
-            if attribute_types.key?(name.to_s) && attribute_types[name.to_s].class.to_s == 'ActsAsTaggableOn::Taggable::TagListType'
-              return {
+              {
                 type: :array,
-                items: {
-                  type: 'string'
-                }
+                items: ref_descriptor(klasses).merge(nested_array_options(name))
               }
             end
+            # rubocop:enable Metrics/AbcSize
+            # rubocop:enable Metrics/PerceivedComplexity
+
+            def property_type_and_format(name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+              # Special cases
+              return { type: :identifier } if name == identifier_property
+              return { type: :string } if defined_enums.key?(name)
+
+              # FIXME: Hack for tags for now
+              if attribute_types.key?(name.to_s) && attribute_types[name.to_s].class.to_s == "ActsAsTaggableOn::Taggable::TagListType"
+                return {
+                  type: :array,
+                  items: {
+                    type: "string"
+                  }
+                }
+              end
 
-            # Use the attribute type if possible
-            return property_type_and_format_attr(name) if attribute_types.key?(name.to_s)
+              # Use the attribute type if possible
+              return property_type_and_format_attr(name) if attribute_types.key?(name.to_s)
 
-            return property_type_and_format_ref(name) if reflections.key?(name)
+              return property_type_and_format_ref(name) if reflections.key?(name)
 
-            # FIXME: There may be no way to reach this
-            # raise UnknownpropertyType
-            { type: :unknown }
-          end
+              # FIXME: There may be no way to reach this
+              # raise UnknownpropertyType
+              { type: :unknown }
+            end
 
-          def property_overrides(property)
-            return {} unless _properties_overrides.key?(property)
+            def property_overrides(property)
+              return {} unless _properties_overrides.key?(property)
 
-            _properties_overrides[property].deep_symbolize_keys
-          end
+              _properties_overrides[property].deep_symbolize_keys
+            end
 
-          def property_validations(property) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-            constraint_hash = {}
+            def property_validations(property) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+              constraint_hash = {}
 
-            # https://swagger.io/specification/
+              # https://swagger.io/specification/
 
-            validators_on(property).each do |v|
-              if v.is_a? ActiveModel::Validations::NumericalityValidator
-                if v.options.key?(:greater_than)
-                  constraint_hash[:minimum] = v.options[:greater_than]
-                  constraint_hash[:exclusiveMinimum] = true
-                end
+              validators_on(property).each do |v|
+                if v.is_a? ActiveModel::Validations::NumericalityValidator
+                  if v.options.key?(:greater_than)
+                    constraint_hash[:minimum] = v.options[:greater_than]
+                    constraint_hash[:exclusiveMinimum] = true
+                  end
 
-                if v.options.key?(:less_than)
-                  constraint_hash[:maximum] = v.options[:less_than]
-                  constraint_hash[:exclusiveMaximum] = true
-                end
+                  if v.options.key?(:less_than)
+                    constraint_hash[:maximum] = v.options[:less_than]
+                    constraint_hash[:exclusiveMaximum] = true
+                  end
 
-                constraint_hash[:minimum] = v.options[:greater_than_or_equal_to] if v.options.key?(:greater_than_or_equal_to)
-                constraint_hash[:maximum] = v.options[:less_than_or_equal_to] if v.options.key?(:less_than_or_equal_to)
+                  constraint_hash[:minimum] = v.options[:greater_than_or_equal_to] if v.options.key?(:greater_than_or_equal_to)
+                  constraint_hash[:maximum] = v.options[:less_than_or_equal_to] if v.options.key?(:less_than_or_equal_to)
 
-                if v.options.key?(:in)
-                  constraint_hash[:minimum] = v.options[:in].min
-                  constraint_hash[:maximum] = v.options[:in].max
+                  if v.options.key?(:in)
+                    constraint_hash[:minimum] = v.options[:in].min
+                    constraint_hash[:maximum] = v.options[:in].max
+                  end
                 end
-              end
-
-              if v.is_a? ::ActiveRecord::Validations::LengthValidator
-                constraint_hash[:minLength] = v.options[:minimum] || v.options[:is]
-                constraint_hash[:maxLength] = v.options[:maximum] || v.options[:is]
-              end
 
-              constraint_hash[:pattern] = JsRegex.new(v.options[:with]).source if v.is_a? ::ActiveModel::Validations::FormatValidator
+                if v.is_a? ::ActiveRecord::Validations::LengthValidator
+                  constraint_hash[:minLength] = v.options[:minimum] || v.options[:is]
+                  constraint_hash[:maxLength] = v.options[:maximum] || v.options[:is]
+                end
 
-              constraint_hash[:enum] = v.options[:in] if v.is_a? ActiveModel::Validations::InclusionValidator
-            end
+                constraint_hash[:pattern] = JsRegex.new(v.options[:with]).source if v.is_a? ::ActiveModel::Validations::FormatValidator
 
-            constraint_hash[:enum] = defined_enums[property].keys if defined_enums.key?(property)
+                constraint_hash[:enum] = v.options[:in] if v.is_a? ActiveModel::Validations::InclusionValidator
+              end
 
-            constraint_hash.compact
-          end
+              constraint_hash[:enum] = defined_enums[property].keys if defined_enums.key?(property)
 
-          # If there is a presence validator in the model it is not nullable.
-          # if there is no optional: true on an association, rails will add a
-          # presence validator automatically
-          # Otherwise check the db for the actual column or foreign key setting
-          # Return nil instead of false for compaction
-          def property_nullable?(name) # rubocop:todo Metrics/AbcSize
-            # Check for any presence validator
-            return false if validators_on(name).any?(::ActiveRecord::Validations::PresenceValidator)
-
-            # https://guides.rubyonrails.org/active_record_validations.html#numericality
-            # By default, numericality doesn't allow nil values. You can use allow_nil: true option to permit it.
-            validators_on(name).select { |v| v.is_a? ::ActiveRecord::Validations::NumericalityValidator }.each do |v|
-              return false unless v.options[:allow_nil]
+              constraint_hash.compact
             end
 
-            name = reflections[name].foreign_key if reflections.key?(name)
+            # If there is a presence validator in the model it is not nullable.
+            # if there is no optional: true on an association, rails will add a
+            # presence validator automatically
+            # Otherwise check the db for the actual column or foreign key setting
+            # Return nil instead of false for compaction
+            def property_nullable?(name) # rubocop:todo Metrics/AbcSize
+              # Check for any presence validator
+              return false if validators_on(name).any?(::ActiveRecord::Validations::PresenceValidator)
+
+              # https://guides.rubyonrails.org/active_record_validations.html#numericality
+              # By default, numericality doesn't allow nil values. You can use allow_nil: true option to permit it.
+              validators_on(name).select { |v| v.is_a? ::ActiveRecord::Validations::NumericalityValidator }.each do |v|
+                return false unless v.options[:allow_nil]
+              end
 
-            # Check the column null setting
-            return columns_hash[name].null if columns_hash.key?(name)
+              name = reflections[name].foreign_key if reflections.key?(name)
 
-            true
-          end
+              # Check the column null setting
+              return columns_hash[name].null if columns_hash.key?(name)
 
-          # Return nil instead of false for compaction
-          def property_read_only?(name)
-            return unless read_properties.include?(name) && (create_properties.exclude?(name) && update_properties.exclude?(name))
+              true
+            end
 
-            true
-          end
+            # Return nil instead of false for compaction
+            def property_read_only?(name)
+              return unless read_properties.include?(name) && (create_properties.exclude?(name) && update_properties.exclude?(name))
 
-          # Return nil instead of false for compaction
-          def property_write_only?(name)
-            return unless (create_properties.include?(name) || update_properties.include?(name)) && read_properties.exclude?(name)
+              true
+            end
 
-            true
-          end
+            # Return nil instead of false for compaction
+            def property_write_only?(name)
+              return unless (create_properties.include?(name) || update_properties.include?(name)) && read_properties.exclude?(name)
 
-          def property_default(name)
-            # FIXME: This will not handle datetime fields
-            # https://github.com/rails/rails/issues/27077 sets the default in the db
-            # but Blog.new does not set the default value like other attributes
-            # https://nubinary.atlassian.net/browse/NUB-298
-            _default_attributes[name].type_cast(_default_attributes[name].value_before_type_cast)
-          end
+              true
+            end
+
+            def property_default(name)
+              # FIXME: This will not handle datetime fields
+              # https://github.com/rails/rails/issues/27077 sets the default in the db
+              # but Blog.new does not set the default value like other attributes
+              # https://nubinary.atlassian.net/browse/NUB-298
+              _default_attributes[name].type_cast(_default_attributes[name].value_before_type_cast)
+            end
         end
       end
     end

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 21
     TINY  = 0
-    PRE   = "beta.9"
+    PRE   = "beta.12"
 
     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.9
+  version: 0.21.0.beta.12
 platform: ruby
 authors:
 - JP Rosevear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails