urabbit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75cd5cf7a7a2c13f4f848c30649f2c6af97af9eb
-  data.tar.gz: 07941cff03f8c709c0b61f16d4de5e9b4e9283ad
+  metadata.gz: d799ad09ff9148e6dbaaeeef2081354dd3c080e6
+  data.tar.gz: 5c2dc55aea39d26681aa5bdda6512befc66dc008
 SHA512:
-  metadata.gz: c77b3fa6a8322cf117d9b991ffe12cdd9d45f303c054773a29ed0203255cc145832d36e0791c7675bcfdfc963ac18b93d853f8c1f0ac9b411ab1cac201ee8243
-  data.tar.gz: 3d769d50b61b9024d6e31ccd7f4f441a87e940e88b62def4533bf4f716cdd758d724cd6c82124cfd474e832d1a203d758eb01fdf790b922c16f55305a4d5b70a
+  metadata.gz: 3298896032c0fef9b2c4a6aae4055338b986448832f5d625e81ea2da8b6156f2f2e29bbf7bbb1b69299ed52103a434c77cb7ca844d0da96f82b3e7de28a94d27
+  data.tar.gz: 2db306043158f167e9494cd02ac5c371862715b18e4ed8e6cb360febf93c909fda27c6f4bb20ddacdb793a5c8239b0620ad55738440c2ff277a790e0944e3c3a

data/lib/urabbit.rb

@@ -3,13 +3,9 @@ require "logger"
 require "json"
 require "securerandom"
 
-require "urabbit/version"
-require "urabbit/rpc"
-require "urabbit/rpc/server"
-require "urabbit/rpc/client"
-require "urabbit/publisher"
-
 module Urabbit
+  class Error < Exception; end
+
   def self.logger
     @logger ||= if defined?(Rails)
       Rails.logger
@@ -21,4 +17,23 @@ module Urabbit
   def self.logger=(logger)
     @logger = logger
   end
+
+  # A single connection shared between threads.
+  def self.connect(cloudamqp_url = ENV["CLOUDAMQP_URL"])
+    @connection = Bunny.new(cloudamqp_url, logger: logger)
+    @connection.start
+    @connection
+  rescue Bunny::Exception
+    raise Error.new("Error connecting to RabbitMQ")
+  end
+
+  def self.create_channel
+    @connection.create_channel
+  end
 end
+
+require "urabbit/version"
+require "urabbit/rpc"
+require "urabbit/rpc/server"
+require "urabbit/rpc/client"
+require "urabbit/publisher"

data/lib/urabbit/publisher.rb

@@ -13,8 +13,6 @@
 # Message is usually a JSON.
 # Exception can contain a cause raised from Bunny.
 class Urabbit::Publisher
-  class Error < Exception; end
-
   def initialize(opts)
     cloudamqp_url = opts[:cloudamqp_url] || ENV["CLOUDAMQP_URL"]
     exchange_type = opts[:exchange_type] || :topic
@@ -23,9 +21,7 @@ class Urabbit::Publisher
     @routing_key = opts[:routing_key] ||
       raise(Error.new("Please provide a 'routing_key'"))
 
-    @connection = Bunny.new(cloudamqp_url, logger: Urabbit.logger)
-    @connection.start
-    @channel = @connection.create_channel
+    @channel = Urabbit.create_channel
     @exchange = Bunny::Exchange.new(
       @channel,
       exchange_type,

data/lib/urabbit/rpc/client.rb

@@ -18,14 +18,10 @@
 #               can be thrown during initialization and method calls.
 #               It can also contain a cause raised from Bunny itself.
 class Urabbit::RPC::Client
-  class Error < Exception; end
-  class ServerError < Error; end
+  class ServerError < Urabbit::Error; end
 
-  def initialize(cloudamqp_url = ENV["CLOUDAMQP_URL"])
-    @connection = Bunny.new(cloudamqp_url, logger: Urabbit.logger)
-    @connection.start
-
-    @channel = @connection.create_channel
+  def initialize
+    @channel = Urabbit.create_channel
     @exchange = @channel.default_exchange
     @reply_queue = @channel.queue("amq.rabbitmq.reply-to")
 
@@ -45,7 +41,7 @@ class Urabbit::RPC::Client
       end
     end
   rescue Bunny::Exception
-    raise Error.new("Error connecting to queue")
+    raise Urabbit::Error.new("Error connecting to queue")
   end
 
   def call(routing_key, message, timeout = 10)
@@ -60,7 +56,7 @@ class Urabbit::RPC::Client
     @lock.synchronize{@condition.wait(@lock, timeout)}
 
     if @error.nil? && @result.nil?
-      raise Error.new("Timed out waiting for reply. "\
+      raise Urabbit::Error.new("Timed out waiting for reply. "\
         "Make sure the RPC queue name is correct.")
     end
 
@@ -70,6 +66,6 @@ class Urabbit::RPC::Client
       @result
     end
   rescue Bunny::Exception
-    raise Error.new("Error communicating with queue")
+    raise Urabbit::Error.new("Error communicating with queue")
   end
 end

data/lib/urabbit/rpc/server.rb

@@ -1,17 +1,10 @@
 module Urabbit::RPC::Server
-  def initialize(cloudamqp_url = ENV["CLOUDAMQP_URL"])
-    @connection = Bunny.new(cloudamqp_url, logger: logger)
-    @connection.start
-
-    @channel = @connection.create_channel
-
-    # TODO: Test which setting is the best
-    # @channel.prefetch(1)
-  end
+  SleepInterval = 1 # How often to check if server should stop.
 
   # TODO: Currently this is called directly, but it should
   # be called using server_engine.
   def start
+    @channel = Urabbit.create_channel
     logger.info("Starting RPC server for #{self.class.name}")
 
     @queue = @channel.queue(self.class.queue_name)
@@ -41,16 +34,16 @@ module Urabbit::RPC::Server
 
     # Subscribing in blocking mode above disables auto-reconnection feature.
     # It's better to just sleep.
-    sleep
+    until(@should_stop) do
+      sleep(SleepInterval)
+    end
 
     logger.info("Stopped responding to RPC calls for #{self.class.name}")
   end
 
   # TODO: Use this method when server_engine is implemented.
   def stop
-    @channel.close
-    @connection.close
-
+    @should_stop = true
     logger.info("Stopped RPC server for #{self.class.name}")
   end
 

data/lib/urabbit/version.rb

@@ -1,3 +1,3 @@
 module Urabbit
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: urabbit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jacek Becela
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler