resque-bus 0.3.2 → 0.7.0

data/spec/subscription_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module ResqueBus
+module QueueBus
   describe SubscriptionList do
     describe ".from_redis" do
       it "should return from attributes" do

data/spec/subscription_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module ResqueBus
+module QueueBus
   describe Subscription do
     it "should normalize the queue name" do
       Subscription.new("test",  "my_event", "MyClass", {}, nil).queue_name.should == "test"

data/spec/worker_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module QueueBus
+  describe Worker do
+    it "should proxy to given class" do
+      hash = {"bus_class_proxy" => "QueueBus::Driver", "ok" => true}
+      QueueBus::Driver.should_receive(:perform).with(hash)
+      QueueBus::Worker.perform(JSON.generate(hash))
+    end
+
+    it "should use instance" do
+      hash = {"bus_class_proxy" => "QueueBus::Rider", "ok" => true}
+      QueueBus::Rider.should_receive(:perform).with(hash)
+      QueueBus::Worker.new.perform(JSON.generate(hash))
+    end
+
+    it "should not freak out if class not there anymore" do
+      hash = {"bus_class_proxy" => "QueueBus::BadClass", "ok" => true}
+      lambda {
+        QueueBus::Worker.perform(JSON.generate(hash))
+      }.should_not raise_error
+    end
+
+    it "should raise error if proxy raises error" do
+      hash = {"bus_class_proxy" => "QueueBus::Rider", "ok" => true}
+      QueueBus::Rider.should_receive(:perform).with(hash).and_raise("rider crash")
+      lambda {
+        QueueBus::Worker.perform(JSON.generate(hash))
+      }.should raise_error
+    end
+  end
+end

metadata

@@ -1,235 +1,219 @@
 --- !ruby/object:Gem::Specification
 name: resque-bus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Brian Leonard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: queue-bus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
-    - - <
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
-    - - <
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: resque-scheduler
+  name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: resque-retry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+        version: 1.10.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: resque-retry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "A simple event bus on top of Resque.\n    Publish and subscribe to
-  events as they occur through a queue."
+description: A simple event bus on top of Resque. Publish and subscribe to events
+  as they occur through a queue.
 email:
 - brian@bleonard.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rbenv-version
-- .rvmrc
+- ".gitignore"
+- ".rbenv-version"
+- ".rspec"
+- ".rvmrc"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.mdown
 - Rakefile
 - lib/resque-bus.rb
-- lib/resque_bus/application.rb
-- lib/resque_bus/dispatch.rb
-- lib/resque_bus/driver.rb
-- lib/resque_bus/heartbeat.rb
-- lib/resque_bus/local.rb
-- lib/resque_bus/matcher.rb
-- lib/resque_bus/publisher.rb
-- lib/resque_bus/rider.rb
+- lib/resque_bus/adapter.rb
+- lib/resque_bus/compatibility/deprecated.rb
+- lib/resque_bus/compatibility/driver.rb
+- lib/resque_bus/compatibility/heartbeat.rb
+- lib/resque_bus/compatibility/publisher.rb
+- lib/resque_bus/compatibility/rider.rb
+- lib/resque_bus/compatibility/subscriber.rb
+- lib/resque_bus/compatibility/task_manager.rb
 - lib/resque_bus/server.rb
 - lib/resque_bus/server/views/bus.erb
-- lib/resque_bus/subscriber.rb
-- lib/resque_bus/subscription.rb
-- lib/resque_bus/subscription_list.rb
-- lib/resque_bus/task_manager.rb
 - lib/resque_bus/tasks.rb
-- lib/resque_bus/util.rb
 - lib/resque_bus/version.rb
-- lib/tasks/resquebus.rake
 - resque-bus.gemspec
+- spec/adapter/compatibility_spec.rb
+- spec/adapter/integration_spec.rb
+- spec/adapter/publish_at_spec.rb
+- spec/adapter/retry_spec.rb
+- spec/adapter/support.rb
+- spec/adapter_spec.rb
 - spec/application_spec.rb
+- spec/config_spec.rb
 - spec/dispatch_spec.rb
 - spec/driver_spec.rb
 - spec/heartbeat_spec.rb
 - spec/integration_spec.rb
 - spec/matcher_spec.rb
-- spec/publish_at_spec.rb
 - spec/publish_spec.rb
-- spec/redis_spec.rb
+- spec/publisher_spec.rb
 - spec/rider_spec.rb
 - spec/spec_helper.rb
 - spec/subscriber_spec.rb
 - spec/subscription_list_spec.rb
 - spec/subscription_spec.rb
-homepage: ''
+- spec/worker_spec.rb
+homepage: https://github.com/queue-bus/resque-bus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: resque-bus
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple event bus on top of Resque
 test_files:
+- spec/adapter/compatibility_spec.rb
+- spec/adapter/integration_spec.rb
+- spec/adapter/publish_at_spec.rb
+- spec/adapter/retry_spec.rb
+- spec/adapter/support.rb
+- spec/adapter_spec.rb
 - spec/application_spec.rb
+- spec/config_spec.rb
 - spec/dispatch_spec.rb
 - spec/driver_spec.rb
 - spec/heartbeat_spec.rb
 - spec/integration_spec.rb
 - spec/matcher_spec.rb
-- spec/publish_at_spec.rb
 - spec/publish_spec.rb
-- spec/redis_spec.rb
+- spec/publisher_spec.rb
 - spec/rider_spec.rb
 - spec/spec_helper.rb
 - spec/subscriber_spec.rb
 - spec/subscription_list_spec.rb
 - spec/subscription_spec.rb
+- spec/worker_spec.rb

data/lib/resque_bus/application.rb

@@ -1,115 +0,0 @@
-module ResqueBus
-  class Application
-
-    class << self
-    
-      def all
-        # note the names arent the same as we started with
-        ResqueBus.redis.smembers(app_list_key).collect{ |val| new(val) }
-      end
-    end
-
-    attr_reader :app_key, :redis_key
-
-    
-    def initialize(app_key)
-      @app_key = self.class.normalize(app_key)
-      @redis_key = "#{self.class.app_single_key}:#{@app_key}"
-      # raise error if only other chars
-      raise "Invalid application name" if @app_key.gsub("_", "").size == 0
-    end
-    
-    def subscribe(subscription_list, log = false)
-      @subscriptions = nil
-      
-      if subscription_list == nil || subscription_list.size == 0
-        unsubscribe
-        return true
-      end
-      
-      temp_key = "temp_#{redis_key}:#{rand(999999999)}"
-      
-      redis_hash = subscription_list.to_redis
-      redis_hash.each do |key, hash|
-        ResqueBus.redis.hset(temp_key, key, Resque.encode(hash))
-      end
-      
-      # make it the real one
-      ResqueBus.redis.rename(temp_key, redis_key)
-      ResqueBus.redis.sadd(self.class.app_list_key, app_key)
-      
-      if log
-        puts ResqueBus.redis.hgetall(redis_key).inspect
-      end
-      
-      true
-    end
-        
-    def unsubscribe
-      # TODO: clean up known queues?
-      ResqueBus.redis.srem(self.class.app_list_key, app_key)
-      ResqueBus.redis.del(redis_key)
-    end
-    
-    def no_connect_queue_names_for(subscriptions)
-      out = []
-      subscriptions.all.each do |sub|
-        queue = "#{app_key}_#{sub.queue_name}"
-        out << queue
-      end
-      out << "#{app_key}_default"
-      out.uniq
-    end
-    
-    def subscription_matches(attributes)
-      out = subscriptions.matches(attributes)
-      out.each do |sub|
-        sub.app_key = self.app_key
-      end
-      out
-    end
-    
-    def event_display_tuples
-      out = []
-      subscriptions.all.each do |sub|
-        out << [sub.class_name, sub.queue_name, sub.matcher.filters]
-      end
-      out
-    end
-    
-    protected
-
-    def self.normalize(val)
-      val.to_s.gsub(/\W/, "_").downcase
-    end
-    
-    def self.app_list_key
-      "resquebus_apps"
-    end
-    
-    def self.app_single_key
-      "resquebus_app"
-    end
-    
-    def event_queues
-      ResqueBus.redis.hgetall(redis_key)
-    end
-    
-    def subscriptions
-      @subscriptions ||= SubscriptionList.from_redis(read_redis_hash)
-    end
-    
-    def read_redis_hash
-      out = {}
-      ResqueBus.redis.hgetall(redis_key).each do |key, val|
-        begin
-          out[key] = Resque.decode(val)
-        rescue Resque::Helpers::DecodeException
-          out[key] = val
-        end
-      end
-      out
-    end
-   
-  end
-end