padrino-core 0.9.6 → 0.9.7

data/lib/padrino-core/reloader.rb

@@ -36,7 +36,7 @@ module Padrino
     ##
     # You can exclude some folders from reload its contents.
     # Defaults excluded directories of Padrino.root are: test, spec, features, tmp, config, lib, db and public
-    # 
+    #
     def self.exclude
       @_exclude ||= %w(test spec tmp features config lib public db).map { |path| Padrino.root(path) }
     end
@@ -48,7 +48,7 @@ module Padrino
     #
     # Please note that this will not reload files in the background, it does so
     # only when actively called.
-    # 
+    #
     module Stat
       class << self
         CACHE  = {}
@@ -72,7 +72,7 @@ module Padrino
 
         ##
         # A safe Kernel::load, issuing the hooks depending on the results
-        # 
+        #
         def safe_load(file, mtime)
           logger.debug "Reloading #{file}"
           load(file)
@@ -85,7 +85,7 @@ module Padrino
 
         ##
         # Search Ruby files in your +Padrino.root+ and monitor them for changes.
-        # 
+        #
         def rotation
           paths = Dir[Padrino.root("*")].reject { |path| Padrino::Reloader.exclude.include?(path) || !File.directory?(path) }
           files = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
@@ -104,7 +104,7 @@ module Padrino
         # Takes a relative or absolute +file+ name, a couple possible +paths+ that
         # the +file+ might reside in. Returns the full path and File::Stat for the
         # path.
-        # 
+        #
         def figure_path(file, paths)
           found = CACHE[file]
           found = file if !found and Pathname.new(file).absolute?
@@ -130,4 +130,4 @@ module Padrino
       end # self
     end # Stat
   end # Reloader
-end # Padrino
+end # Padrino

data/lib/padrino-core/server.rb

@@ -3,12 +3,12 @@ module Padrino
   ##
   # Run the Padrino apps as a self-hosted server using:
   # thin, mongrel, webrick in that order.
-  # 
+  #
   # ==== Examples
-  # 
+  #
   #   Padrino.run! # with these defaults => host: "localhost", port: "3000", adapter: the first found
   #   Padrino.run!("localhost", "4000", "mongrel") # use => host: "localhost", port: "3000", adapter: "mongrel"
-  # 
+  #
   def self.run!(*args)
     Padrino.load! unless Padrino.loaded?
     Server.build(*args)
@@ -16,7 +16,7 @@ module Padrino
 
   ##
   # This module build a Padrino server
-  # 
+  #
   module Server
 
     class LoadError < RuntimeError; end
@@ -61,4 +61,4 @@ module Padrino
         raise LoadError, "Server handler (#{servers.join(',')}) not found."
       end
   end # Server
-end # Padrino
+end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -1,14 +1,14 @@
 ##
 # This file loads certain extensions required by Padrino from ActiveSupport.
-# 
-# Why use ActiveSupport and not our own library or extlib? 
+#
+# Why use ActiveSupport and not our own library or extlib?
 #
 # 1) Writing custom method extensions needed (i.e string inflections) is not a good use of time.
 # 2) Loading custom method extensions or separate gem would conflict when AR or MM has been loaded.
 # 3) Datamapper is planning to move to ActiveSupport and away from extlib.
-# 
+#
 # Extensions required for Padrino:
-# 
+#
 #   * Class#cattr_accessor
 #   * Module#alias_method_chain
 #   * String#inflectors (classify, underscore, camelize, pluralize, etc)
@@ -20,7 +20,7 @@
 #   * Hash#symbolize_keys, Hash.symbolize_keys!
 #   * Hash#reverse_merge, Hash#reverse_merge!
 #   * SupportLite::OrderedHash
-# 
+#
 
 require 'i18n'
 require 'active_support/core_ext/kernel'
@@ -37,7 +37,7 @@ require 'active_support/ordered_hash'
 
 ##
 # Define our own OrderedHash based on AS::OrderedHash
-# 
+#
 unless defined?(SupportLite::OrderedHash)
   module SupportLite
     OrderedHash = ::ActiveSupport::OrderedHash
@@ -46,14 +46,14 @@ end
 
 ##
 # Alias allowing for use of either method to get query parameters
-# 
+#
 unless Hash.method_defined?(:to_params)
-  class Hash 
+  class Hash
     alias :to_params :to_query
   end
 end
 
 ##
 # Loads our locales configuration files
-# 
+#
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]

data/lib/padrino-core/tasks.rb

@@ -4,18 +4,18 @@ module Padrino
   # This module it's used for bootstrap with padrino rake
   # thirdy party tasks, in your gem/plugin/extension you
   # need only do this:
-  # 
+  #
   # ==== Examples
-  # 
+  #
   #   Padrino::Tasks.files << yourtask.rb
   #   Padrino::Tasks.files.concat(Dir["/path/to/all/my/tasks/*.rb"])
   #   Padrino::Tasks.files.unshift("yourtask.rb")
-  # 
+  #
   module Tasks
 
     ##
     # Returns a list of files to handle with padrino rake
-    # 
+    #
     def self.files
       @files ||= []
     end

data/lib/padrino-core/version.rb

@@ -1,13 +1,13 @@
 ##
 # Manages Padrino version from the VERSION file managed by Jeweler
-# We put this in a separate file so you can get padrino version 
+# We put this in a separate file so you can get padrino version
 # without include full padrino core.
 #
 module Padrino
   ##
   # Return the current Padrino version
-  # 
+  #
   def self.version
     @version ||= File.read(File.dirname(__FILE__) + '/../../VERSION').chomp
   end
-end # Padrino
+end # Padrino

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-22}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/padrino-core/application/mounter.rb",
      "lib/padrino-core/application/rendering.rb",
      "lib/padrino-core/application/routing.rb",
+     "lib/padrino-core/application/showexceptions.rb",
      "lib/padrino-core/caller.rb",
      "lib/padrino-core/cli/adapter.rb",
      "lib/padrino-core/cli/base.rb",

data/test/fixtures/apps/simple.rb

@@ -1,6 +1,6 @@
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 # Remove this comment if you want do some like this: ruby PADRINO_ENV=test app.rb
-# 
+#
 # require 'rubygems'
 # require 'lib/padrino-core'
 #
@@ -16,9 +16,9 @@ SimpleDemo.controllers do
 end
 
 ## If you want use this as a standalone app uncomment:
-# 
+#
 # Padrino.mount_core("SimpleDemo")
 # Padrino.run! unless Padrino.loaded? # If you enable reloader prevent to re-run the app
-# 
+#
 
 Padrino.load!

data/test/test_application.rb

@@ -2,42 +2,35 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestApplication < Test::Unit::TestCase
 
-  def with_layout(name=:application)
-    # Build a temp layout
-    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
-    layout = File.dirname(__FILE__) + "/views/layouts/#{name}.erb"
-    File.open(layout, 'wb') { |io| io.write "this is a <%= yield %>" }
-    yield
-  ensure
-    # Remove temp layout
-    File.unlink(layout) rescue nil
-    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
-  end
-
-  def create_view(name, content, options={})
+  def create_template(name, content, options={})
     FileUtils.mkdir_p(File.dirname(__FILE__) + "/views")
-    path   = "/views/#{name}"
-    path  += ".#{options.delete(:locale)}" if options[:locale].present?
-    path  += ".#{options.delete(:format)}" if options[:format].present?
-    path  += ".erb"
-    view   = File.dirname(__FILE__) + path
-    File.open(view, 'wb') { |io| io.write content }
-    view
+    FileUtils.mkdir_p(File.dirname(__FILE__) + "/views/layouts")
+    path  = "/views/#{name}"
+    path += ".#{options.delete(:locale)}" if options[:locale].present?
+    path += ".#{options.delete(:format)}" if options[:format].present?
+    path += ".erb"
+    file  = File.dirname(__FILE__) + path
+    File.open(file, 'w') { |io| io.write content }
+    file
   end
+  alias :create_view   :create_template
+  alias :create_layout :create_template
 
   def remove_views
     FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
   end
 
-  def with_view(name, content, options={})
+  def with_template(name, content, options={})
     # Build a temp layout
-    view = create_view(name, content, options)
+    template = create_template(name, content, options)
     yield
   ensure
     # Remove temp layout
-    File.unlink(view) rescue nil
+    File.unlink(template) rescue nil
     remove_views
   end
+  alias :with_view   :with_template
+  alias :with_layout :with_template
 
   def teardown
     remove_views
@@ -96,7 +89,7 @@ class TestApplication < Test::Unit::TestCase
     end
 
     should 'use rails way layout' do
-      with_layout do
+      with_layout :application, "this is a <%= yield %>" do
         mock_app do
           get("/"){ render :erb, "rails way layout" }
         end
@@ -107,7 +100,7 @@ class TestApplication < Test::Unit::TestCase
     end
 
     should 'use rails way for a custom layout' do
-      with_layout :custom do
+      with_layout "layouts/custom", "this is a <%= yield %>" do
         mock_app do
           layout :custom
           get("/"){ render :erb, "rails way custom layout" }
@@ -119,7 +112,7 @@ class TestApplication < Test::Unit::TestCase
     end
 
     should 'not use layout' do
-      with_layout do
+      with_layout :application, "this is a <%= yield %>" do
         with_view :index, "index" do
           mock_app do
             get("/with/layout"){ render :index }
@@ -239,6 +232,48 @@ class TestApplication < Test::Unit::TestCase
       assert_equal 404, status
     end
 
+    should 'resolve template content_type and locale with layout' do
+      create_layout :foo, "Hello <%= yield %> in a Js layout",     :format => :js
+      create_layout :foo, "Hello <%= yield %> in a Js-En layout",  :format => :js, :locale => :en
+      create_layout :foo, "Hello <%= yield %> in a Js-It layout",  :format => :js, :locale => :it
+      create_layout :foo, "Hello <%= yield %> in a Erb-En layout", :locale => :en
+      create_layout :foo, "Hello <%= yield %> in a Erb-It layout", :locale => :it
+      create_layout :foo, "Hello <%= yield %> in a Erb layout"
+      create_view   :bar, "Im Js",          :format => :js
+      create_view   :bar, "Im Erb"
+      create_view   :bar, "Im English Erb", :locale => :en
+      create_view   :bar, "Im Italian Erb", :locale => :it
+      create_view   :bar, "Im English Js",  :format => :js, :locale => :en
+      create_view   :bar, "Im Italian Js",  :format => :js, :locale => :it
+      create_view   :bar, "Im a json",      :format => :json
+      mock_app do
+        layout :foo
+        get("/bar", :respond_to => [:html, :js, :json]) { render :bar }
+      end
+      I18n.locale = :none
+      get "/bar.js"
+      assert_equal "Hello Im Js in a Js layout", body
+      get "/bar"
+      assert_equal "Hello Im Erb in a Erb layout", body
+      I18n.locale = :en
+      get "/bar"
+      assert_equal "Hello Im English Erb in a Erb-En layout", body
+      I18n.locale = :it
+      get "/bar"
+      assert_equal "Hello Im Italian Erb in a Erb-It layout", body
+      I18n.locale = :en
+      get "/bar.js"
+      assert_equal "Hello Im English Js in a Js-En layout", body
+      I18n.locale = :it
+      get "/bar.js"
+      assert_equal "Hello Im Italian Js in a Js-It layout", body
+      I18n.locale = :en
+      get "/bar.json"
+      assert_equal "Im a json", body
+      get "/bar.pk"
+      assert_equal 404, status
+    end
+
     should 'renders erb with blocks' do
       mock_app do
         def container

data/test/test_mounter.rb

@@ -7,7 +7,7 @@ class TestMounter < Test::Unit::TestCase
   end
 
   context 'for mounter functionality' do
-    
+
     should 'check methods' do
       mounter = Padrino::Mounter.new("test", :app_file => "/path/to/test.rb")
       mounter.to("/test")
@@ -38,7 +38,7 @@ class TestMounter < Test::Unit::TestCase
       assert_equal AnApp, Padrino.mounted_apps.first.app_obj
       assert_equal ["core"], Padrino.mounted_apps.collect(&:name)
     end
-    
+
     should 'mount a core' do
       mounter = Padrino.mount_core("test")
       assert_equal "core", mounter.name
@@ -52,7 +52,7 @@ class TestMounter < Test::Unit::TestCase
     should 'mount multiple apps' do
       class ::OneApp < Padrino::Application; end
       class ::TwoApp < Padrino::Application; end
-      
+
       Padrino.mount("one_app").to("/one_app")
       Padrino.mount("two_app").to("/two_app")
       # And testing no duplicates
@@ -64,7 +64,7 @@ class TestMounter < Test::Unit::TestCase
       assert_equal 2, Padrino.mounted_apps.size, "should not mount duplicate apps"
       assert_equal ["one_app", "two_app"], Padrino.mounted_apps.collect(&:name)
     end
-    
+
     should 'change mounted_root' do
       Padrino.mounted_root = "fixtures"
       assert_equal Padrino.root("fixtures", "test", "app.rb"), Padrino.mounted_root("test", "app.rb")
@@ -79,7 +79,7 @@ class TestMounter < Test::Unit::TestCase
         get("/demo_1"){ "Im Demo 1" }
         get("/demo_2"){ "Im Demo 2" }
       end
-      
+
       get '/demo_1'
       assert_equal "Im Demo 1", body
       get '/demo_2'

data/test/test_reloader_simple.rb

@@ -39,9 +39,9 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal "image/png", response["Content-Type"]
     end
   end
-  
+
   context 'for simple reload functionality' do
-  
+
     should 'correctly instantiate SimpleDemo fixture' do
       Padrino.mounted_apps.clear
       Padrino.mount_core("simple_demo")
@@ -49,7 +49,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end
-  
+
     should 'correctly reload SimpleDemo fixture' do
       @app = SimpleDemo
       get "/"
@@ -61,7 +61,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       sleep 1.2 # We need at least a cooldown of 1 sec.
       get "/"
       assert_equal new_phrase, body
-  
+
       # Now we need to prevent to commit a new changed file so we revert it
       File.open(SimpleDemo.app_file, "w") { |f| f.write(buffer) }
     end

data/test/test_routing.rb

@@ -12,6 +12,17 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "okey", body
   end
 
+  should 'fail with unrecognized route exception when not found' do
+    unrecognized_app = mock_app do
+      get(:index){ "okey" }
+    end
+    assert_nothing_raised { get unrecognized_app.url_for(:index) }
+    assert_equal "okey", body
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get unrecognized_app.url_for(:fake)
+    }
+  end
+
   should "parse routes with question marks" do
     mock_app do
       get("/foo/?"){ "okey" }
@@ -85,6 +96,39 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "/d.js?foo=bar", body
   end
 
+  should "generate routes for format simple" do
+    mock_app do
+      get(:foo, :respond_to => [:html, :rss]) { render :haml, "Test" }
+    end
+    get "/foo"
+    assert_equal "Test\n", body
+    get "/foo.rss"
+    assert_equal "Test\n", body
+  end
+
+  should "generate routes for format with controller" do
+    mock_app do
+      controller :posts do
+        get(:index, :respond_to => [:html, :rss, :atom, :js]) { render :haml, "Index.#{content_type}" }
+        get(:show,  :with => :id, :respond_to => [:html, :rss, :atom]) { render :haml, "Show.#{content_type}" }
+      end
+    end
+    get "/posts"
+    assert_equal "Index.html\n", body
+    get "/posts.rss"
+    assert_equal "Index.rss\n", body
+    get "/posts.atom"
+    assert_equal "Index.atom\n", body
+    get "/posts.js"
+    assert_equal "Index.js\n", body
+    get "/posts/show/5"
+    assert_equal "Show.html\n", body
+    get "/posts/show/5.rss"
+    assert_equal "Show.rss\n", body
+    get "/posts/show/10.atom"
+    assert_equal "Show.atom\n", body
+  end
+
   should 'map routes' do
     mock_app do
       get(:bar){ "bar" }