nyny 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eefb757442e7e6fee6409340e2764aaf6f561481
-  data.tar.gz: 43d71751f9f6563bdf36c86058b2b122e22ff528
+  metadata.gz: 6dd6eb95721d78c86e3bbb400a9840369d02e438
+  data.tar.gz: d85151c9759b13ef449ca5b37fecf4575a486a84
 SHA512:
-  metadata.gz: a99b05e35b1e634dc51a4351d19291a41020e31a81a1a592bfc623755833008422bfa77b020fe6b9372cf94f23d3ad8afdb8b485bf8a2105edcf9c15d8372fd1
-  data.tar.gz: c7cf0199e55dec48be37d4ef923058cc0ed25b61fc70c31bbc1683d7e1cd64633ca5066432cc7de69da3dcc357dbde973bc0de6ed4895d9644a53e57949aea52
+  metadata.gz: 5cd94aac928361668da4b20ee7d23609749d47d4545b7fc13a52f51fae4421c8a7a79655ec96488a90899f13b582bd6de6d9308842b7cd9b95a8f664fb3cce37
+  data.tar.gz: 3d6a67e6dfa7052770ac7b9199863d6d4ad2890d13a3d28be60aaf36ffba7da6fb6be157647a881a8ec1e9f2b49696f5687dac548a5135f41738e12ee77327f6

data/.gitignore

@@ -4,6 +4,8 @@
 .config
 .yardoc
 *.sqlite3
+*.sublime-project
+*.sublime-workspace
 Gemfile.lock
 InstalledFiles
 _yardoc

data/README.md

@@ -42,6 +42,7 @@ Open the browser at [http://localhost:9292](http://localhost:9292)
     - [Environment](#environment)
     - [Running](#running)
     - [Defining routes](#defining-routes)
+    - [Templates](#templates)
     - [Request scope](#request-scope)
     - [Filters](#filters)
     - [Middleware](#middleware)
@@ -144,7 +145,6 @@ development easier: Rack::CommonLogger and Rack::ShowExceptions.
 This will show all requests in the log, and will provide useful details
 in the case a error occurs during a request.
 
-
 ## Defining routes
 
 NYNY supports the following verbs for defining a route: delete, get, head,
@@ -182,6 +182,36 @@ end
 Each block that is passed to a route definition is evaluated in the context of
 a request scope. See below what methods are available there.
 
+## Templates
+NYNY can render templates, all you need is to call the `render` function:
+```ruby
+class App < NYNY::App
+  get '/' do
+    render 'index.erb'
+  end
+end
+```
+There are 2 ways to pass data to the template:
+
+Via a instance variable:
+```ruby
+class App < NYNY::App
+  get '/' do
+    @foo = 'bar' #access it as @foo in template
+    render 'index.erb'
+  end
+end
+```
+
+Or via a local variable:
+```ruby
+class App < NYNY::App
+  get '/' do
+    render 'index.erb', :foo => 'bar' #access it as foo in template
+  end
+end
+```
+
 ## Request scope
 As was said above, when you pass a block to a route definition,
 that block is evaluated in the context of a [RequestScope][2].
@@ -189,7 +219,9 @@ This means that several methods/objects available inside that block:
 
 - `request` - A `Rack::Request` object which encapsulates the request
   to that route. (see [Rack::Request documentation][3] for more info)
-- `response` - A `Rack::Response` object which encapsulates the response
+- `response` - A `Rack::Response` object which encapsulates the response.
+  Additionally, NYNY's response exposes 2 more methods in addition to Rack's ones.
+  (see [primitives.rb][primitivesrb])
 - `params` - a hash which contains both POST body params and GET querystring params.
 - `headers` - allows you to read/add headers to the response
   (ex: `headers 'Content-Type' => 'text/html'`)
@@ -229,7 +261,7 @@ end
 
 ## Middleware
 
-A NYNY app is a Rack middleware, which means that it can be used inside 
+A NYNY app is a Rack middleware, which means that it can be used inside
 Sinatra, Rails, or any other Rack-based app:
 
 ```ruby
@@ -346,3 +378,4 @@ TBD.
 [performance]: https://github.com/alisnic/nyny/blob/master/Performance.md
 [rack-middleware]: https://github.com/rack/rack/wiki/List-of-Middleware
 [halt-definition]: https://github.com/alisnic/nyny/blob/master/lib/nyny/request_scope.rb#L36
+[primitivesrb]: https://github.com/alisnic/nyny/blob/master/lib/nyny/primitives.rb

data/benchmark.rb

@@ -93,3 +93,33 @@ 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
+

data/lib/nyny.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'rack'
+require 'tilt'
 
 require 'nyny/version'
 require 'nyny/primitives'
@@ -9,12 +10,13 @@ require 'nyny/middleware_chain'
 require 'nyny/app'
 require 'nyny/router'
 
-
 # Register core extensions
 require 'nyny/core-ext/runner'
+require 'nyny/core-ext/templates'
 
 module NYNY
   App.register NYNY::Runner
+  App.register NYNY::Templates
 
   class EnvString < String
     [:production, :development, :test].each do |env|

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

@@ -0,0 +1,19 @@
+module NYNY
+  module Templates
+    module Helpers
+      def render template, locals = {}, options = {}, &block
+        template_cache.fetch(template) do
+          Tilt.new(template, options)
+        end.render(self, locals, &block)
+      end
+
+      def template_cache
+        Thread.current[:template_cache] ||= Tilt::Cache.new
+      end
+    end
+
+    def self.registered app
+      app.helpers Helpers
+    end
+  end
+end

data/lib/nyny/version.rb

@@ -1,3 +1,3 @@
 module NYNY
-  VERSION = "2.1.1"
+  VERSION = "2.2.1"
 end

data/nyny.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency             "rack"
+  spec.add_dependency             "tilt"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/spec_helper.rb

@@ -20,6 +20,10 @@ class Rack::MockRequest
   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

data/spec/templates_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Templates do
+  let (:app) do
+    mock_app do
+      get '/without_layout' do
+        render template('index.erb')
+      end
+
+      get '/with_layout' do
+        render template('layout.erb') do
+          render template('index.erb')
+        end
+      end
+
+      get '/instance_var' do
+        @foo = 'bar'
+        render template('instance.erb')
+      end
+
+      get '/local_var' do
+        render template('local.erb'), :foo => 'bar'
+      end
+    end
+  end
+
+  it 'renders correctly without layout' do
+    response = app.get('/without_layout')
+    response.body.should == '<p>Hello!</p>'
+  end
+
+  it 'passes a instance variable to template' do
+    response = app.get('/instance_var')
+    response.body.should == 'bar'
+  end
+
+  it 'passes a local variable to template' do
+    response = app.get('/local_var')
+    response.body.should == 'bar'
+  end
+
+  it 'renders correctly with layout' do
+    response = app.get('/with_layout')
+
+    rendered = Tilt.new(template('layout.erb')).render do
+      Tilt.new(template('index.erb')).render
+    end
+
+    response.body.should == rendered
+  end
+
+end

data/spec/views/index.erb

@@ -0,0 +1 @@
+<p>Hello!</p>

data/spec/views/instance.erb

@@ -0,0 +1 @@
+<%= @foo %>

data/spec/views/layout.erb

@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+  <head></head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/spec/views/local.erb

@@ -0,0 +1 @@
+<%= foo %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyny
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrei Lisnic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +101,7 @@ files:
 - lib/nyny.rb
 - lib/nyny/app.rb
 - lib/nyny/core-ext/runner.rb
+- lib/nyny/core-ext/templates.rb
 - lib/nyny/middleware_chain.rb
 - lib/nyny/primitives.rb
 - lib/nyny/request_scope.rb
@@ -101,6 +116,11 @@ files:
 - spec/router_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
+- spec/templates_spec.rb
+- spec/views/index.erb
+- spec/views/instance.erb
+- spec/views/layout.erb
+- spec/views/local.erb
 homepage: http://alisnic.github.io/nyny/
 licenses:
 - MIT
@@ -133,3 +153,8 @@ test_files:
 - spec/router_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
+- spec/templates_spec.rb
+- spec/views/index.erb
+- spec/views/instance.erb
+- spec/views/layout.erb
+- spec/views/local.erb