rails_event_store-rspec 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70db937a2e115aceb3d4c01978447620202dc5a41b64b5c24672869e09844c77
-  data.tar.gz: 6c6b02698b8c45e31317b18a35369f96667c3562097394846f79c0ea58b2a7dd
+  metadata.gz: 390b1d981a082e02362684ad51daa1236313bc6126ec5585c8e17a854f0c3131
+  data.tar.gz: 141370fd5d39f1eb5d317ea88e658d28dc75cc0c37f1e5a0c76e9b7ed69305ed
 SHA512:
-  metadata.gz: 0b8244bd6ba6e6fb550f9ee846271dfeb92822d053e63f51b6c118677d38d26569e47987e6be5b027637ce38927794fb4ff7a1309269064e903f343f3927ef5b
-  data.tar.gz: 75bcc8649432de809b2980fe6f2f4373a36881ae853ba7a6fb80d5fa53848fa0ffa9e80bdd5d9144913b6ccc9eeae83b913f6bca837cab67994fe6d25c6d1ef6
+  metadata.gz: d1480b7aa2c2076b915dad1a577f01be0f90ab04e12c534137a73921cf9bac45dbf5aec911dfad1bb85791a95b5894b6ce7f973608cf3bcb30dc75d125775500
+  data.tar.gz: 836935f2e46c5709a3eb2a4e84885d06622e9ef0739bfd6f21294c9b01ce2eb61d7264ef31e4c3921eba9aba578272110027c929541f6a233f5118526a13a6e0

data/lib/rails_event_store/rspec/be_event.rb

@@ -115,9 +115,9 @@ module RailsEventStore
       include ::RSpec::Matchers::Composable
 
       def initialize(expected, differ:, formatter:)
+        @expected  = expected
         @differ    = differ
         @formatter = formatter
-        @expected  = expected
       end
 
       def matches?(actual)
@@ -152,7 +152,15 @@ expected: not a kind of #{expected}
       end
 
       def description
-        "be event #{formatter.(expected)}"
+        "be an event #{formatter.(expected)}#{data_and_metadata_expectations_description}"
+      end
+
+      def data_and_metadata_expectations_description
+        predicate = strict? ? "matching" : "including"
+        expectation_list = []
+        expectation_list << "with data #{predicate} #{formatter.(expected_data)}" if expected_data
+        expectation_list << "with metadata #{predicate} #{formatter.(expected_metadata)}" if expected_metadata
+        " (#{expectation_list.join(" and ")})" if expectation_list.any?
       end
 
       private

data/lib/rails_event_store/rspec/have_applied.rb

@@ -1,11 +1,11 @@
 module RailsEventStore
   module RSpec
     class HaveApplied
-      def initialize(mandatory_expected, *optional_expected, differ:, formatter:)
+      def initialize(mandatory_expected, *optional_expected, differ:, phraser:)
         @expected  = [mandatory_expected, *optional_expected]
         @matcher   = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
         @differ    = differ
-        @formatter = formatter
+        @phraser    = phraser
       end
 
       def matches?(aggregate_root)
@@ -27,6 +27,11 @@ module RailsEventStore
         exactly(1)
       end
 
+      def strict
+        @matcher = ::RSpec::Matchers::BuiltIn::Match.new(expected)
+        self
+      end
+
       def failure_message
         "expected #{expected} to be applied, diff:" +
           differ.diff_as_string(expected.to_s, events.to_s)
@@ -38,7 +43,7 @@ module RailsEventStore
       end
 
       def description
-        "have applied [%s]" % expected.map { |e| formatter.(e) }.join(', ')
+        "have applied events that have to (#{phraser.(expected)})"
       end
 
       private
@@ -52,7 +57,7 @@ module RailsEventStore
         end
       end
 
-      attr_reader :formatter, :differ, :expected, :events, :count, :matcher
+      attr_reader :differ, :phraser, :expected, :events, :count, :matcher
     end
   end
 end

data/lib/rails_event_store/rspec/have_published.rb

@@ -1,16 +1,18 @@
 module RailsEventStore
   module RSpec
     class HavePublished
-      def initialize(mandatory_expected, *optional_expected, differ:, formatter:)
+      def initialize(mandatory_expected, *optional_expected, differ:, phraser:)
         @expected  = [mandatory_expected, *optional_expected]
         @matcher   = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
         @differ    = differ
-        @formatter = formatter
+        @phraser   = phraser
       end
 
       def matches?(event_store)
-        @events = stream_name ? event_store.read_events_backward(stream_name)
-                              : event_store.read_all_streams_backward
+        @events = event_store.read
+        @events = events.stream(stream_name) if stream_name
+        @events = events.from(start)         if start
+        @events = events.each
         @matcher.matches?(events) && matches_count?
       end
 
@@ -29,24 +31,32 @@ module RailsEventStore
       end
       alias :time :times
 
+      def from(event_id)
+        @start = event_id
+        self
+      end
+
       def once
         exactly(1)
       end
 
       def failure_message
         "expected #{expected} to be published, diff:" +
-            differ.diff_as_string(expected.to_s, events.to_s)
+            differ.diff_as_string(expected.to_s, events.to_a.to_s)
       end
 
       def failure_message_when_negated
         "expected #{expected} not to be published, diff:" +
-            differ.diff_as_string(expected.to_s, events.to_s)
+            differ.diff_as_string(expected.to_s, events.to_a.to_s)
       end
 
       def description
-        "have published [%s]" % expected
-          .map { |e| formatter.(e) }
-          .join(', ')
+        "have published events that have to (#{phraser.(expected)})"
+      end
+
+      def strict
+        @matcher = ::RSpec::Matchers::BuiltIn::Match.new(expected)
+        self
       end
 
       private
@@ -60,7 +70,7 @@ module RailsEventStore
         end
       end
 
-      attr_reader :formatter, :differ, :stream_name, :expected, :count, :events
+      attr_reader :differ, :phraser, :stream_name, :expected, :count, :events, :start
     end
   end
 end

data/lib/rails_event_store/rspec/matchers.rb

@@ -1,6 +1,28 @@
 module RailsEventStore
   module RSpec
     module Matchers
+      class ListPhraser
+        def self.call(object)
+          items = Array(object).compact.map { |o| format(o) }
+          return "" if items.empty?
+          if items.one?
+            items.join
+          else
+            "#{items[0...-1].join(", ")}#{" and "}#{items.fetch(-1)}"
+          end
+        end
+
+        private
+
+        def self.format(object)
+          if object.respond_to?(:description)
+            ::RSpec::Support::ObjectFormatter.format(object)
+          else
+            "be a #{object}"
+          end
+        end
+      end
+
       def be_an_event(expected)
         BeEvent.new(expected, differ: differ, formatter: formatter)
       end
@@ -9,22 +31,26 @@ module RailsEventStore
       alias :event    :be_an_event
 
       def have_published(*expected)
-        HavePublished.new(*expected, differ: differ, formatter: formatter)
+        HavePublished.new(*expected, differ: differ, phraser: phraser)
       end
 
       def have_applied(*expected)
-        HaveApplied.new(*expected, differ: differ, formatter: formatter)
+        HaveApplied.new(*expected, differ: differ, phraser: phraser)
       end
 
       private
 
       def formatter
-        ::RSpec::Support::ObjectFormatter.method(:format)
+        ::RSpec::Support::ObjectFormatter.public_method(:format)
       end
 
       def differ
         ::RSpec::Support::Differ.new(color: ::RSpec::Matchers.configuration.color?)
       end
+
+      def phraser
+        ListPhraser
+      end
     end
   end
 end

data/lib/rails_event_store/rspec/version.rb

@@ -1,5 +1,5 @@
 module RailsEventStore
   module RSpec
-    VERSION = "0.29.0"
+    VERSION = "0.30.0"
   end
 end

data/rails_event_store-rspec.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
   spec.add_development_dependency 'rails', '~> 5.1'
-  spec.add_development_dependency 'rails_event_store', '= 0.29.0'
+  spec.add_development_dependency 'rails_event_store', '= 0.30.0'
 
   spec.add_runtime_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store-rspec
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement