magellan-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332b7e16cca102a6a4147f905d19e3e4a3e5e664
-  data.tar.gz: ec9343f83483a86de1766b7548990bd5af5b8e68
+  metadata.gz: 8c421c287c6fa5f5c8f5b6ef25b7b3f99bfae56e
+  data.tar.gz: 0c895a7553fa8799cd237631a549ebd8c44206b5
 SHA512:
-  metadata.gz: 5df36c50d2f67c599e64f36186d1db49be0d4e7480a160b8cdef4fa059362c0fdc2d5560aabb0d50a2cc2f722a0281248ec91895854df1443e5a7144cd32fb50
-  data.tar.gz: f9c486e2431466fae90720cfcdae438d1f5ff222e02d5012077d427e5cdc00cd3d14f098911d50639a695fbfd8760df9f836a7d2a7afe46db98636bcc4d64694
+  metadata.gz: 36dfd7b680d8689dc06111cb67a366946fc4b0a9385a17f34d0af9dd0d5672de56bbc877c21fa1f2b4f9459585378d062bc2b23d39313b1860d00542fb380053
+  data.tar.gz: 1e9474777f528152bb2913dbb43eb750c65ebb7c827d3ebc058b81fc0c7bdbb4b39d8166dd5ad76d0e991b1848cc84c3da4796f9039e948c9182e9474b295cc8

data/lib/magellan/rails/version.rb

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

data/lib/magellan/worker/executor.rb

@@ -23,7 +23,16 @@ class Magellan::Worker::Executor
   end
 
   def execute(reply_to, correlation_id, delivery_tag, request_message)
-    case request_message["headers"]["Method"]
+    version = request_message["v"] || 1
+    case version
+    when 1
+      request_method = request_message["headers"]["Method"]
+    when 2
+      request_method = request_message["env"]["METHOD"]
+    else
+      raise "Unsupported request format version: #{version}. Please update magellan-rails."
+    end
+    case request_method
     when /\Apublish\z/i
       subscriber_executor.execute(request_message)
     else

data/spec/magellan/worker/executor_spec.rb

@@ -0,0 +1,67 @@
+# coding: utf-8
+
+require "spec_helper"
+
+describe Magellan::Worker::Executor do
+
+  describe "#execute" do
+    let(:exchange) do double(:exchange) end
+    let(:reply_to) do double(:reply_to) end
+    let(:correlation_id) do double(:correlation_id) end
+    let(:delivery_tag) do double(:delivery_tag) end
+    let(:rails_executor) do double(:rails_executor) end
+    let(:subscriber_executor) do double(:subscriber_executor) end
+    let(:executor) do
+      Magellan::Worker::Executor.new(exchange).tap do |e|
+        e.instance_variable_set :@rails_executor, rails_executor
+        e.instance_variable_set :@subscriber_executor, subscriber_executor
+      end
+    end
+    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
+      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(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
+        end
+      end
+      context "PUBLISH" do
+        before do
+          @method = "PUBLISH"
+          expect(subscriber_executor).to receive(:execute).with(request_obj).and_return(:result)
+        end
+        it do
+          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
+      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(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
+        end
+      end
+      context "PUBLISH" do
+        before do
+          @method = "PUBLISH"
+          expect(subscriber_executor).to receive(:execute).with(request_obj).and_return(:result)
+        end
+        it do
+          expect(executor.execute(reply_to, correlation_id, delivery_tag, request_obj)).to eql(:result)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magellan-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Yuuki Noguchi
@@ -147,6 +147,7 @@ files:
 - spec/magellan/subscriber/mapper_spec.rb
 - spec/magellan/subscriber/request_spec.rb
 - spec/magellan/worker/core_spec.rb
+- spec/magellan/worker/executor_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -178,4 +179,5 @@ test_files:
 - spec/magellan/subscriber/mapper_spec.rb
 - spec/magellan/subscriber/request_spec.rb
 - spec/magellan/worker/core_spec.rb
+- spec/magellan/worker/executor_spec.rb
 - spec/spec_helper.rb