rack-rabbit 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 919fa7db9bf34a8358ba5393faac1f4cb777f4e3
-  data.tar.gz: 7d102a9f0e29a85ef653d768fc0ef1ccac5d521a
+  metadata.gz: d0ae6fe9017057176665a112219b20bcb02cf6c4
+  data.tar.gz: 643d99de440abf0344e63bbe6628acb55cfba3a4
 SHA512:
-  metadata.gz: fee6fd72ec96b95ec755f4c2806298ccba06fd84693a5c0b924bf77716f89b3cae2d3b29d1ee98c7f0820682430697507682d16c0a661e7cbe06c09ee331fefe
-  data.tar.gz: b7c3e6f3f61b84aeaadd444d20d3f2d0de8814b7ac82cb2465af40ff6062d3f3d56e3e5fc6e8026e34c2c9540a4015724edb09ac990a498b7eeec9ffc952e4ce
+  metadata.gz: f24c11999c486fa2272ff592cc0a6fd2564d0a345102852375393952d8397646478b8178ed8153413e194a7cd3df74be9ee46a84059f3118874dad6d068b3d79
+  data.tar.gz: 7aa285b2a94b5ebafadd532df2f260523d636a8fe2f1ed1615fd977bbfc78284a2fd285014904a335f8aa33027e98061accf1dd88a64839b9ab94e48020cd2e6

data/EXAMPLES.md

@@ -154,7 +154,7 @@ First `foo.ru`
     require 'sinatra/base'
 
     class Foo < Sinatra::Base
-      post "/event do
+      post "/event" do
         logger.info "Foo saw the event"
       end
     end
@@ -165,7 +165,7 @@ Then `bar.ru`
     require 'sinatra/base'
 
     class Bar < Sinatra::Base
-      post "/event do
+      post "/event" do
         logger.info "Bar saw the event"
       end
     end

data/Gemfile

@@ -1,7 +1,13 @@
 source "http://rubygems.org"
 
+ruby "~> 2.4.0"
+
+group :development, :test do
+  gem "rake"
+end
+
 group :test do
-  gem "minitest", "~>4.7.0"
+  gem "minitest", "~>5.10.3"
   gem "timecop"
   gem "mocha"
 end

data/Gemfile.lock

@@ -2,32 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     amq-protocol (1.9.2)
-    amqp (1.4.1)
-      amq-protocol (>= 1.9.2)
+    amqp (1.5.1)
+      amq-protocol (~> 1.9)
       eventmachine
-    bunny (1.4.0)
+    bunny (2.0.1)
       amq-protocol (>= 1.9.2)
     coderay (1.1.0)
-    eventmachine (1.0.3)
+    eventmachine (1.0.8)
     metaclass (0.0.4)
     method_source (0.8.2)
-    minitest (4.7.5)
+    minitest (5.10.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    sinatra (1.4.5)
+    rake (12.0.0)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
-    tilt (1.4.1)
-    timecop (0.7.1)
+    tilt (2.0.1)
+    timecop (0.8.0)
 
 PLATFORMS
   ruby
@@ -35,8 +36,15 @@ PLATFORMS
 DEPENDENCIES
   amqp
   bunny
-  minitest (~> 4.7.0)
+  minitest (~> 5.10.3)
   mocha
   pry
+  rake
   sinatra
   timecop
+
+RUBY VERSION
+   ruby 2.4.1p111
+
+BUNDLED WITH
+   1.15.3

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Jake Gordon
+Copyright (c) 2014, 2015, 2016, 2017 Jake Gordon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-# Rack Rabbit (v0.5.0)
+# Rack Rabbit (v0.6.0)
 
 A forking server for hosting rabbitMQ consumer processes as load balanced rack applications.
 
@@ -53,8 +53,8 @@ Install a rabbitMQ server if necessary ([docs](https://www.rabbitmq.com/download
 
 Update your Gemfile to include RackRabbit and your preferred rabbitMQ client library
 
-    gem bunny,       "~> 1.4"             # or an alternative such as AMQP or march-hare
-    gem rack-rabbit, "~> 0.1"
+    gem bunny,       "~> 2.7"
+    gem rack-rabbit, "~> 0.6"
 
 
 ## Getting started by example

data/lib/rack-rabbit.rb

@@ -4,7 +4,7 @@ module RackRabbit
   # CONSTANTS
   #============================================================================
 
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
   SUMMARY = "A Unicorn-style forking, rack-based server for hosting rabbitMQ consumer processes"
 
   DEFAULT_RABBIT = {
@@ -59,5 +59,11 @@ module RackRabbit
 
   #----------------------------------------------------------------------------
 
+  def self.load_rack_app(rack_file)
+    (@rack_app_cache ||= {})[rack_file] ||= Rack::Builder.parse_file(rack_file)
+  end
+
+  #----------------------------------------------------------------------------
+
 end
 

data/lib/rack-rabbit/adapter.rb

@@ -31,6 +31,8 @@ module RackRabbit
 
     def initialize(options)
       @connection_options = options
+      @started   = nil
+      @connected = nil
     end
 
     def startup

data/lib/rack-rabbit/adapter/mock.rb

@@ -42,7 +42,7 @@ module RackRabbit
       end
 
       def with_reply_queue(&block)
-        yield OpenStruct.new :name => "reply.queue"
+        yield MockReplyQueue.new :name => "reply.queue"
       end
 
       def ack(delivery_tag)
@@ -85,6 +85,15 @@ module RackRabbit
         @subscribe_options
       end
 
+      class MockReplyQueue
+        attr_accessor :name
+        def initialize(options)
+          @name = options[:name]
+        end
+        def delete(*params)
+        end
+      end
+
     end
 
   end

data/lib/rack-rabbit/client.rb

@@ -55,6 +55,7 @@ module RackRabbit
       method    = options[:method]  || :GET
       headers   = options[:headers] || {}
       response  = nil
+      timeout   = options[:timeout] || 1
 
       rabbit.with_reply_queue do |reply_queue|
 
@@ -62,6 +63,7 @@ module RackRabbit
           if message.correlation_id == id
             lock.synchronize do
               response = Response.new(message.status, message.headers, message.body)
+              reply_queue.delete(if_empty: true)
               condition.signal
             end
           end
@@ -84,7 +86,7 @@ module RackRabbit
       end
 
       lock.synchronize do
-        condition.wait(lock) unless response
+        condition.wait(lock, timeout) unless response
       end
 
       response

data/lib/rack-rabbit/config.rb

@@ -16,7 +16,7 @@ module RackRabbit
 
     def reload(options = {})
       @rack_env = nil
-      instance_eval(File.read(config_file), config_file) if config_file && File.exists?(config_file)
+      instance_eval(File.read(config_file), config_file) if config_file && File.exist?(config_file)
       validate(options) unless options[:validate] == false
     end
 
@@ -215,9 +215,9 @@ module RackRabbit
 
       raise ArgumentError, "must provide EITHER a :queue OR an :exchange to subscribe to" if queue.nil? && exchange.nil?
       raise ArgumentError, "missing app_id" if app_id.to_s.empty?
-      raise ArgumentError, "invalid workers" unless workers.is_a?(Fixnum)
-      raise ArgumentError, "invalid min_workers" unless min_workers.is_a?(Fixnum)
-      raise ArgumentError, "invalid max_workers" unless max_workers.is_a?(Fixnum)
+      raise ArgumentError, "invalid workers" unless workers.is_a?(Integer)
+      raise ArgumentError, "invalid min_workers" unless min_workers.is_a?(Integer)
+      raise ArgumentError, "invalid max_workers" unless max_workers.is_a?(Integer)
       raise ArgumentError, "invalid workers < min_workers" if workers < min_workers
       raise ArgumentError, "invalid workers > max_workers" if workers > max_workers
       raise ArgumentError, "invalid min_workers > max_workers" if min_workers > max_workers

data/lib/rack-rabbit/message.rb

@@ -25,6 +25,8 @@ module RackRabbit
       @content_encoding   = properties.content_encoding
       @content_length     = body.nil? ? 0 : body.length
       @rabbit             = rabbit
+      @acknowledged       = nil
+      @rejected           = nil
     end
 
     #--------------------------------------------------------------------------

data/lib/rack-rabbit/server.rb

@@ -248,7 +248,7 @@ module RackRabbit
     #==========================================================================
 
     def load_app
-      inner_app, options = Rack::Builder.parse_file(config.rack_file)
+      inner_app, _options = RackRabbit.load_rack_app(config.rack_file)
       @app = Rack::Builder.new do
         use RackRabbit::Middleware::ProgramName
         run inner_app

data/lib/rack-rabbit/subscriber.rb

@@ -31,7 +31,7 @@ module RackRabbit
                        :exchange      => config.exchange,
                        :exchange_type => config.exchange_type,
                        :routing_key   => config.routing_key,
-                       :ack           => config.ack) do |message|
+                       :manual_ack    => config.ack) do |message|
         lock.synchronize do
           start = Time.now
           response = handle(message)

data/test/test_case.rb

@@ -21,7 +21,7 @@ require 'rack-rabbit/config'          # server configuration
 require 'rack-rabbit/signals'         # process signal queue
 
 module RackRabbit
-  class TestCase < Minitest::Unit::TestCase
+  class TestCase < Minitest::Test
 
     #--------------------------------------------------------------------------
 
@@ -102,7 +102,7 @@ module RackRabbit
     end
 
     def build_app(rack_file)
-      Rack::Builder.parse_file(rack_file)[0]
+      RackRabbit.load_rack_app(rack_file)[0]
     end
 
     def build_handler(options = {})
@@ -124,6 +124,20 @@ module RackRabbit
 
     #--------------------------------------------------------------------------
 
+    # FUCK MT6 forcing me to use assert_nil when I want to user assert_equal
+    alias_method :orig_assert_equal, :assert_equal
+    def assert_equal(exp, act, msg = nil)
+      if exp.nil?
+        assert_nil act, msg
+      else
+        orig_assert_equal(exp, act, msg)
+      end
+      # msg = message(msg, E) { diff exp, act }
+      # assert exp == act, msg
+    end
+
+    #--------------------------------------------------------------------------
+
     def assert_raises_argument_error(message = nil, &block)
       e = assert_raises(ArgumentError, &block)
       assert_match(/#{message}/, e.message) unless message.nil?

data/test/unit/test_config.rb

@@ -200,10 +200,10 @@ module RackRabbit
 
     def test_queue_or_exchange_is_required
       assert_raises_argument_error("must provide EITHER a :queue OR an :exchange") do
-        bad = build_config(:validate => true)
+        _bad = build_config(:validate => true)
       end
-      good1 = build_config(:validate => true, :queue    => "myqueue")
-      good2 = build_config(:validate => true, :exchange => "myexchange")
+      _good1 = build_config(:validate => true, :queue    => "myqueue")
+      _good2 = build_config(:validate => true, :exchange => "myexchange")
     end
 
     #--------------------------------------------------------------------------

data/test/unit/test_subscriber.rb

@@ -26,11 +26,22 @@ module RackRabbit
     #--------------------------------------------------------------------------
 
     def test_subscribe_options
-      options    = { :queue => QUEUE, :exchange => EXCHANGE, :exchange_type => :fanout, :routing_key => ROUTE, :ack => true }
-      subscriber = build_subscriber(options)
+      subscriber = build_subscriber({
+        queue: QUEUE,
+        exchange: EXCHANGE,
+        exchange_type: :fanout,
+        routing_key: ROUTE,
+        ack: true
+      })
       rabbit     = subscriber.rabbit
       subscriber.subscribe
-      assert_equal(options, rabbit.subscribe_options, "subscription options should be set as expected")
+      assert_equal({
+        queue: QUEUE,
+        exchange: EXCHANGE,
+        exchange_type: :fanout,
+        routing_key: ROUTE,
+        manual_ack: true
+      }, rabbit.subscribe_options)
     end
 
     #--------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-rabbit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jake Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Unicorn-style forking, rack-based server for hosting rabbitMQ consumer