padrino-core 0.7.0 → 0.7.1

data/Rakefile

@@ -15,7 +15,6 @@ begin
     gem.add_runtime_dependency     "i18n",          ">= 0.3.2"
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
     gem.add_runtime_dependency     "thor",          ">= 0.11.8"
-    gem.add_development_dependency "haml",          ">= 2.2.1"
     gem.add_runtime_dependency     "bundler",       ">= 0.5.0"
     gem.add_development_dependency "shoulda",       ">= 0"
     gem.add_development_dependency "mocha",         ">= 0.9.7"

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/padrino-core.rb

@@ -5,7 +5,8 @@ require 'sinatra/base'
 PADRINO_ENV = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
 
 module Padrino
-  class ApplicationLoadError < RuntimeError; end
+  class ApplicationLoadError < RuntimeError #:nodoc:
+  end
 
   class << self
     ##

data/lib/padrino-core/application.rb

@@ -1,5 +1,6 @@
 module Padrino
-  class ApplicationSetupError < RuntimeError; end
+  class ApplicationSetupError < RuntimeError #:nodoc:
+  end
   ##
   # Subclasses of this become independent Padrino applications (stemming from Sinatra::Application)
   # These subclassed applications can be easily mounted into other Padrino applications as well.
@@ -11,10 +12,12 @@ module Padrino
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         subclass.default_configuration!
         Padrino.set_load_paths File.join(subclass.root, "/models")
+        Padrino.require_dependencies File.join(subclass.root, "/models.rb")
         Padrino.require_dependencies File.join(subclass.root, "/models/**/*.rb")
         super # Loading the subclass
         subclass.default_filters!
         subclass.default_routes!
+        subclass.default_errors!
       end
 
       ##
@@ -67,6 +70,11 @@ module Padrino
       ##
       # Usher router, for fatures and configurations see: http://github.com/joshbuddy/usher
       # 
+      # Examples:
+      # 
+      #   router.add_route('/greedy/{!:greed,.*}')
+      #   router.recognize_path('/simple')
+      # 
       def router
         @router ||= Usher.new(:request_methods => [:request_method, :host, :port, :scheme], 
                               :ignore_trailing_delimiters => true,
@@ -153,6 +161,7 @@ module Padrino
           set :raise_errors, true if development?
           set :logging, false # !test?
           set :sessions, true
+          set :public, Proc.new { Padrino.root('public', self.uri_root) }
           # Padrino specific
           set :uri_root, "/"
           set :reload, development?
@@ -185,10 +194,23 @@ module Padrino
         # 
         def default_filters!
           before do
-            unless options.static? && options.public? && (request.get? || request.head?) && static_file?(request.path_info)
-              request.path_info =~ /\.([^\.\/]+)$/
-              @_content_type = ($1 || :html).to_sym
-              content_type(@_content_type, :charset => 'utf-8') rescue content_type('application/octet-stream')
+            request.path_info =~ /\.([^\.\/]+)$/
+            @_content_type = ($1 || :html).to_sym
+            content_type(@_content_type, :charset => 'utf-8') rescue content_type('application/octet-stream')
+          end
+        end
+
+        ##
+        # This log errors for production environments
+        # 
+        def default_errors!
+          configure :production do
+            error ::Exception do
+              boom = env['sinatra.error']
+              logger.error ["#{boom.class} - #{boom.message}:", *boom.backtrace].join("\n ")
+              response.status = 500
+              content_type 'text/html'
+              '<h1>Internal Server Error</h1>'
             end
           end
         end
@@ -227,7 +249,7 @@ module Padrino
         # Returns the load_paths for the application (relative to the application root)
         # 
         def load_paths
-          @load_paths ||= ["urls.rb", "config/urls.rb", "mailers/*.rb", "controllers/**/*.rb", "helpers/*.rb"]
+          @load_paths ||= ["urls.rb", "config/urls.rb", "mailers/*.rb", "controllers/**/*.rb", "controllers.rb", "helpers/*.rb"]
         end
 
         ##
@@ -482,7 +504,8 @@ module Padrino
         if (options[:layout].nil? || options[:layout] == true) && !self.class.templates.has_key?(:layout)
           layout = self.class.instance_variable_defined?(:@_layout) ? self.class.instance_variable_get(:@_layout) : :application
           if layout
-            options[:layout] = Dir["#{self.options.views}/#{layout}.*"].size == 0 ? File.join('layouts', layout.to_s).to_sym : layout.to_sym
+            # We look first for views/layout_name.ext then then for views/layouts/layout_name.ext
+            options[:layout] = Dir["#{self.options.views}/#{layout}.*"].present? ? layout.to_sym : File.join('layouts', layout.to_s).to_sym
             logger.debug "Rendering layout #{options[:layout]}"
           end
         end

data/lib/padrino-core/logger.rb

@@ -234,7 +234,7 @@ module Padrino
       now = Time.now
       length = extract_content_length(header)
 
-      logger.warn FORMAT % [
+      logger.debug FORMAT % [
         env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
         env["REMOTE_USER"] || "-",
         env["REQUEST_METHOD"],
@@ -257,7 +257,7 @@ module Padrino
   end # Logger
 end # Padrino
 
-module Kernel
+module Kernel #:nodoc:
 
   ##
   # Define a logger available every where in our app

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   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-01-31}
+  s.date = %q{2010-02-03}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}
@@ -81,7 +81,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<usher>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -92,7 +91,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0.3.2"])
       s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<bundler>, [">= 0.5.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -104,7 +102,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0.3.2"])
     s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
-    s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<bundler>, [">= 0.5.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/test_routing.rb

@@ -144,16 +144,16 @@ class TestRouting < Test::Unit::TestCase
     end
     get "/a.js"
     assert_equal "js", body
-    assert_equal 'application/javascript', response["Content-Type"]
+    assert_equal 'application/javascript;charset=utf-8', response["Content-Type"]
     get "/a.json"
     assert_equal "json", body
-    assert_equal 'application/json', response["Content-Type"]
+    assert_equal 'application/json;charset=utf-8', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
     assert_equal 'application/octet-stream', response["Content-Type"]
     get "/a"
     assert_equal "html", body
-    assert_equal 'text/html', response["Content-Type"]
+    assert_equal 'text/html;charset=utf-8', response["Content-Type"]
   end
 
   should 'use controllers' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +01:00
+date: 2010-02-03 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,16 +55,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.11.8
     version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.2.1
-    version: 
 - !ruby/object:Gem::Dependency 
   name: bundler
   type: :runtime