aggregate_root 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6283f565f49164977c767f1861436c0b967454b88343a66eca43a51cbed62bee
-  data.tar.gz: '07208fd928b28951bfe984e8bca3cc43755277c5be8c147ab998522adb6ab067'
+  metadata.gz: c9b0e4f4f401bdccd5f7fa286c0d2560d6e3fab598a0ef0f0b4f003ddd65bf7e
+  data.tar.gz: ab27a56da04977950165c9ebf4d224b2298970c113b383d4d91d5144145dbc3c
 SHA512:
-  metadata.gz: da972cb63c395d4d7690c5b7ce214c8201ad70c3a5e4991da9b18e4003d16204ec72ea2285067d6e2ef5d2abde90018084e931ca4447284d125f89103e9a6158
-  data.tar.gz: dc20159def2f3fe6dd977f2601bea5151b763f9368c9a10dc50e918eff92995b65818c03d83ec2d476b1e2670c527fb4a6f7386ef84eb3a2ac4937ed11e5b886
+  metadata.gz: 805091b0dd92bc9f02dace8031bff7aa90a2d91eae797aaf062467247daceb0552b0bcbe872b06ea4e50aaded13e391becc3e1145f04de6d8eb35dcbb4ee2270
+  data.tar.gz: 1a1d771ef1db8121faa3ae2ac3ce4f1fe4ab44e5779da3807a7a6da23ccf2932a0e24122b9c91ed5ee6bf7f26a9ae56292433b9f14a3f24e33830d5c3a01d92f

data/aggregate_root.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ruby_event_store', '= 0.36.0'
+  spec.add_dependency 'ruby_event_store', '= 0.37.0'
 end

data/lib/aggregate_root.rb

@@ -2,6 +2,7 @@ require 'aggregate_root/version'
 require 'aggregate_root/configuration'
 require 'aggregate_root/transform'
 require 'aggregate_root/default_apply_strategy'
+require 'aggregate_root/repository'
 
 module AggregateRoot
   module ClassMethods
@@ -35,47 +36,59 @@ module AggregateRoot
     end
   end
 
-  def load(stream_name, event_store: default_event_store)
-    @loaded_from_stream_name = stream_name
-    events_enumerator(event_store, stream_name).with_index do |event, index|
-      apply(event)
-      @version = index
-    end
-    @unpublished_events = nil
-    self
+  def version
+    @version ||= -1
   end
 
-  def store(stream_name = loaded_from_stream_name, event_store: default_event_store)
-    event_store.publish(unpublished, stream_name: stream_name, expected_version: version)
-    @version += unpublished_events.size
+  def version=(value)
     @unpublished_events = nil
+    @version = value
   end
 
   def unpublished_events
     unpublished.each
   end
 
-  private
-
-  def unpublished
-    @unpublished_events ||= []
+  def load(stream_name, event_store: default_event_store)
+    warn <<~EOW
+      Method `load` on aggregate is deprecated. Use AggregateRoot::Repository instead.
+      Instead of: `order = Order.new.load("OrderStreamHere")`
+      you need to have code:
+      ```
+      repository = AggregateRoot::Repository.new
+      order = repository.load(Order.new, "OrderStreamHere")
+      ```
+    EOW
+    @loaded_from_stream_name = stream_name
+    Repository.new(event_store).load(self, stream_name)
   end
 
-  def version
-    @version ||= -1
+  def store(stream_name = loaded_from_stream_name, event_store: default_event_store)
+    warn <<~EOW
+      Method `store` on aggregate is deprecated. Use AggregateRoot::Repository instead.
+      Instead of: `order.store("OrderStreamHere")`
+      you need to have code:
+      ```
+      repository = AggregateRoot::Repository.new
+      # load and order and execute some operation on it here
+      repository.store(order, "OrderStreamHere")
+      ```
+    EOW
+    Repository.new(event_store).store(self, stream_name)
   end
 
-  def apply_strategy
-    DefaultApplyStrategy.new(on_methods: self.class.on_methods)
-  end
+  private
+  attr_reader :loaded_from_stream_name
 
   def default_event_store
     AggregateRoot.configuration.default_event_store
   end
 
-  def events_enumerator(event_store, stream_name)
-    event_store.read.in_batches.stream(stream_name).each
+  def unpublished
+    @unpublished_events ||= []
   end
 
-  attr_reader :loaded_from_stream_name
+  def apply_strategy
+    DefaultApplyStrategy.new(on_methods: self.class.on_methods)
+  end
 end

data/lib/aggregate_root/repository.rb

@@ -0,0 +1,32 @@
+module AggregateRoot
+  class Repository
+    def initialize(event_store = default_event_store)
+      @event_store = event_store
+    end
+
+    def load(aggregate, stream_name)
+      event_store.read.stream(stream_name).reduce {|_, ev| aggregate.apply(ev) }
+      aggregate.version = aggregate.unpublished_events.count - 1
+      aggregate
+    end
+
+    def store(aggregate, stream_name)
+      event_store.publish(aggregate.unpublished_events.to_a,
+                          stream_name: stream_name,
+                          expected_version: aggregate.version)
+      aggregate.version = aggregate.version + aggregate.unpublished_events.count
+    end
+
+    def with_aggregate(aggregate, stream_name, &block)
+      block.call(load(aggregate, stream_name))
+      store(aggregate, stream_name)
+    end
+
+    private
+    attr_reader :event_store
+
+    def default_event_store
+      AggregateRoot.configuration.default_event_store
+    end
+  end
+end

data/lib/aggregate_root/version.rb

@@ -1,3 +1,3 @@
 module AggregateRoot
-  VERSION = "0.36.0"
+  VERSION = "0.37.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggregate_root
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.37.0
 description: Event sourced (with Rails Event Store) aggregate root implementation
 email:
 - dev@arkency.com
@@ -39,6 +39,7 @@ files:
 - lib/aggregate_root.rb
 - lib/aggregate_root/configuration.rb
 - lib/aggregate_root/default_apply_strategy.rb
+- lib/aggregate_root/repository.rb
 - lib/aggregate_root/transform.rb
 - lib/aggregate_root/version.rb
 homepage: https://railseventstore.org
@@ -64,7 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Event sourced (with Rails Event Store) aggregate root implementation