ruby_event_store 0.28.2 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0def047b412b8c6bf085f4dd64676ec4c83914669f7130dd8222c3bacf54388
-  data.tar.gz: fa118f1c24a9341f9cc268dc11f1f564ce19dd449f568d33cfcda7c8a5e0c2fd
+  metadata.gz: dce5f67de62e85755060ade796d9f07674197175c867ea6028dca2b9fd730791
+  data.tar.gz: 95fb9ef4100c3fd2179cb0c5ff7e77e9c31801c68cc5872eb020433e448d1668
 SHA512:
-  metadata.gz: d14dce04d4bed5741513e671583518ee9c5556205d88025a9e3147198e7721b53392c88e8463505151cfea28d88f31b0b3fa5c603b31ef7d81b897be2a72626e
-  data.tar.gz: b46d4bf827500892af75fa53827761ef8cde5fbf9bcb96dc8c1a08eeb8eb1993d276ac3927503fbcf557dd85deab88db3a42bd5bff2a049699f5dc374487ffff
+  metadata.gz: eee87e104fc965fe7c4e7768ba97424d072d816c107d7ed70a8317c86e6b848f532808626851cd3acd9e7ef5f7f3a4fcfa224baa47b631b97b6be6968e82c92c
+  data.tar.gz: 4aa91e0bf722675f60dff89fcf1b42ab47faf82e95ab4087017f3538b2ea919c814aa63692d467eab69f12ece43efd516bd73ae5c7a3da51af6bfad2f5bbbc60

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gemspec
-gem 'pry'
 gem 'protobuf_nested_struct'

data/lib/ruby_event_store/client.rb

@@ -10,6 +10,7 @@ module RubyEventStore
       @mapper         = mapper
       @event_broker   = event_broker
       @page_size      = page_size
+      warn "`RubyEventStore::Client#metadata_proc` has been deprecated. Use `RubyEventStore::Client#with_metadata` instead." if metadata_proc
       @metadata_proc  = metadata_proc
       @clock          = clock
     end
@@ -171,6 +172,14 @@ module RubyEventStore
       Within.new(block, event_broker)
     end
 
+    def with_metadata(metadata, &block)
+      previous_metadata = metadata()
+      self.metadata = (previous_metadata || {}).merge(metadata)
+      block.call if block_given?
+    ensure
+      self.metadata = previous_metadata
+    end
+
     private
 
     def serialized_events(events)
@@ -198,13 +207,26 @@ module RubyEventStore
     end
 
     def enrich_event_metadata(event)
-      event.metadata[:timestamp] ||= clock.()
       if metadata_proc
         md = metadata_proc.call || {}
         md.each{|k,v| event.metadata[k]=(v) }
       end
+      if metadata
+        metadata.each { |key, value| event.metadata[key] = value }
+      end
+      event.metadata[:timestamp] ||= clock.call
     end
 
     attr_reader :repository, :mapper, :event_broker, :clock, :metadata_proc, :page_size
+
+    protected
+
+    def metadata
+      Thread.current["ruby_event_store_#{hash}"]
+    end
+
+    def metadata=(value)
+      Thread.current["ruby_event_store_#{hash}"] = value
+    end
   end
 end

data/lib/ruby_event_store/specification.rb

@@ -31,14 +31,13 @@ module RubyEventStore
 
     attr_reader :result
 
-    def initialize(repository)
+    def initialize(repository, result = Result.new(:forward, :head, NO_LIMIT, Stream.new(GLOBAL_STREAM)))
       @repository  = repository
-      @result = Result.new(:forward, :head, NO_LIMIT, Stream.new(GLOBAL_STREAM))
+      @result = result
     end
 
     def stream(stream_name)
-      result.stream = Stream.new(stream_name)
-      self
+      Specification.new(repository, result.dup.tap { |r| r.stream = Stream.new(stream_name) })
     end
 
     def from(start)
@@ -47,30 +46,29 @@ module RubyEventStore
         raise InvalidPageStart unless [:head].include?(start)
       else
         raise InvalidPageStart if start.nil? || start.empty?
-        raise EventNotFound.new(start) unless @repository.has_event?(start)
+        raise EventNotFound.new(start) unless repository.has_event?(start)
       end
-      result.start = start
-      self
+      Specification.new(repository, result.dup.tap { |r| r.start = start })
     end
 
     def forward
-      result.direction = :forward
-      self
+      Specification.new(repository, result.dup.tap { |r| r.direction = :forward })
     end
 
     def backward
-      result.direction = :backward
-      self
+      Specification.new(repository, result.dup.tap { |r| r.direction = :backward })
     end
 
     def limit(count)
       raise InvalidPageSize unless count && count > 0
-      result.count = count
-      self
+      Specification.new(repository, result.dup.tap { |r| r.count = count })
     end
 
     def each
-      @repository.read(result)
+      repository.read(result)
     end
+
+    private
+    attr_reader :repository
   end
 end

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.28.2"
+  VERSION = "0.29.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Arkency