nancy 0.1.0 → 0.2.0

data/README.md

@@ -6,7 +6,7 @@ _Sinatra's little daughter_
 
 ## Description
 
-Minimal Ruby microframework for web development inspired in [Sinatra](http://www.sinatrarb.com/)
+Minimal Ruby microframework for web development inspired in [Sinatra](http://www.sinatrarb.com/) and [Cuba](https://github.com/soveran/cuba)
 
 
 ## Installation
@@ -66,6 +66,14 @@ class Hello < Nancy::Base
     halt 404 unless @user
     UserSerializer.new(@user).to_json
   end
+
+  map "/resque" do
+    run Resque::Server
+  end
+
+  map "/nancy" do
+    run AnotherNancyApp
+  end
 end
 ```
 
@@ -75,7 +83,7 @@ To run it, you can create a `config.ru` file:
 # config.ru
 require "./hello"
 
-run App.new
+run Hello
 ```
 
 You can now run `rackup` and enjoy what you have just created.
@@ -85,9 +93,10 @@ Check examples folder for a detailed example.
 
 ## Features
 
-*  "Sinatra-like" routes: support for get, post, put, patch, delete
+*  "Sinatra-like" routes: support for get, post, put, patch, delete, options, head
 *  Template rendering and caching through Tilt
 *  Include middlewares with the use method
+*  Mount rack apps with the map method
 *  Sessions through Rack::Session
 *  Halt execution at any point using Ruby's throw/catch mechanism
 *  Thread-safe
@@ -95,7 +104,15 @@ Check examples folder for a detailed example.
 
 ## Version history
 
-### 0.1.0
+### 0.2.0 (April 12, 2012)
+
+*   Set PATH INFO to '/' when is blank
+*   Fixed session method: Raise error when is used but Rack::Session isn't present
+*   Added support for HEAD and OPTIONS HTTP verbs
+*   Refactored Base.use to use a Rack::Builder internally
+*   Added Base.map to redirect requests to Rack sub-apps
+
+### 0.1.0 (April 4, 2012)
 
 *   Created a new [Github Page](http://guilleiguaran.github.com/nancy) for the project
 *   Added env accessor, this add support for [Shield](https://github.com/cyx/shield)
@@ -104,7 +121,7 @@ Check examples folder for a detailed example.
 *   Refactored Nancy::Base to evaluate code blocks at instance level
 *   Fixed passing of render options to Tilt (thanks to [lporras](https://github.com/lporras))
 
-### 0.0.1
+### 0.0.1 (March 20, 2012)
 
 *   Initial Release
 

data/Rakefile

@@ -1,7 +1,15 @@
 #!/usr/bin/env rake
+require 'rake/testtask'
 
 task :test do
-  Dir.chdir('test'){ ruby('base_test.rb') }
+  Dir.chdir('test')
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << '../lib'
+  t.libs << '../test'
+  t.test_files = FileList['*_test.rb']
+  t.verbose = false
 end
 
 task :default => :test

data/examples/app.rb

@@ -3,10 +3,15 @@ $:.push File.expand_path("../../lib", __FILE__)
 require "nancy/base"
 require "nancy/render"
 
+class MiniApp < Nancy::Base
+  get("/") { "Hello from MiniApp" }
+  get("/:something") { params['something'] }
+end
+
 class App < Nancy::Base
   use Rack::Runtime
   use Rack::Session::Cookie
-  use Rack::Static, :urls => ["/javascripts"], :root => "public"
+  use Rack::Static, urls: ["/js"], root: "public"
   include Nancy::Render
 
   get "/" do
@@ -58,6 +63,14 @@ class App < Nancy::Base
     halt 500, "Error fatal"
   end
 
+  map "/rack" do
+    run lambda{|env| [200, {"Content-Type" => "text/html"}, ["PATH_INFO: #{env["PATH_INFO"]}"]]}
+  end
+
+  map "/nancy" do
+    run MiniApp
+  end
+
   # Helper method
   def render(*args)
     args[0] = "views/#{args[0]}"

data/examples/config.ru

@@ -1,3 +1,2 @@
 require "./app"
-
-run App.new
+run App

data/lib/nancy/base.rb

@@ -3,7 +3,7 @@ require 'rack'
 module Nancy
   class Base
     class << self
-      %w(GET POST PATCH PUT DELETE).each do |verb|
+      %w(GET POST PATCH PUT DELETE HEAD OPTIONS).each do |verb|
         define_method(verb.downcase) do |pattern, &block|
           route_set[verb] << [compile(pattern), block]
         end
@@ -28,32 +28,32 @@ module Nancy
     end
 
     def session
-      request.env["rack.session"]
+      request.env["rack.session"] || raise("Rack::Session handler is missing")
     end
 
     def redirect(uri)
       halt 302, {"Location" => uri}
     end
 
-    def self.use(middleware, *args, &block)
-      middlewares << [middleware, *args, block]
+    def self.use(*args, &block)
+      @builder.use(*args, &block)
     end
 
-    def self.middlewares
-      @middlewares ||= []
+    def self.map(*args, &block)
+      @builder.map(*args, &block)
     end
 
-    def initialize
-      klass = self.class
-      @app = Rack::Builder.new do
-        klass.middlewares.each do |middleware|
-          middleware, *args, block = middleware
-          use(middleware, *args, &block)
-        end
-        run self
+    def self.inherited(child)
+      child.instance_eval do
+        @builder = Rack::Builder.new
+        @builder.run(child.new)
       end
     end
 
+    def self.call(env)
+      @builder.dup.call(env)
+    end
+
     def call(env)
       Thread.current[:request] = Rack::Request.new(env)
       Thread.current[:response] = Rack::Response.new
@@ -65,6 +65,7 @@ module Nancy
     end
 
     def route_eval(request_method, path_info)
+      path_info = "/" if path_info == ""
       self.class.route_set[request_method].each do |matcher, block|
         if match = path_info.match(matcher[0])
           if (captures = match.captures) && !captures.empty?

data/lib/nancy/version.rb

@@ -1,3 +1,3 @@
 module Nancy
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/base_test.rb

@@ -1,11 +1,10 @@
 require File.expand_path('../test_helper', __FILE__)
-require "minitest/autorun"
 
 class BaseTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   class TestApp < Nancy::Base
-    include Nancy::Render
+    use Rack::Session::Cookie
 
     get "/" do
       "Hello World"
@@ -36,32 +35,19 @@ class BaseTest < MiniTest::Unit::TestCase
       "not reached code"
     end
 
-    get "/view" do
-      @message = "Hello from view"
-      render("#{view_path}/view.erb")
-    end
-
-    get "/layout" do
-      @message = "Hello from view"
-      render("#{view_path}/layout.erb") { render("#{view_path}/view.erb") }
-    end
-
-    get "/view_with_option_trim" do
-      render("#{view_path}/view_with_trim.erb", {}, :trim => "%")
-    end
-
-    def view_path
-      File.expand_path("fixtures", Dir.pwd)
+    get "/session" do
+      session['test'] = "test"
+      "session['test'] content is: #{session['test']}"
     end
   end
 
   def app
-    TestApp.new
+    TestApp
   end
 
   def test_app_respond_with_call
     assert TestApp.new.respond_to?(:call)
-    request = Rack::MockRequest.new(TestApp.new)
+    request = Rack::MockRequest.new(TestApp)
     response = request.get('/')
     assert_equal 200, response.status
     assert_equal 'Hello World', response.body
@@ -94,20 +80,8 @@ class BaseTest < MiniTest::Unit::TestCase
     assert_equal 'Internal Error', last_response.body
   end
 
-  def test_render
-    get '/view'
-    assert !last_response.body.include?("<html>")
-    assert last_response.body.include?("Hello from view")
-  end
-
-  def test_render_with_layout
-    get '/layout'
-    assert last_response.body.include?("<html>")
-    assert last_response.body.include?("Hello from view")
-  end
-
-  def test_send_tilt_options_to_render
-    get '/view_with_option_trim'
-    assert_equal "\nhello\n", last_response.body
+  def test_session
+    get '/session'
+    assert_equal "session['test'] content is: test", last_response.body
   end
 end

data/test/fixtures/view_with_trim.erb

@@ -1,4 +1,3 @@
-
-% if true
+<% if true %>
 hello
-%end
+<% end %>

data/test/map_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class RackApp
+  def call(env)
+    [200, {'Content-Type' => 'text/html'}, ["Hello from RackApp"]]
+  end
+end
+
+class NancyApp < Nancy::Base
+  get "/" do
+    "Hello from NancyApp"
+  end
+end
+
+class MainApp < Nancy::Base
+  get "/" do
+    "Hello from MainApp"
+  end
+
+  map "/rack_app" do
+    run RackApp.new
+  end
+
+  map "/nancy_app" do
+    run NancyApp
+  end
+
+  map "/lambda_app" do
+    run lambda{|env| [200, {'Content-Type' => 'text/html'}, ["Hello from LambdaApp"]]}
+  end
+end
+
+class UseTest < MiniTest::Unit::TestCase
+  def setup
+    @request = Rack::MockRequest.new(MainApp)
+  end
+
+  def test_main_app
+    response = @request.get('/')
+    assert_equal "Hello from MainApp", response.body
+  end
+
+  def test_map_with_rack_app
+    response = @request.get('/rack_app')
+    assert_equal "Hello from RackApp", response.body
+  end
+
+  def test_map_with_nancy_app
+    response = @request.get('/nancy_app')
+    assert_equal "Hello from NancyApp", response.body
+  end
+
+  def test_map_with_lambda
+    response = @request.get('/lambda_app')
+    assert_equal "Hello from LambdaApp", response.body
+  end
+end

data/test/render_test.rb

@@ -0,0 +1,48 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class BaseTest < MiniTest::Unit::TestCase
+  include Rack::Test::Methods
+
+  class TestApp < Nancy::Base
+    include Nancy::Render
+
+    get "/view" do
+      @message = "Hello from view"
+      render("#{view_path}/view.erb")
+    end
+
+    get "/layout" do
+      @message = "Hello from view"
+      render("#{view_path}/layout.erb") { render("#{view_path}/view.erb") }
+    end
+
+    get "/view_with_option_trim" do
+      render("#{view_path}/view_with_trim.erb", {}, :trim => true)
+    end
+
+    def view_path
+      File.expand_path("fixtures", Dir.pwd)
+    end
+  end
+
+  def app
+    TestApp
+  end
+
+  def test_render
+    get '/view'
+    assert !last_response.body.include?("<html>")
+    assert last_response.body.include?("Hello from view")
+  end
+
+  def test_render_with_layout
+    get '/layout'
+    assert last_response.body.include?("<html>")
+    assert last_response.body.include?("Hello from view")
+  end
+
+  def test_send_tilt_options_to_render
+    get '/view_with_option_trim'
+    assert_equal "hello\n", last_response.body
+  end
+end

data/test/test_helper.rb

@@ -7,4 +7,5 @@ $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 require "rubygems"
 require "nancy"
 require "minitest/unit"
+require "minitest/autorun"
 require "rack/test"

data/test/use_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class Reverser
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    body = response.body
+    [status, headers, [body.first.reverse]]
+  end
+end
+
+class HelloApp < Nancy::Base
+  use Reverser
+
+  get "/" do
+    "Hello World"
+  end
+end
+
+class UseTest < MiniTest::Unit::TestCase
+
+  def test_use
+    request = Rack::MockRequest.new(HelloApp)
+    response = request.get('/')
+    assert_equal "dlroW olleH", response.body
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nancy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -101,7 +101,10 @@ files:
 - test/fixtures/layout.erb
 - test/fixtures/view.erb
 - test/fixtures/view_with_trim.erb
+- test/map_test.rb
+- test/render_test.rb
 - test/test_helper.rb
+- test/use_test.rb
 homepage: http://guilleiguaran.github.com/nancy
 licenses: []
 post_install_message: 
@@ -131,4 +134,7 @@ test_files:
 - test/fixtures/layout.erb
 - test/fixtures/view.erb
 - test/fixtures/view_with_trim.erb
+- test/map_test.rb
+- test/render_test.rb
 - test/test_helper.rb
+- test/use_test.rb