reactor 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e406cf4fa1d19fae39e7bfc19d2088d8e3975bda
-  data.tar.gz: 0ea82c5d9076c52f985ea09df8f4acade6b23f57
+  metadata.gz: c7a94df79b5698ed5185c29373773cc7478d523a
+  data.tar.gz: 2a5fc2f01a02fbf53077e42c2893348847dc53e9
 SHA512:
-  metadata.gz: a9cbffeb2aef6cf566d8721bbf556cf6d404e791a8e0572f610d60613b8e4881f5bd51e7ff7aef13343c14a0756399f2bbae31d7cad11356abaf99c3c1a3fde8
-  data.tar.gz: b9d02b1842161c50f6c084a1777cd2117469fef70a4bd926fdb7e8fcaee76d3a1e99fee11e0040d93184256293bf402709fe239f8f456494f0919137502cb1ed
+  metadata.gz: c8066ac65ac0f4ee4ddeb0dd3f6be6e65276fcc127a800595e78b601de6aad1d932bbb533a459918f3729075a178513eaa165743bdf4b68eff589355474d3bd7
+  data.tar.gz: 541f84a63ec312081e3f675269503901c4af5939871ab91f4b1dc35d9d1e1c3d33f3d2525da9d40128312ffbf4bb33abc009af51fcf4f1ee117dc085f5d4775e

data/.gitignore

@@ -18,3 +18,4 @@ tags
 .rvmrc
 .ruby-gemset
 .idea
+gemfiles/*.lock

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
-rvm:
-  - 2.3.0
 services:
   - redis-server
+gemfile:
+  - gemfiles/sidekiq_4.gemfile
+  - gemfiles/sidekiq_5.gemfile
+script: 'bundle exec rake'

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "sidekiq-4" do
+  gem 'sidekiq', '< 5.0'
+end
+
+appraise "sidekiq-5" do
+  gem 'sidekiq', '~> 5.0'
+end

data/Gemfile.lock

@@ -2,49 +2,53 @@ PATH
   remote: .
   specs:
     reactor (0.14.0)
-      rails (~> 5.0.2)
-      sidekiq
+      rails (~> 5.0.4)
+      sidekiq (> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
+    actioncable (5.0.4)
+      actionpack (= 5.0.4)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.4)
+      actionpack (= 5.0.4)
+      actionview (= 5.0.4)
+      activejob (= 5.0.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.4)
+      actionview (= 5.0.4)
+      activesupport (= 5.0.4)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.4)
+      activesupport (= 5.0.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.0.4)
+      activesupport (= 5.0.4)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.4)
+      activesupport (= 5.0.4)
+    activerecord (5.0.4)
+      activemodel (= 5.0.4)
+      activesupport (= 5.0.4)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     arel (7.1.4)
     builder (3.2.3)
     byebug (9.0.6)
@@ -56,21 +60,21 @@ GEM
     erubis (2.7.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
-    json (2.0.3)
+    i18n (0.8.4)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nio4r (2.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -83,57 +87,57 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.0.4)
+      actioncable (= 5.0.4)
+      actionmailer (= 5.0.4)
+      actionpack (= 5.0.4)
+      actionview (= 5.0.4)
+      activejob (= 5.0.4)
+      activemodel (= 5.0.4)
+      activerecord (= 5.0.4)
+      activesupport (= 5.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.0.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.4)
+      actionpack (= 5.0.4)
+      activesupport (= 5.0.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     redis (3.3.3)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (4.2.10)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sidekiq (5.0.4)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    simplecov (0.12.0)
+      redis (~> 3.3, >= 3.3.3)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -157,6 +161,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  appraisal
   bundler
   pry
   pry-byebug
@@ -169,4 +174,4 @@ DEPENDENCIES
   test_after_commit
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/README.md

@@ -142,7 +142,7 @@ Once you write your own action_event to describe your event data model's base at
 <dt>index =></dt>
 <dd>"pets_indexed"</dd>
 </dl>
- 
+
 <dl>
 <dt>show =></dt>
 <dd>"pet_viewed", target: @pet</dd>
@@ -167,7 +167,7 @@ Once you write your own action_event to describe your event data model's base at
 
 <dl>
 <dt>update =></dt>
-<dd> 
+<dd>
 when valid => "pet_updated", target: @pet, changes: @pet.previous_changes.as_json
 <br />
   when invalid => "pet_update_failed", target: @pet,
@@ -242,6 +242,12 @@ for your testing convenience.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+For testing Reactor itself we use Thoughtbot's [appraisal gem](https://github.com/thoughtbot/appraisal). This lets us test against multiple versions of Sidekiq, Rails, etc. To install appraisal and set up multiple dependencies, do the following:
+
+1. `bundle install` - this will install up-to-date dependencies and appraisal
+2. `appraisal install` - installs dependencies for appraisal groups
+3. `appraisal rake` - runs specs for each appraisal group
+
 ## Open Source by [Hired](https://hired.com/?utm_source=opensource&utm_medium=reactor&utm_campaign=readme)
 
 We are Ruby developers ourselves, and we use all of our open source projects in production. We always encourge forks, pull requests, and issues. Get in touch with the Hired Engineering team at _opensource@hired.com_.

data/Rakefile

@@ -1,5 +1,6 @@
-require "bundler/gem_tasks"
-
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/gemfiles/sidekiq_4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "< 5.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 5.0"
+
+gemspec path: "../"

data/lib/reactor/subscription.rb

@@ -29,7 +29,7 @@ module Reactor
 
     def handler_defined?
       namespace.const_defined?(handler_name) &&
-        namespace.const_get(handler_name).ancestors.include?(Reactor.subscriber_namespace)
+        namespace.const_get(handler_name).parents.include?(Reactor.subscriber_namespace)
     end
 
     def event_handler_names
@@ -68,8 +68,7 @@ module Reactor
     end
 
     def build_worker_class
-      return @worker_class = namespace.const_get(handler_name) if handler_defined?
-
+      namespace.send(:remove_const, handler_name) if handler_defined?
 
       worker_class = mailer_subscriber? ? build_mailer_worker : build_event_worker
       namespace.const_set(handler_name, worker_class)

data/lib/reactor/version.rb

@@ -1,3 +1,3 @@
 module Reactor
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/reactor.gemspec

@@ -18,11 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sidekiq"
-
-  rails_version = '~> 5.0.2'
-
-  spec.add_dependency 'rails',  rails_version
+  spec.add_dependency 'rails', '~> 5.0.4'
+  spec.add_dependency "sidekiq", '> 4.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -33,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "test_after_commit"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "appraisal"
 end

data/spec/models/concerns/publishable_spec.rb

@@ -118,7 +118,7 @@ describe Reactor::Publishable do
         publisher.start_at = 3.days.from_now
         publisher.save!
 
-        expect{ Reactor::Event.perform(@job_args[0], @job_args[1]) }.to_not change{ Sidekiq::Extensions::DelayedClass.jobs.size }
+        expect{ Reactor::Event.perform(@job_args[0], @job_args[1]) }.to_not change{ Sidekiq::Queues.jobs_by_queue.values.flatten.count }
       end
 
       it 'keeps the if intact when rescheduling' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactor
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - winfred
@@ -11,36 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +167,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: " rails chrono reactor "
 email:
 - winfred@hired.com
@@ -181,12 +195,15 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Changes.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/sidekiq_4.gemfile
+- gemfiles/sidekiq_5.gemfile
 - lib/reactor.rb
 - lib/reactor/controllers.rb
 - lib/reactor/controllers/concerns/actions/action_event.rb
@@ -247,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sidekiq/ActiveRecord pubsub lib