stark-rack 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.2 / 2013-08-21
+
+* Propagate root cause exception to env['rack.exception']
+
 === 1.0.1 / 2013-08-20
 
 * Save any marshalled thrift exceptions in env['rack.exception']

data/lib/stark/rack.rb

@@ -5,7 +5,7 @@ require 'stark/rack/verbose_protocol'
 
 class Stark::Rack
 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   FORMAT = %{when: %0.4f, client: "%s", path: "%s%s", type: "%s", name: "%s", seqid: %d, error: %s\n}
 
@@ -84,7 +84,7 @@ class Stark::Rack
   def status_from_last_error(env)
     return 200 if @last_error.nil? || @last_error.first == :success
     x = @last_error.last[3]
-    env['rack.exception'] = x
+    env['rack.exception'] = x.cause.nil? ? x : x.cause
     case x.type
     when Thrift::ApplicationException::UNKNOWN_METHOD
       404

data/lib/stark/rack/logging_processor.rb

@@ -1,3 +1,7 @@
+class Thrift::ApplicationException
+  attr_accessor :cause
+end
+
 class Stark::Rack
   class LoggingProcessor
     def initialize(handler, secondary=nil)
@@ -16,6 +20,7 @@ class Stark::Rack
           x = Thrift::ApplicationException.new(
                            Thrift::ApplicationException::UNKNOWN,
                            "#{e.message} (#{e.class})")
+          x.cause = e
           oprot.write_message_begin(name, Thrift::MessageTypes::EXCEPTION, seqid)
           x.write(oprot)
           oprot.write_message_end

data/stark-rack.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stark-rack"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-08-20"
+  s.date = "2013-08-21"
   s.description = "Provides middleware for mounting Stark/Thrift services as Rack endpoints."
   s.email = ["evan@phx.io"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]

data/test/test_rack.rb

@@ -87,8 +87,8 @@ class TestRack < Test::Unit::TestCase
       @client.add 3, 4
     end
 
-    assert Thrift::ApplicationException === env['rack.exception']
-    assert env['rack.exception'].to_s =~ /^can't add/
+    assert_equal RangeError, env['rack.exception'].class
+    assert_equal "can't add", env['rack.exception'].to_s
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stark-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stark