foobara 0.0.115 → 0.0.117

data/projects/command_connectors/src/command_connector.rb

@@ -154,15 +154,11 @@ module Foobara
       command_registry.foobara_lookup_command(name)
     end
 
-    # TODO: maybe instead connect commands with a shortcut_only: "describe" option
-    # in order to make this easier to extend and manage.
-    def request_to_command(request)
+    def request_to_command_class(request)
       action = request.action
-      inputs = nil
       full_command_name = request.full_command_name
 
-      case action
-      when "run"
+      if action == "run"
         transformed_command_class = transformed_command_from_name(full_command_name)
 
         unless transformed_command_class
@@ -171,9 +167,36 @@ module Foobara
           # :nocov:
         end
 
-        request.command_class = transformed_command_class
+        transformed_command_class
+      else
+        action = case action
+                 when "describe_type", "manifest", "describe_command"
+                   "describe"
+                 when "describe", "ping", "query_git_commit_info", "help"
+                   action
+                 when "list"
+                   "list_commands"
+                 else
+                   # :nocov:
+                   raise InvalidContextError.new(message: "Not sure what to do with #{action}")
+                   # :nocov:
+                 end
+
+        command_name = Util.classify(action)
+        command_class = find_builtin_command_class(command_name)
+        full_command_name = command_class.full_command_name
+
+        transformed_command_from_name(full_command_name) || transform_command_class(command_class)
+      end
+    end
+
+    def request_to_command_inputs(request)
+      action = request.action
+      full_command_name = request.full_command_name
 
-        inputs = request.inputs
+      case action
+      when "run"
+        request.inputs
       when "describe"
         manifestable = transformed_command_from_name(full_command_name) || type_from_name(full_command_name)
 
@@ -185,13 +208,7 @@ module Foobara
           # :nocov:
         end
 
-        command_class = find_builtin_command_class("Describe")
-        full_command_name = command_class.full_command_name
-
-        inputs = request.inputs.merge(manifestable:, request:)
-
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        request.inputs.merge(manifestable:, request:)
       when "describe_command"
         transformed_command_class = transformed_command_from_name(full_command_name)
 
@@ -201,12 +218,7 @@ module Foobara
           # :nocov:
         end
 
-        command_class = find_builtin_command_class("Describe")
-        full_command_name = command_class.full_command_name
-
-        inputs = request.inputs.merge(manifestable: transformed_command_class, request:)
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        request.inputs.merge(manifestable: transformed_command_class, request:)
       when "describe_type"
         type = type_from_name(full_command_name)
 
@@ -216,59 +228,30 @@ module Foobara
           # :nocov:
         end
 
-        command_class = find_builtin_command_class("Describe")
-        full_command_name = command_class.full_command_name
-
-        inputs = request.inputs.merge(manifestable: type, request:)
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        request.inputs.merge(manifestable: type, request:)
       when "manifest"
-        command_class = find_builtin_command_class("Describe")
-        full_command_name = command_class.full_command_name
-
-        inputs = request.inputs.merge(manifestable: self, request:)
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
-      when "ping"
-        command_class = find_builtin_command_class("Ping")
-        full_command_name = command_class.full_command_name
-
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
-      when "query_git_commit_info"
-        # TODO: this feels out of control... should just accomplish this through run I think instead. Same with ping.
-        command_class = find_builtin_command_class("QueryGitCommitInfo")
-        full_command_name = command_class.full_command_name
-
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        request.inputs.merge(manifestable: self, request:)
+      when "ping", "query_git_commit_info"
+        nil
       when "help"
-        command_class = find_builtin_command_class("Help")
-        full_command_name = command_class.full_command_name
-
-        inputs = { request: }
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        { request: }
       when "list"
-        command_class = find_builtin_command_class("ListCommands")
-
-        full_command_name = command_class.full_command_name
-
-        request.command_class = command_class
-        inputs = request.inputs.merge(request:)
-
-        transformed_command_class = transformed_command_from_name(full_command_name) ||
-                                    transform_command_class(command_class)
+        request.inputs.merge(request:)
       else
         # :nocov:
         raise InvalidContextError.new(message: "Not sure what to do with #{action}")
         # :nocov:
       end
+    end
+
+    def request_to_command_instance(request)
+      command_class = request.command_class
+      inputs = request.inputs
 
       if inputs && !inputs.empty?
-        transformed_command_class.new(inputs)
+        command_class.new(inputs)
       else
-        transformed_command_class.new
+        command_class.new
       end
     end
 
@@ -305,6 +288,7 @@ module Foobara
       command = response.command
 
       if command.respond_to?(:serialize_result)
+        # TODO: Get serialization off of the command instance!!
         response.body = command.serialize_result(response.body)
       end
     end
@@ -383,18 +367,40 @@ module Foobara
     end
 
     def run_request(request)
-      command = build_command(request)
-
-      if command.respond_to?(:requires_authentication?) && command.requires_authentication?
-        authenticate(request)
-      end
-
-      if command
-        run_command(request)
-        # :nocov:
-      elsif !request.error
-        raise "No command returned from #request_to_command"
-        # :nocov:
+      command_class = determine_command_class(request)
+      request.command_class = command_class
+
+      return build_response(request) unless command_class
+
+      begin
+        request.open_transaction
+        request.use_transaction do
+          request.authenticate
+          request.mutate_request
+
+          inputs = request_to_command_inputs(request)
+          request.inputs = inputs
+          command = build_command_instance(request)
+          request.command = command
+
+          unless request.error
+            if command
+              run_command(request)
+              # :nocov:
+            else
+              raise "No command returned from #request_to_command"
+              # :nocov:
+            end
+          end
+        end
+      ensure
+        request.use_transaction do
+          if (request.response || request).outcome&.success?
+            request.commit_transaction_if_open
+          else
+            request.rollback_transaction
+          end
+        end
       end
 
       build_response(request)
@@ -414,33 +420,22 @@ module Foobara
       end
     end
 
-    def authenticate(request)
-      request_command = request.command
-      authenticator = request_command.authenticator || self.authenticator
-
-      request_command.after_load_records do |command:, **|
-        authenticated_user, authenticated_credential = authenticator.authenticate(request)
-
-        # TODO: why are these on the command instead of the request??
-        request_command.authenticated_user = authenticated_user
-        request_command.authenticated_credential = authenticated_credential
-
-        unless authenticated_user
-          request_command.outcome = Outcome.error(CommandConnector::UnauthenticatedError.new)
-
-          command.state_machine.error!
-          command.halt!
-        end
+    def build_command_instance(request)
+      command = request_to_command_instance(request)
+      request.command = command
+      if command.is_a?(TransformedCommand)
+        # This allows the command to access the authenticated_user
+        command.request = request
       end
+
+      command
     end
 
-    def build_command(request)
+    def determine_command_class(request)
       unless request.error
-        command = request_to_command(request)
-        request.command = command
+        command_class = request_to_command_class(request)
+        request.command_class = command_class
       end
-
-      command
     end
 
     def build_response(request)

data/projects/command_connectors/src/command_registry.rb

@@ -13,7 +13,7 @@ module Foobara
       self.scoped_path = []
       self.authenticator = authenticator
 
-      customized = %i[command]
+      customized = [:command]
 
       Namespace.global.foobara_categories.keys.reverse.each do |symbol|
         next if customized.include?(symbol)

data/projects/command_connectors/src/serializers/entities_to_primary_keys_serializer.rb

@@ -11,7 +11,7 @@ module Foobara
             # Is there maybe prior art for this in the associations stuff?
             object.primary_key
           when DetachedEntity
-            if declaration_data[:detached_to_primary_key]
+            if detached_to_primary_key?
               object.primary_key
             else
               object.attributes
@@ -28,6 +28,13 @@ module Foobara
             object
           end
         end
+
+        def detached_to_primary_key?
+          return true unless declaration_data.is_a?(::Hash)
+          return true unless declaration_data.key?(:detached_to_primary_key)
+
+          declaration_data[:detached_to_primary_key]
+        end
       end
     end
   end

data/projects/{command → command_connectors}/src/transformed_command.rb

@@ -95,7 +95,9 @@ module Foobara
 
                            command_class.inputs_type
                          else
-                           inputs_transformer.from_type || command_class.inputs_type
+                           if inputs_transformer.is_a?(TypeDeclarations::TypedTransformer)
+                             inputs_transformer.from_type
+                           end || command_class.inputs_type
                          end
                        else
                          command_class.inputs_type
@@ -479,8 +481,7 @@ module Foobara
       end
     end
 
-    attr_accessor :command, :untransformed_inputs, :transformed_inputs, :outcome, :authenticated_user,
-                  :authenticated_credential
+    attr_accessor :command, :untransformed_inputs, :transformed_inputs, :outcome, :request
 
     def initialize(untransformed_inputs = {})
       self.untransformed_inputs = untransformed_inputs || {}
@@ -499,7 +500,6 @@ module Foobara
                      :errors_transformers,
                      :pre_commit_transformers,
                      :serializers,
-                     :requires_authentication,
                      :allowed_rule,
                      :authenticator,
                      to: :class
@@ -508,14 +508,19 @@ module Foobara
       apply_allowed_rule
       apply_pre_commit_transformers
       run_command
-      # TODO: do this within the transaction!!!
+      # this gives us primary keys
+      flush_transactions
       transform_outcome
 
       outcome
     end
 
-    def requires_authentication?
-      !!requires_authentication
+    def authenticated_user
+      request.authenticated_user
+    end
+
+    def authenticated_credential
+      request.authenticated_credential
     end
 
     def transform_inputs
@@ -669,6 +674,10 @@ module Foobara
       outcome.errors
     end
 
+    def flush_transactions
+      request.opened_transactions&.reverse&.each(&:flush!)
+    end
+
     def transform_outcome
       if outcome.success?
         # can we do this while still in the transaction of the command???

data/projects/detached_entity/src/concerns/attributes.rb

@@ -0,0 +1,28 @@
+module Foobara
+  class DetachedEntity < Model
+    class CannotReadAttributeOnUnloadedRecordError < StandardError; end
+
+    module Concerns
+      module Attributes
+        include Concern
+
+        def read_attribute(attribute_name)
+          attribute_name = attribute_name.to_sym
+
+          if attribute_name != self.class.primary_key_attribute
+            unless can_read_attributes_other_than_primary_key?
+              raise CannotReadAttributeOnUnloadedRecordError,
+                    "Cannot read attribute #{attribute_name} on unloaded record"
+            end
+          end
+
+          super
+        end
+
+        def can_read_attributes_other_than_primary_key?
+          loaded?
+        end
+      end
+    end
+  end
+end

data/projects/detached_entity/src/concerns/initialization.rb

@@ -0,0 +1,57 @@
+module Foobara
+  class DetachedEntity < Model
+    class NoCurrentTransactionError < StandardError; end
+
+    module Concerns
+      module Initialization
+        include Concern
+
+        module ClassMethods
+          def unloaded(primary_key_value)
+            primary_key_value = primary_key_type.process_value!(primary_key_value)
+
+            new({ primary_key_attribute => primary_key_value }, unloaded: true)
+          end
+        end
+
+        ALLOWED_OPTIONS = Model::ALLOWED_OPTIONS + [:unloaded]
+
+        def initialize(attributes = nil, options = {})
+          invalid_options = options.keys - ALLOWED_OPTIONS
+
+          unless invalid_options.empty?
+            # :nocov:
+            raise ArgumentError, "Invalid options #{invalid_options} expected only #{ALLOWED_OPTIONS}"
+            # :nocov:
+          end
+
+          if options[:unloaded]
+            options = options.except(:unloaded)
+
+            unless options.key?(:validate)
+              options[:validate] = false
+            end
+
+            unless options.key?(:skip_validations)
+              options[:skip_validations] = true
+            end
+
+            unless options.key?(:ignore_unexpected_attributes)
+              options[:ignore_unexpected_attributes] = false
+            end
+
+            unless options.key?(:mutable)
+              options[:mutable] = false
+            end
+
+            super
+            self.is_loaded = false
+          else
+            super
+            self.is_loaded = true
+          end
+        end
+      end
+    end
+  end
+end

data/projects/detached_entity/src/concerns/persistence.rb

@@ -0,0 +1,14 @@
+module Foobara
+  class DetachedEntity < Model
+    module Concerns
+      # Too simple to include Concern
+      module Persistence
+        attr_accessor :is_loaded
+
+        def loaded?
+          is_loaded
+        end
+      end
+    end
+  end
+end

data/projects/detached_entity/src/detached_entity.rb

@@ -1,5 +1,7 @@
 module Foobara
   class DetachedEntity < Model
+    include Concerns::Attributes
+    include Concerns::Persistence
     include Concerns::Equality
     include Concerns::Associations
     include Concerns::PrimaryKey
@@ -7,5 +9,6 @@ module Foobara
     include Concerns::Types
     include Concerns::Aliases
     include Concerns::Serialize
+    include Concerns::Initialization
   end
 end

data/projects/detached_entity/src/extensions/builtin_types/detached_entity/casters/primary_key.rb

@@ -0,0 +1,43 @@
+module Foobara
+  module BuiltinTypes
+    module DetachedEntity
+      module Casters
+        class PrimaryKey < Value::Caster
+          class << self
+            def requires_declaration_data?
+              true
+            end
+
+            def requires_type?
+              true
+            end
+          end
+
+          def entity_class
+            declaration_data.target_class
+          end
+
+          def primary_key_type
+            entity_class.primary_key_type
+          end
+
+          def applicable?(value)
+            primary_key_type.applicable?(value)
+          end
+
+          def transform(primary_key)
+            entity_class.send(build_method, primary_key)
+          end
+
+          def applies_message
+            primary_key_type.value_caster.applies_message
+          end
+
+          def build_method
+            :unloaded
+          end
+        end
+      end
+    end
+  end
+end

data/projects/entity/src/concerns/attributes.rb

@@ -6,6 +6,10 @@ module Foobara
 
         include Concern
 
+        def can_read_attributes_other_than_primary_key?
+          loaded? || built? || created?
+        end
+
         def write_attribute_without_callbacks(attribute_name, value)
           without_callbacks do
             write_attribute(attribute_name, value)

data/projects/entity/src/concerns/callbacks.rb

@@ -39,22 +39,22 @@ module Foobara
         module ClassMethods
           def class_callback_registry
             @class_callback_registry ||= begin
-              actions = %i[
-                initialized
-                initialized_built
-                initialized_thunk
-                initialized_loaded
-                initialized_created
-                dirtied
-                undirtied
-                attribute_changed
-                reverted
-                loaded
-                persisted
-                hard_deleted
-                unhard_deleted
-                invalidated
-                uninvalidated
+              actions = [
+                :initialized,
+                :initialized_built,
+                :initialized_thunk,
+                :initialized_loaded,
+                :initialized_created,
+                :dirtied,
+                :undirtied,
+                :attribute_changed,
+                :reverted,
+                :loaded,
+                :persisted,
+                :hard_deleted,
+                :unhard_deleted,
+                :invalidated,
+                :uninvalidated
               ]
 
               if self == Entity

data/projects/entity/src/concerns/initialization.rb

@@ -16,6 +16,7 @@ module Foobara
             record.build(attributes)
             # TODO: rename to something like "detached"
             record.is_built = true
+            record.is_loaded = false
 
             record.fire(:initialized)
             record.fire(:initialized_built)
@@ -39,6 +40,7 @@ module Foobara
             return record if record
 
             record = __private_new__
+            record.is_loaded = false
             record.is_persisted = true
             record.write_attributes_without_callbacks(primary_key_attribute => record_id)
 
@@ -80,6 +82,7 @@ module Foobara
           def create(attributes = {})
             record = __private_new__
             record.is_created = true
+            record.is_loaded = false
 
             defaults = attributes_type.declaration_data[:defaults]
             if defaults && !defaults.empty?

data/projects/entity/src/concerns/persistence.rb

@@ -7,7 +7,7 @@ module Foobara
 
         include Concern
 
-        attr_accessor :is_loaded, :is_persisted, :is_hard_deleted, :is_built, :is_created, :persisted_attributes
+        attr_accessor :is_persisted, :is_hard_deleted, :is_built, :is_created, :persisted_attributes
 
         module ClassMethods
           def entity_base
@@ -50,10 +50,6 @@ module Foobara
           is_created
         end
 
-        def loaded?
-          is_loaded
-        end
-
         # TODO: rename, maybe #detatched? or something?
         def built?
           is_built

data/projects/entity/src/extensions/builtin_types/entity/casters/primary_key.rb

@@ -2,35 +2,9 @@ module Foobara
   module BuiltinTypes
     module Entity
       module Casters
-        class PrimaryKey < Value::Caster
-          class << self
-            def requires_declaration_data?
-              true
-            end
-
-            def requires_type?
-              true
-            end
-          end
-
-          def entity_class
-            declaration_data.target_class
-          end
-
-          def primary_key_type
-            entity_class.primary_key_type
-          end
-
-          def applicable?(value)
-            primary_key_type.applicable?(value)
-          end
-
-          def transform(primary_key)
-            entity_class.thunk(primary_key)
-          end
-
-          def applies_message
-            primary_key_type.value_caster.applies_message
+        class PrimaryKey < DetachedEntity::Casters::PrimaryKey
+          def build_method
+            :thunk
           end
         end
       end

data/projects/entity/src/sensitive_type_removers/entity.rb

@@ -2,6 +2,21 @@ module Foobara
   class Entity < DetachedEntity
     module SensitiveTypeRemovers
       class Entity < DetachedEntity::SensitiveTypeRemovers::DetachedEntity
+        def transform(strict_type_declaration)
+          new_type_declaration = super
+
+          if strict_type_declaration != new_type_declaration
+            if new_type_declaration[:type] == :entity
+              new_type_declaration[:type] = :detached_entity
+
+              if new_type_declaration[:model_base_class] == "Foobara::Entity"
+                new_type_declaration[:model_base_class] = "Foobara::DetachedEntity"
+              end
+            end
+          end
+
+          new_type_declaration
+        end
       end
     end
   end