rabbit_feed 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa59494167f26b29ead2d8be4e547884c555bf8
-  data.tar.gz: 873561ab416044cbb81b0b085d56e7bbbc5084f2
+  metadata.gz: 5cfc4d957f4cce3aac5cf77870241ec8f60d5495
+  data.tar.gz: b6047ba2d39c634ae3c8d3cbc3b09a1f2849f3ab
 SHA512:
-  metadata.gz: 9ddfa7d6c4163a6af9d48dcddc6dc87bc06f4e02530211d35d95292c77dc99d49873f05bf524d07a5a95a9ea78d9e140e9d3d4cd68afaf4022644f3a1aeffc7b
-  data.tar.gz: dee6c6afcee2e1967208cc4c5ad65441b6412763baabecf1ea8e42d46d7bd4693488e8ccb5e1a2c296afa9dab052168ec3dc1fac3a0ba05499f8dce1caa0c9c0
+  metadata.gz: 8dafb9b1caf08fc1025fa1f366585a7eab7844e224d1e935c6a7cbf9c2d068cfe490e7964cac24cdcc4011aa797368998b4e0fccd63ca976ac3053c5f190496e
+  data.tar.gz: 6a740b0c0fdf17fb64516faf622bb77b7b2d30a5f765c5901d6efb14b7d9ef5022e311b1d4c0343c7b439552ca6c99a676cc7b125dcb1b4ad760b4bda92bc23e

data/README.md

@@ -168,6 +168,18 @@ describe BeaversController do
 end
 ```
 
+You can also pass a block with `do/end` (not `{}`) and do more fine grained matching.
+
+```ruby
+it 'publishes a create event' do
+  expect{
+    post :create, beaver: { name: 'beaver' }
+  }.to publish_event('user_creates_beaver', nil) do |payload|
+    expect(payload['beaver_name']).to match(/ea/)
+  end
+end
+```
+
 ## Consuming events
 
 The consumer defines to which events it will subscribe as well as how it handles events using the [Event Routing DSL](https://github.com/simplybusiness/rabbit_feed#event-routing-dsl). In a rails app, this can be defined in the [initialiser](https://github.com/simplybusiness/rabbit_feed#initialisation).

data/example/non_rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.4.3)
+    rabbit_feed (2.4.4)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)
@@ -30,7 +30,7 @@ GEM
     i18n (0.7.0)
     json (1.8.3)
     minitest (5.8.4)
-    multi_json (1.11.2)
+    multi_json (1.12.0)
     pidfile (0.3.0)
     rake (10.4.2)
     rspec (3.2.0)
@@ -59,4 +59,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/example/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    rabbit_feed (2.4.3)
+    rabbit_feed (2.4.4)
       activemodel (>= 3.2.0, < 5.0.0)
       activesupport (>= 3.2.0, < 5.0.0)
       avro (>= 1.5.4, < 1.8.0)
@@ -189,4 +189,4 @@ DEPENDENCIES
   unicorn
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/rabbit_feed/testing_support/rspec_matchers/publish_event.rb

@@ -10,30 +10,19 @@ module RabbitFeed
         end
 
         def matches?(given_proc, negative_expectation = false)
-          unless given_proc.respond_to?(:call)
-            ::Kernel.warn "`publish_event` was called with non-proc object #{given_proc.inspect}"
-            return false
-          end
-
-          begin
-            TestingSupport.published_events.clear
-            given_proc.call
-          rescue
-          end
+          execute_proc(given_proc)
 
-          actual_event = TestingSupport.published_events.detect do |event|
-            event.name == expected_event
-          end
-
-          received_expected_event = actual_event.present?
+          if block_given? && actual_event
+            yield actual_event.payload
+          else
+            received_expected_event = actual_event.present?
+            with_expected_payload = negative_expectation
 
-          with_expected_payload = negative_expectation
-          if received_expected_event && !with_expected_payload
-            actual_payload        = actual_event.payload
-            with_expected_payload = expected_payload.nil? || actual_payload == expected_payload
+            if received_expected_event && !with_expected_payload
+              with_expected_payload = expected_payload.nil? || actual_event.payload == expected_payload
+            end
+            return received_expected_event && with_expected_payload
           end
-
-          return received_expected_event && with_expected_payload
         end
 
         alias == matches?
@@ -72,6 +61,23 @@ module RabbitFeed
 
         private
 
+        def execute_proc(given_proc)
+          unless given_proc.respond_to?(:call)
+            ::Kernel.warn "`publish_event` was called with non-proc object #{given_proc.inspect}"
+            return false
+          end
+
+          TestingSupport.published_events.clear
+          given_proc.call
+        rescue
+        end
+
+        def actual_event
+          TestingSupport.published_events.detect do |event|
+            event.name == expected_event
+          end
+        end
+
         def expected_payload
           @expected_payload.respond_to?(:call) ? @expected_payload.call : @expected_payload
         end

data/lib/rabbit_feed/version.rb

@@ -1,3 +1,3 @@
 module RabbitFeed
-  VERSION = '2.4.3'
+  VERSION = '2.4.4'
 end

data/spec/lib/rabbit_feed/testing_support/rspec_matchers/publish_event_spec.rb

@@ -74,6 +74,42 @@ module RabbitFeed
           (matcher.matches? block).should be_falsey
         end
 
+        context 'with block' do
+          it 'validates block' do
+            expect {
+              RabbitFeed::Producer.publish_event event_name, event_payload
+            }.to publish_event(event_name, nil) do |actual_payload|
+              expect(actual_payload['field']).to eq 'value'
+            end
+          end
+
+          it 'validates block with `with` will be ignored' do
+            eval_block  = Proc.new {|actual_payload|
+              expect(actual_payload['field']).to eq 'value'
+            }
+            matcher = described_class.new(event_name, nil).with({field: 'different name'})
+            block   = Proc.new { RabbitFeed::Producer.publish_event event_name, {'field' => 'value'} }
+
+            (matcher.matches? block, &eval_block).should be true
+          end
+
+          it 'does not evaluates block with {}' do
+            expect {
+              RabbitFeed::Producer.publish_event event_name, event_payload
+            }.to publish_event(event_name, nil) { |actual_payload|
+              raise 'this block should not be evaluated'
+            }
+          end
+
+          it 'does not evaluate block if the expectation block does not return actual payload' do
+            expect {
+              nil
+            }.not_to publish_event(event_name, nil) do |actual_payload|
+              raise 'this block should not be evaluated'
+            end
+          end
+        end
+
         context 'when validating the payload' do
           context 'and the payload is not a Proc' do
             it 'validates the event payload' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_feed
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Enables your Ruby applications to perform centralized event logging with