foobara-active-record-type 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7875c3851e75b4b6b2f5963c057a93541fcfc825d1705bdaf181e1ce9b703982
-  data.tar.gz: 2907faeae76548a51190010dd96710795c334b793ccc9fc64c78b57cd11f15fa
+  metadata.gz: d414152dfd728426b476b045fed5257eb2033730df365489e237579133faed97
+  data.tar.gz: dda2b3cefaf392d06385fc89d6cd584db39871add5fd962e354671e989a45596
 SHA512:
-  metadata.gz: 4ea9d7c160402a9e0e7035dc4fc83f0bb44bddd9a779b8f458044c064659822a868255c6c63afae8276025a29e0bf752ddbaf5e1e6e8a1112022d61c448076d3
-  data.tar.gz: 48e1cfb557bc5bf9637db1da097eb1c25283e17e6f370bd24307c1633a5139a19ff4dd3ba72d77a8cf96269ef90642846154003cb67a3c8329713384d07ebff4
+  metadata.gz: fcf8caf0d05f288b939f97017c46ee0322ff2b4d2041c63252c66600fcc8faf68920dee1379f88fe0f912439a1d344fdbb92014864f4866a451196da19575a78
+  data.tar.gz: '088d5e174cf4b25fe2377779419da3af45399e144cdb2ef42104d1cf86e5874ec16a8fd8f77b928a8351bc5be42c9461d7c8db61750ed2889bc2d77b45e84d7a'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.0] - 2025-08-22
+
+- Add support for Foobara 0.1.0 type declarations
+
 ## [0.0.14] - 2025-02-02
 
 - Fix manifest name bug

data/lib/foobara/active_record_type.rb

@@ -17,6 +17,7 @@ module Foobara
           type_module: Foobara::ActiveRecordType
         )
         type.remove_processor_by_symbol(:attributes_declaration)
+        type.remove_processor_by_symbol(:model_instance_is_valid)
 
         BuiltinTypes.install_type_declaration_extensions_for(ExtendActiveRecordTypeDeclaration)
 
@@ -24,6 +25,7 @@ module Foobara
         ActiveRecord::Base.include ActiveRecordFoobaraMethods
         ActiveRecord::Base.include Foobara::Model::Concerns::Reflection
         ActiveRecord::Base.include Foobara::DetachedEntity::Concerns::Reflection
+        # ActiveRecord::Base.include Foobara::Model::Concerns::Errors
 
         if defined?(Foobara::CommandConnectors::RailsCommandConnector)
           Foobara::CommandConnectors::RailsCommandConnector.default_serializers = [

data/src/active_record_foobara_methods.rb

@@ -11,6 +11,14 @@ module Foobara
           {}
         end
 
+        def foobara_delegates
+          {}
+        end
+
+        def foobara_private_attribute_names
+          []
+        end
+
         # TODO: implement this or figure out how to re-use the methods from Entity/Model
         def foobara_deep_associations
           # TODO: test this
@@ -36,7 +44,13 @@ module Foobara
         end
 
         def foobara_attributes_for_create(...)
-          TypeDeclarations::Attributes.reject(super, :created_at, :updated_at)
+          attributes = super
+
+          if attributes.is_a?(Types::Type)
+            attributes = attributes.declaration_data
+          end
+
+          TypeDeclarations::Attributes.reject(attributes, :created_at, :updated_at)
         end
 
         def foobara_attributes_for_update(...)

data/src/extend_active_record_type_declaration/active_record_base_class_desugarizer.rb

@@ -1,34 +1,42 @@
 module Foobara
   module ActiveRecordType
-    class ExtendActiveRecordTypeDeclaration <  TypeDeclarations::Handlers::ExtendDetachedEntityTypeDeclaration
+    class ExtendActiveRecordTypeDeclaration < TypeDeclarations::Handlers::ExtendDetachedEntityTypeDeclaration
       class ActiveRecordBaseClassDesugarizer < TypeDeclarations::Desugarizer
-        def applicable?(klass)
-          klass.is_a?(Class) && klass < ActiveRecord::Base
+        def applicable?(sugary_type_declaration)
+          if sugary_type_declaration.class?
+            sugary_type_declaration.declaration_data < ActiveRecord::Base
+          end
         end
 
-        def desugarize(active_record_class)
-          active_record_superclass = active_record_class.superclass
+        def desugarize(sugary_type_declaration)
+          klass = sugary_type_declaration.declaration_data
+          active_record_superclass = klass.superclass
 
           if active_record_superclass != ActiveRecord::Base
-            if active_record_superclass.attribute_names.include?(active_record_class.primary_key)
+            if active_record_superclass.attribute_names.include?(klass.primary_key)
               # this will register a foobara type for the base class
-              type_for_declaration(active_record_class.superclass)
+              type_for_declaration(klass.superclass)
             end
           end
 
-          domain = Foobara::Domain.domain_through_modules(active_record_class)
+          domain = Foobara::Domain.domain_through_modules(klass)
 
-          name = active_record_class.name.gsub(/^#{domain.scoped_full_name}::/, "")
+          name = klass.name.gsub(/^#{domain.scoped_full_name}::/, "")
 
-          {
+          sugary_type_declaration.declaration_data = {
             type: :active_record,
-            model_class: active_record_class.name,
+            model_class: klass.name,
             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)
+            model_module: Util.module_for(klass)&.name,
+            primary_key: klass.primary_key,
+            attributes_declaration: active_record_class_to_attributes_declaration(klass)
           }
+
+          sugary_type_declaration.is_duped = true
+          sugary_type_declaration.is_deep_duped = true
+
+          sugary_type_declaration
         end
 
         def column_to_foobara_type_declaration(column)

data/src/extend_active_record_type_declaration/to_type_transformer.rb

@@ -13,7 +13,9 @@ module Foobara
               handler = handler_for_class(TypeDeclarations::Handlers::ExtendAttributesTypeDeclaration)
               attributes_type_declaration = type.declaration_data[:attributes_declaration]
 
-              active_record_class.foobara_attributes_type = handler.process_value!(attributes_type_declaration)
+              active_record_class.foobara_attributes_type = TypeDeclarations.strict do
+                handler.process_value!(TypeDeclaration.new(attributes_type_declaration))
+              end
 
               type.element_types = active_record_class.foobara_attributes_type.element_types
               type_name = type.declaration_data[:name]

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

@@ -6,14 +6,24 @@ module Foobara
           module Desugarizers
             class RegisteredActiveRecordBaseClassDesugarizer < TypeDeclarations::Desugarizer
               def applicable?(sugary_type_declaration)
-                sugary_type_declaration.is_a?(Class) && sugary_type_declaration < ActiveRecord::Base &&
-                  sugary_type_declaration.foobara_type
+                if sugary_type_declaration.class?
+                  klass = sugary_type_declaration.declaration_data
+
+                  if klass < ActiveRecord::Base
+                    klass.foobara_type
+                  end
+                end
               end
 
-              def desugarize(active_record_class)
-                {
-                  type: active_record_class.foobara_type.foobara_manifest_reference.to_sym
-                }
+              def desugarize(sugary_declaration)
+                klass = sugary_declaration.declaration_data
+                type = klass.foobara_type
+
+                sugary_declaration.type = type
+                sugary_declaration.declaration_data = type.foobara_manifest_reference.to_sym
+                sugary_declaration.is_strict = true
+
+                sugary_declaration
               end
 
               def priority

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

@@ -6,8 +6,10 @@ module Foobara
           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
+                if sugary_type_declaration.class?
+                  klass = sugary_type_declaration.declaration_data
+                  klass < ActiveRecord::Base && !klass.foobara_type
+                end
               end
 
               # We will create the foobara type from the active record class and then the
@@ -15,13 +17,16 @@ module Foobara
               # 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)
+              def desugarize(sugary_type_declaration)
+                klass = sugary_type_declaration.declaration_data
+
                 handler = handler_for_class(Foobara::ActiveRecordType::ExtendActiveRecordTypeDeclaration)
-                handler.process_value!(active_record_class)
+                handler.process_value!(sugary_type_declaration)
+
+                sugary_type_declaration.declaration_data = klass.foobara_type.foobara_manifest_reference.to_sym
+                sugary_type_declaration.handle_symbolic_declaration
 
-                {
-                  type: active_record_class.foobara_type.foobara_manifest_reference.to_sym
-                }
+                sugary_type_declaration
               end
 
               def priority

data/src/extend_active_record_type_declaration.rb

@@ -1,9 +1,10 @@
 module Foobara
   module ActiveRecordType
     class ExtendActiveRecordTypeDeclaration < TypeDeclarations::Handlers::ExtendDetachedEntityTypeDeclaration
-      def applicable?(*args, **opts, &)
-        arg = args.first
-        (arg.is_a?(Class) && arg < ActiveRecord::Base) || super
+      def applicable?(sugary_type_declaration)
+        if sugary_type_declaration.class?
+          sugary_type_declaration.declaration_data < ActiveRecord::Base
+        end || super
       end
 
       def expected_type_symbol

data/src/serializers/active_record_atomic_serializer.rb

@@ -4,7 +4,9 @@ module Foobara
       class ActiveRecordAtomicSerializer < AtomicSerializer
         def serialize(object)
           if object.is_a?(ActiveRecord::Base)
-            super(object.attributes)
+            super(
+              entities_to_primary_keys_serializer.serialize(object.attributes)
+            )
           else
             super
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-active-record-type
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -29,14 +29,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 email:
 - azimux@gmail.com
 executables: []
@@ -90,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Provides a detached entity foobara type for Active Record classes
 test_files: []