sneakers 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 955c1e3e788a76c97ae9b89ee240a9a2d3f4aaf8
-  data.tar.gz: 28a4049a67567ba36e434a471e280ba0f5fe20b2
+  metadata.gz: ec56c8e9d5a17b77884550db383bd199027c6df5
+  data.tar.gz: 057d82d280432901949988868f0643958cd26ec4
 SHA512:
-  metadata.gz: 9405f6a0baf93ddf0211f7437138228e6bdeb76247d64675a8211775f540654bb89efe44497f5502d1582cf7855bae5d38c45986a167c3e39cd580ac2c98d24b
-  data.tar.gz: 11b4a380a5b3a3e596f294d7406c8afed06a7d9e5679dd12907bc543e00580e05f18cb71331ef16c24e6b1881cadb8df90d29317e4ed8573b0d8de946c877ab3
+  metadata.gz: 9d57c46bf38eb2bbb9752cc4fdc14d2de9ff9abdd9cf5d32a5a9a89c68e62d1884ccff6ba9c46eae106ea02c30ed2b4f8faffe8d3e69a1527ba395b3c0a2663a
+  data.tar.gz: f31f033a8fb2173632e16f7bd2ac73d6e6572270e8c77cc6f3d8dd3510ae63cd02bd241d6609c488a5dbb93ecc34d1d66653985e1e7895265c185ef92f7fd10f

data/lib/sneakers/configuration.rb

@@ -4,7 +4,7 @@ module Sneakers
   class Configuration
 
     extend Forwardable
-    def_delegators :@hash, :to_hash, :[], :[]=, :merge!, :==, :fetch, :delete
+    def_delegators :@hash, :to_hash, :[], :[]=, :==, :fetch, :delete
 
     DEFAULTS = {
       # runner
@@ -39,6 +39,16 @@ module Sneakers
       @hash[:vhost] = AMQ::Settings.parse_amqp_url(@hash[:amqp]).fetch(:vhost, '/')
     end
 
+    def merge!(hash)
+      # parse vhost from amqp if vhost is not specified explicitly
+      if hash[:vhost].nil? && !hash[:amqp].nil?
+        hash = hash.dup
+        hash[:vhost] = AMQ::Settings.parse_amqp_url(hash[:amqp]).fetch(:vhost, '/')
+      end
+
+      @hash.merge!(hash)
+    end
+
     def merge(hash)
       instance = self.class.new
       instance.merge! to_hash

data/lib/sneakers/queue.rb

@@ -22,7 +22,8 @@ class Sneakers::Queue
     @channel = @bunny.create_channel
     @channel.prefetch(@opts[:prefetch])
 
-    @exchange = @channel.exchange(@opts[:exchange],
+    exchange_name = @opts[:exchange]
+    @exchange = @channel.exchange(exchange_name,
                                   :type => @opts[:exchange_type],
                                   :durable => @opts[:durable])
 
@@ -35,8 +36,10 @@ class Sneakers::Queue
     queue_durable = @opts[:queue_durable].nil? ? @opts[:durable] : @opts[:queue_durable]
     queue = @channel.queue(@name, :durable => queue_durable, :arguments => @opts[:arguments])
 
-    routing_keys.each do |key|
-      queue.bind(@exchange, :routing_key => key)
+    if exchange_name.length > 0
+      routing_keys.each do |key|
+        queue.bind(@exchange, :routing_key => key)
+      end
     end
 
     # NOTE: we are using the worker's options. This is necessary so the handler

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/sneakers/worker.rb

@@ -50,7 +50,7 @@ module Sneakers
 
         begin
           metrics.increment("work.#{self.class.name}.started")
-          Timeout.timeout(@timeout_after) do
+          Timeout.timeout(@timeout_after, Timeout::Error) do
             metrics.timing("work.#{self.class.name}.time") do
               if @call_with_params
                 res = work_with_params(msg, delivery_info, metadata)

data/sneakers.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(/^bin/).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
-  gem.add_dependency 'serverengine'
+  gem.add_dependency 'serverengine', '~> 1.5.5'
   gem.add_dependency 'bunny', '~> 1.7.0'
-  gem.add_dependency 'thread'
+  gem.add_dependency 'thread', '0.1.5'
   gem.add_dependency 'thor'
 
   gem.add_development_dependency 'rr'
@@ -30,5 +30,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov-rcov-text'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'guard'
 end
 

data/spec/sneakers/configuration_spec.rb

@@ -32,6 +32,39 @@ describe Sneakers::Configuration do
     end
   end
 
+  it 'should parse vhost from amqp option' do
+    env_url = 'amqp://foo:bar@localhost:5672/foobarvhost'
+    with_env('RABBITMQ_URL', env_url) do
+      url = 'amqp://foo:bar@localhost:5672/testvhost'
+      config = Sneakers::Configuration.new
+      config.merge!({ :amqp => url })
+      config[:vhost].must_equal 'testvhost'
+    end
+  end
+
+  it 'should not parse vhost from amqp option if vhost is specified explicitly' do
+    url = 'amqp://foo:bar@localhost:5672/foobarvhost'
+    config = Sneakers::Configuration.new
+    config.merge!({ :amqp => url, :vhost => 'test_host' })
+    config[:vhost].must_equal 'test_host'
+  end
+
+  it 'should use vhost option if it is specified' do
+    url = 'amqp://foo:bar@localhost:5672/foobarvhost'
+    with_env('RABBITMQ_URL', url) do
+      config = Sneakers::Configuration.new
+      config.merge!({ :vhost => 'test_host' })
+      config[:vhost].must_equal 'test_host'
+    end
+  end
+
+  it 'should use default vhost if vhost is not specified in amqp option' do
+    url = 'amqp://foo:bar@localhost:5672'
+    config = Sneakers::Configuration.new
+    config.merge!({ :amqp => url })
+    config[:vhost].must_equal '/'
+  end
+
   def with_env(key, value)
     old_value = ENV[key]
     ENV[key] = value
@@ -39,4 +72,4 @@ describe Sneakers::Configuration do
   ensure
     ENV[key] = old_value
   end
-end
+end

data/spec/sneakers/queue_spec.rb

@@ -8,35 +8,38 @@ describe Sneakers::Queue do
     Sneakers.configure
   end
 
-  describe "#subscribe" do
-    let :queue_vars do
-      {
-        :prefetch => 25,
-        :durable => true,
-        :ack => true,
-        :heartbeat => 2,
-        :vhost => '/',
-        :exchange => "sneakers",
-        :exchange_type => :direct
-      }
-    end
+  let :queue_vars do
+    {
+      :prefetch => 25,
+      :durable => true,
+      :ack => true,
+      :heartbeat => 2,
+      :vhost => '/',
+      :exchange => "sneakers",
+      :exchange_type => :direct
+    }
+  end
+
+  before do
+    @mkbunny = Object.new
+    @mkchan = Object.new
+    @mkex = Object.new
+    @mkqueue = Object.new
+    @mkqueue_nondurable = Object.new
+    @mkworker = Object.new
 
+    mock(@mkbunny).start {}
+    mock(@mkbunny).create_channel{ @mkchan }
+    mock(Bunny).new(anything, :vhost => '/', :heartbeat => 2){ @mkbunny }
+
+    mock(@mkchan).prefetch(25)
+
+    stub(@mkworker).opts { { :exchange => 'test-exchange' } }
+  end
+
+  describe "#subscribe with sneakers exchange" do
     before do
-      @mkbunny = Object.new
-      @mkchan = Object.new
-      @mkex = Object.new
-      @mkqueue = Object.new
-      @mkqueue_nondurable = Object.new
-      @mkworker = Object.new
-
-      mock(@mkbunny).start {}
-      mock(@mkbunny).create_channel{ @mkchan }
-      mock(Bunny).new(anything, :vhost => '/', :heartbeat => 2){ @mkbunny }
-
-      mock(@mkchan).prefetch(25)
       mock(@mkchan).exchange("sneakers", :type => :direct, :durable => true){ @mkex }
-
-      stub(@mkworker).opts { { :exchange => 'test-exchange' } }
     end
 
     it "should setup a bunny queue according to configuration values" do
@@ -86,5 +89,29 @@ describe Sneakers::Queue do
       myqueue = q.instance_variable_get(:@queue)
     end
   end
+
+  describe "#subscribe with default exchange" do
+    before do
+      # expect default exchange
+      queue_vars[:exchange] = ""
+      mock(@mkchan).exchange("", :type => :direct, :durable => true){ @mkex }
+    end
+
+    it "does not bind to exchange" do
+      mock(@mkchan).queue("downloads", :durable => true) { @mkqueue }
+      @handler = Object.new
+      worker_opts = { :handler => @handler }
+      stub(@mkworker).opts { worker_opts }
+      mock(@handler).new(@mkchan, @mkqueue, worker_opts).once
+
+      stub(@mkqueue).bind do
+        raise "bind should not be called"
+      end
+
+      stub(@mkqueue).subscribe
+      q = Sneakers::Queue.new("downloads", queue_vars)
+      q.subscribe(@mkworker)
+    end
+  end
 end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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'
 description: " Fast background processing framework for Ruby and RabbitMQ "
 email:
 - jondotan@gmail.com