watership 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 102d250bba9e756c136c1aca5f39bdb47626f4b7
-  data.tar.gz: 72a655309f210bf26e4e63825f8c8409a16b3c68
+  metadata.gz: 88ed411442bd7d22a020bf35b2977fa8045c28f0
+  data.tar.gz: a8b8d9ff4cca429b7349b9c49b5afff814f5dfc0
 SHA512:
-  metadata.gz: e49f2338b90a7fca3685346b819a499ab5c761e4499569f3bc333a891bc21d0f5af0112ac2da1acee9ca28ad6e65e0438c655d0353b1978f809d8287928c380c
-  data.tar.gz: 384e85f983fc9564c7659e10847b111ba61c8ca58d3ef8982c6dd42e16d949609a2fd7ffb19fd0fec2794f330b1f5f30d98f75dad7460d936b18383c82e22560
+  metadata.gz: c49ca8b9245b9a785cde330485f3a602586cc1d863d9f3f1e6f0ed4833eb0d6ed1b1f88670eff8e0c402f4dea6aaad63ceebdbad1e541d3150ac67887059804f
+  data.tar.gz: a7f0a9f4362792ea35b269cc445d0bcec29bf933639a676bd6895c1b46b24f81750d3fd82e8f512822868db82246e4edfb2d68d5abbf6443d7c7f456abf88550

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 class Watership
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/watership.rb

@@ -1,7 +1,6 @@
-require 'watership/version'
-
-require 'bunny'
-require 'json'
+require "bunny"
+require "json"
+require "watership/version"
 
 class Watership
   CONNECTION_EXCEPTIONS = [
@@ -11,35 +10,48 @@ class Watership
     Bunny::TCPConnectionFailed
   ]
 
-  def self.config=(path)
-    @config = IO.read(path).chomp
-  end
+  class << self
+    def config=(path)
+      @config = IO.read(path).chomp
+    end
 
-  def self.connect_to_rabbit
-    $rabbit = Bunny.new(@config)
+    def enqueue(options = {})
+      options  = options.dup
+      message  = options.delete(:message)
+      name     = options.delete(:name)
+      fallback = options.delete(:fallback)
+
+      queue = connect_with_queue(name, options)
+      queue.publish(JSON.generate(message))
+    rescue StandardError => exception
+      fallback.call if fallback
+      Airbrake.notify(exception) if defined?(Airbrake)
+      logger.error(exception.class.name)
+    end
 
-    $rabbit.start
-    $channel = $rabbit.create_channel
-  rescue *CONNECTION_EXCEPTIONS => e
-    logger.warn(e.class.name)
-    $channel = nil
-  end
+    def connect_with_queue(name, options)
+      channel.queue(name, { durable: true }.merge(options))
+    end
 
-  def self.enqueue(queue_name, data, options = {})
-    if $channel
-      queue = $channel.queue(queue_name, { durable: true }.merge(options))
-      queue.publish(JSON.generate(data))
+    def reconnect
+      $channel = nil
+      channel
+      true
     end
-  rescue StandardError => e
-    # $channel.close
-    # $channel = nil # kill the channel so we stop trying to push to Rabbit
 
-    Airbrake.notify(e) if defined?(Airbrake)
-    logger.error e.class.name
-  end
+    def channel
+      $channel ||= connection.create_channel
+    rescue *CONNECTION_EXCEPTIONS => exception
+      logger.warn(exception.class.name)
+      $channel = nil
+    end
 
-  def self.logger
-    @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
-  end
+    def connection
+      Bunny.new(@config).tap { |bunny| bunny.start }
+    end
 
-end
+    def logger
+      @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler