rack-remote 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460fb84ecefd34385f80aa6ebc14421a818b844b
-  data.tar.gz: 13e5f8a42aca5a612c4dc4e7576e2f6b454bd482
+  metadata.gz: 4fd96f00690a34791cdf740b05ceabb0b11c8e11
+  data.tar.gz: ad6625414ec22cc4bf3c2707c836703713f6642f
 SHA512:
-  metadata.gz: 68ea6cc8f771d6435bc8f732b31568192f03c5fbc97bd18f2938da91fbaba99fa8732c051a0284525d0495335c6ebf77117d5e67f5d4155c8a35a9d2b4d900f4
-  data.tar.gz: 9ee0fe1fbca68005eafb306f26d3527eebe29a92a1b9805583fb3ca57edab55a4be8b39d06fbc5f2849d9e3a431e6e86b538730e9e233b033169cc860b47f30f
+  metadata.gz: af407c05bacc948152cf7c67597239a0bdd62a083b1b3f1b20759cdbc22890b7e7ba89a53504bc960afb215a8b28e90bad20513c0d0bcb232693f813e5a13039
+  data.tar.gz: 5cf6ad86343dade6b2cb27ff8a191bb696efec7cbc189ef5781f4cf41ca9c402a33f0f02d4c1c7aa587d06d3bdbc616afdb79da69b573e2a09b7d3226cca9758

data/Gemfile

@@ -8,6 +8,6 @@ gem 'coveralls'
 gem 'webmock', '~> 1.7'
 gem 'rack-test'
 
-# Specify your gem's dependencies in acfs.gemspec
+# Specify your gem's dependencies in gemspec
 gemroot = File.dirname File.absolute_path __FILE__
 gemspec path: gemroot

data/lib/rack/remote.rb

@@ -3,12 +3,45 @@ require 'rack/request'
 require 'multi_json'
 
 module Rack
-
   # Rack::Remote is a Rack middleware for intercepting calls
   # and invoking remote calls. It can be used to call remote
   # function for test instructions in distributed systems.
   #
   class Remote
+    require 'rack/remote/railtie' if defined?(Rails)
+
+    class ChainedError < StandardError
+      attr_reader :cause
+
+      def initialize(*attrs)
+        if attrs.last.is_a?(Hash) && attrs.last[:cause].is_a?(Exception)
+          @cause = attrs.last.delete(:cause)
+          attrs.pop if attrs.last.empty?
+        end
+        super *attrs
+      end
+
+      def set_backtrace(trace)
+        trace.is_a?(Array) ? trace.map!(&:to_s) : trace = trace.to_s.split("\n")
+        trace.map! { |line| "  #{line}" }
+        if cause
+          trace << "caused by #{cause.class.name}: #{cause.message}"
+          trace += cause.backtrace.map! { |line| "  #{line}" }
+        end
+        super trace
+      end
+    end
+
+    class RemoteError < StandardError
+      def initialize(opts = {})
+        super "#{opts[:class]}: #{opts[:error]}"
+        set_backtrace opts[:backtrace]
+      end
+    end
+
+    class RemoteCallFailed < ChainedError
+    end
+
     def initialize(app)
       @app = app
     end
@@ -20,14 +53,24 @@ module Rack
       call    = env['HTTP_X_RACK_REMOTE_CALL'].to_s
 
       if (cb = self.class.calls[call])
-        response = cb.call(request.params, env, request)
-        if response.is_a?(Array) && response.size == 3
-          return response
-        else
-          [200, {'Content-Type' => 'application/json'}, StringIO.new(MultiJson.dump response) ]
+        begin
+          # First rewind request body before read
+          request.body.rewind
+
+          data = request.body.read
+          json = data.empty? ? {} : MultiJson.load(data)
+
+          response = cb.call(json, env, request)
+          if response.is_a?(Array) && response.size == 3
+            return response
+          else
+            [200, {'Content-Type' => 'application/json'}, StringIO.new(MultiJson.dump response) ]
+          end
+        rescue => err
+          [500, {'Content-Type' => 'application/json'}, StringIO.new(MultiJson.dump error: err.message, backtrace: err.backtrace, class: err.class.name) ]
         end
       else
-        [404, {'Content-Type' => 'application/json'}, StringIO.new('{"error":"remote call not defined"}') ]
+        [404, {'Content-Type' => 'application/json'}, StringIO.new(MultiJson.dump error: 'remote call not defined', calls: call, list: self.class.calls.keys) ]
       end
     end
 
@@ -88,13 +131,23 @@ module Rack
           end
 
           request['X-Rack-Remote-Call'] = call.to_s
-          request.form_data = params
+          request['Content-Type'] = 'application/json'
+          request.body = MultiJson.dump(params)
 
           response = http.request request
+          if response.code.to_i == 500 and response['Content-Type'] == 'application/json'
+            json = MultiJson.load(response.body)
+
+            if json['error'] && json['backtrace'] && json['class']
+              remote_error = RemoteError.new class: json['class'], error: json['error'], backtrace: json['backtrace']
+              raise Rack::Remote::RemoteCallFailed.new("Remote call returned error code #{response.code}", cause: remote_error)
+            end
+          end
+
           raise StandardError, "Rack Remote Error Response: #{response.code}: #{response.body}" if response.code.to_i != 200
 
           if response['Content-Type'] == 'application/json'
-            MultiJson.load response.body
+            response.body.empty? ? {} : MultiJson.load(response.body)
           else
             response.body
           end

data/lib/rack/remote/railtie.rb

@@ -0,0 +1,7 @@
+class Rack::Remote
+  class Railtie < ::Rails::Railtie
+    initializer 'rack-remote.middleware' do |app|
+      app.config.middleware.use Rack::Remote unless Rails.env.production?
+    end
+  end
+end

data/lib/rack/remote/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Remote
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/spec/rack/remote_spec.rb

@@ -13,7 +13,7 @@ describe Rack::Remote do
     before { Rack::Remote.register :factory_girl, &block }
 
     context 'with intercept call' do
-      let(:request) { -> { get '/', {}, {'HTTP_X_RACK_REMOTE_CALL' => 'factory_girl'} }}
+      let(:request) { -> { post '/', {}, {'HTTP_X_RACK_REMOTE_CALL' => 'factory_girl'} }}
 
       it 'should invoke registered call' do
         expect(block).to receive(:call)
@@ -27,7 +27,7 @@ describe Rack::Remote do
     end
 
     context 'with non-rack-remote call' do
-      let(:request) { -> { get '/' }}
+      let(:request) { -> { post '/' }}
 
       it 'should delegate request to inner app' do
         expect(inner_app).to receive(:call).and_call_original
@@ -74,6 +74,12 @@ describe Rack::Remote do
         ret = Rack::Remote.invoke :users, :factory_girl, param1: 'val1'
         expect(ret).to eq({'id' => 1})
       end
+
+      it 'should invoke remote call (2)' do
+        expect(block).to receive(:call).with({ 'param1' => ['val1', {'abc' => 'cde'}] }, kind_of(Hash), kind_of(Rack::Request)).and_return({id: 1})
+        ret = Rack::Remote.invoke :users, :factory_girl, param1: ['val1', {abc: :cde}]
+        expect(ret).to eq({'id' => 1})
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-remote
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - lib/rack/remote.rb
+- lib/rack/remote/railtie.rb
 - lib/rack/remote/version.rb
 - rack-remote.gemspec
 - spec/rack/remote_spec.rb
@@ -99,3 +100,4 @@ summary: Small request intercepting rack middleware to invoke remote calls over
 test_files:
 - spec/rack/remote_spec.rb
 - spec/spec_helper.rb
+has_rdoc: