nyny 2.0.0 → 2.1.0

data/lib/nyny.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'nyny/version'
 require 'nyny/primitives'
 require 'nyny/request_scope'
-require 'nyny/route_signature'
+require 'nyny/route'
 require 'nyny/middleware_chain'
 require 'nyny/app'
 require 'nyny/router'
@@ -15,4 +15,20 @@ require 'nyny/core-ext/runner'
 
 module NYNY
   App.register NYNY::Runner
+
+  class EnvString < String
+    [:production, :development, :test].each do |env|
+      define_method "#{env}?" do
+        self == env.to_s
+      end
+    end
+  end
+
+  def self.root
+    Dir.pwd
+  end
+
+  def self.env
+    @env ||= EnvString.new(ENV['RACK_ENV'] || 'development')
+  end
 end

data/lib/nyny/app.rb

@@ -26,12 +26,12 @@ module NYNY
     class << self
       HTTP_VERBS.each do |method|
         define_method method do |str, &blk|
-          (routes[method] ||= {})[RouteSignature.new(str)] = Proc.new &blk
+          routes << Route.new(method, str, &blk)
         end
       end
 
       def middlewares;  @middlewares  ||= []  end
-      def routes;       @routes       ||= {}  end
+      def routes;       @routes       ||= []  end
       def before_hooks; @before_hooks ||= []  end
       def after_hooks;  @after_hooks  ||= []  end
 
@@ -55,7 +55,11 @@ module NYNY
         middlewares << [middleware, args, block]
       end
 
-      def helpers *args
+      def helpers *args, &block
+        if block_given?
+          args << Module.new(&block)
+        end
+
         args.each {|m| RequestScope.add_helper_module m }
       end
     end #class methods

data/lib/nyny/core-ext/runner.rb

@@ -11,7 +11,8 @@ module NYNY
     end
 
     def run! port=9292
-      middlewares.unshift Rack::ShowExceptions, Rack::CommonLogger
+      middlewares.unshift Rack::CommonLogger
+      middlewares.unshift Rack::ShowExceptions unless NYNY.env.production?
       optimal_runner.run new, :Port => port
     end
   end

data/lib/nyny/{route_signature.rb → route.rb}

@@ -1,10 +1,12 @@
 module NYNY
-  class RouteSignature
+  class Route
     NAME_PATTERN = /:(\S+)/
 
-    attr_reader :pattern
-    def initialize signature
+    attr_reader :pattern, :handler, :method
+    def initialize method, signature, &block
       @pattern = pattern_for signature
+      @handler = Proc.new(&block)
+      @method = method.to_s.upcase
     end
 
     def pattern_for signature
@@ -25,11 +27,14 @@ module NYNY
       %r(^\/#{groups}$)
     end
 
-    def match path
-      data = pattern.match path
-      if data
-        Hash[data.names.map {|n| [n.to_sym, URI.unescape(data[n])]}]
-      end
+    def match? env
+      return false unless method == env['REQUEST_METHOD']
+      not pattern.match(env['PATH_INFO']).nil?
+    end
+
+    def url_params env
+      data = pattern.match(env['PATH_INFO'])
+      Hash[data.names.map {|n| [n.to_sym, URI.unescape(data[n])]}]
     end
   end
 end

data/lib/nyny/router.rb

@@ -10,34 +10,26 @@ module NYNY
       @after_hooks  = options[:after_hooks]
     end
 
-    def find_handler request
-      routes.fetch(request.request_method.downcase.to_sym, []).each do |sig, h|
-        params = sig.match request.path
-        return [h, params] if params
-      end
-
-      [NullHandler, {}]
-    end
-
     def call env
-      req = Request.new(env)
-      handler, params = find_handler req
+      env['PATH_INFO'] = '/' if env['PATH_INFO'].empty?
+      route = routes.find {|route| route.match? env }
 
-      if handler != NullHandler
-        prepare_params req, params
-        process req, handler
+      if route
+        process route, env
       else
         fallback.call env
       end
     end
 
-    def prepare_params request, url_params
-      request.params.merge! url_params
+    def process route, env
+      request = Request.new(env)
+      request.params.merge! route.url_params(env)
       request.params.default_proc = proc {|h,k| h[k.to_s] || h[k.to_sym]}
+
+      eval_response RequestScope.new(request), route.handler
     end
 
-    def process request, handler
-      scope = RequestScope.new(request)
+    def eval_response scope, handler
       catch (:halt) do
         before_hooks.each {|h| scope.instance_eval &h }
         response = scope.apply_to &handler

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/nyny.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://alisnic.github.io/nyny/"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).select {|f| !f.start_with?('examples')}
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/spec/app_spec.rb

@@ -132,17 +132,28 @@ describe App do
   end
 
   it 'should be able to set cookies' do
-    app_class = Class.new(App) do
+    app = mock_app do
       post '/write' do
         cookies.merge! params
       end
     end
 
-    req = Rack::MockRequest.env_for '/write?foo=bar', :method => :post
-    res = app_class.new.call(req)
+    res = app.post '/write?foo=bar'
     res.headers['Set-Cookie'].should == 'foo=bar'
   end
 
+  it 'works with empty path' do
+    kls = mock_app_class do
+      get '/' do
+        'Hello'
+      end
+    end
+
+    env = Rack::MockRequest.env_for '/'
+    env['PATH_INFO'] = ''
+    kls.new.call(env).body.first.should == 'Hello'
+  end
+
   describe 'Class level api' do
     let (:app_class) { Class.new(App) }
     describe 'middlewares' do
@@ -170,6 +181,20 @@ describe App do
         app_class.helpers NullHelper, NullHelper2
         RequestScope.ancestors.should include(NullHelper, NullHelper2)
       end
+
+      it 'should allow to define helpers with a block' do
+        app_class.helpers do
+          def foo
+            'bar'
+          end
+        end
+
+        app_class.get '/' do
+          foo.should == 'bar'
+        end
+        req = Rack::MockRequest.env_for '/'
+        res = app_class.new.call(req)
+      end
     end
   end
 end

data/spec/nyny_spec.rb

@@ -0,0 +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

data/spec/runner_spec.rb

@@ -13,4 +13,10 @@ describe Runner do
     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

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rack'
 require 'securerandom'
+ENV['RACK_ENV'] = 'test'
 
 if ENV['TRAVIS']
   require 'coveralls'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -83,51 +83,21 @@ files:
 - Performance.md
 - README.md
 - Rakefile
-- benchmarks/filters/nyny.rb
-- benchmarks/filters/sinatra.rb
-- benchmarks/helpers/nyny.rb
-- benchmarks/helpers/sinatra.rb
-- benchmarks/simple/nyny.rb
-- benchmarks/simple/sinatra.rb
-- benchmarks/url_pattern/nyny.rb
-- benchmarks/url_pattern/sinatra.rb
-- examples/active_record/.gitignore
-- examples/active_record/Gemfile
-- examples/active_record/Rakefile
-- examples/active_record/config/database.yml
-- examples/active_record/database.rb
-- 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/db/.gitignore
-- examples/data_mapper/models/shout.rb
-- examples/data_mapper/server.rb
-- examples/json_api.rb
-- examples/templates/server.rb
-- examples/templates/views/index.haml
-- examples/web_sockets/Gemfile
-- examples/web_sockets/public/FABridge.js
-- examples/web_sockets/public/WebSocketMain.swf
-- examples/web_sockets/public/index.html
-- examples/web_sockets/public/swfobject.js
-- examples/web_sockets/public/web_socket.js
-- examples/web_sockets/server.rb
+- benchmark.rb
 - lib/nyny.rb
 - lib/nyny/app.rb
 - lib/nyny/core-ext/runner.rb
 - lib/nyny/middleware_chain.rb
 - lib/nyny/primitives.rb
 - lib/nyny/request_scope.rb
-- lib/nyny/route_signature.rb
+- lib/nyny/route.rb
 - lib/nyny/router.rb
 - lib/nyny/version.rb
 - nyny.gemspec
 - spec/app_spec.rb
+- spec/nyny_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: http://alisnic.github.io/nyny/
@@ -156,8 +126,8 @@ specification_version: 4
 summary: New York, New York.
 test_files:
 - spec/app_spec.rb
+- spec/nyny_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/benchmarks/filters/nyny.rb

@@ -1,18 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'nyny'
-
-class App < NYNY::App
-  before do
-    request
-  end
-
-  after do
-    response
-  end
-
-  get '/' do
-    'Hello World!'
-  end
-end
-
-App.run!

data/benchmarks/filters/sinatra.rb

@@ -1,17 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'sinatra'
-
-class App < Sinatra::Base
-  before do
-    request
-  end
-
-  after do
-    response
-  end
-
-  get '/' do
-    'Hello World!'
-  end
-end
-

data/benchmarks/helpers/nyny.rb

@@ -1,19 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'nyny'
-
-module Dude
-  def da_request_man
-    request
-  end
-end
-
-class App < NYNY::App
-  helpers Dude
-
-  get '/' do
-    da_request_man
-    'Hello World!'
-  end
-end
-
-App.run!

data/benchmarks/helpers/sinatra.rb

@@ -1,18 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'sinatra'
-
-module Dude
-  def da_request_man
-    request
-  end
-end
-
-class App < Sinatra::Base
-  helpers Dude
-
-  get '/' do
-    da_request_man
-    'Hello World!'
-  end
-end
-

data/benchmarks/simple/nyny.rb

@@ -1,10 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'nyny'
-
-class App < NYNY::App
-  get '/' do
-    'Hello World!'
-  end
-end
-
-App.run!

data/benchmarks/simple/sinatra.rb

@@ -1,9 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'sinatra'
-
-class App < Sinatra::Base
-  get '/' do
-    'Hello World!'
-  end
-end
-

data/benchmarks/url_pattern/nyny.rb

@@ -1,10 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'nyny'
-
-class App < NYNY::App
-  get '/hello/:name' do
-    "Hello #{params[:name]}!"
-  end
-end
-
-App.run!

data/benchmarks/url_pattern/sinatra.rb

@@ -1,8 +0,0 @@
-#!ruby -I ../../lib -I lib
-require 'sinatra'
-
-class App < Sinatra::Base
-  get '/hello/:name' do
-    "Hello #{params[:name]}!"
-  end
-end