low 0.0.17 → 0.0.18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    low (0.0.16)
+    low (0.0.17)
       bson_ext (~> 1.8.2)
       mongo (~> 1.8.2)
       rack (~> 1.5.2)

data/lib/low.rb

@@ -3,5 +3,4 @@ $:.push File.dirname(__FILE__)
 require 'low/version'
 
 module Low
-  DEFAULT_LOGGER_KEY = 'rack.logger'
 end

data/lib/low/rack/default.rb

@@ -0,0 +1,19 @@
+module Low
+  module Rack
+    class Default
+
+      LOGGER_KEY = 'rack.logger'
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env['low.show_exceptions'] =
+          ['development', 'test'].include? ENV['RACK_ENV']
+
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/low/rack/exceptions.rb

@@ -1,4 +1,4 @@
-require 'low'
+require 'low/rack/default'
 
 module Low
   module Rack
@@ -10,7 +10,7 @@ module Low
 
       def initialize(app, opts = {})
         @app = app
-        @logger_key = opts[:logger_key] || Low::DEFAULT_LOGGER_KEY
+        @logger_key = opts[:logger_key] || Low::Rack::Default::LOGGER_KEY
       end
 
       def call(env)

data/lib/low/rack/log_level.rb

@@ -12,7 +12,7 @@ module Low
       end
 
       def call(env)
-        env['low.log_level'] = log_level
+        env['low.log_level'] ||= log_level
         @app.call(env)
       end
 

data/lib/low/rack/rack_errors.rb

@@ -10,7 +10,7 @@ module Low
       end
 
       def call(env)
-        env['rack.errors'] = io
+        env['rack.errors'] ||= io
         @app.call(env)
       end
 

data/lib/low/rack/request_id.rb

@@ -21,19 +21,21 @@ module Low
       end
 
       def call(env)
-        # If there is a request_id parameter,
-        req = ::Rack::Request.new(env)
+        unless env['low.request_id']
 
-        # and it's valid, use it;
-        if req['request_id'] and RequestId.is_valid?(req['request_id'])
-          env['useless.request_id'] = req['request_id']
+          # If there is a request_id parameter,
+          req = ::Rack::Request.new(env)
 
-        # otherwise, use the generated one
-        else
-          env['useless.request_id'] = @current_request_id.to_s
+          # and it's valid, use it;
+          if req['request_id'] and RequestId.is_valid?(req['request_id'])
+            env['low.request_id'] = req['request_id']
+
+          # otherwise, use the generated one
+          else
+            env['low.request_id'] = @current_request_id.to_s
+          end
         end
 
-        # and call the app.
         @app.call(env)
       end
     end

data/lib/low/rack/request_logger.rb

@@ -1,5 +1,5 @@
 require 'logger'
-require 'low'
+require 'low/rack/default'
 require 'low/scoped_logger'
 
 module Low
@@ -12,7 +12,7 @@ module Low
 
       def initialize(app, opts = {})
         @app = app
-        @key = opts[:key] || Low::DEFAULT_LOGGER_KEY
+        @key = opts[:key] || Low::Rack::Default::LOGGER_KEY
       end
 
       def call(env)

data/lib/low/version.rb

@@ -1,3 +1,3 @@
 module Low
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/spec/low/rack/default_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'low/rack/default'
+
+describe Low::Rack::Default do
+  def app(key)
+    base = lambda do |env|
+      [200, {'Content-Type' => 'text/plain'}, [env[key]]]
+    end
+
+    Low::Rack::Default.new(base)
+  end
+
+  context 'low.show_exceptions' do
+    it 'should set low.show_exceptions to true in development' do
+      begin
+        ENV['RACK_ENV'] = 'development'
+        response = app('low.show_exceptions').call({})
+        response[2].first.should == true
+      ensure
+        ENV['RACK_ENV'] = 'test'
+      end
+    end
+
+    it 'should set low.show_exceptions to true in test' do
+      response = app('low.show_exceptions').call({})
+      response[2].first.should == true
+    end
+
+    it 'should set low.show_exceptions to false in production' do
+      begin
+        ENV['RACK_ENV'] = 'production'
+        response = app('low.show_exceptions').call({})
+        response[2].first.should == false
+      ensure
+        ENV['RACK_ENV'] = 'test'
+      end
+    end
+
+    it 'should set low.show_exceptions to false in any other environment' do
+      begin
+        ENV['RACK_ENV'] = 'stage'
+        response = app('low.show_exceptions').call({})
+        response[2].first.should == false
+      ensure
+        ENV['RACK_ENV'] = 'test'
+      end
+    end
+  end
+end

data/spec/low/rack/log_level_spec.rb

@@ -60,4 +60,11 @@ describe Low::Rack::LogLevel do
     response = rack.call({})
     response[2].should == Logger::DEBUG
   end
+
+  it 'should not set low.log_level if it is already set' do
+    ENV['LOG_LEVEL'] = 'DEBUG'
+    rack = Low::Rack::LogLevel.new test_app, default_level: Logger::DEBUG
+    response = rack.call({'low.log_level' => Logger::INFO})
+    response[2].should == Logger::INFO
+  end
 end

data/spec/low/rack/rack_errors_spec.rb

@@ -40,4 +40,11 @@ describe Low::Rack::RackErrors do
     response = rack.call({})
     response[2].should == STDOUT
   end
+
+  it 'should not set rack.errors if it is already set' do
+    ENV['RACK_ENV'] = 'test'
+    rack = Low::Rack::RackErrors.new test_app
+    response = rack.call('rack.errors' => STDOUT)
+    response[2].should == STDOUT
+  end
 end

data/spec/low/rack/request_id_spec.rb

@@ -4,27 +4,33 @@ require 'low/rack/request_id'
 describe Low::Rack::RequestId do
   def app
     app = lambda do |env|
-      [200, {'Content-Type' => 'text/plain'}, ['Request Id: ' + env['useless.request_id']]]
+      [200, {'Content-Type' => 'text/plain'}, ['Request Id: ' + env['low.request_id']]]
     end
 
     Low::Rack::RequestId.new(app)
   end
 
   it 'should add a request ID to the env while proxying transparently' do
-    res = Rack::MockRequest.new(app).get('http://useless.info')
+    res = Rack::MockRequest.new(app).get('http://low.edu')
     res.should be_ok
     res.body.should =~ /Request Id: [a-z0-9]{1,}/
   end
 
   it 'should use the ID specified in the query parameter' do
-    res = Rack::MockRequest.new(app).get('http://useless.info?request_id=jah')
+    res = Rack::MockRequest.new(app).get('http://low.edu?request_id=jah')
     res.should be_ok
     res.body.should == 'Request Id: jah'
   end
 
   it 'should not use the ID specified it does not have "simple" characters' do
-    res = Rack::MockRequest.new(app).get('http://useless.info?request_id=(jah)')
+    res = Rack::MockRequest.new(app).get('http://low.edu?request_id=(jah)')
     res.should be_ok
     res.body.should_not == 'Request Id: (jah)'
   end
+
+  it 'should not set low.request_id if it is already set' do
+    set_app = lambda { |env| app.call(env.merge('low.request_id' => 'special request ID')) }
+    res = Rack::MockRequest.new(set_app).get('http://low.edu?request_id=jah')
+    res.body.should == 'Request Id: special request ID'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -109,6 +109,7 @@ files:
 - lib/low/mongo.rb
 - lib/low/mongo/heroku.rb
 - lib/low/mongo/util.rb
+- lib/low/rack/default.rb
 - lib/low/rack/exceptions.rb
 - lib/low/rack/log_level.rb
 - lib/low/rack/rack_errors.rb
@@ -120,6 +121,7 @@ files:
 - low.gemspec
 - spec/low/mongo/util_spec.rb
 - spec/low/mongo_spec.rb
+- spec/low/rack/default_spec.rb
 - spec/low/rack/exceptions_spec.rb
 - spec/low/rack/log_level_spec.rb
 - spec/low/rack/rack_errors_spec.rb
@@ -155,6 +157,7 @@ summary: A low-level utility library.
 test_files:
 - spec/low/mongo/util_spec.rb
 - spec/low/mongo_spec.rb
+- spec/low/rack/default_spec.rb
 - spec/low/rack/exceptions_spec.rb
 - spec/low/rack/log_level_spec.rb
 - spec/low/rack/rack_errors_spec.rb