action_subscriber 3.0.2 → 4.0.0.pre1

data/spec/integration/basic_subscriber_spec.rb

@@ -11,25 +11,12 @@ describe "A Basic Subscriber", :integration => true do
     end
   end
 
-  context "ActionSubscriber.auto_pop!" do
-    it "routes messages to the right place" do
-      ::ActivePublisher.publish("basic_push.booked", "Ohai Booked", "events")
+  it "routes messages to the right place" do
+    ::ActionSubscriber.start_subscribers!
+    ::ActivePublisher.publish("basic_push.booked", "Ohai Booked", "events")
 
-      verify_expectation_within(2.0) do
-        ::ActionSubscriber.auto_pop!
-        expect($messages).to eq(Set.new(["Ohai Booked"]))
-      end
-    end
-  end
-
-  context "ActionSubscriber.auto_subscribe!" do
-    it "routes messages to the right place" do
-      ::ActionSubscriber.auto_subscribe!
-      ::ActivePublisher.publish("basic_push.booked", "Ohai Booked", "events")
-
-      verify_expectation_within(2.0) do
-        expect($messages).to eq(Set.new(["Ohai Booked"]))
-      end
+    verify_expectation_within(2.0) do
+      expect($messages).to eq(Set.new(["Ohai Booked"]))
     end
   end
 end

data/spec/integration/custom_actions_spec.rb

@@ -14,7 +14,7 @@ describe "A subscriber with a custom action", :integration => true do
   end
 
   it "routes the message to the selected action" do
-    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber.start_subscribers!
     ::ActivePublisher.publish("react.javascript_framework", "Another?!?!", "events")
 
     verify_expectation_within(2.0) do

data/spec/integration/custom_headers_spec.rb

@@ -13,17 +13,9 @@ describe "Custom Headers Are Published and Received", :integration => true do
     end
   end
   let(:headers) { { "Custom" => "content/header" } }
-
-  it "works for auto_pop!" do
-    ::ActivePublisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
-    verify_expectation_within(2.0) do
-      ::ActionSubscriber.auto_pop!
-      expect($messages).to eq(Set.new([headers]))
-    end
-  end
-
-  it "works for auto_subscriber!" do
-    ::ActionSubscriber.auto_subscribe!
+  
+  it "passes custom headers through" do
+    ::ActionSubscriber.start_subscribers!
     ::ActivePublisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
     verify_expectation_within(2.0) do
       expect($messages).to eq(Set.new([headers]))

data/spec/integration/decoding_payloads_spec.rb

@@ -19,7 +19,7 @@ describe "Payload Decoding", :integration => true do
   let(:json_string) { '{"foo": "bar"}' }
 
   it "decodes json by default" do
-    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber.start_subscribers!
     ::ActivePublisher.publish("twitter.tweet", json_string, "events", :content_type => "application/json")
 
     verify_expectation_within(2.0) do
@@ -37,7 +37,7 @@ describe "Payload Decoding", :integration => true do
     after { ::ActionSubscriber.config.decoder.delete(content_type) }
 
     it "it decodes the payload using the custom decoder" do
-      ::ActionSubscriber.auto_subscribe!
+      ::ActionSubscriber.start_subscribers!
       ::ActivePublisher.publish("twitter.tweet", json_string, "events", :content_type => content_type)
 
       verify_expectation_within(2.0) do

data/spec/integration/manual_acknowledgement_spec.rb

@@ -21,7 +21,7 @@ describe "Manual Message Acknowledgment", :integration => true do
   let(:subscriber) { BaconSubscriber }
 
   it "retries rejected messages and stops retrying acknowledged messages" do
-    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber.start_subscribers!
     ::ActivePublisher.publish("bacon.served", "BACON!", "events")
 
     verify_expectation_within(2.0) do

data/spec/integration/multiple_connections_spec.rb

@@ -24,7 +24,7 @@ describe "Separate connections to get multiple threadpools", :integration => tru
   end
 
   it "spreads the load across multiple threadpools and consumer" do
-    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber.start_subscribers!
     1.upto(10).each do |i|
       ::ActivePublisher.publish("multiple_connections.burp", "belch#{i}", "events")
     end

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -4,14 +4,11 @@ describe ::ActionSubscriber::Configuration do
     specify { expect(subject.default_exchange).to eq("events") }
     specify { expect(subject.heartbeat).to eq(5) }
     specify { expect(subject.host).to eq("localhost") }
-    specify { expect(subject.mode).to eq('subscribe') }
-    specify { expect(subject.pop_interval).to eq(100) }
     specify { expect(subject.port).to eq(5672) }
     specify { expect(subject.prefetch).to eq(2) }
     specify { expect(subject.seconds_to_wait_for_graceful_shutdown).to eq(30) }
     specify { expect(subject.threadpool_size).to eq(8) }
     specify { expect(subject.timeout).to eq(1) }
-    specify { expect(subject.times_to_pop).to eq(8) }
   end
 
   describe "add_decoder" do

data/spec/spec_helper.rb

@@ -28,12 +28,12 @@ RSpec.configure do |config|
     ::ActionSubscriber.setup_subscriptions!
   end
   config.after(:each, :integration => true) do
-    ::ActionSubscriber.stop_subscribers!
+    ::ActionSubscriber.stop_subscribers!(0.1)
     ::ActionSubscriber.instance_variable_set("@route_set", nil)
     ::ActionSubscriber.instance_variable_set("@route_set_block", nil)
   end
   config.after(:suite) do
-    ::ActionSubscriber.stop_subscribers!
+    ::ActionSubscriber.stop_subscribers!(0.1)
     ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,20 +42,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: lifeguard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +221,6 @@ files:
 - lib/action_subscriber/router.rb
 - lib/action_subscriber/rspec.rb
 - lib/action_subscriber/subscribable.rb
-- lib/action_subscriber/threadpool.rb
 - lib/action_subscriber/uri.rb
 - lib/action_subscriber/version.rb
 - routing.md
@@ -249,7 +234,6 @@ files:
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
 - spec/integration/multiple_connections_spec.rb
-- spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
 - spec/lib/action_subscriber/dsl_spec.rb
@@ -262,7 +246,6 @@ files:
 - spec/lib/action_subscriber/middleware/runner_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
-- spec/lib/action_subscriber/threadpool_spec.rb
 - spec/spec_helper.rb
 - spec/support/user_subscriber.rb
 homepage: https://github.com/mxenabled/action_subscriber
@@ -280,9 +263,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.6
@@ -301,7 +284,6 @@ test_files:
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
 - spec/integration/multiple_connections_spec.rb
-- spec/integration/multiple_threadpools_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
 - spec/lib/action_subscriber/configuration_spec.rb
 - spec/lib/action_subscriber/dsl_spec.rb
@@ -314,6 +296,5 @@ test_files:
 - spec/lib/action_subscriber/middleware/runner_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
-- spec/lib/action_subscriber/threadpool_spec.rb
 - spec/spec_helper.rb
 - spec/support/user_subscriber.rb

data/lib/action_subscriber/threadpool.rb

@@ -1,62 +0,0 @@
-module ActionSubscriber
-  class Threadpool
-    ##
-    # Class Methods
-    #
-    def self.busy?
-      !ready?
-    end
-
-    def self.new_pool(name, pool_size = nil)
-      fail ArgumentError, "#{name} already exists as a threadpool" if pools.key?(name)
-      pool_size ||= ::ActionSubscriber.config.threadpool_size
-      pools[name] = ::Lifeguard::InfiniteThreadpool.new(
-        :name => name,
-        :pool_size => pool_size
-      )
-    end
-
-    def self.pool(which_pool = :default)
-      pools[which_pool]
-    end
-
-    def self.pools
-      @pools ||= {
-        :default => ::Lifeguard::InfiniteThreadpool.new(
-          :name => :default,
-          :pool_size => ::ActionSubscriber.config.threadpool_size
-        )
-      }
-    end
-
-    def self.ready?
-      pools.any? { |_pool_name, pool| !pool.busy? }
-    end
-
-    def self.ready_size
-      pools.inject(0) do |total_ready, (_pool_name, pool)|
-        total_ready + [0, pool.pool_size - pool.busy_size].max
-      end
-    end
-
-    def self.wait_to_finish_with_timeout(timeout)
-      wait_loops = 0
-      loop do
-        wait_loops = wait_loops + 1
-        any_threadpools_busy = false
-        pools.each do |name, pool|
-          next if pool.busy_size <= 0
-          puts "  -- #{name} (remaining: #{pool.busy_size})"
-          any_threadpools_busy = true
-        end
-        if !any_threadpools_busy
-          puts "  -- Lifeguard threadpools empty"
-          break
-        end
-        break if wait_loops >= timeout
-        Thread.pass
-        sleep 1
-      end
-    end
-  end
-end

data/spec/integration/multiple_threadpools_spec.rb

@@ -1,29 +0,0 @@
-class DifferentThreadpoolsSubscriber < ActionSubscriber::Base
-  def one
-    $messages << payload
-  end
-
-  def two
-    $messages << payload
-  end
-end
-
-describe "Separate Threadpools for Different Message", :integration => true do
-  let(:draw_routes) do
-    low_priority_threadpool = ::ActionSubscriber::Threadpool.new_pool(:low_priority, 1)
-    ::ActionSubscriber.draw_routes do
-      route DifferentThreadpoolsSubscriber, :one
-      route DifferentThreadpoolsSubscriber, :two, :threadpool => low_priority_threadpool
-    end
-  end
-
-  it "processes messages in separate threadpools based on the routes" do
-    ::ActivePublisher.publish("different_threadpools.one", "ONE", "events")
-    ::ActivePublisher.publish("different_threadpools.two", "TWO", "events")
-
-    verify_expectation_within(2.0) do
-      ::ActionSubscriber.auto_pop!
-      expect($messages).to eq(Set.new(["ONE","TWO"]))
-    end
-  end
-end

data/spec/lib/action_subscriber/threadpool_spec.rb

@@ -1,47 +0,0 @@
-describe ::ActionSubscriber::Threadpool do
-  describe "busy?" do
-    context "when the pool is busy" do
-      it "returns true" do
-        allow(::ActionSubscriber::Threadpool).to receive(:ready?).and_return(false)
-        expect(::ActionSubscriber::Threadpool).to be_busy
-      end
-    end
-
-    context "when the pool is not busy" do
-      it "returns false" do
-        allow(::ActionSubscriber::Threadpool).to receive(:ready?).and_return(true)
-        expect(::ActionSubscriber::Threadpool).to_not be_busy
-      end
-    end
-  end
-
-  describe "ready?" do
-    context "when all the workers are full" do
-      it "returns false" do
-        ::ActionSubscriber::Threadpool.new_pool(:some_dumb_pool, 2)
-
-        ::ActionSubscriber::Threadpool.pools.map do |_name, pool|
-          allow(pool).to receive(:busy_size).and_return(pool.pool_size)
-        end
-
-        expect(::ActionSubscriber::Threadpool).to_not be_ready
-      end
-    end
-
-    context "when only one of the workers is full" do
-      it "returns true" do
-        pool = ::ActionSubscriber::Threadpool.new_pool(:some_other_dumb_pool, 2)
-        allow(pool).to receive(:busy_size).and_return(2)
-
-        expect(::ActionSubscriber::Threadpool).to be_ready
-      end
-    end
-
-    context "when there are idle workers" do
-      it "returns true" do
-        allow(::ActionSubscriber::Threadpool.pool).to receive(:busy_size).and_return(1)
-        expect(::ActionSubscriber::Threadpool).to be_ready
-      end
-    end
-  end
-end