foobara-active-record-type 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671d17e08f4547b324b61474ef20d10e7057b063af31b4fad297b621f05e16dd
-  data.tar.gz: 7cf66a0c5f9b4302f24f5059a50a9f2979adc0f9b870e627c213402fd6884192
+  metadata.gz: 308b78e110004588dedfaec131948d47f060ed15fa8a09fa241af01d15bf83d7
+  data.tar.gz: a17c4130c51c4d2cc6c51a48ee50b5b176bd98fd0237fe8cf26c225a9a2a971e
 SHA512:
-  metadata.gz: b9adb3df88d04f1d5215785eac7eb71a8ab8efdd7d88c02d24aaaf7de1c1e7a13dfacab73cb0af114c74074b1ab075284118acf8a432b045e92270106fcca56a
-  data.tar.gz: 3524d0cf555774eb8d46afd200a98fa9d4c0c81c198936810e882d8a8d8a603035b2081b6b392f9e1c33a545cfc96a414792d9ede6e421fa4bdf4b0096e96df8
+  metadata.gz: d8fa16c2ba0deaf38e9d0f66d273b939be62d69bb8eb85590574d0eec1d472a966513154774d8fbaff8744767ceb45a398ec1faeb6c2ed2b497e6d8a4bdf0443
+  data.tar.gz: 9e47b6836d783f38b90636d3713da58222a8c3668ebac313736b63cd08b40b25c304d73ffc4b8248608ac6215860083fb967244f7b5364b57f730945df841360

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.2]
+
+- Fix problem where the first time a type is declared via an
+  active record class it has a complex declaration hash instead of a simple
+  registered class lookup
+
 ## [0.0.1]
 
 - Release as a gem

data/src/extend_active_record_type_declaration/active_record_base_class_desugarizer.rb

@@ -7,7 +7,9 @@ module Foobara
         end
 
         def desugarize(active_record_class)
-          if active_record_class.superclass != ActiveRecord::Base
+          active_record_superclass = active_record_class.superclass
+
+          if active_record_superclass != ActiveRecord::Base
             # this will register a foobara type for the base class
             type_for_declaration(active_record_class.superclass)
           end
@@ -16,7 +18,7 @@ module Foobara
             type: :active_record,
             model_class: active_record_class.name,
             name: active_record_class.name,
-            model_base_class: active_record_class.superclass.name,
+            model_base_class: active_record_superclass.name,
             model_module: Util.module_for(active_record_class)&.name,
             primary_key: active_record_class.primary_key,
             attributes_declaration: active_record_class_to_attributes_declaration(active_record_class)

data/src/extend_active_record_type_declaration/{registered_active_record_base_class_desugarizer.rb → type_declaration_extension/registered_type_declaration/desugarizers/registered_active_record_base_class_desugarizer.rb}

@@ -5,13 +5,14 @@ module Foobara
         module RegisteredTypeDeclaration
           module Desugarizers
             class RegisteredActiveRecordBaseClassDesugarizer < TypeDeclarations::Desugarizer
-              def applicable?(klass)
-                klass.is_a?(Class) && klass < ActiveRecord::Base && type_registered?(klass.name)
+              def applicable?(sugary_type_declaration)
+                sugary_type_declaration.is_a?(Class) && sugary_type_declaration < ActiveRecord::Base &&
+                  sugary_type_declaration.foobara_type
               end
 
               def desugarize(active_record_class)
                 {
-                  type: active_record_class.name
+                  type: active_record_class.foobara_type.foobara_manifest_reference.to_sym
                 }
               end
 

data/src/extend_active_record_type_declaration/type_declaration_extension/registered_type_declaration/desugarizers/unregistered_active_record_base_class_desugarizer.rb

@@ -0,0 +1,36 @@
+module Foobara
+  module ActiveRecordType
+    class ExtendActiveRecordTypeDeclaration < TypeDeclarations::Handlers::ExtendDetachedEntityTypeDeclaration
+      module TypeDeclarationExtension
+        module RegisteredTypeDeclaration
+          module Desugarizers
+            class UnregisteredActiveRecordBaseClassDesugarizer < TypeDeclarations::Desugarizer
+              def applicable?(sugary_type_declaration)
+                sugary_type_declaration.is_a?(Class) && sugary_type_declaration < ActiveRecord::Base &&
+                  !sugary_type_declaration.foobara_type
+              end
+
+              # We will create the foobara type from the active record class and then the
+              # RegisteredActiveRecordBaseClassDesugarizer
+              # will handle it properly.
+              # This will keep declarations using just the active record class simple in the first place they are used
+              # by acting as if it were a registered type at the time even though it wasn't yet.
+              def desugarize(active_record_class)
+                handler = handler_for_class(Foobara::ActiveRecordType::ExtendActiveRecordTypeDeclaration)
+                handler.process_value!(active_record_class)
+
+                {
+                  type: active_record_class.foobara_type.foobara_manifest_reference.to_sym
+                }
+              end
+
+              def priority
+                Priority::FIRST - 3
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-active-record-type
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,8 +58,9 @@ files:
 - src/extend_active_record_type_declaration/hash_desugarizer.rb
 - src/extend_active_record_type_declaration/model_class_desugarizer.rb
 - src/extend_active_record_type_declaration/primary_key_desugarizer.rb
-- src/extend_active_record_type_declaration/registered_active_record_base_class_desugarizer.rb
 - src/extend_active_record_type_declaration/to_type_transformer.rb
+- src/extend_active_record_type_declaration/type_declaration_extension/registered_type_declaration/desugarizers/registered_active_record_base_class_desugarizer.rb
+- src/extend_active_record_type_declaration/type_declaration_extension/registered_type_declaration/desugarizers/unregistered_active_record_base_class_desugarizer.rb
 - src/extend_active_record_type_declaration/validate_primary_key_is_symbol.rb
 - src/extend_active_record_type_declaration/validate_primary_key_present.rb
 - src/extend_active_record_type_declaration/validate_primary_key_references_attribute.rb