watership 0.7.4 → 0.8.0.pre

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f426f32fd102d92fe6af3346c5a097e7fc2b8f09
-  data.tar.gz: 79283ca32d717adc9592faf08ed75006208666f8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MThkNjNkYjBiNDBmMGQ4NzllNWE2YjgwMWJjMzc3MjMwMmQ2N2JhMw==
+  data.tar.gz: !binary |-
+    ZjA3OGE1MjdhOWM3M2ViZDlhN2FlN2Q4ZjRjMzkzZDlmNmZhNGQ3MQ==
 SHA512:
-  metadata.gz: 7e3452318d4a2da31b92b78dad4b69718e9e94a555160eb28fb24c990b3e8f0ab35d28a10d64491ff81311f003702e649cb0911821c807c190f4884380d3e72a
-  data.tar.gz: cc9b786b7814e45ebbdbe5ff605e700b9f43d8a565e7649fbdc9be2f3c799be1249ddae5380bd1890b45c6a36b49fd155378b95e5cbafdd48b15d735841c5169
+  metadata.gz: !binary |-
+    OGQ4YmU0NTU0YTIxMWIwYzU2ZTY0MDdlMGM0MjZhODU1N2U3NWU4ZTg5MmNm
+    MTA5ZTBhNWE0YzJjNTM3OTU2YmU5Y2Q2NTlhYjYxY2MxNjdlZjcxYmQ0YmZl
+    NmU3OGRkYjRlNGQ5MTBlMjgyOTM3NzgxOTVkZTlkNmE3OGIzNzY=
+  data.tar.gz: !binary |-
+    NGE5ZDlkNjllMDg4MDFiYTc5ZWE2NjVkMWExNDFhMzE0MzgzNWYwYWU3ODFl
+    NTljNTU1ZTYwZDA4NDRmYmNjNGM4NDkxNmYyNzdmNDRiY2Q3MDA4MjExOTYz
+    MzBiYjFjYjVlMjFiNmE4MzY0OGViYzRiMDk3NzIwMTUzNGJlNjI=

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = '0.7.4'
+  VERSION = '0.8.0.pre'
 end

data/lib/watership.rb

@@ -10,54 +10,105 @@ module Watership
     Bunny::TCPConnectionFailed
   ]
 
-  class << self
-    def environment=(env)
-      @env = env
-    end
+  def self.register(name, uri, env = 'production')
+    registered[name.to_sym] = Client.new(uri, env)
+  end
 
-    def config=(uri)
-      @config = uri
-    end
+  def self.registered
+    @registered_instances ||= {}
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  end
+
+  def self.enqueue(name, opts)
+    registered.fetch(name.to_sym).enqueue(opts)
+  end
 
-    def enqueue!(options = {})
-      enqueue(options, true)
+  class Client
+    def initialize(uri, env)
+      @uri = uri
+      @env = env
     end
 
-    def enqueue(options = {}, reraise = false)
+    def enqueue(options = {})
       options  = options.dup
       message  = options.delete(:message)
-      name     = options.delete(:name)
+      name     = options.delete(:queue)
       fallback = options.delete(:fallback)
 
       queue = connect_with_queue(name, options)
       queue.publish(JSON.generate(message))
+
+    rescue *CONNECTION_EXCEPTIONS => exception
+      fallback.call if fallback
+      notify(exception)
+      clear_channel
+      logger.error(exception.class.name)
+      raise exception
     rescue StandardError => exception
       fallback.call if fallback
       notify(exception)
       logger.error(exception.class.name)
-      raise exception if reraise
+      raise exception
     end
 
     def connect_with_queue(name, options = {})
-      channel.queue(name, { durable: true }.merge(options)) if channel
+      with_channel do |channel|
+        channel.queue(name, { durable: true }.merge(options)) if channel
+      end
+    end
+
+    def thread
+      Thread.current[:"watership_#{self.object_id}"] ||= {}
     end
 
     def reconnect
-      Thread.current[:bunny_channel] = nil
-      $bunny_connection = nil
-      channel
+      clear_channel
+      clear_connection
+      create_channel
       true
     end
 
-    def channel
-      Thread.current[:bunny_channel] ||= connection.create_channel
-    rescue *CONNECTION_EXCEPTIONS => exception
-      notify(exception)
-      Thread.current[:bunny_channel] = nil
+    def connection
+      @bunny_connection ||= Bunny.new(@uri).tap { |bunny| bunny.start }
     end
+    alias create_connection connection
 
-    def connection
-      $bunny_connection ||= Bunny.new(@config).tap { |bunny| bunny.start }
+    def clear_connection
+      if @bunny_connection.respond_to?(:close)
+        begin
+          @bunny_connection.close
+        rescue Bunny::ConnectionError # the connection is already closed
+        end
+      end
+    ensure
+      @bunny_connection = nil
+    end
+
+    def with_channel
+      channel = create_channel
+      yield(channel) if channel
+    end
+
+    def create_channel
+      thread[:bunny_channel] ||= connection.create_channel
+    end
+
+    def clear_channel
+      if thread[:bunny_channel].respond_to?(:close)
+        begin
+          thread[:bunny_channel].close
+        rescue Bunny::ChannelError # the channel is already closed
+        end
+      end
+    ensure
+      thread[:bunny_channel] = nil
     end
 
     def notify(exception)
@@ -65,12 +116,8 @@ module Watership
       Airbrake.notify_or_ignore(exception) if defined?(Airbrake) && @env == 'production'
     end
 
-    def logger=(logger)
-      @logger = logger
-    end
-
     def logger
-      @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+      Watership.logger
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0.pre
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,42 +28,42 @@ dependencies:
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper around Bunny to better handle connection issues
@@ -94,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wrapper around Bunny to better handle connection issues