true-web 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    true-web (0.1.2)
+    true-web (0.1.3)
       activesupport (>= 3.0.0)
       honkster-addressable (>= 2.2.3)
       mustache

data/lib/true-web/controller.rb

@@ -38,6 +38,9 @@ module TrueWeb
 
     error(500) do
       env["rack.exception"] = env["sinatra.error"]
+      if env["rack.logger"]
+        env["rack.logger"].error "#{env["sinatra.error"].message}\n#{env["sinatra.error"].backtrace.join("\n\t")}"
+      end
       "<div>Oops, an error occurred.</div>"
     end
 

data/lib/true-web/version.rb

@@ -1,3 +1,3 @@
 module TrueWeb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixture-app/app.rb

@@ -3,11 +3,13 @@ module FixtureApp
 
   def self.app
     @app ||= Rack::Builder.new do
+      use Rack::Logger
       run ::FixtureApp::Controller
     end.to_app
   end
 
   class Controller < ::TrueWeb::Controller
+    set :dump_errors, false
   end
 
   class Views < ::TrueWeb::Views

data/spec/fixture-app/services/authentication/app/controllers/authentication.rb

@@ -0,0 +1,6 @@
+FixtureApp::Controller.define_routes do
+  def authentication_error_page; end
+  get path(:authentication_error_page, "/authentication/error-page") do
+    raise "An Error"
+  end
+end

data/spec/spec_helpers/example_group.rb

@@ -0,0 +1,47 @@
+RSpec::Core::ExampleGroup.class_eval do
+  include Capybara
+
+  def app
+    FixtureApp::Controller
+  end
+
+  def uris
+    @uris ||= FixtureApp::Routes.instance
+  end
+  alias_method :named_routes, :uris
+
+  def views
+    @views ||= begin
+      app_instance = Capybara.app.allocate
+      app_instance.send(:initialize)
+      app_instance.session_data = session_data
+      ::FixtureApp::Views.new(app_instance)
+    end
+  end
+
+  [
+    :request, :last_request, :response, :last_response, :follow_redirect!,
+    :rack_mock_session
+  ].each do |method_name|
+    class_eval((<<-RUBY), __FILE__, __LINE__+1)
+    def #{method_name}(*args, &block)
+      page.driver.#{method_name}(*args, &block)
+    end
+    RUBY
+  end
+
+  [:get, :put, :post, :delete].each do |method_name|
+    class_eval((<<-RUBY), __FILE__, __LINE__+1)
+    def #{method_name}(*args, &block)
+      (res = page.driver.#{method_name}(*args, &block)).tap do
+        puts res.errors if res.status == 500
+      end
+    end
+    RUBY
+  end
+
+  def current_path
+    Addressable::URI.parse(current_url).path
+  end
+
+end

data/spec/true-web/controller_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
+
+module TrueWeb
+  describe Controller do
+    describe "GET /authentication/error-page" do
+      context "when there is not a rack.logger" do
+        it "responds with a 500" do
+          any_instance_of(FixtureApp::Controller) do |controller|
+            stub.proxy(controller).env do |env|
+              env.delete("rack.logger")
+              env
+            end
+          end
+          get uris.authentication_error_page
+
+          response.status.should == 500
+        end
+      end
+
+      context "when there is a rack.logger" do
+        it "responds with a 500 and logs the message" do
+          message = nil
+          any_instance_of(Logger) do |l|
+            stub(l).error(is_a(String)) do |*args|
+              message = args.first
+            end
+          end
+          get uris.authentication_error_page
+
+          response.status.should == 500
+          message.should include("An Error")
+        end
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: true-web
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Brian Takita
@@ -181,12 +181,15 @@ files:
 - lib/true-web/version.rb
 - lib/true-web/views.rb
 - spec/fixture-app/app.rb
+- spec/fixture-app/services/authentication/app/controllers/authentication.rb
 - spec/fixture-app/services/authentication/app/presenters/index.html.ms.rb
 - spec/fixture-app/services/authentication/app/templates/index.html.ms
 - spec/fixture-app/services/authentication/init.rb
 - spec/fixture-app/services/authentication/public/javascripts/foo.js
 - spec/spec_helper.rb
+- spec/spec_helpers/example_group.rb
 - spec/spec_suite.rb
+- spec/true-web/controller_spec.rb
 - spec/true-web/service_spec.rb
 - spec/true-web/views_spec.rb
 - true-web.gemspec