nyny 2.2.1 → 3.0.0

data/spec/nyny_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
-
-describe NYNY do
-  it '.root points to pwd' do
-    NYNY.root.should == Dir.pwd
-  end
-
-  it 'has the correct env' do
-    NYNY.env.should be_test
-  end
-end
+require 'spec_helper'
+
+describe NYNY do
+  it '.root points to pwd' do
+    NYNY.root.should == Dir.pwd
+  end
+
+  it 'has the correct env' do
+    NYNY.env.should be_test
+  end
+end

data/spec/primitives_spec.rb

@@ -1,33 +1,33 @@
-require 'spec_helper'
-
-describe Request do
-  let (:subject) { Request.new double }
-
-  it { should be_a(Rack::Request) }
-end
-
-describe Response do
-  it { should be_a(Rack::Response) }
-
-  describe '#raw_body' do
-    it 'should be accesible when the response was initialized' do
-      raw_body = double
-      res = Response.new raw_body
-      res.raw_body.should == raw_body
-    end
-
-    it 'should accesible after body was set' do
-      res = Response.new
-      raw_body = double
-      res.body = raw_body
-      res.raw_body.should == raw_body
-    end
-
-    it 'should set the iterable as the raw body as well' do
-      res = Response.new
-      raw_body = ['one', 'two']
-      res.body = raw_body
-      res.raw_body.should == raw_body
-    end
-  end
-end
+require 'spec_helper'
+
+describe Request do
+  let (:subject) { Request.new double }
+
+  it { should be_a(Rack::Request) }
+end
+
+describe Response do
+  it { should be_a(Rack::Response) }
+
+  describe '#raw_body' do
+    it 'should be accesible when the response was initialized' do
+      raw_body = double
+      res = Response.new raw_body
+      res.raw_body.should == raw_body
+    end
+
+    it 'should accesible after body was set' do
+      res = Response.new
+      raw_body = double
+      res.body = raw_body
+      res.raw_body.should == raw_body
+    end
+
+    it 'should set the iterable as the raw body as well' do
+      res = Response.new
+      raw_body = ['one', 'two']
+      res.body = raw_body
+      res.raw_body.should == raw_body
+    end
+  end
+end

data/spec/request_scope_spec.rb

@@ -1,105 +1,103 @@
-require 'spec_helper'
-
-describe RequestScope do
-  let (:env) { Rack::MockRequest.env_for '/', :params => {:some => 'param'} }
-  let (:dummy_request) { Rack::Request.new(env) }
-  let (:subject) { RequestScope.new dummy_request }
-  let (:handler) {
-    Proc.new {"hello"}
-  }
-
-  it 'should be able to add a helper module' do
-    RequestScope.add_helper_module NullHelper
-    RequestScope.ancestors.should include(NullHelper)
-  end
-
-  describe 'exposed methods' do
-    its (:params) { should == dummy_request.params }
-    its (:cookies) { should == dummy_request.cookies }
-    its (:session) { should == dummy_request.session }
-
-    it 'params should have insensitive keys' do
-      app = mock_app do
-        get '/' do
-          params[:foo].should == params['foo']
-        end
-      end
-
-      app.get '/?foo=bar'
-    end
-
-    it '#headers should set the header values' do
-      subject.headers 'Head' => 'Tail'
-      response = subject.apply_to &handler
-      response.headers['Head'].should == 'Tail'
-    end
-
-    it '#status should set the response status' do
-      forbid = Proc.new { status 403 }
-      response = subject.apply_to &forbid
-      response.status.should == 403
-    end
-
-    it 'params should have insensitive keys' do
-      app = mock_app do
-        get '/' do
-          params[:foo].should == params['foo']
-        end
-      end
-
-      app.get '/?foo=bar'
-    end
-
-    it 'halt in a before block should override the response' do
-      prc = Proc.new { 'da block' }
-
-      app = mock_app do
-        before do
-          halt 302
-        end
-
-        get '/', &prc
-      end
-
-      res = app.get '/'
-      res.status.should == 302
-      prc.should_not_receive(:call)
-    end
-
-    it 'should halt if the statement is in the route definition' do
-      app = mock_app do
-        get '/' do
-          halt 200, {}, 'Halted'
-          'shouldnt be returned'
-        end
-      end
-      res = app.get '/'
-      res.status.should == 200
-      res.body.should == 'Halted'
-    end
-
-    it 'return prematurely with pass' do
-      app = mock_app do
-        get '/' do
-          next 'hui'
-          'shouldnt be returned'
-        end
-      end
-      res = app.get '/'
-      res.status.should == 200
-      res.body.should == 'hui'
-    end
-
-    it '#redirect_to should redirect' do
-      redir = Proc.new { redirect_to 'http://foo.bar' }
-      response = catch(:halt) { subject.apply_to &redir }
-      response.status.should == 302
-      response.headers['Location'].should == 'http://foo.bar'
-    end
-
-    it '#apply_to should return a Rack response' do
-      response = subject.apply_to &handler
-      response.should be_a(Rack::Response)
-    end
-  end
-end
+require 'spec_helper'
+
+describe RequestScope do
+  let (:env) { Rack::MockRequest.env_for '/', :params => {:some => 'param'} }
+  let (:dummy_request) { Rack::Request.new(env) }
+  let (:subject) { RequestScope.new dummy_request }
+  let (:handler) {
+    Proc.new {"hello"}
+  }
+
+  describe 'exposed methods' do
+    its (:params) { should == dummy_request.params }
+    its (:cookies) { should == dummy_request.cookies }
+    its (:session) { should == dummy_request.session }
+
+    it 'params should have insensitive keys' do
+      app = mock_app do
+        get '/' do
+          params[:foo].should == params['foo']
+        end
+      end
+
+      app.get '/?foo=bar'
+    end
+
+    it '#headers should set the header values' do
+      subject.headers['Head'] = 'Tail'
+      response = subject.apply_to &handler
+      response[1]['Head'].should == 'Tail'
+    end
+
+    it '#status should set the response status' do
+      forbid = Proc.new { status 403 }
+      response = subject.apply_to &forbid
+      response[0].should == 403
+    end
+
+    it 'params should have insensitive keys' do
+      app = mock_app do
+        get '/' do
+          params[:foo].should == params['foo']
+        end
+      end
+
+      app.get '/?foo=bar'
+    end
+
+    it 'halt in a before block should override the response' do
+      prc = Proc.new { 'da block' }
+
+      app = mock_app do
+        before do
+          halt 302
+        end
+
+        get '/', &prc
+      end
+
+      res = app.get '/'
+      res.status.should == 302
+      prc.should_not_receive(:call)
+    end
+
+    it 'should halt if the statement is in the route definition' do
+      app = mock_app do
+        get '/' do
+          halt 200, {}, 'Halted'
+          'shouldnt be returned'
+        end
+      end
+      res = app.get '/'
+      res.status.should == 200
+      res.body.should == 'Halted'
+    end
+
+    it 'return prematurely with pass' do
+      app = mock_app do
+        get '/' do
+          next 'hui'
+          'shouldnt be returned'
+        end
+      end
+      res = app.get '/'
+      res.status.should == 200
+      res.body.should == 'hui'
+    end
+
+    it '#redirect_to should redirect' do
+      redir = Proc.new { redirect_to 'http://foo.bar' }
+      response = catch(:halt) { subject.apply_to &redir }
+      response[0] == 302
+      response[1]['Location'].should == 'http://foo.bar'
+    end
+
+    it '#apply_to should return a Rack response' do
+      response = subject.apply_to &handler
+      response.length.should == 3
+      response[0].should == 200
+      response[1].should == subject.headers
+      response[2].should be_a(Rack::BodyProxy)
+    end
+  end
+end

data/spec/router_spec.rb

@@ -1,21 +1,21 @@
-require 'spec_helper'
-
-describe Router do
-  let (:app) do
-    mock_app do
-      get '/' do
-        halt 200, {}, "Bar"
-        "Foo"
-      end
-
-      after do
-        response.body = "Zaz"
-      end
-    end
-  end
-
-  it "should eval after blocks even if the request was halted" do
-    response = app.get('/')
-    response.body.should == "Zaz"
-  end
-end
+require 'spec_helper'
+
+describe Router do
+  let (:app) do
+    mock_app do
+      get '/' do
+        halt 200, {}, "Bar"
+        "Foo"
+      end
+
+      after do
+        response.body = "Zaz"
+      end
+    end
+  end
+
+  it "should eval after blocks even if the request was halted" do
+    response = app.get('/')
+    response.body.should == "Zaz"
+  end
+end

data/spec/runner_spec.rb

@@ -1,22 +1,23 @@
-require 'spec_helper'
-
-describe Runner do
-  let (:kls) { mock_app_class {} }
-
-  before do
-    kls.optimal_runner.stub :run
-  end
-
-  it 'should include the default middleware on top' do
-    kls.run!
-    kls.middlewares.first.should == Rack::ShowExceptions
-    kls.middlewares[1].should == Rack::CommonLogger
-  end
-
-  it 'should not include show exceptions middleware in production' do
-    NYNY.env.stub :production? => true
-    kls.run!
-    kls.middlewares.should == [Rack::CommonLogger]
-  end
-
-end
+require 'spec_helper'
+
+describe Runner do
+  let (:kls) { mock_app_class {} }
+
+  before do
+    kls.optimal_runner.stub :run
+  end
+
+  it 'should include the default middleware on top' do
+    kls.should_receive(:use).with(Rack::CommonLogger)
+    kls.should_receive(:use).with(Rack::ShowExceptions)
+    kls.run!
+  end
+
+  it 'should not include show exceptions middleware in production' do
+    NYNY.env.stub :production? => true
+    kls.should_receive(:use).with(Rack::CommonLogger)
+    kls.should_not_receive(:use).with(Rack::ShowExceptions)
+    kls.run!
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,58 +1,61 @@
-require 'rack'
-require 'securerandom'
-ENV['RACK_ENV'] = 'test'
-
-if ENV['TRAVIS']
-  require 'coveralls'
-  Coveralls.wear!
-else
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "spec"
-  end
-end
-
-require 'nyny'
-include NYNY
-
-class Rack::MockRequest
-  def trace(uri, opts={})     request("TRACE", uri, opts)     end
-  def options(uri, opts={})   request("OPTIONS", uri, opts)   end
-end
-
-def template name
-  File.join(File.dirname(__FILE__), 'views', name)
-end
-
-def extended_modules_for kls
-  (class << kls; self end).included_modules
-end
-
-def mock_app &blk
-  Rack::MockRequest.new mock_app_class(&blk).new
-end
-
-def mock_app_class &blk
-  Class.new(App, &blk)
-end
-
-def random_url levels=1
-  parts = levels.times.map do
-    SecureRandom.urlsafe_base64
-  end
-
-  "/#{parts.join('/')}"
-end
-
-class NullMiddleware
-  def initialize app
-    @app = app
-  end
-
-  def call env
-    @app.call env
-  end
-end
-
-module NullHelper
-end
+require 'securerandom'
+ENV['RACK_ENV'] = 'test'
+
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+else
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "spec"
+  end
+end
+
+require 'nyny'
+include NYNY
+
+class Rack::MockRequest
+  def trace(uri, opts={})     request("TRACE", uri, opts)     end
+  def options(uri, opts={})   request("OPTIONS", uri, opts)   end
+end
+
+def template name
+  File.join(File.dirname(__FILE__), 'views', name)
+end
+
+def extended_modules_for kls
+  (class << kls; self end).included_modules
+end
+
+def mock_app parent=App, &blk
+  Rack::MockRequest.new mock_app_class(parent, &blk).new
+end
+
+def mock_app_class parent=App, &blk
+  Class.new(parent, &blk)
+end
+
+def random_url levels=1
+  parts = levels.times.map do
+    SecureRandom.urlsafe_base64
+  end
+
+  "/#{parts.join('/')}"
+end
+
+class NullMiddleware
+  def initialize app
+    @app = app
+  end
+
+  def call env
+    @app.call env
+  end
+end
+
+module NullHelper
+end
+
+RSpec.configure do |c|
+  c.filter_run_excluding :broken => true
+end