reactor 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95dc37409d0b41598fd79e08c761e3024bffd663
-  data.tar.gz: dc006fba8540a1a2ee3d18b2a0280c83fac78364
+  metadata.gz: 7693ae6991c1cb79fa7257e131e844363db098fc
+  data.tar.gz: df0eac5e0c734cace8b3d37fa2be485f896ffc31
 SHA512:
-  metadata.gz: c96bc020fefc6c9eb331e32a7b71db10403088ba23228cf73c0b9d66a0861a720351f1773293bf0c80b0296186e20f31af0d141f0707ae8af33556001f91ef96
-  data.tar.gz: 8e934d6d187cb1f08f8492758f87441a023db7d164a8272f4632e5f164244f7fff6f91819efb2e808b9f254ced744f652f4d2dde849be3d0377c33fe834de5fc
+  metadata.gz: 95f7c623e0569143793bc7ee1bd2870e5d71902ea794dd7f6aee6b0c95d67984f70b306ece0e1609f01f19ab0cb58b66f585dd557268a98e1c40d380b1113b36
+  data.tar.gz: 4bf1fe49637b5a72cdd5e774c42c2ba2e24b5567b6be195b0c11f5f9a0b36708ddd54f303a1e554250107f1bcd1ff700686888c66a0ac279da7cea6057530e3b

data/lib/reactor/testing/matchers.rb

@@ -3,38 +3,29 @@ RSpec::Matchers.define :publish_event do |name, data = {}|
 
   match do |block|
     defaults = {:actor => anything}
-    expect(Reactor::Event).to receive(:publish).with(name, hash_including(defaults.merge(data)))
-
-    begin
-      block.call
-      RSpec::Mocks::verify
-      true
-    rescue RSpec::Mocks::MockExpectationError => e
-      false
-    end
+
+    allow(Reactor::Event).to receive(:publish).with(name, a_hash_including(defaults.merge(data)))
+
+    block.call
+
+    expect(Reactor::Event).to have_received(:publish).with(name, a_hash_including(defaults.merge(data)))
   end
 end
 
-RSpec::Matchers.define :publish_events do |*events|
+RSpec::Matchers.define :publish_events do |*names|
   supports_block_expectations
 
   match do |block|
-    expect(Reactor::Event).to receive(:publish).exactly(events.count).times do |event, data|
-      match = events.select { |e| (e.is_a?(Hash) ? e.keys.first : e) == event }.first
-      expect(match).to be_present
-
-      expected = match.is_a?(Hash) ? match.values.first : {match => {}}
-      expected.each do |key, value|
-        expect(value).to eq(expected[key])
-      end
+    defaults = {:actor => anything}
+
+    names.each do |name|
+      allow(Reactor::Event).to receive(:publish).with(name, a_hash_including(defaults))
     end
 
-    begin
-      block.call
-      RSpec::Mocks::verify
-      true
-    rescue RSpec::Mocks::MockExpectationError => e
-      false
+    block.call
+
+    names.each do |name|
+      expect(Reactor::Event).to have_received(:publish).with(name, a_hash_including(defaults))
     end
   end
 end

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/reactor.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.99.0"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "test_after_commit"
 end

data/spec/event_spec.rb

@@ -18,7 +18,7 @@ describe Reactor::Event do
 
   describe 'publish' do
     it 'fires the first perform and sets message event_id' do
-      Reactor::Event.should_receive(:perform_async).with(event_name, 'actor_id' => '1', 'event' => :user_did_this)
+      expect(Reactor::Event).to receive(:perform_async).with(event_name, 'actor_id' => '1', 'event' => :user_did_this)
       Reactor::Event.publish(:user_did_this, actor_id: '1')
     end
   end
@@ -51,7 +51,7 @@ describe Reactor::Event do
           raise 'UNEXPECTED!'
         end
         Reactor::SUBSCRIBERS['barfed'] << Reactor::Subscribable::StaticSubscriberFactory.create('barfed') do |event|
-          double.some_method
+          mock.some_method
         end
       end
 

data/spec/models/concerns/publishable_spec.rb

@@ -28,40 +28,39 @@ class TestSubscriber < Reactor::Subscriber
 end
 
 describe Reactor::Publishable do
-  before { TestSubscriber.destroy_all }
+  before do
+    TestSubscriber.destroy_all
+    TestSubscriber.class_variable_set(:@@called, false)
+  end
+
   describe 'publish' do
     let(:pet) { Pet.create! }
     let(:auction) { Auction.create!(pet: pet, start_at: DateTime.new(2012,12,21)) }
 
     it 'publishes an event with actor_id and actor_type set as self' do
       auction
-      expect(Reactor::Event).to receive(:publish) do |name, data|
-        expect(name).to eq(:an_event)
-        expect(data[:what]).to eq('the')
-        expect(data[:actor]).to eq(auction)
-      end
+      expect(Reactor::Event).to receive(:publish).with(:an_event, what: 'the', actor: auction)
       auction.publish(:an_event, {what: 'the'})
     end
 
     it 'publishes an event with provided actor and target methods' do
-      expect(Reactor::Event).to receive(:publish) do |name, data|
-        expect(name).to eq(:woof)
-        expect(data[:actor]).to eq(pet)
-      end
+      allow(Reactor::Event).to receive(:publish).exactly(5).times
       auction
+      expect(Reactor::Event).to have_received(:publish).with(:woof, a_hash_including(actor: pet, target: auction))
     end
 
     it 'reschedules an event when the :at time changes' do
       start_at = auction.start_at
       new_start_at = start_at + 1.week
       expect(Reactor::Event).to receive(:reschedule).with :ring, anything
-      expect(Reactor::Event).to receive(:reschedule).with :begin,
-        hash_including(
+      expect(Reactor::Event).to receive(:reschedule).with(:begin,
+        a_hash_including(
           at: new_start_at,
           actor: auction,
           was: start_at,
           additional_info: 'curtis was here'
         )
+      )
       auction.start_at = new_start_at
       auction.save!
     end
@@ -71,12 +70,13 @@ describe Reactor::Publishable do
       new_start_at = auction.start_at + 1.week
       new_ring_time = new_start_at + 30.seconds
       expect(Reactor::Event).to receive(:reschedule).with :begin, anything
-      expect(Reactor::Event).to receive(:reschedule).with :ring,
-        hash_including(
+      expect(Reactor::Event).to receive(:reschedule).with(:ring,
+        a_hash_including(
           at: new_ring_time,
           actor: auction,
           was: ring_time
         )
+      )
       auction.start_at = new_start_at
       auction.save!
     end

data/spec/models/concerns/subscribable_spec.rb

@@ -30,6 +30,7 @@ end
 
 describe Reactor::Subscribable do
   let(:scheduled) { Sidekiq::ScheduledSet.new }
+  before { Reactor::TEST_MODE_SUBSCRIBERS.clear }
 
   describe 'on_event' do
     it 'binds block of code statically to event being fired' do

data/spec/spec_helper.rb

@@ -27,8 +27,6 @@ end
 RSpec.configure do |config|
   # some (optional) config here
 
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
   # Runs Sidekiq jobs inline by default unless the RSpec metadata :sidekiq is specified,
   # in which case it will use the real Redis-backed Sidekiq queue
   config.before(:each, :sidekiq) do
@@ -36,9 +34,13 @@ RSpec.configure do |config|
     Sidekiq::Testing.disable!
   end
 
-
   config.after(:each, :sidekiq) do
     Sidekiq::Testing.inline!
   end
 
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - winfred
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -75,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement