foobara 0.0.30 → 0.0.32

data/projects/entity/src/extensions/type_declarations/handlers/extend_entity_type_declaration.rb

@@ -1,10 +1,14 @@
 module Foobara
   module TypeDeclarations
     module Handlers
-      class ExtendEntityTypeDeclaration < ExtendModelTypeDeclaration
+      class ExtendEntityTypeDeclaration < ExtendDetachedEntityTypeDeclaration
         def expected_type_symbol
           :entity
         end
+
+        def priority
+          super - 1
+        end
       end
     end
   end

data/projects/entity/src/new_prepend.rb

@@ -1,5 +1,5 @@
 module Foobara
-  class Entity < Model
+  class Entity < DetachedEntity
     module NewPrepend
       # rubocop:disable Lint/UselessMethodDefinition
       def new(...)

data/projects/entity/src/not_found_error.rb

@@ -1,5 +1,5 @@
 module Foobara
-  class Entity < Model
+  class Entity < DetachedEntity
     class NotFoundError < Foobara::RuntimeError
       class << self
         def not_found_error_class_name(data_path)

data/projects/foobara/lib/foobara/all.rb

@@ -29,6 +29,7 @@ module Foobara
              "type_declarations",
              "builtin_types",
              "model",
+             "detached_entity",
              "entity",
              "command",
              "persistence",

data/projects/manifest/src/foobara/manifest/detached_entity.rb

@@ -0,0 +1,30 @@
+require_relative "model"
+
+module Foobara
+  module Manifest
+    class DetachedEntity < Model
+      # this isn't inherited? why not?
+      self.category_symbol = :type
+
+      optional_key(:associations, default: {})
+
+      alias detached_entity_manifest model_manifest
+
+      def primary_key_name
+        primary_key_attribute.to_s
+      end
+
+      def primary_key_type
+        @primary_key_type ||= TypeDeclaration.new(root_manifest, [*path, :primary_key_type])
+      end
+
+      def attribute_names
+        super - [primary_key_name]
+      end
+
+      def full_detached_entity_name
+        full_model_name
+      end
+    end
+  end
+end

data/projects/manifest/src/foobara/manifest/domain.rb

@@ -19,6 +19,10 @@ module Foobara
         end
       end
 
+      def detached_entities
+        @detached_entities ||= types.select(&:detached_entity?)
+      end
+
       def entities
         @entities ||= types.select(&:entity?)
       end

data/projects/manifest/src/foobara/manifest/entity.rb

@@ -2,33 +2,21 @@ require_relative "model"
 
 module Foobara
   module Manifest
-    class Entity < Model
+    class Entity < DetachedEntity
+      # this isn't inherited? why not?
       self.category_symbol = :type
 
-      optional_key(:associations, default: {})
-
       alias entity_manifest model_manifest
 
       def has_associations?
         associations && !associations.empty?
       end
 
-      def primary_key_name
-        primary_key_attribute.to_s
-      end
-
-      def primary_key_type
-        @primary_key_type ||= TypeDeclaration.new(root_manifest, [*path, :primary_key_type])
-      end
-
-      def attribute_names
-        super - [primary_key_name]
-      end
-
       def full_entity_name
         full_model_name
       end
 
+      # TODO: should this instead be on DetachedEntity??
       def associations
         @associations ||= self[:associations].to_h do |path_key, type_name|
           [path_key.to_sym, Type.new(root_manifest, [:type, type_name])]

data/projects/manifest/src/foobara/manifest/root_manifest.rb

@@ -45,6 +45,14 @@ module Foobara
         end
       end
 
+      def detached_entity_by_name(name)
+        type = type_by_name(name)
+
+        raise "#{name} is not a detached entity" unless type.detached_entity?
+
+        type
+      end
+
       def entity_by_name(name)
         type = type_by_name(name)
 

data/projects/manifest/src/foobara/manifest/type.rb

@@ -11,6 +11,8 @@ module Foobara
           if self == Type
             if type.entity?
               type = Entity.new(type.root_manifest, type.path)
+            elsif type.detached_entity?
+              type = DetachedEntity.new(type.root_manifest, type.path)
             elsif type.model?
               type = Model.new(type.root_manifest, type.path)
             end
@@ -36,11 +38,25 @@ module Foobara
         false
       end
 
-      def model?
+      def detached_entity?
         return false if reference == "entity"
 
         type = base_type
 
+        while type
+          return true if type.reference.to_sym == :detached_entity
+
+          type = type.base_type
+        end
+
+        false
+      end
+
+      def model?
+        return false if reference == "entity" || reference == "detached_entity"
+
+        type = base_type
+
         while type
           return true if type.reference.to_sym == :model
 

data/projects/manifest/src/foobara/manifest/type_declaration.rb

@@ -91,6 +91,23 @@ module Foobara
         type
       end
 
+      def detached_entity?
+        return @detached_entity if defined?(@detached_entity)
+
+        @detached_entity = to_type.detached_entity?
+      end
+
+      def to_detached_entity
+        raise "not an detached_entity" unless detached_entity?
+        raise "detached_entity extension instead of an detached_entity" unless relevant_manifest.size == 1
+
+        type = to_type
+
+        raise "not an detached_entity" unless type.detached_entity?
+
+        type
+      end
+
       def entity?
         return @entity if defined?(@entity)
 

data/projects/model/src/model.rb

@@ -180,6 +180,8 @@ module Foobara
       end
     end
 
+    abstract
+
     attr_accessor :mutable
 
     def initialize(attributes = nil, options = {})
@@ -262,7 +264,7 @@ module Foobara
     end
 
     def read_attribute(attribute_name)
-      attributes[attribute_name.to_sym]
+      attributes[attribute_name&.to_sym]
     end
 
     def read_attribute!(attribute_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.32
 platform: ruby
 authors:
 - Miles Georgi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-07 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara-util
@@ -172,6 +172,25 @@ files:
 - projects/concerns/src/concern.rb
 - projects/delegate/lib/foobara/delegate.rb
 - projects/delegate/src/extensions/module.rb
+- projects/detached_entity/lib/foobara/detached_entity.rb
+- projects/detached_entity/src/concerns/associations.rb
+- projects/detached_entity/src/concerns/equality.rb
+- projects/detached_entity/src/concerns/primary_key.rb
+- projects/detached_entity/src/concerns/reflection.rb
+- projects/detached_entity/src/concerns/types.rb
+- projects/detached_entity/src/detached_entity.rb
+- projects/detached_entity/src/extensions/builtin_types/detached_entity.rb
+- projects/detached_entity/src/extensions/builtin_types/detached_entity/casters/hash.rb
+- projects/detached_entity/src/extensions/builtin_types/detached_entity/validators/attributes_declaration.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/attributes_handler_desugarizer.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/hash_desugarizer.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/model_class_desugarizer.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/primary_key_desugarizer.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/to_type_transformer.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/validate_primary_key_is_symbol.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/validate_primary_key_present.rb
+- projects/detached_entity/src/extensions/type_declarations/handlers/extend_detached_entity_type_declaration/validate_primary_key_references_attribute.rb
 - projects/domain/lib/foobara/domain.rb
 - projects/domain/src/domain.rb
 - projects/domain/src/domain_mapper.rb
@@ -186,15 +205,13 @@ files:
 - projects/domain/src/organization.rb
 - projects/domain/src/organization_module_extension.rb
 - projects/entity/lib/foobara/entity.rb
-- projects/entity/src/concerns/associations.rb
 - projects/entity/src/concerns/attribute_helpers.rb
 - projects/entity/src/concerns/attributes.rb
 - projects/entity/src/concerns/callbacks.rb
 - projects/entity/src/concerns/initialization.rb
+- projects/entity/src/concerns/mutations.rb
 - projects/entity/src/concerns/persistence.rb
-- projects/entity/src/concerns/primary_key.rb
 - projects/entity/src/concerns/queries.rb
-- projects/entity/src/concerns/reflection.rb
 - projects/entity/src/concerns/transactions.rb
 - projects/entity/src/concerns/types.rb
 - projects/entity/src/entity.rb
@@ -226,6 +243,7 @@ files:
 - projects/manifest/src/foobara/manifest/attributes.rb
 - projects/manifest/src/foobara/manifest/base_manifest.rb
 - projects/manifest/src/foobara/manifest/command.rb
+- projects/manifest/src/foobara/manifest/detached_entity.rb
 - projects/manifest/src/foobara/manifest/domain.rb
 - projects/manifest/src/foobara/manifest/entity.rb
 - projects/manifest/src/foobara/manifest/error.rb
@@ -373,6 +391,7 @@ require_paths:
 - "./projects/common/lib"
 - "./projects/concerns/lib"
 - "./projects/delegate/lib"
+- "./projects/detached_entity/lib"
 - "./projects/domain/lib"
 - "./projects/entity/lib"
 - "./projects/enumerated/lib"