nyny 1.0.0.pre1 → 1.0.0

data/spec/primitives_spec.rb

@@ -1,7 +1,7 @@
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Request do
-  let (:subject) { Request.new stub }
+  let (:subject) { Request.new double }
 
   it { should be_a(Rack::Request) }
 end
@@ -11,14 +11,21 @@ describe Response do
 
   describe '#raw_body' do
     it 'should be accesible when the response was initialized' do
-      raw_body = stub
+      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 = stub
+      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

data/spec/request_scope_spec.rb

@@ -1,9 +1,9 @@
-require_relative 'spec_helper'
+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 App.new, dummy_request }
+  let (:subject) { RequestScope.new dummy_request }
   let (:handler) {
     Proc.new {"hello"}
   }
@@ -18,6 +18,16 @@ describe RequestScope do
     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

data/spec/route_signature_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe RouteSignature do
+  it 'should have the initial regexp as the pattern' do
+    exp = /[w+]/
+    sig = RouteSignature.new exp
+    sig.pattern.should == exp
+  end
+end

data/spec/runner_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Runner do
+  describe '.run!' do
+    before do
+      handler = begin
+                  Rack::Handler::Thin
+                rescue LoadError
+                  Rack::Handler::WEBrick
+                end
+      handler.stub :run
+    end
+
+    it 'should include the default middleware on top' do
+      kls = mock_app_class do
+      end
+
+      kls.run!
+      kls.middlewares.first.should == Rack::ShowExceptions
+      kls.middlewares[1].should == Rack::CommonLogger
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,17 @@
-require 'nyny'
 require 'rack'
 require 'securerandom'
+
+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
@@ -13,10 +24,10 @@ def extended_modules_for kls
 end
 
 def mock_app &blk
-  Rack::MockRequest.new frankie_app(&blk).new
+  Rack::MockRequest.new mock_app_class(&blk).new
 end
 
-def frankie_app &blk
+def mock_app_class &blk
   Class.new(App, &blk)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: New York, New York.
+description: New York, New York - (very) small Sinatra clone.
 email:
 - andrei.lisnic@gmail.com
 executables: []
@@ -61,20 +61,20 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - Performance.md
 - README.md
 - Rakefile
-- benchmarks/filters/frankie.rb
+- benchmarks/filters/nyny.rb
 - benchmarks/filters/sinatra.rb
-- benchmarks/helpers/frankie.rb
+- benchmarks/helpers/nyny.rb
 - benchmarks/helpers/sinatra.rb
-- benchmarks/simple/frankie.rb
+- benchmarks/simple/nyny.rb
 - benchmarks/simple/sinatra.rb
-- benchmarks/url_pattern/frankie.rb
+- benchmarks/url_pattern/nyny.rb
 - benchmarks/url_pattern/sinatra.rb
 - examples/active_record/.gitignore
 - examples/active_record/Gemfile
@@ -84,6 +84,10 @@ files:
 - examples/active_record/db/migrate/20130606133756_add_shouts.rb
 - examples/active_record/models/shout.rb
 - examples/active_record/server.rb
+- examples/data_mapper/Gemfile
+- examples/data_mapper/database.rb
+- examples/data_mapper/models/shout.rb
+- examples/data_mapper/server.rb
 - examples/json_api.rb
 - examples/templates/server.rb
 - examples/templates/views/index.haml
@@ -95,16 +99,19 @@ files:
 - examples/web_sockets/server.rb
 - lib/nyny.rb
 - lib/nyny/app.rb
-- lib/nyny/class_level_api.rb
+- lib/nyny/middleware_chain.rb
 - lib/nyny/primitives.rb
 - lib/nyny/request_scope.rb
 - lib/nyny/route_signature.rb
+- lib/nyny/router.rb
+- lib/nyny/runner.rb
 - lib/nyny/version.rb
 - nyny.gemspec
 - spec/app_spec.rb
-- spec/class_level_api_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb
+- spec/route_signature_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/alisnic/nyny
 licenses:
@@ -121,18 +128,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: sinatra's little brother
+summary: New York, New York.
 test_files:
 - spec/app_spec.rb
-- spec/class_level_api_spec.rb
 - spec/primitives_spec.rb
 - spec/request_scope_spec.rb
+- spec/route_signature_spec.rb
+- spec/runner_spec.rb
 - spec/spec_helper.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-frankie

data/lib/nyny/class_level_api.rb

@@ -1,40 +0,0 @@
-module NYNY
-  module ClassLevelApi
-    HTTP_VERBS = [:delete, :get, :head, :options, :patch, :post, :put, :trace]
-    HTTP_VERBS.each do |method|
-      define_method method do |str, &blk|
-        (routes[method] ||= {})[RouteSignature.new(str)] = Proc.new &blk
-      end
-    end
-
-    def middlewares;  @middlewares  ||= []  end
-    def routes;       @routes       ||= {}  end
-    def before_hooks; @before_hooks ||= []  end
-    def after_hooks;  @after_hooks  ||= []  end
-
-    def use_protection! args={}
-      begin
-        require 'rack/protection'
-        middlewares.unshift [Rack::Protection, args]
-      rescue LoadError
-        puts "WARN: to use protection, you must install 'rack-protection' gem"
-      end
-    end
-
-    def before &blk
-      before_hooks << Proc.new(&blk)
-    end
-
-    def after &blk
-      after_hooks << Proc.new(&blk)
-    end
-
-    def use middleware, *args, &block
-      middlewares << [middleware, args, block]
-    end
-
-    def helpers *args
-      args.each {|m| RequestScope.add_helper_module m }
-    end
-  end
-end

data/spec/class_level_api_spec.rb

@@ -1,39 +0,0 @@
-require_relative 'spec_helper'
-
-describe ClassLevelApi do
-  let (:app_class) { Class.new(App) }
-  describe 'middlewares' do
-    let (:app_class) do
-      frankie_app do
-        use NullMiddleware
-      end
-    end
-
-    it 'should allow to add a middleware' do
-      app_class.middlewares.last.first.should == NullMiddleware
-    end
-
-    it 'should call the middleware when called' do
-      app = app_class.new
-      top = app.instance_variable_get '@top'
-      top.class.should == NullMiddleware
-      top.should_receive :call
-      app.call Rack::MockRequest.env_for '/'
-    end
-  end
-
-  describe 'helpers' do
-    it 'should allow to include a helper in request scope' do
-      app_class.helpers NullHelper
-      RequestScope.ancestors.should include(NullHelper)
-    end
-
-    it 'should allow to include multiple helpers modules' do
-      module NullHelper2
-      end
-
-      app_class.helpers NullHelper, NullHelper2
-      RequestScope.ancestors.should include(NullHelper, NullHelper2)
-    end
-  end
-end