magellan-rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c421c287c6fa5f5c8f5b6ef25b7b3f99bfae56e
-  data.tar.gz: 0c895a7553fa8799cd237631a549ebd8c44206b5
+  metadata.gz: 63e5b0203bac9edc86ff8a7c38a4d5614d4cb885
+  data.tar.gz: cc46775047760890bfc4b4090dea5ee33d8fbf00
 SHA512:
-  metadata.gz: 36dfd7b680d8689dc06111cb67a366946fc4b0a9385a17f34d0af9dd0d5672de56bbc877c21fa1f2b4f9459585378d062bc2b23d39313b1860d00542fb380053
-  data.tar.gz: 1e9474777f528152bb2913dbb43eb750c65ebb7c827d3ebc058b81fc0c7bdbb4b39d8166dd5ad76d0e991b1848cc84c3da4796f9039e948c9182e9474b295cc8
+  metadata.gz: 6a8f418c06a1be76956354ad59db62ca43d256e1241ebeb06ee6c6fbd964552d56977d3cee49d1900c4d716a54fc1b4af6d62b864b8edc9e909506361bdbd74f
+  data.tar.gz: cf79d0fe416b92487b12b4f8e762614e3b4689b87a3db5cb7cf29011763ed9199e0638e479a7f85f520a7ec5ce38b5ca79e2e5e768094838dac0a30eba032a32

data/lib/magellan/rails/response.rb

@@ -14,8 +14,11 @@ class Magellan::Rails::Response
     @body    = ''
     @body_encoding = :plain
     body_proxy = response[2]
-    body_proxy.each{|b| @body << b}
-    body_proxy.close
+    begin
+      body_proxy.each{|b| @body << b}
+    ensure
+      body_proxy.close if body_proxy.respond_to?(:close)
+    end
   end
 
   def to_message

data/lib/magellan/rails/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Rails
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/magellan/worker/executor.rb

@@ -27,11 +27,14 @@ class Magellan::Worker::Executor
     case version
     when 1
       request_method = request_message["headers"]["Method"]
+      request_id = request_message["headers"]["Magellan-Request-Id"]
     when 2
       request_method = request_message["env"]["METHOD"]
+      request_id = request_message["env"]["REQUEST_ID"]
     else
       raise "Unsupported request format version: #{version}. Please update magellan-rails."
     end
+    Magellan.logger.info("Magellan requested with `#{request_id}`")
     case request_method
     when /\Apublish\z/i
       subscriber_executor.execute(request_message)

data/spec/magellan/worker/executor_spec.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 require "spec_helper"
+require "securerandom"
 
 describe Magellan::Worker::Executor do
 
@@ -17,18 +18,20 @@ describe Magellan::Worker::Executor do
         e.instance_variable_set :@subscriber_executor, subscriber_executor
       end
     end
+    let(:request_id) { SecureRandom.uuid }
     before do
       allow_any_instance_of(Magellan::Worker::Executor).to receive(:require)
     end
 
     context "v1" do
-      let(:request_obj) do { "headers" => { "Method" => @method, "Path-Info" => "topic" }, "body" => "payload" } end
+      let(:request_obj) do { "headers" => { "Method" => @method, "Path-Info" => "topic", "Magellan-Request-Id" => request_id }, "body" => "payload" } end
       context "GET" do
         before do
           @method = "GET"
           expect(rails_executor).to receive(:execute).with(reply_to, correlation_id, delivery_tag, request_obj).and_return(:result)
         end
         it do
+          expect(Magellan.logger).to receive(:info).with("Magellan requested with `#{request_id}`").once
           expect(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
         end
       end
@@ -38,18 +41,20 @@ describe Magellan::Worker::Executor do
           expect(subscriber_executor).to receive(:execute).with(request_obj).and_return(:result)
         end
         it do
+          expect(Magellan.logger).to receive(:info).with("Magellan requested with `#{request_id}`").once
           expect(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
         end
       end
     end
     context "v2" do
-      let(:request_obj) do { "v" => 2, "env" => { "METHOD" => @method, "PATH_INFO" => "topic" }, "headers" => {}, "body" => "payload" } end
+      let(:request_obj) do { "v" => 2, "env" => { "METHOD" => @method, "PATH_INFO" => "topic", "REQUEST_ID" => request_id }, "headers" => {}, "body" => "payload" } end
       context "GET" do
         before do
           @method = "GET"
           expect(rails_executor).to receive(:execute).with(reply_to, correlation_id, delivery_tag, request_obj).and_return(:result)
         end
         it do
+          expect(Magellan.logger).to receive(:info).with("Magellan requested with `#{request_id}`").once
           expect(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
         end
       end
@@ -59,6 +64,7 @@ describe Magellan::Worker::Executor do
           expect(subscriber_executor).to receive(:execute).with(request_obj).and_return(:result)
         end
         it do
+          expect(Magellan.logger).to receive(:info).with("Magellan requested with `#{request_id}`").once
           expect(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuuki Noguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ''