magellan-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdcba31f332e20d8b61eb8f3e76723eefc4af595
-  data.tar.gz: e9ad695ce5a14c4fa307c5588573f16c1ad0bc42
+  metadata.gz: 2cc3c3d99017ab1ddca401772a150619a9e760a0
+  data.tar.gz: 0e473c7599532b9ae3570cd586e3950204322379
 SHA512:
-  metadata.gz: b1791f5b53e9b5733d2f781350804b7a96992f5726d7d608c73305e18def91705c2590db02c0b354ccba5360f320dcefd8bb6a954cdbf61fc047dae1a98d2295
-  data.tar.gz: 81775c67cf77d68e0e3ffe4b756fa9db57fffd8d756487b5eac8e300fe87251906fe3b31e7d9f96de1a52e778dfe72ff506401ef9e5d5a00d1a79f73fee9ac3b
+  metadata.gz: e812b06bfe2bec1d7d8d4d08516b1eb3bde553daf8dda04ee8091e737c30751b5a6a0a70f113a53140ce30b121714aabe92eb7d26ce06a692900a4cd4c31e8eb
+  data.tar.gz: 5ca87553e052d1da2f5f128b311a73eb33f04800bed2fc68955d9631dce7220823cc307682c6bbda1e94b5765b213354d6812db2a1437bafb2307e12aa0a12f8

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format Fuubar

data/Gemfile

@@ -5,3 +5,14 @@ gem "bunny_mock", :git => 'git://github.com/groovenauts/bunny-mock.git',
 
 # Specify your gem's dependencies in magellan-rails.gemspec
 gemspec
+
+group :development, :test do
+  gem "rspec-mocks"
+  gem "simplecov"
+  gem "fuubar"
+  if RUBY_VERSION.split(".", 2)[0].to_i >= 2
+    gem "pry-byebug"
+  else
+    gem "pry-debugger"
+  end
+end

data/lib/magellan/rails/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Rails
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/magellan/worker/core.rb

@@ -41,13 +41,23 @@ class Magellan::Worker::Core
 
     @executor = Magellan::Worker::Executor.new(@exchange)
 
+    @shutdown = false
+
     self
   end
 
+  def shutdown
+    @channel && @channel.work_pool.shutdown
+    @shutdown = true
+  end
+
   def run
+    # reset for re-run
+    @shutdown = false
+
     # handle SIGTERM from `docker stop`
-    Signal.trap(:TERM) do
-      @channel.work_pool.shutdown
+    @original_trap_handler = Signal.trap(:TERM) do
+      shutdown
     end
 
     Magellan.logger.info("====== Magellan Worker start ======")
@@ -70,7 +80,14 @@ class Magellan::Worker::Core
       rescue
         Magellan.logger.error("Magellan Worker request execution error: #{$!}\n" + $@.join("\n"))
       end
+      if @shutdown
+        delivery_info.consumer.cancel
+      end
     end
     Magellan.logger.info("====== Magellan Worker finished ======")
+  ensure
+    if @original_trap_handler
+      Signal.trap(:TERM, @original_trap_handler)
+    end
   end
 end

data/spec/magellan/worker/core_spec.rb

@@ -34,11 +34,13 @@ describe Magellan::Worker::Core do
         queue    = channel.queue("consumer1.sample_project.1.0.0.rails")
         queue.bind(exchange)
         exchange.publish(@request_message.to_json, routing_key: "1.0.0.rails", reply_to: 'reply_test', correlation_id: "correlation_id_sample")
+        @work_pool = double "work_pool"
 
         allow(Bunny  ).to receive(:new).and_return(bunny)
         allow(bunny  ).to receive(:create_channel).and_return(channel)
         allow(channel).to receive(:queue).with('customer1.sample_project.1.0.0.rails', no_declare: true).and_return(queue)
         allow(channel).to receive(:basic_ack).and_return(queue)
+        allow(channel).to receive(:work_pool).and_return(@work_pool)
 
         config = {}
         config[:host]              = '127.0.0.1'
@@ -63,8 +65,29 @@ describe Magellan::Worker::Core do
         subject.run
         expect(Magellan.logger        ).to be_a(Logger)
       end
-    end
-
 
+      describe "gracefully shutdown" do
+        before do
+          @consumer = double(:consumer)
+          expect_any_instance_of(BunnyMock::DeliveryInfo).to receive(:consumer).and_return(@consumer)
+          expect(@consumer).to receive(:cancel)
+        end
+        it do
+          expect(Magellan::Worker::Config).to receive(:load_config).once
+          expect(@work_pool).to receive(:shutdown).once
+          # store local variable to be referenced in module_eval block
+          core = subject()
+          # FIXME: RSpec3 mock obsolete and_return{ ... } feature and it seems no alternatives.
+          # Re-define `execute` method to emulate signal handling during the method execution.
+          @executor.singleton_class.module_eval do
+            define_method(:execute) do |*args|
+              core.shutdown
+              nil
+            end
+          end
+          subject.run
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,12 @@
+if ENV["COVERAGE"].to_s =~ /true|yes|on|1/i
+  require "simplecov"
+  SimpleCov.start "rails"
+end
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'magellan/worker'
 require 'magellan/rails'
 require 'magellan/subscriber'
+require "rspec"
+require "rspec/mocks"
+require "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuuki Noguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''