circuitry 2.1.1 → 3.0.0

data/lib/circuitry/provisioning/topic_creator.rb

@@ -0,0 +1,31 @@
+require 'circuitry/services/sns'
+require 'circuitry/topic'
+
+module Circuitry
+  module Provisioning
+    class TopicCreator
+      include Services::SNS
+
+      attr_reader :topic_name
+
+      def self.find_or_create(topic_name)
+        new(topic_name).topic
+      end
+
+      def initialize(topic_name)
+        self.topic_name = topic_name
+      end
+
+      def topic
+        return @_topic if defined?(@_topic)
+
+        response = sns.create_topic(name: topic_name)
+        @_topic = Topic.new(response.topic_arn)
+      end
+
+      private
+
+      attr_writer :topic_name
+    end
+  end
+end

data/lib/circuitry/publisher.rb

@@ -2,7 +2,6 @@ require 'json'
 require 'timeout'
 require 'circuitry/concerns/async'
 require 'circuitry/services/sns'
-require 'circuitry/topic_creator'
 
 module Circuitry
   class PublishError < StandardError; end
@@ -40,7 +39,7 @@ module Circuitry
     end
 
     def self.default_async_strategy
-      Circuitry.config.publish_async_strategy
+      Circuitry.publisher_config.async_strategy
     end
 
     protected
@@ -52,7 +51,7 @@ module Circuitry
         Timeout.timeout(timeout) do
           logger.info("Publishing message to #{topic_name}")
 
-          topic = TopicCreator.find_or_create(topic_name)
+          topic = Topic.find(topic_name)
           sns.publish(topic_arn: topic.arn, message: message)
         end
       end
@@ -63,17 +62,17 @@ module Circuitry
     private
 
     def logger
-      Circuitry.config.logger
+      Circuitry.publisher_config.logger
     end
 
     def can_publish?
-      Circuitry.config.aws_options.values.all? do |value|
+      Circuitry.publisher_config.aws_options.values.all? do |value|
         !value.nil? && !value.empty?
       end
     end
 
     def middleware
-      Circuitry.config.publisher_middleware
+      Circuitry.publisher_config.middleware
     end
   end
 end

data/lib/circuitry/queue.rb

@@ -4,10 +4,30 @@ module Circuitry
   class Queue
     include Services::SQS
 
+    class Finder
+      include Services::SQS
+
+      def initialize(name)
+        self.name = name
+      end
+
+      def find
+        sqs.get_queue_url(queue_name: name)
+      end
+
+      private
+
+      attr_accessor :name
+    end
+
     attr_reader :url
 
     def initialize(url)
-      @url = url
+      self.url = url
+    end
+
+    def self.find(name)
+      new(Finder.new(name).find.queue_url)
     end
 
     def name
@@ -18,10 +38,12 @@ module Circuitry
       @arn ||= attribute('QueueArn')
     end
 
-    private
-
     def attribute(name)
       sqs.get_queue_attributes(queue_url: url, attribute_names: [name]).attributes[name]
     end
+
+    private
+
+    attr_writer :url
   end
 end

data/lib/circuitry/railtie.rb

@@ -1,9 +1,18 @@
 require 'rails'
+require 'circuitry/config/file_loader'
 
 module Circuitry
   class Railtie < Rails::Railtie
     rake_tasks do
       load 'circuitry/tasks.rb'
     end
+
+    initializer 'circuitry' do
+      env = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+
+      %w[config/circuitry.yml.erb config/circuitry.yml].detect do |filename|
+        Circuitry::Config::FileLoader.load(filename, env)
+      end
+    end
   end
 end

data/lib/circuitry/services/sns.rb

@@ -4,7 +4,7 @@ module Circuitry
   module Services
     module SNS
       def sns
-        @sns ||= Aws::SNS::Client.new(Circuitry.config.aws_options)
+        @sns ||= Aws::SNS::Client.new(Circuitry.publisher_config.aws_options)
       end
     end
   end

data/lib/circuitry/services/sqs.rb

@@ -4,7 +4,7 @@ module Circuitry
   module Services
     module SQS
       def sqs
-        @sqs ||= Aws::SQS::Client.new(Circuitry.config.aws_options)
+        @sqs ||= Aws::SQS::Client.new(Circuitry.subscriber_config.aws_options)
       end
     end
   end

data/lib/circuitry/subscriber.rb

@@ -1,9 +1,9 @@
 require 'retries'
 require 'timeout'
-require 'circuitry/queue_creator'
 require 'circuitry/concerns/async'
 require 'circuitry/services/sqs'
 require 'circuitry/message'
+require 'circuitry/queue'
 
 module Circuitry
   class SubscribeError < StandardError; end
@@ -30,8 +30,8 @@ module Circuitry
       options = DEFAULT_OPTIONS.merge(options)
 
       self.subscribed = false
+      self.queue = Queue.find(Circuitry.subscriber_config.queue_name).url
 
-      self.queue = QueueCreator.find_or_create(Circuitry.config.subscriber_queue_name).url
       %i[lock async timeout wait_time batch_size].each do |sym|
         send(:"#{sym}=", options[sym])
       end
@@ -64,7 +64,7 @@ module Circuitry
     end
 
     def self.default_async_strategy
-      Circuitry.config.subscribe_async_strategy
+      Circuitry.subscriber_config.async_strategy
     end
 
     protected
@@ -74,7 +74,7 @@ module Circuitry
 
     def lock=(value)
       value = case value
-              when true then Circuitry.config.lock_strategy
+              when true then Circuitry.subscriber_config.lock_strategy
               when false then Circuitry::Locks::NOOP.new
               when Circuitry::Locks::Base then value
               else raise ArgumentError, lock_value_error(value)
@@ -181,21 +181,21 @@ module Circuitry
     end
 
     def logger
-      Circuitry.config.logger
+      Circuitry.subscriber_config.logger
     end
 
     def error_handler
-      Circuitry.config.error_handler
+      Circuitry.subscriber_config.error_handler
     end
 
     def can_subscribe?
-      Circuitry.config.aws_options.values.all? do |value|
+      Circuitry.subscriber_config.aws_options.values.all? do |value|
         !value.nil? && !value.empty?
       end
     end
 
     def middleware
-      Circuitry.config.subscriber_middleware
+      Circuitry.subscriber_config.middleware
     end
   end
 end

data/lib/circuitry/tasks.rb

@@ -1,11 +1,11 @@
 namespace :circuitry do
   desc 'Create subscriber queues and subscribe queue to topics'
   task setup: :environment do
-    require 'circuitry/provisioner'
-    
+    require 'circuitry/provisioning'
+
     logger = Logger.new(STDOUT)
     logger.level = Logger::INFO
 
-    Circuitry::Provisioner.new(Circuitry.config, logger: logger).run
+    Circuitry::Provisioning.provision(logger: logger)
   end
 end

data/lib/circuitry/topic.rb

@@ -1,17 +1,39 @@
+require 'circuitry/services/sns'
+
 module Circuitry
   class Topic
+    class Finder
+      include Services::SNS
+
+      def initialize(name)
+        self.name = name
+      end
+
+      def find
+        sns.create_topic(name: name)
+      end
+
+      private
+
+      attr_accessor :name
+    end
+
     attr_reader :arn
 
     def initialize(arn)
       @arn = arn
     end
 
+    def self.find(name)
+      new(Finder.new(name).find.topic_arn)
+    end
+
     def name
       @name ||= arn.split(':').last
     end
 
-    def ==(obj)
-      obj.hash == self.hash
+    def ==(other)
+      other.hash == hash
     end
 
     def hash

data/lib/circuitry/version.rb

@@ -1,3 +1,3 @@
 module Circuitry
-  VERSION = '2.1.1'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circuitry
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Matt Huggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -247,7 +247,10 @@ files:
 - lib/circuitry.rb
 - lib/circuitry/cli.rb
 - lib/circuitry/concerns/async.rb
-- lib/circuitry/configuration.rb
+- lib/circuitry/config/file_loader.rb
+- lib/circuitry/config/publisher_settings.rb
+- lib/circuitry/config/shared_settings.rb
+- lib/circuitry/config/subscriber_settings.rb
 - lib/circuitry/locks/base.rb
 - lib/circuitry/locks/memcache.rb
 - lib/circuitry/locks/memory.rb
@@ -260,18 +263,19 @@ files:
 - lib/circuitry/processors/batcher.rb
 - lib/circuitry/processors/forker.rb
 - lib/circuitry/processors/threader.rb
-- lib/circuitry/provisioner.rb
+- lib/circuitry/provisioning.rb
+- lib/circuitry/provisioning/provisioner.rb
+- lib/circuitry/provisioning/queue_creator.rb
+- lib/circuitry/provisioning/subscription_creator.rb
+- lib/circuitry/provisioning/topic_creator.rb
 - lib/circuitry/publisher.rb
 - lib/circuitry/queue.rb
-- lib/circuitry/queue_creator.rb
 - lib/circuitry/railtie.rb
 - lib/circuitry/services/sns.rb
 - lib/circuitry/services/sqs.rb
 - lib/circuitry/subscriber.rb
-- lib/circuitry/subscription_creator.rb
 - lib/circuitry/tasks.rb
 - lib/circuitry/topic.rb
-- lib/circuitry/topic_creator.rb
 - lib/circuitry/version.rb
 homepage: https://github.com/kapost/circuitry
 licenses:

data/lib/circuitry/configuration.rb

@@ -1,64 +0,0 @@
-require 'logger'
-require 'virtus'
-
-module Circuitry
-  class Configuration
-    include Virtus::Model
-
-    attribute :subscriber_queue_name, String
-    attribute :subscriber_dead_letter_queue_name, String
-    attribute :publisher_topic_names, Array[String]
-
-    attribute :access_key, String
-    attribute :secret_key, String
-    attribute :region, String, default: 'us-east-1'
-    attribute :logger, Logger, default: Logger.new(STDERR)
-    attribute :error_handler
-    attribute :lock_strategy, Object, default: ->(_page, _attribute) { Circuitry::Locks::Memory.new }
-    attribute :publish_async_strategy, Symbol, default: ->(_page, _attribute) { :fork }
-    attribute :subscribe_async_strategy, Symbol, default: ->(_page, _attribute) { :fork }
-    attribute :on_thread_exit
-    attribute :on_fork_exit
-
-    def publish_async_strategy=(value)
-      validate(value, Publisher.async_strategies)
-      super
-    end
-
-    def subscribe_async_strategy=(value)
-      validate(value, Subscriber.async_strategies)
-      super
-    end
-
-    def subscriber_dead_letter_queue_name
-      super || "#{subscriber_queue_name}-failures"
-    end
-
-    def subscriber_middleware
-      @subscriber_middleware ||= Circuitry::Middleware::Chain.new
-      yield @subscriber_middleware if block_given?
-      @subscriber_middleware
-    end
-
-    def publisher_middleware
-      @publisher_middleware ||= Circuitry::Middleware::Chain.new
-      yield @publisher_middleware if block_given?
-      @publisher_middleware
-    end
-
-    def aws_options
-      {
-        access_key_id:     access_key,
-        secret_access_key: secret_key,
-        region:            region
-      }
-    end
-
-    private
-
-    def validate(value, permitted_values)
-      return if permitted_values.include?(value)
-      raise ArgumentError, "invalid value `#{value}`, must be one of #{permitted_values.inspect}"
-    end
-  end
-end

data/lib/circuitry/provisioner.rb

@@ -1,60 +0,0 @@
-require 'circuitry/queue_creator'
-require 'circuitry/topic_creator'
-require 'circuitry/subscription_creator'
-
-module Circuitry
-  class Provisioner
-    attr_reader :config, :logger
-
-    def initialize(config, logger: Logger.new(STDOUT))
-      self.config = config
-      self.logger = logger
-    end
-
-    def run
-      queue = create_queue
-      topics = create_topics if queue
-      subscribe_topics(queue, topics) if queue && topics
-    end
-
-    private
-
-    attr_writer :config, :logger
-
-    def create_queue
-      safe_aws('Create Queue') do
-        queue = Circuitry::QueueCreator.find_or_create(
-          config.subscriber_queue_name,
-          dead_letter_queue_name: config.subscriber_dead_letter_queue_name
-        )
-        logger.info "Created queue #{queue.url}"
-        queue
-      end
-    end
-
-    def create_topics
-      safe_aws('Create Topics') do
-        config.publisher_topic_names.map do |topic_name|
-          topic = Circuitry::TopicCreator.find_or_create(topic_name)
-          logger.info "Created topic #{topic.name}"
-          topic
-        end
-      end
-    end
-
-    def subscribe_topics(queue, topics)
-      safe_aws('Subscribe Topics') do
-        Circuitry::SubscriptionCreator.subscribe_all(queue, topics)
-        logger.info "Subscribed all topics to #{queue.name}"
-        true
-      end
-    end
-
-    def safe_aws(desc)
-      yield
-    rescue Aws::SQS::Errors::AccessDenied
-      logger.fatal("#{desc}: Access denied. Check your configured credentials.")
-      nil
-    end
-  end
-end