nancy 0.0.1 → 0.1.0

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nancy.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -3,10 +3,12 @@ _Sinatra's little daughter_
 
 ![Frank and Nancy by classic film scans](http://farm6.staticflickr.com/5212/5386187897_e3155cec68.jpg)
 
+
 ## Description
 
 Minimal Ruby microframework for web development inspired in [Sinatra](http://www.sinatrarb.com/)
 
+
 ## Installation
 
 Install the gem:
@@ -17,6 +19,7 @@ or add it to your Gemfile:
 
     gem "nancy"
 
+
 ## Usage
 
 Here's a simple application:
@@ -26,7 +29,8 @@ Here's a simple application:
 require "nancy"
 
 class Hello < Nancy::Base
-  use Rack::Session::Cookie
+  use Rack::Session::Cookie # for sessions
+  include Nancy::Render # for templates
 
   get "/" do
     "Hello World"
@@ -48,12 +52,26 @@ class Hello < Nancy::Base
     @message = "Hello world"
     render("views/hello.erb")
   end
+
+  post "/login" do
+    @user = User.find(params['username'])
+    halt 401, "unauthorized" unless @user.authenticate(params['password'])
+    session[:authenticated] = true
+    render("views/layout.erb") { render("views/welcome.erb") }
+  end
+
+  get "/users/:id.json" do
+    @user = User.find(params['id'])
+    response["Content-Type"] = "application/json"
+    halt 404 unless @user
+    UserSerializer.new(@user).to_json
+  end
 end
 ```
 
 To run it, you can create a `config.ru` file:
 
-``` ruby
+```ruby
 # config.ru
 require "./hello"
 
@@ -64,6 +82,33 @@ You can now run `rackup` and enjoy what you have just created.
 
 Check examples folder for a detailed example.
 
+
+## Features
+
+*  "Sinatra-like" routes: support for get, post, put, patch, delete
+*  Template rendering and caching through Tilt
+*  Include middlewares with the use method
+*  Sessions through Rack::Session
+*  Halt execution at any point using Ruby's throw/catch mechanism
+*  Thread-safe
+
+
+## Version history
+
+### 0.1.0
+
+*   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)
+*   Added support for templates caching using Tilt::Cache
+*   Moved render method from Nancy::Base to Nancy::Render module
+*   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
+
+*   Initial Release
+
+
 ## Contributing
 
 1. Fork it

data/examples/app.rb

@@ -1,11 +1,13 @@
 $:.push File.expand_path("../../lib", __FILE__)
 
 require "nancy/base"
+require "nancy/render"
 
 class App < Nancy::Base
   use Rack::Runtime
   use Rack::Session::Cookie
   use Rack::Static, :urls => ["/javascripts"], :root => "public"
+  include Nancy::Render
 
   get "/" do
     "Hello World"
@@ -57,7 +59,7 @@ class App < Nancy::Base
   end
 
   # Helper method
-  def self.render(*args)
+  def render(*args)
     args[0] = "views/#{args[0]}"
     super(*args)
   end

data/lib/nancy.rb

@@ -1,4 +1,5 @@
 require 'nancy/base'
+require 'nancy/render'
 require 'nancy/version'
 
 module Nancy

data/lib/nancy/base.rb

@@ -1,5 +1,4 @@
 require 'rack'
-require 'tilt'
 
 module Nancy
   class Base
@@ -24,17 +23,15 @@ module Nancy
       @route_set ||= Hash.new { |h, k| h[k] = [] }
     end
 
-    class << self
-      %w(request response params).each do |accessor|
-        define_method(accessor){ Thread.current[accessor.to_sym] }
-      end
+    %w(request response params env).each do |accessor|
+      define_method(accessor){ Thread.current[accessor.to_sym] }
     end
 
-    def self.session
+    def session
       request.env["rack.session"]
     end
 
-    def self.redirect(uri)
+    def redirect(uri)
       halt 302, {"Location" => uri}
     end
 
@@ -53,38 +50,35 @@ module Nancy
           middleware, *args, block = middleware
           use(middleware, *args, &block)
         end
-        run klass
+        run self
       end
     end
 
     def call(env)
-      @app.call(env)
-    end
-
-    def self.call(env)
       Thread.current[:request] = Rack::Request.new(env)
       Thread.current[:response] = Rack::Response.new
       Thread.current[:params] = request.params
+      Thread.current[:env] = env
       response = catch(:halt) do
         route_eval(request.request_method, request.path_info)
       end.finish
     end
 
-    def self.route_eval(request_method, path_info)
-      route_set[request_method].each do |matcher, block|
+    def route_eval(request_method, 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?
             url_params = Hash[*matcher[1].zip(captures).flatten]
             Thread.current[:params] = url_params.merge(params)
           end
-          response.write(block.call)
+          response.write instance_eval(&block)
           halt response
         end
       end
       halt 404
     end
 
-    def self.halt(*res)
+    def halt(*res)
       throw :halt, res.first if res.first.is_a?(Rack::Response)
       response.status = res.select{|x| x.is_a?(Fixnum)}.first || 200
       headers = res.select{|x| x.is_a?(Hash)}.first || {}
@@ -92,9 +86,5 @@ module Nancy
       response.body = [(res.select{|x| x.is_a?(String)}.first || "")]
       throw :halt, response
     end
-
-    def self.render(template, locals = {}, options = {}, &block)
-      Tilt.new(template).render(self, locals, &block)
-    end
   end
 end

data/lib/nancy/render.rb

@@ -0,0 +1,16 @@
+require 'tilt'
+
+module Nancy
+  module Render
+
+    def render(template, locals = {}, options = {}, &block)
+      templates_cache.fetch(template) {
+        Tilt.new(template, options)
+      }.render(self, locals, &block)
+    end
+
+    def templates_cache
+      Thread.current[:templates_cache] ||= Tilt::Cache.new
+    end
+  end
+end

data/lib/nancy/version.rb

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

data/nancy.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["guilleiguaran@gmail.com"]
   gem.description   = %q{Sinatra's little daughter}
   gem.summary       = %q{Ruby Microframework inspired in Sinatra}
-  gem.homepage      = "https://github.com/guilleiguaran/nancy"
+  gem.homepage      = "http://guilleiguaran.github.com/nancy"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/test/base_test.rb

@@ -5,6 +5,8 @@ class BaseTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   class TestApp < Nancy::Base
+    include Nancy::Render
+
     get "/" do
       "Hello World"
     end
@@ -44,18 +46,22 @@ class BaseTest < MiniTest::Unit::TestCase
       render("#{view_path}/layout.erb") { render("#{view_path}/view.erb") }
     end
 
-    def self.view_path
+    get "/view_with_option_trim" do
+      render("#{view_path}/view_with_trim.erb", {}, :trim => "%")
+    end
+
+    def view_path
       File.expand_path("fixtures", Dir.pwd)
     end
   end
 
   def app
-    TestApp
+    TestApp.new
   end
 
   def test_app_respond_with_call
-    assert TestApp.respond_to?(:call)
-    request = Rack::MockRequest.new(TestApp)
+    assert TestApp.new.respond_to?(:call)
+    request = Rack::MockRequest.new(TestApp.new)
     response = request.get('/')
     assert_equal 200, response.status
     assert_equal 'Hello World', response.body
@@ -99,4 +105,9 @@ class BaseTest < MiniTest::Unit::TestCase
     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
+  end
 end

data/test/fixtures/view_with_trim.erb

@@ -0,0 +1,4 @@
+
+% if true
+hello
+%end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nancy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70255892249720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255892249720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70255892249040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255892249040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70255892248380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255892248380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70255892247960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255892247960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sinatra's little daughter
 email:
 - guilleiguaran@gmail.com
@@ -74,13 +94,15 @@ files:
 - examples/views/layout.erb
 - lib/nancy.rb
 - lib/nancy/base.rb
+- lib/nancy/render.rb
 - lib/nancy/version.rb
 - nancy.gemspec
 - test/base_test.rb
 - test/fixtures/layout.erb
 - test/fixtures/view.erb
+- test/fixtures/view_with_trim.erb
 - test/test_helper.rb
-homepage: https://github.com/guilleiguaran/nancy
+homepage: http://guilleiguaran.github.com/nancy
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -100,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby Microframework inspired in Sinatra
@@ -108,4 +130,5 @@ test_files:
 - test/base_test.rb
 - test/fixtures/layout.erb
 - test/fixtures/view.erb
+- test/fixtures/view_with_trim.erb
 - test/test_helper.rb