circuitry 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ae4efdabd382cf4dcc8cda4c2102639e14515d
-  data.tar.gz: c7b36755a9674de3660b169b08e0db6765e65819
+  metadata.gz: 95884450075da2bde6359a923037db59ddaee7f6
+  data.tar.gz: 7b56e6c314947463b2d95627ec622632a9fe60d0
 SHA512:
-  metadata.gz: ece369e583e3f2febaaba9ef5bc16481d88b5756fff08d9926f2baea3185e849efb7d9468276d32bc7560cc7822e8546fee01d7d0fd11623052a756522754634
-  data.tar.gz: 7314bcd628b794be00e20f2f160970ef02b8a2e443220bde6b11257527bf4a8da667acd4e571b039bdf6fc0b4f1a99bbaca2a2d0fa85784475aa3dd24a995e46
+  metadata.gz: 9d9000bb3af034d32c012a6610c1f2a791b7f1af3192e276d9901075828ee0a2a8221d5dc5f01b10c18cd8bf5c92348b1d4fea54a738e4136b1f9b17546e22b1
+  data.tar.gz: 3a810f4b53a4eb4c4e5227e6e877fe69bcc2cef12a22c2205854782f1cf174670d84159224eabf310e482a68bffa80dfce5e40377f287076d8e66847689d8864

data/CHANGELOG.md

@@ -1,17 +1,27 @@
+## Circuitry 3.1.1 (Mar 3, 2016)
+
+* Removed flush middleware. *Matt Huggins*
+
+## Circuitry 3.1.0 (Mar 2, 2016)
+
+* Added test stubs. *Matt Huggins*
+* Added flush middleware. *Matt Huggins*
+* Updated provisioning to permit publisher-only configuration (no queue name). *Matt Huggins*
+
 ## Circuitry 3.0.1 (Feb 19, 2016)
 
-* Reworded provisioner subscription creator message *Brandon Croft*
+* Reworded provisioner subscription creator message. *Brandon Croft*
 
 ## Circuitry 3.0.0 (Feb 19, 2016)
 
-* Added separate configuration for publisher/subscriber applications *Brandon Croft*
-* Added YML config option *Brandon Croft*
-* Added max_receive_count and visibility_timeout subscriber config options *Brandon Croft*
-* Replace on_thread_exit and on_fork_exit with on_async_exit config option *Brandon Croft*
+* Added separate configuration for publisher/subscriber applications. *Brandon Croft*
+* Added YML config option. *Brandon Croft*
+* Added `max_receive_count` and `visibility_timeout` subscriber config options. *Brandon Croft*
+* Replaced `on_thread_exit` and `on_fork_exit` with `on_async_exit` config option. *Brandon Croft*
 
 ## Circuitry 2.1.1 (Jan 30, 2016)
 
-* Fixed missing require in subscriber *Brandon Croft*
+* Fixed missing require in subscriber. *Brandon Croft*
 
 ## Circuitry 2.1.0 (Jan 28, 2016)
 
@@ -19,8 +29,8 @@
 
 ## Circuitry 2.0.0 (Jan 28, 2016)
 
-* Added subscriber_queue_name config. *Brandon Croft*
-* Added publisher_topic_names config. *Brandon Croft*
+* Added `subscriber_queue_name` config. *Brandon Croft*
+* Added `publisher_topic_names` config. *Brandon Croft*
 * Added CLI and rake provisioning of queues and topics as defined by config. *Brandon Croft*
 * Removed the requirement to provide a SQS URL to the subscriber. *Brandon Croft*
 

data/README.md

@@ -16,7 +16,7 @@ A Circuitry publisher application can broadcast events which can be fanned out t
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'circuitry', '~>2.0.0'
+gem 'circuitry', '~> 3.1'
 ```
 
 And then execute:
@@ -86,8 +86,8 @@ development:
 production:
   publisher:
     topic_names:
-      - brandonc-appname-user-create
-      - brandonc-appname-user-destroy
+      - production-appname-user-create
+      - production-appname-user-destroy
   subscriber:
     queue_name: "production-appname"
     dead_letter_queue_name: "production-appname-failures"
@@ -555,6 +555,16 @@ your middleware:
 * `#clear`: Removes all middleware classes from the chain.
   * `middleware.clear`
 
+## Testing
+
+Circuitry provides a simple option for testing publishing and subscribing without actually hitting
+Amazon services.  Inside your test suite (e.g.: `spec_helper.rb`), just make sure you include the
+following line:
+
+```ruby
+require 'circuitry/testing'
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run

data/lib/circuitry/config/shared_settings.rb

@@ -17,7 +17,7 @@ module Circuitry
       end
 
       def middleware
-        @_middleware ||= Circuitry::Middleware::Chain.new
+        @_middleware ||= Middleware::Chain.new
         yield @_middleware if block_given?
         @_middleware
       end

data/lib/circuitry/middleware/chain.rb

@@ -5,6 +5,10 @@ module Circuitry
     class Chain
       include Enumerable
 
+      def initialize
+        yield self if block_given?
+      end
+
       def each(&block)
         entries.each(&block)
       end

data/lib/circuitry/processors/batcher.rb

@@ -12,9 +12,9 @@ module Circuitry
         end
 
         def flush
-          pool.each { |block| safely_process(&block) }
-        ensure
-          pool.clear
+          while (block = pool.shift)
+            safely_process(&block)
+          end
         end
       end
     end

data/lib/circuitry/provisioning/provisioner.rb

@@ -11,10 +11,8 @@ module Circuitry
 
       def run
         queue = create_queue
-        return unless queue
-
+        subscribe_topics(queue, create_topics(:subscriber, subscriber_config.topic_names)) if queue
         create_topics(:publisher, publisher_config.topic_names)
-        subscribe_topics(queue, create_topics(:subscriber, subscriber_config.topic_names))
       end
 
       private
@@ -30,6 +28,11 @@ module Circuitry
       end
 
       def create_queue
+        if subscriber_config.queue_name.nil?
+          logger.info 'Skipping queue creation: queue_name is not configured'
+          return nil
+        end
+
         safe_aws('Create queue') do
           queue = QueueCreator.find_or_create(
             subscriber_config.queue_name,

data/lib/circuitry/subscriber.rb

@@ -131,50 +131,51 @@ module Circuitry
       message = Message.new(message)
 
       logger.info("Processing message #{message.id}")
-      handle_message(message, &block)
-      delete_message(message)
-    rescue => e
-      logger.error("Error processing message #{message.id}: #{e}")
-      error_handler.call(e) if error_handler
-    end
 
-    def handle_message(message, &block)
       handled = try_with_lock(message.id) do
-        middleware.invoke(message.topic.name, message.body) do
-          handle_message_with_timeout(message, &block)
-        end
+        handle_message_with_middleware(message, &block)
       end
 
       logger.info("Ignoring duplicate message #{message.id}") unless handled
+    rescue => e
+      logger.error("Error processing message #{message.id}: #{e}")
+      error_handler.call(e) if error_handler
     end
 
-    # TODO: Don't use ruby timeout.
-    # http://www.mikeperham.com/2015/05/08/timeout-rubys-most-dangerous-api/
-    def handle_message_with_timeout(message, &block)
-      Timeout.timeout(timeout) do
-        block.call(message.body, message.topic.name)
+    def handle_message_with_middleware(message, &block)
+      middleware.invoke(message.topic.name, message.body) do
+        handle_message(message, &block)
+        delete_message(message)
       end
-    rescue => e
-      logger.error("Error handling message #{message.id}: #{e}")
-      raise e
     end
 
-    def try_with_lock(handle)
-      if lock.soft_lock(handle)
+    def try_with_lock(id)
+      if lock.soft_lock(id)
         begin
           yield
         rescue => e
-          lock.unlock(handle)
+          lock.unlock(id)
           raise e
         end
 
-        lock.hard_lock(handle)
+        lock.hard_lock(id)
         true
       else
         false
       end
     end
 
+    # TODO: Don't use ruby timeout.
+    # http://www.mikeperham.com/2015/05/08/timeout-rubys-most-dangerous-api/
+    def handle_message(message, &block)
+      Timeout.timeout(timeout) do
+        block.call(message.body, message.topic.name)
+      end
+    rescue => e
+      logger.error("Error handling message #{message.id}: #{e}")
+      raise e
+    end
+
     def delete_message(message)
       logger.info("Removing message #{message.id} from queue")
       sqs.delete_message(queue_url: queue, receipt_handle: message.receipt_handle)

data/lib/circuitry/testing.rb

@@ -0,0 +1,15 @@
+require 'circuitry'
+
+module Circuitry
+  class Publisher
+    def publish(_topic_name, _object)
+      # noop
+    end
+  end
+
+  class Subscriber
+    def subscribe(&_block)
+      # noop
+    end
+  end
+end

data/lib/circuitry/version.rb

@@ -1,3 +1,3 @@
 module Circuitry
-  VERSION = '3.0.1'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitry
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Matt Huggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -275,6 +275,7 @@ files:
 - lib/circuitry/services/sqs.rb
 - lib/circuitry/subscriber.rb
 - lib/circuitry/tasks.rb
+- lib/circuitry/testing.rb
 - lib/circuitry/topic.rb
 - lib/circuitry/version.rb
 homepage: https://github.com/kapost/circuitry
@@ -297,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Decouple ruby applications using Amazon SNS fanout with SQS processing.