nyny 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107d11189a291b7486db035f572921ff75946129
-  data.tar.gz: 484670541b44ee3c37e59c219a5769a489caccce
+  metadata.gz: 6db6a9ca35676823e643db65bc2b458c44bc793f
+  data.tar.gz: 582642543e721156d818975ced8ad08849c5c2eb
 SHA512:
-  metadata.gz: a130aa58b46327176465becf3d4d030bdaad6bb6b681ca0c8be4f55658b6fe72351e06050c9d1eafc7a98e4319629045697ea55b09f02725023082453e27fa8c
-  data.tar.gz: 5fb16a4139ac277a4cea7da8320f2e3ead517d8bcaa54c5ae0b71aa20c5dbb7cfe1c75fe5462d33f7b8aa71a3adc85affb562e4997978d634563db9d8f3405db
+  metadata.gz: 0b4aeb7be4451c4d4663cecf2ce4bb0056bf9a2170d2afd0935399f0d114c37a32fb5f3101029509a839dee046d809fbf3dfd48a52faaa5b996c18d006cc3dfc
+  data.tar.gz: fc5e89993a3d8356c21fab47ca10b132ca1b0eeb1f5e46b7365f648353b35b8bfbfd873e2ec30a4a19717d191c63adfda8404c01fcc70708b203977b4ff53d23

data/CHANGELOG

@@ -1,3 +1,9 @@
+3.3.1
+  - if the response of the route is a enumerable, NYNY will try to
+    send it in chunks (given that both the client and the server support it)
+  - NYNY::Base for those who love the barebone (lacks config, namespaces,
+    templates, and run!)
+
 3.3.0
   - App.config
   - before_initialize hooks

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://api.travis-ci.org/alisnic/nyny.png)](https://travis-ci.org/alisnic/nyny)
 [![Coverage Status](https://coveralls.io/repos/alisnic/nyny/badge.png)](https://coveralls.io/r/alisnic/nyny)
 [![Code Climate](https://codeclimate.com/repos/521b7ee513d637348712864a/badges/60e3637788bbac94f1cb/gpa.png)](https://codeclimate.com/repos/521b7ee513d637348712864a/feed)
-[![Dependency Status](https://gemnasium.com/alisnic/nyny.png)](https://gemnasium.com/alisnic/nyny)
 [![Gem Version](https://badge.fury.io/rb/nyny.png)](http://badge.fury.io/rb/nyny)
 
 ```ruby
@@ -37,7 +36,7 @@ Open the browser at [http://localhost:9292](http://localhost:9292)
 - [TOP](#new-york-new-york)
 - [Motivation](#motivation)
 - [Philosophy](#philosophy)
-- [Why use NYNY instead of Sinatra](#why-use-nyny-instead-of-sinatra)
+- [Why use NYNY](#why-use-nyny)
 - [Usage](#usage)
     - [Environment](#environment)
     - [Configuration](#configuration)
@@ -58,8 +57,8 @@ NYNY is unassuming, it has all the core stuff to get running, but nothing else.
 Your app is the framework. However, it's trivial to extend NYNY via its
 [extension interface](#extensions).
 
-# Why use NYNY instead of any other small web framework
-- It's __very__ small (<300 LOC), which is just a little overhead on top of Rack.
+# Why use NYNY
+- It's __very__ small (~300 LOC), which is just a little overhead on top of Rack.
 - You want to dig into the source code and change to your needs (NYNY's source code is more welcoming)
 - Each NYNY app is a Rack middleware, so it can be used inside of Sinatra, Rails, or any other Rack-based app.
 - __It uses Journey for routing (Rails' router)__, which makes its routing logic
@@ -124,7 +123,7 @@ class App < NYNY::App
     config.always = true
   end
 
-  configdure :production do
+  configure :production do
     config.prod = true
   end
 

data/lib/nyny/app.rb

@@ -1,61 +1,18 @@
-require 'rack'
+require 'nyny/base'
+require 'nyny/templates'
 require 'better_errors'
 require 'ostruct'
-require 'nyny/primitives'
-require 'nyny/request_scope'
-require 'nyny/router'
-require 'nyny/templates'
 
 module NYNY
-  class App
-    include NYNY::Inheritable
-    HTTP_VERBS = [:delete, :get, :head, :options, :patch, :post, :put, :trace]
-
-    inheritable :builder,           Rack::Builder.new
-    inheritable :scope_class,       Class.new(RequestScope)
-    inheritable :config,            OpenStruct.new
-    inheritable :route_defs,        []
-    inheritable :before_hooks,      []
-    inheritable :after_hooks,       []
-    inheritable :before_init_hooks, []
-    inheritable :after_init_hooks,  []
-
-    def initialize app=nil
-      self.class.builder.run Router.new({
-        :scope_class    => self.class.scope_class,
-        :route_defs     => self.class.route_defs,
-        :before_hooks   => self.class.before_hooks,
-        :after_hooks    => self.class.after_hooks,
-        :fallback       => app
-      })
-
-      self.class.before_init_hooks.each {|h| h.call(self)}
-      @app = self.class.builder.to_app
-      self.class.after_init_hooks.each {|h| h.call(self, @app)}
-    end
-
-    def call env
-      @app.call env
-    end
+  class App < Base
+    inheritable :config, OpenStruct.new
+    register NYNY::Templates
+    use Rack::Chunked
 
-    #class methods
     class << self
-      HTTP_VERBS.each do |method|
-        define_method method do |path, options={}, &block|
-          options[:constraints] ||= {}
-          options[:constraints].merge!(:request_method => method.to_s.upcase)
-          define_route path, options, &block
-        end
-      end
-
-      def define_route path, options, &block
-        self.route_defs << [path, options, Proc.new(&block)]
-      end
-
-      def register *extensions
-        extensions.each do |ext|
-          extend ext
-          ext.registered(self) if ext.respond_to?(:registered)
+      def configure *envs, &block
+        if envs.map(&:to_sym).include?(NYNY.env.to_sym) or envs.empty?
+          instance_eval(&block)
         end
       end
 
@@ -70,44 +27,11 @@ module NYNY
         builder.map (url) { use klass }
       end
 
-      def before &blk
-        before_hooks << Proc.new(&blk)
-      end
-
-      def after &blk
-        after_hooks << Proc.new(&blk)
-      end
-
-      def before_initialize &blk
-        before_init_hooks << Proc.new(&blk)
-      end
-
-      def after_initialize &blk
-        after_init_hooks << Proc.new(&blk)
-      end
-
-      def configure *envs, &block
-        if envs.map(&:to_sym).include?(NYNY.env.to_sym) or envs.empty?
-          instance_eval(&block)
-        end
-      end
-
-      def use middleware, *args, &block
-        builder.use middleware, *args, &block
-      end
-
-      def helpers *args, &block
-        args << Module.new(&block) if block_given?
-        args.each {|m| scope_class.send :include, m }
-      end
-
       def run! port=9292
         use Rack::CommonLogger
         use BetterErrors::Middleware unless NYNY.env.production?
-        Rack::Handler.pick(['thin', 'webrick']).run new, :Port => port
+        Rack::Handler.pick(['puma', 'thin', 'webrick']).run new, :Port => port
       end
-    end #class methods
-
-    register NYNY::Templates
+    end
   end
-end
+end

data/lib/nyny/base.rb

@@ -0,0 +1,85 @@
+require 'rack'
+require 'nyny/primitives'
+require 'nyny/request_scope'
+require 'nyny/router'
+
+module NYNY
+  class Base
+    include NYNY::Inheritable
+    HTTP_VERBS = [:delete, :get, :head, :options, :patch, :post, :put, :trace]
+
+    inheritable :builder,           Rack::Builder.new
+    inheritable :scope_class,       Class.new(RequestScope)
+    inheritable :route_defs,        []
+    inheritable :before_hooks,      []
+    inheritable :after_hooks,       []
+    inheritable :before_init_hooks, []
+    inheritable :after_init_hooks,  []
+
+    def initialize app=nil
+      self.class.before_init_hooks.each {|h| h.call(self)}
+
+      self.class.builder.run Router.new({
+        :scope_class    => self.class.scope_class,
+        :route_defs     => self.class.route_defs,
+        :before_hooks   => self.class.before_hooks,
+        :after_hooks    => self.class.after_hooks,
+        :fallback       => app
+      })
+
+      @app = self.class.builder.to_app
+      self.class.after_init_hooks.each {|h| h.call(self, @app)}
+    end
+
+    def call env
+      @app.call env
+    end
+
+    #class methods
+    class << self
+      HTTP_VERBS.each do |method|
+        define_method method do |path, options={}, &block|
+          options[:constraints] ||= {}
+          options[:constraints].merge!(:request_method => method.to_s.upcase)
+          define_route path, options, &block
+        end
+      end
+
+      def define_route path, options, &block
+        self.route_defs << [path, options, Proc.new(&block)]
+      end
+
+      def before &blk
+        before_hooks << Proc.new(&blk)
+      end
+
+      def after &blk
+        after_hooks << Proc.new(&blk)
+      end
+
+      def before_initialize &blk
+        before_init_hooks << Proc.new(&blk)
+      end
+
+      def after_initialize &blk
+        after_init_hooks << Proc.new(&blk)
+      end
+
+      def use middleware, *args, &block
+        builder.use middleware, *args, &block
+      end
+
+      def register *extensions
+        extensions.each do |ext|
+          extend ext
+          ext.registered(self) if ext.respond_to?(:registered)
+        end
+      end
+
+      def helpers *args, &block
+        args << Module.new(&block) if block_given?
+        args.each {|m| scope_class.send :include, m }
+      end
+    end #class methods
+  end
+end

data/lib/nyny/primitives.rb

@@ -38,14 +38,6 @@ module NYNY
   end
 
   class Response < Rack::Response
-    def rewrite str
-      @body   = []
-      @length = 0
-      header.delete "Content-Type"
-      header.delete "Content-Length"
-      write str
-    end
-    alias_method :body=, :rewrite
   end
 
   def self.root

data/lib/nyny/request_scope.rb

@@ -24,11 +24,9 @@ module NYNY
     end
 
     def halt status, headers={}, body=''
-      response.status = status
-      response.headers.merge! headers
-      response.rewrite body
+      @response = Response.new body, status, headers
       cookies.finish!(response) if @cookies
-      throw :halt, response.finish
+      throw :halt, response
     end
 
     def redirect_to uri, status=302
@@ -37,9 +35,10 @@ module NYNY
     alias_method :redirect, :redirect_to
 
     def apply_to &handler
-      response.write instance_eval(&handler)
+      data = instance_eval(&handler)
+      data.respond_to?(:each) ? response.body = data : response.write(data)
       cookies.finish!(response) if @cookies
-      response.finish
+      response
     end
   end
 end

data/lib/nyny/router.rb

@@ -54,7 +54,7 @@ module NYNY
           after_hooks.each {|h| scope.instance_eval &h }
         end
 
-        response
+        response.finish
       end
     end
   end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/spec/app_spec.rb

@@ -1,11 +1,17 @@
 require 'spec_helper'
 
 describe App do
+  let (:klass) { mock_app_class {} }
   let (:app) { mock_app {} }
 
   it 'should return a rack response on call' do
-    response = app.get '/'
-    response.should be_a(Rack::Response)
+    env = Rack::MockRequest.env_for '/'
+    res = klass.new.call(env)
+    res.should be_a(Array)
+    res.size.should == 3
+    res[0].should == 404
+    res[1].should be_a(Hash)
+    res[2].should respond_to(:each)
   end
 
   it 'should return 404 for non-matched routes' do
@@ -144,7 +150,7 @@ describe App do
 
   it 'acts well as a middleware' do
     app = lambda do |env|
-      [210, {}, ['Hello from downstream']]
+      [210, {'Content-Length' => 21}, ['Hello from downstream']]
     end
 
     app_class = mock_app_class do

data/spec/request_scope_spec.rb

@@ -76,13 +76,13 @@ describe RequestScope do
     it '#headers should set the header values' do
       subject.headers['Head'] = 'Tail'
       response = subject.apply_to &handler
-      response[1]['Head'].should == 'Tail'
+      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[0].should == 403
+      response.status.should == 403
     end
 
     it 'params should have insensitive keys' do
@@ -138,16 +138,8 @@ describe RequestScope do
     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)
+      response.status == 302
+      response.headers['Location'].should == 'http://foo.bar'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-contrib
@@ -126,6 +126,7 @@ files:
 - Rakefile
 - lib/nyny.rb
 - lib/nyny/app.rb
+- lib/nyny/base.rb
 - lib/nyny/primitives.rb
 - lib/nyny/request_scope.rb
 - lib/nyny/router.rb
@@ -137,7 +138,6 @@ files:
 - spec/inheritance_spec.rb
 - spec/initialize_hooks_spec.rb
 - spec/nyny_spec.rb
-- spec/primitives_spec.rb
 - spec/request_scope_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
@@ -176,7 +176,6 @@ test_files:
 - spec/inheritance_spec.rb
 - spec/initialize_hooks_spec.rb
 - spec/nyny_spec.rb
-- spec/primitives_spec.rb
 - spec/request_scope_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb

data/spec/primitives_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-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