pg_eventstore 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af4900fd9dc0524bcc7abcf7becd913c33fc50e1f0cb097c124ab48ee9cf3cd
-  data.tar.gz: c5626c8b58e6265b7deed496b6531881ea352049cbaea6f29b2281abd7a7d5b9
+  metadata.gz: 9f21137e2e5210ac3482ac7dc91d6e7bcb7e34e51e24cbbfa558f891d071fdf4
+  data.tar.gz: 37e42584895549d55d99efd2bc1667916e5ded9c8a0b9539c2081cd2d0a1f323
 SHA512:
-  metadata.gz: 6c4c6425faea1168e3396b14c7cd66fb3c7f10097d2e2645ebf7dba6ba2b9800ddb6372bac3f6c8d39baf4c78a46bbfc907b352274b3839ef5eeb7acd8dbec02
-  data.tar.gz: '09a4f239984bffc88abaa5e08aa4c4fa31df1856aebcb4c8b5fcd6bdd5e77806d556584680cdc5702cfd5f720bc5f91ecf19bdc98bdf15c4a16f3024e5df0151'
+  metadata.gz: e2190a042255a6e9b59c6822d586dbc9b142a2189ffc2c3e192fd4bc96862f1c38ceb5307fcf8f4f16d5ab2a0b57852cb46ef3553855f129a08ce289a2293266
+  data.tar.gz: 7b9e343f6fd66e620e8ae19c5d0bf480d393b69763c312786d983a7be90e13a2987ea8b6714268860dcd7d4e851674c755e88dc07c1da18f7bee82ae13480837

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.6.0] - 2024-02-08
+
+- Add stream info into `PgEventstore::WrongExpectedRevisionError` error details
+
+## [0.5.3] - 2024-02-07
+
+- Fix `pg_eventstore:drop` rake task
+
 ## [0.5.2] - 2024-02-06
 
 - Improve speed of `PgEventstore::Stream#eql?` a bit

data/lib/pg_eventstore/commands/append.rb

@@ -18,7 +18,7 @@ module PgEventstore
         queries.transactions.transaction do
           stream = queries.streams.find_or_create_stream(stream)
           revision = stream.stream_revision
-          assert_expected_revision!(revision, options[:expected_revision]) if options[:expected_revision]
+          assert_expected_revision!(revision, options[:expected_revision], stream) if options[:expected_revision]
           events.map.with_index(1) do |event, index|
             queries.events.insert(stream, event_modifier.call(event, revision + index))
           end.tap do
@@ -31,20 +31,30 @@ module PgEventstore
 
       # @param revision [Integer]
       # @param expected_revision [Symbol, Integer]
+      # @param stream [PgEventstore::Stream]
       # @raise [PgEventstore::WrongExpectedRevisionError] in case if revision does not satisfy expected revision
       # @return [void]
-      def assert_expected_revision!(revision, expected_revision)
+      def assert_expected_revision!(revision, expected_revision, stream)
         return if expected_revision == :any
 
         case [revision, expected_revision]
         in [Integer, Integer]
-          raise WrongExpectedRevisionError.new(revision, expected_revision) unless revision == expected_revision
+          unless revision == expected_revision
+            raise WrongExpectedRevisionError.new(
+              revision: revision, expected_revision: expected_revision, stream: stream
+            )
+          end
+
         in [Integer, Symbol]
           if revision == Stream::INITIAL_STREAM_REVISION && expected_revision == :stream_exists
-            raise WrongExpectedRevisionError.new(revision, expected_revision)
+            raise WrongExpectedRevisionError.new(
+              revision: revision, expected_revision: expected_revision, stream: stream
+            )
           end
           if revision > Stream::INITIAL_STREAM_REVISION && expected_revision == :no_stream
-            raise WrongExpectedRevisionError.new(revision, expected_revision)
+            raise WrongExpectedRevisionError.new(
+              revision: revision, expected_revision: expected_revision, stream: stream
+            )
           end
         end
       end

data/lib/pg_eventstore/errors.rb

@@ -42,13 +42,15 @@ module PgEventstore
   end
 
   class WrongExpectedRevisionError < Error
-    attr_reader :revision, :expected_revision
+    attr_reader :stream, :revision, :expected_revision
 
     # @param revision [Integer]
     # @param expected_revision [Integer, Symbol]
-    def initialize(revision, expected_revision)
+    # @param stream [PgEventstore::Stream]
+    def initialize(revision:, expected_revision:, stream:)
       @revision = revision
       @expected_revision = expected_revision
+      @stream = stream
       super(user_friendly_message)
     end
 
@@ -65,22 +67,30 @@ module PgEventstore
 
     # @return [String]
     def expected_stream_exists
-      "Expected stream to exist, but it doesn't."
+      "Expected stream #{stream_descr} to exist, but it doesn't."
     end
 
     # @return [String]
     def expected_no_stream
-      "Expected stream to be absent, but it actually exists."
+      "Expected stream #{stream_descr} to be absent, but it actually exists."
     end
 
     # @return [String]
     def current_no_stream
-      "Stream revision #{expected_revision} is expected, but stream does not exist."
+      "#{stream_descr} stream revision #{expected_revision.inspect} is expected, but stream does not exist."
     end
 
     # @return [String]
     def unmatched_stream_revision
-      "Stream revision #{expected_revision} is expected, but actual stream revision is #{revision.inspect}."
+      <<~TEXT.strip
+        #{stream_descr} stream revision #{expected_revision.inspect} is expected, but actual stream revision is \
+        #{revision.inspect}.
+      TEXT
+    end
+
+    # @return [String]
+    def stream_descr
+      stream.to_hash.inspect
     end
   end
 

data/lib/pg_eventstore/tasks/setup.rake

@@ -59,10 +59,10 @@ namespace :pg_eventstore do
         DROP TABLE IF EXISTS public.streams;
         DROP TABLE IF EXISTS public.event_types;
         DROP TABLE IF EXISTS public.migrations;
-        DROP TABLE IF EXISTS public.subscriptions_set;
-        DROP TABLE IF EXISTS public.subscriptions;
         DROP TABLE IF EXISTS public.subscription_commands;
         DROP TABLE IF EXISTS public.subscriptions_set_commands;
+        DROP TABLE IF EXISTS public.subscriptions_set;
+        DROP TABLE IF EXISTS public.subscriptions;
         DROP EXTENSION IF EXISTS "uuid-ossp";
         DROP EXTENSION IF EXISTS pgcrypto;
       SQL

data/lib/pg_eventstore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEventstore
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_eventstore
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg