Always include OnDSL in DefaultApplyStrategy

DefaultApplyStrategy relies on OnDSL. Therefore they always have to go
together.

https: //github.com//issues/982

Co-authored-by: Paweł Pacana <[email protected]>
Co-authored-by: Szymon Fiedler <[email protected]>

Author: 3 people

aggregate_root/lib/aggregate_root.rb

@@ -76,10 +76,16 @@ def marshal_load(vars)
     end
   end
 
-  def self.with_default_apply_strategy
+  def self.with_default_apply_strategy(strict: true)
     Module.new do
       def self.included(host_class)
-        host_class.include AggregateRoot.with_strategy(-> { DefaultApplyStrategy.new })
+        host_class.extend OnDSL
+        host_class.extend Constructor
+        host_class.include AggregateMethods
+      end
+
+      define_method :apply_strategy do
+        DefaultApplyStrategy.new(strict: strict)
       end
     end
   end

aggregate_root/spec/aggregate_root_spec.rb

@@ -68,7 +68,7 @@ def expire
 
   it "should ignore missing apply method based on a default non-strict apply strategy" do
     klass =
-      Class.new { include AggregateRoot.with_strategy(-> { AggregateRoot::DefaultApplyStrategy.new(strict: false) }) }
+      Class.new { include AggregateRoot.with_default_apply_strategy(strict: false) }
     order = klass.new
     spanish_inquisition = Orders::Events::SpanishInquisition.new
     expect { order.apply(spanish_inquisition) }.to_not raise_error