stark-rack 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.1 / 2013-08-20
+
+* Save any marshalled thrift exceptions in env['rack.exception']
+
 === 1.0.0 / 2013-05-22
 
 * 1 major enhancement

data/Rakefile

@@ -12,10 +12,12 @@ Hoe::RUBY_FLAGS.concat " -I#{stark_local_path}" if File.directory?(stark_local_p
 Hoe.plugin :git
 Hoe.plugin :gemspec
 
-Hoe.spec 'stark-rack' do
+Hoe.spec 'stark-rack' do |spec|
   developer('Evan Phoenix', 'evan@phx.io')
   dependency 'stark', '< 2.0.0'
   dependency 'rack', '>= 1.5.0', :dev
+
+  spec.testlib = :testunit if spec.respond_to?(:testlib)
 end
 
 # vim: syntax=ruby

data/lib/stark/rack.rb

@@ -5,7 +5,7 @@ require 'stark/rack/verbose_protocol'
 
 class Stark::Rack
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   FORMAT = %{when: %0.4f, client: "%s", path: "%s%s", type: "%s", name: "%s", seqid: %d, error: %s\n}
 
@@ -69,7 +69,7 @@ class Stark::Rack
       processor.process protocol, protocol
     end
 
-    [status_from_last_error, headers(env), [out.string]]
+    [status_from_last_error(env), headers(env), [out.string]]
   end
 
   def error_capture
@@ -81,9 +81,10 @@ class Stark::Rack
     end
   end
 
-  def status_from_last_error
+  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
     case x.type
     when Thrift::ApplicationException::UNKNOWN_METHOD
       404

data/stark-rack.gemspec

@@ -2,16 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "stark-rack"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-05-22"
+  s.date = "2013-08-20"
   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"]
-  s.files = [".autotest", ".gemtest", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/stark/rack.rb", "lib/stark/rack/content_negotiation.rb", "lib/stark/rack/logging_processor.rb", "lib/stark/rack/metadata.rb", "lib/stark/rack/rest.rb", "stark-rack.gemspec", "test/calc-opt.rb", "test/calc.thrift", "test/config.ru", "test/gen-rb/calc.rb", "test/gen-rb/calc_constants.rb", "test/gen-rb/calc_types.rb", "test/helper.rb", "test/test_metadata.rb", "test/test_rack.rb", "test/test_rest.rb"]
+  s.files = [".autotest", ".gemtest", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/stark/rack.rb", "lib/stark/rack/content_negotiation.rb", "lib/stark/rack/logging_processor.rb", "lib/stark/rack/metadata.rb", "lib/stark/rack/rest.rb", "lib/stark/rack/verbose_protocol.rb", "stark-rack.gemspec", "test/calc-opt.rb", "test/calc.thrift", "test/config.ru", "test/gen-rb/calc.rb", "test/gen-rb/calc_constants.rb", "test/gen-rb/calc_types.rb", "test/helper.rb", "test/test_metadata.rb", "test/test_rack.rb", "test/test_rest.rb"]
   s.homepage = "https://github.com/evanphx/stark-rack"
+  s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "stark-rack"
@@ -26,17 +27,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<stark>, ["< 2.0.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<rack>, [">= 1.5.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
     else
       s.add_dependency(%q<stark>, ["< 2.0.0"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<rack>, [">= 1.5.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_dependency(%q<hoe>, ["~> 3.7"])
     end
   else
     s.add_dependency(%q<stark>, ["< 2.0.0"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<rack>, [">= 1.5.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.6"])
+    s.add_dependency(%q<hoe>, ["~> 3.7"])
   end
 end

data/test/test_rack.rb

@@ -62,4 +62,33 @@ class TestRack < Test::Unit::TestCase
     assert_equal 404, code
   end
 
+  def test_exception_sets_status_and_env_rack_exception
+    @client_p = Thrift::JsonProtocol.new @client_t
+    @client = @n::Calc::Client.new @client_p, @client_p
+
+    def @handler.add(*)
+      raise RangeError, "can't add"
+    end
+
+
+    code = headers = out = nil
+    env = { 'rack.input' => @sr, 'REQUEST_METHOD' => 'POST' }
+    env['PATH_INFO'] = ''
+    env['HTTP_CONTENT_TYPE'] = 'application/vnd.thrift+json'
+
+    st = Thread.new do
+      code, headers, out = stark_rack.call env
+      out.each do |s|
+        @sw << s
+      end
+    end
+
+    assert_raises Thrift::ApplicationException do
+      @client.add 3, 4
+    end
+
+    assert Thrift::ApplicationException === env['rack.exception']
+    assert env['rack.exception'].to_s =~ /^can't add/
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stark-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stark
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 description: Provides middleware for mounting Stark/Thrift services as Rack endpoints.
 email:
 - evan@phx.io
@@ -109,7 +109,8 @@ files:
 - test/test_rack.rb
 - test/test_rest.rb
 homepage: https://github.com/evanphx/stark-rack
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main