nyny 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1377196ade715ab3d114440cf120a5596c81f67
-  data.tar.gz: 186f4d5433cb0171a41c07a0b686e40382622f95
+  metadata.gz: ae38227835876ef5e85282b236b5349049e15116
+  data.tar.gz: 70836d65922b92ac174fee44b9c0c1dc8a2525b9
 SHA512:
-  metadata.gz: 4d7cf903b0dfda2ea397680ac6cb8326e9e1a042733629452d9cb9576312da507eb10a54696afebf7b3c473337a88638eaafef60e15b72b92b90256db3f4ed25
-  data.tar.gz: 03ca191d2113dfc7bae9d674db8f75889127911df2ec38c1d3fedca30bb242739f6c16e7549e1b5e3c1c01ecb1c8d4d3d074161fba49b8dc1b7b4cd0a884489d
+  metadata.gz: 99cfbc9eabad3173837d1acba68236b4eb7ba01dee114691d12a8266bb6c4970acea3a586c7be8b1699f08938abaea8f5ef1e25931b47dc78b6d2c10a6d5907b
+  data.tar.gz: 5443fdcb5d69b8771f35153ca8c7bbec47eb71f6db4221fd831f2f733da4b62576f99ac723491f9778d7e2fa0659a472ff21d378bbb9fd46054948067127fe8b

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1

data/CHANGELOG

@@ -1,3 +1,13 @@
+3.1.0
+  - use latest Tilt (2.0.0)
+  - get rid of silly Rack::Response hacks, write to body properly
+  - Response#rewrite (body= aliases it for backward compatibility)
+  - Refactor .run! implementation, prefer thin, webrik.
+  - NYNY now ships with better_errors, which is only enabled in development
+  - Fixed builder instanciation logic
+  - removed benchmark script, since tilt dep version is not compatible with
+    Sinatra
+
 3.0.1
   - File SystemStackError when accessing missing param (@holies)
 

data/Performance.md

@@ -1,4 +1,8 @@
-This output was generated by running benchmark.rb in repo root
+
+Note: this bench may be a bit obsolete, I removed the profiling
+script due to the fact that NYNY's and Sintara's deps are
+incompatible. For a more complete list of of microframework
+benchmarks, see [https://github.com/luislavena/bench-micro]()
 ```
 Comparing NYNY 3.0.0 with Sinatra 1.4.4
 

data/README.md

@@ -213,6 +213,7 @@ class App < NYNY::App
   end
 end
 ```
+
 There are 2 ways to pass data to the template:
 
 Via a instance variable:
@@ -239,7 +240,7 @@ to create a helper for that:
 ```ruby
 class App < NYNY::App
   helpers do
-    def render_with_layout *args
+    def template *args
       render 'layout.erb' do
         render *args
       end
@@ -247,7 +248,7 @@ class App < NYNY::App
   end
 
   get '/' do
-    render_with_layout 'index.erb'
+    template 'index.erb'
   end
 end
 ```

data/lib/nyny/app.rb

@@ -27,15 +27,16 @@ module NYNY
     def initialize app=nil
       self.class.builder.run Router.new({
         :routes       => self.class.routes,
-        :fallback     => (app || lambda {|env| Response.new '', 404 }),
+        :fallback     => (app || lambda {|env| Response.new [], 404 }),
         :before_hooks => self.class.before_hooks,
         :after_hooks  => self.class.after_hooks,
         :scope_class  => self.class.scope_class
       })
+      @app = self.class.builder.to_app
     end
 
     def call env
-      self.class.builder.call env
+      @app.call env
     end
 
     #class methods

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

@@ -1,19 +1,11 @@
+require 'better_errors'
+
 module NYNY
   module Runner
-    def optimal_runner
-      return Rack::Handler::WEBrick if RUBY_PLATFORM == 'java'
-
-      begin
-        Rack::Handler::Thin
-      rescue LoadError
-        Rack::Handler::WEBrick
-      end
-    end
-
     def run! port=9292
       use Rack::CommonLogger
-      use Rack::ShowExceptions unless NYNY.env.production?
-      optimal_runner.run new, :Port => port
+      use BetterErrors::Middleware unless NYNY.env.production?
+      Rack::Handler.pick(['thin', 'webrick']).run new, :Port => port
     end
   end
 end

data/lib/nyny/primitives.rb

@@ -3,23 +3,13 @@ module NYNY
   end
 
   class Response < Rack::Response
-    attr_reader :raw_body
-
-    def initialize body=[], status=200, header={}
-      @raw_body = body
-      super body.to_s, status, header
-    end
-
-    def body= value
-      @raw_body = value
-      @body = []
+    def rewrite str
+      @body   = []
       @length = 0
-
-      if value.respond_to? :to_str
-        write value.to_str
-      elsif value.respond_to?(:each)
-        value.each {|part| write part.to_s }
-      end
+      header.delete "Content-Type"
+      header.delete "Content-Length"
+      write str
     end
+    alias_method :body=, :rewrite
   end
 end

data/lib/nyny/request_scope.rb

@@ -11,7 +11,7 @@ module NYNY
 
     def initialize request
       @request  = request
-      @response = Response.new '', 200, {'Content-Type' => 'text/html'}
+      @response = Response.new
     end
 
     def cookies
@@ -25,7 +25,8 @@ module NYNY
     def halt status, headers={}, body=''
       response.status = status
       response.headers.merge! headers
-      response.body = body
+      response.rewrite body
+      cookies.finish!(response) if @cookies
       throw :halt, response.finish
     end
 
@@ -35,8 +36,8 @@ module NYNY
     alias_method :redirect, :redirect_to
 
     def apply_to &handler
-      response.body = instance_eval(&handler)
-      cookies.finish!(response)
+      response.write instance_eval(&handler)
+      cookies.finish!(response) if @cookies
       response.finish
     end
   end

data/lib/nyny/router.rb

@@ -23,9 +23,9 @@ module NYNY
     def process route, env
       request = Request.new(env)
       request.params.merge! route.url_params(env)
-      request.params.default_proc = proc { |h, k|
+      request.params.default_proc = lambda do |h, k|
         h.fetch(k.to_s, nil) || h.fetch(k.to_sym, nil)
-      }
+      end
 
       eval_response scope_class.new(request), route.handler
     end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/nyny.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "rack",         "~> 1.5.2"
-  spec.add_dependency             "rack-contrib", "~> 1.1.0"
-  spec.add_dependency             "tilt",         "~> 1.4.1"
+  spec.add_dependency             "rack",           "~> 1.5.2"
+  spec.add_dependency             "rack-contrib",   "~> 1.1.0"
+  spec.add_dependency             "tilt",           "~> 2.0.0"
+  spec.add_dependency             "better_errors",  "~> 1.1.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/app_spec.rb

@@ -167,31 +167,6 @@ describe App do
     app.get '/'
   end
 
-  describe 'cookies' do
-    let (:app) do
-      mock_app do
-        post '/cookie' do
-          cookies['foo'] = 'bar'
-        end
-
-        delete '/cookie' do
-          cookies.delete 'foo'
-        end
-      end
-    end
-
-    it 'sets a cookie' do
-      res = app.post '/cookie'
-      res.headers['Set-Cookie'].should == 'foo=bar; path=/'
-    end
-
-    it 'deletes a cookie' do
-      app.post '/cookie'
-      res = app.delete '/cookie'
-      res.headers['Set-Cookie'].should_not include('foo=bar')
-    end
-  end
-
   it 'works with empty path' do
     kls = mock_app_class do
       get '/' do
@@ -201,7 +176,7 @@ describe App do
 
     env = Rack::MockRequest.env_for '/'
     env['PATH_INFO'] = ''
-    kls.new.call(env)[2].body.first.should == 'Hello'
+    kls.new.call(env)[2].body.last.should == 'Hello'
   end
 
   describe 'Class level api' do

data/spec/primitives_spec.rb

@@ -1,33 +1,13 @@
 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
+describe 'NYNY primitives' do
+  describe NYNY::Response do
+    it 'allows to rewrite the response' do
+      resp = NYNY::Response.new
+      resp.write 'foo'
+      resp.rewrite 'banana'
+      resp.headers['Content-Length'].should == "6"
+      resp.body.first.should == 'banana'
     end
   end
-end
+end

data/spec/request_scope_spec.rb

@@ -23,6 +23,56 @@ describe RequestScope do
       app.get '/?foo=bar'
     end
 
+    describe 'cookies' do
+      let (:app) do
+        mock_app do
+          post '/cookie' do
+            cookies['foo'] = 'bar'
+          end
+
+          post '/cookie_halt' do
+            cookies['foo'] = 'bar'
+            halt 200, {}, 'blah'
+            cookies['foo'] = 'moo'
+          end
+
+          delete '/cookie' do
+            cookies.delete 'foo'
+          end
+
+          delete '/cookie_halt' do
+            cookies.delete 'foo'
+            halt 200, {}, 'blah'
+            'blah'
+          end
+        end
+      end
+
+      it 'sets a cookie' do
+        res = app.post '/cookie'
+        res.headers['Set-Cookie'].should == 'foo=bar; path=/'
+      end
+
+      it 'deletes a cookie' do
+        app.post '/cookie'
+        res = app.delete '/cookie'
+        res.headers['Set-Cookie'].should_not include('foo=bar')
+      end
+
+      describe 'when response was halted' do
+        it 'sets a cookie' do
+          res = app.post '/cookie_halt'
+          res.headers['Set-Cookie'].should == 'foo=bar; path=/'
+        end
+
+        it 'deletes a cookie' do
+          app.post '/cookie'
+          res = app.delete '/cookie_halt'
+          res.headers['Set-Cookie'].should_not include('foo=bar')
+        end
+      end
+    end
+
     it '#headers should set the header values' do
       subject.headers['Head'] = 'Tail'
       response = subject.apply_to &handler
@@ -76,13 +126,13 @@ describe RequestScope do
     it 'return prematurely with pass' do
       app = mock_app do
         get '/' do
-          next 'hui'
+          next 'blah'
           'shouldnt be returned'
         end
       end
       res = app.get '/'
       res.status.should == 200
-      res.body.should == 'hui'
+      res.body.should == 'blah'
     end
 
     it '#redirect_to should redirect' do

data/spec/router_spec.rb

@@ -13,7 +13,7 @@ describe Router do
       end
 
       after do
-        response.body = "Zaz"
+        response.rewrite "Zaz"
       end
     end
   end
@@ -24,6 +24,6 @@ describe Router do
   end
 
   it "should not raise SystemStackError if any absent param is accessed" do
-    expect { response = app.post('/') }.not_to raise_error SystemStackError
+    expect { response = app.post('/') }.not_to raise_error
   end
 end

data/spec/runner_spec.rb

@@ -4,19 +4,19 @@ describe Runner do
   let (:kls) { mock_app_class {} }
 
   before do
-    kls.optimal_runner.stub :run
+    Rack::Handler.stub :pick => double(:run => nil)
   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.should_receive(:use).with(BetterErrors::Middleware)
     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.should_not_receive(:use).with(BetterErrors::Middleware)
     kls.run!
   end
 

data/spec/spec_helper.rb

@@ -55,7 +55,3 @@ end
 
 module NullHelper
 end
-
-RSpec.configure do |c|
-  c.filter_run_excluding :broken => true
-end

data/spec/templates_spec.rb

@@ -1,8 +1,14 @@
 require 'spec_helper'
 
 describe Templates do
-  let (:app) do
-    mock_app do
+  let (:app_class) do
+    mock_app_class do
+      helpers do
+        def template_root
+          File.join(__dir__, "views")
+        end
+      end
+
       get '/without_layout' do
         render template('index.erb')
       end
@@ -18,12 +24,18 @@ describe Templates do
         render template('instance.erb')
       end
 
+      get '/via_helper' do
+        erb :index
+      end
+
       get '/local_var' do
         render template('local.erb'), :foo => 'bar'
       end
     end
   end
 
+  let (:app) { Rack::MockRequest.new(app_class.new)}
+
   it 'renders correctly without layout' do
     response = app.get('/without_layout')
     response.body.should == '<p>Hello!</p>'
@@ -48,5 +60,4 @@ describe Templates do
 
     response.body.should == rendered
   end
-
 end

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: better_errors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: New York, New York - (very) small Sinatra clone.
@@ -101,17 +115,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
 - Performance.md
 - README.md
 - Rakefile
-- benchmark.rb
 - lib/nyny.rb
 - lib/nyny/app.rb
 - lib/nyny/core-ext/runner.rb
@@ -145,17 +158,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: New York, New York.

data/benchmark.rb

@@ -1,116 +0,0 @@
-#!ruby -I ./lib -I lib
-require 'nyny'
-require 'ruby-prof'
-require 'benchmark'
-require 'sinatra'
-include Benchmark
-
-set :run, false #do not run sinatra's builtin web server
-
-def build_apps &block
-  sinatra = Class.new(Sinatra::Base, &block).new
-  nyny    = Class.new(NYNY::App, &block).new
-  return [nyny, sinatra].map {|app| Rack::MockRequest.new(app) }
-end
-
-def run_test name, apps, &block
-  nyny, sinatra = apps
-  prc = Proc.new(&block)
-
-  puts "\nTest: #{name}"
-  Benchmark.benchmark(CAPTION, 7, FORMAT, "> NYNY/Sinatra:") do |x|
-    nyny_time     = x.report("nyny:   ")  { 1000.times { prc.call(nyny) } }
-    sinatra_time  = x.report("sinatra:")  { 1000.times { prc.call(sinatra) } }
-    puts "NYNY is #{"%.2f" % [sinatra_time.real/nyny_time.real]}x faster than Sinatra in this test"
-  end
-end
-
-puts "Comparing NYNY #{NYNY::VERSION} with Sinatra #{Sinatra::VERSION}"
-
-#
-# Hello World
-apps = build_apps do
-  get '/' do
-    'Hello World'
-  end
-end
-run_test 'hello world', apps do |app|
-  app.get '/'
-end
-
-#
-# Filters
-apps = build_apps do
-  before do
-    request
-  end
-
-  after do
-    response
-  end
-
-  get '/' do
-    'Hello World!'
-  end
-end
-run_test 'filters', apps do |app|
-  app.get '/'
-end
-
-#
-# Helpers
-apps = build_apps do
-  helpers do
-    def da_request
-      request
-    end
-  end
-
-  get '/' do
-    da_request
-  end
-end
-run_test 'helpers', apps do |app|
-  app.get '/'
-end
-
-#
-# Url patterns
-apps = build_apps do
-  get '/:name' do
-    params[:name]
-  end
-end
-run_test 'Url patterns', apps do |app|
-  app.get '/foo'
-end
-
-# Plain routes
-apps = build_apps do
-  [:get, :post, :put].each do |method|
-    10.times do |i|
-      send(method, "/foo/#{i}") do
-        i
-      end
-    end
-  end
-end
-run_test 'A lot o Plain routes', apps do |app|
-  app.get '/foo/5'
-end
-
-#
-# Pattern routes
-apps = build_apps do
-  [:get, :post, :put].each do |method|
-    10.times do |i|
-      send(method, "/foo/#{i}/:action") do
-        params[:action]
-      end
-    end
-  end
-end
-run_test 'A lot of Pattern routes', apps do |app|
-  app.get '/foo/5/edit'
-end
-