ruby_event_store 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469ba42eaa17c3da62c4982cb2faf4fa2f247da7
-  data.tar.gz: 3bd2294568ef5228c4dfe3887e84b26efd5b1c89
+  metadata.gz: 154e81d7d982c34b92400ed0fd52e37e7c1ba5de
+  data.tar.gz: ec1660f106a05c033c5570cecfe45ae45a648114
 SHA512:
-  metadata.gz: 073ae3f2ed7e25f2acad23b5deb7991866b4f76e01e41f8d015a1760780f15882ea596431d2e664dde644b416b7c6a0faf78875fefd12d482882d33091e06892
-  data.tar.gz: a87826352248c9f50e38dfffd3f4f4a1474243d74fdb924ad66d49b41d20e359b2d9171b3d22085da7cb2e3ec01e059b8bb8091995102cce812feb3344f856ac
+  metadata.gz: 97ce3e03d40b9c95fcaf322324a1efe146f2d02647671937af37030271957ab0448657e19c08223649fa03c3b9961ef10c966ddbeaf7aa1c0095e3bf6d7b363e
+  data.tar.gz: e15c18b34e6e661565754e84004ec22e29519f759b188ca3093c466d47f4e7d2af897df0d6935fbfd77be86f32bf5b108e25b50c09ebe6d55f27950df9e21116

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ### HEAD
 
+### 0.5.0 (21.03.2016)
+
+* Change: Event class refactoring to make default values more explicit PR #11
+* Change: No nils, use symbols instead - :any & :none replaced meaningless nil value
+* Change: Let event broker to be given as a dependency
+* Change: Remove Event#event_type - use class instead PR #10
+
 ### 0.4.0 (17.03.2016)
 
 * Change: Use class names to subscribe events PR #8

data/lib/ruby_event_store/errors.rb

@@ -1,5 +1,6 @@
 module RubyEventStore
   WrongExpectedEventVersion  = Class.new(StandardError)
+  InvalidExpectedVersion     = Class.new(StandardError)
   IncorrectStreamData        = Class.new(StandardError)
   EventNotFound              = Class.new(StandardError)
   SubscriberNotExist         = Class.new(StandardError)

data/lib/ruby_event_store/event.rb

@@ -3,25 +3,20 @@ require 'securerandom'
 module RubyEventStore
   class Event
 
-    def initialize(**args)
-      attributes(args).each do |key, value|
+    def initialize(event_id: SecureRandom.uuid, metadata: {}, **data)
+      data.each do |key, value|
         singleton_class.__send__(:define_method, key) { value }
       end
 
-      @event_id   = (args[:event_id]  || generate_id).to_s
-      @metadata   = args[:metadata]   || {}
-      @data       = attributes(args)
+      @event_id = event_id.to_s
+      @metadata = metadata
+      @data     = data
       @metadata[:timestamp] ||= Time.now.utc
     end
     attr_reader :event_id, :metadata, :data
 
-    def event_type
-      self.class
-    end
-
     def to_h
       {
-          event_type: event_type.name,
           event_id:   event_id,
           metadata:   metadata,
           data:       data
@@ -37,15 +32,5 @@ module RubyEventStore
     end
 
     alias_method :eql?, :==
-
-    private
-
-    def attributes(args)
-      args.reject { |k| [:event_id, :metadata].include? k }
-    end
-
-    def generate_id
-      SecureRandom.uuid
-    end
   end
 end

data/lib/ruby_event_store/facade.rb

@@ -1,23 +1,27 @@
 module RubyEventStore
   class Facade
-    def initialize(repository)
-      @repository = repository
+    def initialize(repository, event_broker = PubSub::Broker.new)
+      @repository   = repository
+      @event_broker = event_broker
     end
-    attr_reader :repository
+    attr_reader :repository, :event_broker
 
-    def publish_event(event_data, stream_name = GLOBAL_STREAM, expected_version = nil)
-      event = append_to_stream(stream_name, event_data, expected_version)
+    def publish_event(event, stream_name = GLOBAL_STREAM, expected_version = :any)
+      append_to_stream(stream_name, event, expected_version)
       event_broker.notify_subscribers(event)
+      :ok
     end
 
-    def append_to_stream(stream_name, event_data, expected_version = nil)
-      raise WrongExpectedEventVersion if version_incorrect?(stream_name, expected_version)
-      repository.create(event_data, stream_name)
+    def append_to_stream(stream_name, event, expected_version = :any)
+      validate_expected_version(stream_name, expected_version)
+      repository.create(event, stream_name)
+      :ok
     end
 
     def delete_stream(stream_name)
       raise IncorrectStreamData if stream_name.nil? || stream_name.empty?
       repository.delete_stream(stream_name)
+      :ok
     end
 
     def read_events_forward(stream_name, start, count)
@@ -78,18 +82,22 @@ module RubyEventStore
       attr_reader :start, :count
     end
 
-    def event_broker
-      @event_broker ||= PubSub::Broker.new
-    end
-
-    def version_incorrect?(stream_name, expected_version)
-      unless expected_version.nil?
-        find_last_event_version(stream_name) != expected_version
+    def validate_expected_version(stream_name, expected_version)
+      raise InvalidExpectedVersion if expected_version.nil?
+      case expected_version
+      when :any
+        return
+      when :none
+        return if last_stream_event_id(stream_name).nil?
+      else
+        return if last_stream_event_id(stream_name).equal?(expected_version)
       end
+      raise WrongExpectedEventVersion
     end
 
-    def find_last_event_version(stream_name)
-      repository.last_stream_event(stream_name).event_id
+    def last_stream_event_id(stream_name)
+      last = repository.last_stream_event(stream_name)
+      last.event_id if last
     end
   end
 end

data/lib/ruby_event_store/pub_sub/broker.rb

@@ -18,7 +18,7 @@ module RubyEventStore
       end
 
       def notify_subscribers(event)
-        all_subscribers_for(event.event_type).each do |subscriber|
+        all_subscribers_for(event.class).each do |subscriber|
           subscriber.handle_event(event)
         end
       end

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -14,9 +14,9 @@ RSpec.shared_examples :event_repository do |repository_class|
   it 'created event is stored in given stream' do
     expected_event = TestDomainEvent.new(data: {})
     created = repository.create(expected_event, 'stream')
-    expect_to_be_like_event(created, expected_event)
-    expect_to_be_like_event(repository.read_all_streams_forward(:head, 1).first, expected_event)
-    expect_to_be_like_event(repository.read_stream_events_forward('stream').first, expected_event)
+    expect(created).to eq(expected_event)
+    expect(repository.read_all_streams_forward(:head, 1).first).to eq(expected_event)
+    expect(repository.read_stream_events_forward('stream').first).to eq(expected_event)
     expect(repository.read_stream_events_forward('other_stream')).to be_empty
   end
 
@@ -94,12 +94,4 @@ RSpec.shared_examples :event_repository do |repository_class|
     expect(repository.read_all_streams_backward('5', 4).map(&:event_id)).to eq ['4','3','2','1']
     expect(repository.read_all_streams_backward('5', 100).map(&:event_id)).to eq ['4','3','2','1']
   end
-
-  private
-
-  def expect_to_be_like_event(actual, expected)
-    expect(actual.event_type).to eq expected.event_type
-    expect(actual.data).to eq expected.data
-    if expected.event_id then expect(actual.event_id).to eq expected.event_id else true end
-  end
 end

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - rybex
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler