la_gear 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0f62ca02e7a0d327d376e9d1e43c72819f5cbe
-  data.tar.gz: 164640b8a42d87770dc09c2eb4a73195e21cf502
+  metadata.gz: cf848e73d2235da6d435ad58dca4a1dc145c260d
+  data.tar.gz: 0e6c492bd0154d0315a7475e03dce357991601fc
 SHA512:
-  metadata.gz: 8c87e0696e4d709d2332f01f4d0c77bcd1725e5114173f98c7aef887ade8af73fe41afa34e44e3d98bb010e8aef3cc6f87d24267ab152793a7f70f3f4a7181ec
-  data.tar.gz: 4fa5b3011ec6741c0531677777aa816fef663edcea671885f180334efb2a89343588763a703cc46d51b535060517c4b5da29f71bf6c818adde4377276211d083
+  metadata.gz: 6e2f6b5625e1b8c708029443d13da69e9734334713b66622de4f5cf64d8ce0984cd68dbea5823194a3eb99b593f86d7051ca82d15247646d2adedb8756db0732
+  data.tar.gz: c45ddfbcb2dbcc5d64d9a7665576127466ea34b7deaa07b4672a537e3a2a1df741a41297b67a41fd428329eab6584871f8b27d669b410db2e1b4a79b6c1c24b7

data/README.md

@@ -11,6 +11,8 @@ Here are some other features:
 * Helper methods for configuring `sneakers`
 * Support for configuring `sneakers` with [BigWig](http://bigwig.io/)
 
+[![Build status](https://codeship.com/projects/26f19c80-e7c0-0132-7554-4e340869c11f/status?branch=master)](https://codeship.com/projects/82628)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/examples/test_worker.rb

@@ -21,7 +21,7 @@ bunny.start
 channel = bunny.channel
 queue = channel.queue(
   TestWorker.default_queue_name,
-  TestWorker.default_queue_opts.merge(durable: true)
+  TestWorker.default_queue_opts.merge(durable: true, arguments: TestWorker.default_queue_args),
 )
 queue.purge
 r = Sneakers::Runner.new([TestWorker])

data/la_gear.gemspec

@@ -8,18 +8,18 @@ Gem::Specification.new do |spec|
   spec.version       = LaGear::VERSION
   spec.authors       = ['Gabriel Chaney', 'Andy Arminio', 'Jonah Hirsch']
   spec.email         = ['gabriel.chaney@gmail.com', '5thWall@gmail.com', 'jonah.w.h@gmail.com']
-  spec.summary       = %q{A thin abstraction on-top-of sneakers to DRY your workers. Pump it up!}
-  spec.description   = %q{This gem allows you to DRY up your sneakers workers by using a conventions-based configuration. It also includes a LaGear::Bus class that allows you to pass in more options when publishing to an exchange.}
+  spec.summary       = 'A thin abstraction on-top-of sneakers to DRY your workers. Pump it up!'
+  spec.description   = 'This gem allows you to DRY up your sneakers workers by using a conventions-based configuration. It also includes a LaGear::Bus class that allows you to pass in more options when publishing to an exchange.'
   spec.homepage      = 'https://github.com/giftcardzen/la_gear'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/).reject{|f| f == 'Gemfile.lock'}
+  spec.files         = `git ls-files`.split($/).reject { |f| f == 'Gemfile.lock' }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.add_dependency 'json', '~> 1.8'
-  spec.add_dependency 'bunny', '~> 1.6'
-  spec.add_dependency 'sneakers', '~> 1.0.4'
+  spec.add_dependency 'bunny', '~> 2.2.0'
+  spec.add_dependency 'sneakers', '~> 2.3'
   spec.add_dependency 'activesupport', '~> 4.2'
   spec.add_dependency 'sidekiq', '~> 3.3'
   spec.add_dependency 'connection_pool', '~> 2.1'

data/lib/la_gear/publisher.rb

@@ -6,8 +6,6 @@ module LaGear
       super(self.class.serialize(msg), opts)
     end
 
-    protected
-
     def self.serialize(msg)
       msg.to_json
     end
@@ -20,11 +18,7 @@ module LaGear
       @bunny = Bunny.new(@opts[:amqp_publish] || @opts[:amqp], opts)
       @bunny.start
       @channel = @bunny.create_channel
-      @exchange = @channel.exchange(
-        @opts[:exchange],
-        type: @opts[:exchange_type],
-        durable: @opts[:durable]
-      )
+      @exchange = @channel.exchange(@opts[:exchange], @opts[:exchange_options])
     end
 
     def connected?

data/lib/la_gear/version.rb

@@ -1,3 +1,3 @@
 module LaGear
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/lib/la_gear/worker.rb

@@ -6,6 +6,7 @@ module LaGear
       else
         base.send(:include, ::Sneakers::Worker)
         base.extend(SneakersClassMethods)
+
         base.from_queue base.default_queue_name, base.default_queue_opts
       end
       base.send(:include, ::Sidekiq::Worker)
@@ -26,13 +27,15 @@ module LaGear
 
     module SneakersClassMethods
       def default_queue_name
-        "#{::Sneakers::CONFIG.fetch(:app_name, 'sneakers_app').underscore}.#{routing_key}"
+        "#{::Sneakers::CONFIG.fetch(:app_name, 'sneakers').underscore}.#{routing_key}"
       end
 
       def default_queue_opts
         {
           routing_key: [routing_key, retry_routing_key],
-          arguments: default_queue_args,
+          queue_options: {
+            arguments: default_queue_args
+          }.merge(::Sneakers::CONFIG.fetch(:global_queue_options, {})),
           handler_opts: {
             routing_key: retry_routing_key
           }

data/test/helper.rb

@@ -10,7 +10,6 @@ begin
   require 'pry-byebug'
 rescue LoadError
 end
-
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'sidekiq'
@@ -21,5 +20,7 @@ require 'la_gear'
 require 'active_support/all'
 require 'pry'
 
+ActiveSupport::TestCase.test_order = :random
+
 LaGear::Test = Minitest::Test
 LaGear::Spec = Minitest::Spec

data/test/test_worker.rb

@@ -38,18 +38,31 @@ class TestWorker < LaGear::Test
       PumpItUp.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
     end
 
-    it 'must have bo_knows.pump_it_up.retry as the retry_routing_key' do
-      PumpItUp.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
-    end
-
     it 'must have default queue has with x-dead-letter-exchange of football.retry' do
       PumpItUp.default_queue_args.must_equal 'x-dead-letter-exchange' => "#{Sneakers::CONFIG[:exchange]}.retry"
     end
 
+    describe 'when global queue_arguments are set' do
+      before do
+        @global_queue_args = { 'x-expires' => 60_000 }
+        Sneakers::CONFIG[:global_queue_options] = @global_queue_args
+      end
+
+      after do
+        Sneakers::CONFIG.delete(:global_queue_options)
+      end
+
+      it 'must include global queue_arguments' do
+        PumpItUp.default_queue_opts[:queue_options]['x-expires'].must_equal 60_000
+      end
+    end
+
     it 'must have default queue options hash' do
       PumpItUp.default_queue_opts.must_equal(
         routing_key: [PumpItUp.routing_key, PumpItUp.retry_routing_key],
-        arguments: PumpItUp.default_queue_args,
+        queue_options: {
+          arguments: PumpItUp.default_queue_args
+        },
         handler_opts: {
           routing_key: PumpItUp.retry_routing_key
         }
@@ -90,10 +103,6 @@ class TestWorker < LaGear::Test
         NotPogs::V2.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
       end
 
-      it 'must have bo_knows.pump_it_up.retry as the retry_routing_key' do
-        NotPogs::V2.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
-      end
-
       it 'must have default queue has with x-dead-letter-exchange of football.retry' do
         NotPogs::V2.default_queue_args.must_equal 'x-dead-letter-exchange' => "#{Sneakers::CONFIG[:exchange]}.retry"
       end
@@ -101,7 +110,9 @@ class TestWorker < LaGear::Test
       it 'must have default queue options hash' do
         NotPogs::V2.default_queue_opts.must_equal(
           routing_key: [NotPogs::V2.routing_key, NotPogs::V2.retry_routing_key],
-          arguments: NotPogs::V2.default_queue_args,
+          queue_options: {
+            arguments: NotPogs::V2.default_queue_args
+          },
           handler_opts: {
             routing_key: NotPogs::V2.retry_routing_key
           }
@@ -130,10 +141,6 @@ class TestWorker < LaGear::Test
         GoGo::PowerRangers::V2.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
       end
 
-      it 'must have bo_knows.pump_it_up.retry as the retry_routing_key' do
-        GoGo::PowerRangers::V2.retry_routing_key.must_equal "#{Sneakers::CONFIG[:app_name]}.#{@expected_queue_routing_key}.retry"
-      end
-
       it 'must have default queue has with x-dead-letter-exchange of football.retry' do
         GoGo::PowerRangers::V2.default_queue_args.must_equal 'x-dead-letter-exchange' => "#{Sneakers::CONFIG[:exchange]}.retry"
       end
@@ -141,7 +148,9 @@ class TestWorker < LaGear::Test
       it 'must have default queue options hash' do
         GoGo::PowerRangers::V2.default_queue_opts.must_equal(
           routing_key: [GoGo::PowerRangers::V2.routing_key, GoGo::PowerRangers::V2.retry_routing_key],
-          arguments: GoGo::PowerRangers::V2.default_queue_args,
+          queue_options: {
+            arguments: GoGo::PowerRangers::V2.default_queue_args
+          },
           handler_opts: {
             routing_key: GoGo::PowerRangers::V2.retry_routing_key
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: la_gear
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Gabriel Chaney
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -32,28 +32,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sneakers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A thin abstraction on-top-of sneakers to DRY your workers. Pump it up!