padrino-core 0.9.9 → 0.9.10

data/README.rdoc

@@ -34,7 +34,7 @@ Reloading::	Automatically reloads server code during development.
 Localization:: Full support of I18n language localization and can auto-set user’s locale.
 
 Keep in mind, the user will be able to pull in these components
-{seperately into existing Sinatra applications}[http://wiki.github.com/padrino/padrino-framework/standalone-usage-in-sinatra]
+{seperately into existing Sinatra applications}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra]
 or use them altogether for a comprehensive upgrade to Sinatra (a full-stack Padrino application).
 
 == Installation
@@ -47,7 +47,7 @@ This will install the necessary padrino gems to get you started.
 Now you are ready to use this gem to enhance your sinatra projects or to create new Padrino applications.
 
 For a more detailed look at Padrino installation,
-check out the {Installation Guide}[http://wiki.github.com/padrino/padrino-framework/installation].
+check out the {Installation Guide}[http://www.padrinorb.com/guides/installation].
 
 == Usage
 
@@ -57,20 +57,20 @@ on the enhancements to the core Sinatra functionality. To use Padrino, one shoul
 usage of Sinatra itself.
 
 Please check out the
-{Understanding Sinatra}[http://wiki.github.com/padrino/padrino-framework/underlying-sinatra-overview] guide
+{Understanding Sinatra}[http://www.padrinorb.com/guides/underlying-sinatra-overview] guide
 to learn more about these fundamentals.
 
 For information on how to use a specific gem in isolation within an existing Sinatra project, checkout the guide for
-{Using Padrino in Sinatra}[http://wiki.github.com/padrino/padrino-framework/standalone-usage-in-sinatra].
+{Using Padrino in Sinatra}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra].
 
 == Getting Started
 
 Once a developer understands Sinatra, Padrino is quite easy to get comfortable with since Padrino is simply a superset
 of existing Sinatra Functionality! Best way to get started with building Padrino applications is to read following resources:
 
-* {Blog Tutorial}[http://wiki.github.com/padrino/padrino-framework/blog-tutorial] - Step-by-step guide to building a blog application with Padrino.
-* {Quick Overview}[http://wiki.github.com/padrino/padrino-framework/basic-projects] - Outlines basic generation commands.
-* {Padrino Examples}[http://wiki.github.com/padrino/padrino-framework/examples] - List of known Padrino applications which can serve as examples.
+* {Blog Tutorial}[http://www.padrinorb.com/guides/blog-tutorial] - Step-by-step guide to building a blog application with Padrino.
+* {Quick Overview}[http://www.padrinorb.com/guides/basic-projects] - Outlines basic generation commands.
+* {Padrino Examples}[http://www.padrinorb.com/guides/examples] - List of known Padrino applications which can serve as examples.
 
 == Enhanced Base Application (padrino-core)
 
@@ -107,7 +107,7 @@ Let us first take a look at the simplest possible Padrino application:
 === Enhanced Route Definitions and Controllers
 
 For a complete overview of the Padrino routing and controller system,
-check out the {Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
+check out the {Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
 
 Suppose we wanted to add additional routes to our Padrino application, and we want to organize the routes
 within a more structured layout. Simply add a <tt>controllers</tt> or <tt>app/controllers</tt> folder and create a file as such:
@@ -175,7 +175,7 @@ When you visit :+show+ and your I18n.locale == :ru Padrino try to look for "admi
 they try "admin/show.ru.*" then "admin/show.js.*" if none match return "admin/show.erb" (or other engine i.e. haml)
 
 For a complete overview of the routing and controller system, check out the
-{Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
+{Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
 
 === Rendering
 
@@ -191,7 +191,7 @@ The existing render function works as well if an engine type should be specified
 render :haml, 'account/index'
 
 For a complete overview of the Padrino rendering system, check out the
-{Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
+{Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
 
 === Layout
 
@@ -206,7 +206,7 @@ With Padrino you can (like rails do) use for your custom layout, disable it
     layout :custom
 
 For a complete overview of the layout functionality,
-check out the {Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
+check out the {Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
 
 === Mounting Applications
 
@@ -221,7 +221,7 @@ Padrino stores application mounting information by default within <tt>config/app
 to keep all information regarding what applications are mounted to which uri's.
 
 For a complete look at mounting applications within a Padrino project,
-check out the guide on {Mounting Applications}[http://wiki.github.com/padrino/padrino-framework/mounting-applications].
+check out the guide on {Mounting Applications}[http://www.padrinorb.com/guides/mounting-applications].
 
 === Auto Load Paths
 
@@ -231,7 +231,7 @@ as a convention for establishing database connection. Also, any files within the
 automatically by Padrino.
 
 For a complete overview of auto-loaded paths within Padrino,
-check out the {Padrino Development Guide}[http://wiki.github.com/padrino/padrino-framework/development-and-terminal-commands].
+check out the {Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
 
 === Application Logging
 
@@ -248,7 +248,7 @@ within your app and any controller or views:
   end
 
 For a complete overview of Padrino logger functionality, check out the
-{Padrino Development Guide}[http://wiki.github.com/padrino/padrino-framework/development-and-terminal-commands].
+{Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
 
 === Development Reloader
 
@@ -260,7 +260,7 @@ This makes rapid development much easier and provides a better alternative to 's
 which requires the application server to be restarted which makes requests take much longer to complete.
 
 For a complete overview of code reloading in development,
-check out the {Padrino Development Guide}[http://wiki.github.com/padrino/padrino-framework/development-and-terminal-commands].
+check out the {Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
 
 === Terminal Commands
 
@@ -287,7 +287,7 @@ You can also create custom rake tasks as well. Using these commands can simplify
 making development that much smoother.
 
 For a complete overview of Padrino terminal commands, check out the
-{Padrino Commands Guide}[http://wiki.github.com/padrino/padrino-framework/development-and-terminal-commands].
+{Padrino Commands Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
 
 == Copyright
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
 
 begin
   require 'jeweler'
@@ -12,6 +13,7 @@ begin
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.executables = ["padrino"]
     gem.rubyforge_project = 'padrino-core'
+    gem.version = Padrino.version
     gem.add_runtime_dependency     "sinatra",       ">= 1.0.0"
     gem.add_runtime_dependency     "i18n",          ">= 0.3.2"
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
@@ -52,16 +54,4 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "padrino-core #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :test

data/bin/padrino

@@ -4,14 +4,21 @@ require 'rubygems'
 padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
+padrino_local_path = Dir.pwd
+$:.unshift(padrino_local_path) if File.directory?(padrino_local_path) && !$:.include?(padrino_local_path)
+
 require 'padrino-core/cli/base'
+require 'padrino-core/support_lite'
 
 if %w(g gen).include?(ARGV[0])
   ARGV.shift
-  padrino_gen = File.join(padrino_core_path, "/../../padrino-gen/bin/padrino-gen")
-  if File.exist?(padrino_gen)
-    system "#{padrino_gen} #{ARGV.join(" ")}"
-  else
+  begin
+    # We try to load the vendored padrino-gen if exist
+    padrino_gen_path = File.expand_path('../../../padrino-gen/lib', __FILE__)
+    $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)
+    require 'padrino-gen'
+    Padrino.bin_gen(ARGV)
+  rescue
     puts "<= You need padrino-gen! Run: gem install padrino-gen"
   end
   exit(0)

data/lib/padrino-core/application/mounter.rb

@@ -9,14 +9,15 @@ module Padrino
   #   Mounter.new("blog_app", :app_file => "/path/to/blog/app.rb").to("/blog")
   #
   class Mounter
-    attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj
+    attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host
 
     def initialize(name, options={})
-      @name      = name.downcase
+      @name      = name.underscore
       @app_class = options[:app_class] || name.classify
       @app_file  = options[:app_file]  || locate_app_file
       @app_root  = options[:app_root]  || File.dirname(@app_file)
       @app_obj   = self.app_object
+      @uri_root  = "/"
     end
 
     ##
@@ -33,21 +34,36 @@ module Padrino
     end
 
     ##
-    # Maps Padrino application onto a Rack::Builder
+    # Registers the mounted application onto Padrino for the given host
+    #
+    # ==== Examples
+    #
+    #   Mounter.new("blog_app").to("/blog").host("blog.padrino.org")
+    #   Mounter.new("blog_app").host("blog.padrino.org")
+    #   Mounter.new("catch_all").host(/.*\.padrino.org/)
+    #
+    def host(mount_host)
+      @app_host = mount_host
+      Padrino.insert_mounted_app(self)
+      self
+    end
+
+    ##
+    # Maps Padrino application onto a Padrino::Router
     # For use in constructing a Rack application
     #
-    #   @app.map_onto(@builder)
+    #   @app.map_onto(router)
     #
-    def map_onto(builder)
+    def map_onto(router)
       app_data, app_obj = self, @app_obj
-      builder.map self.uri_root do
-        app_obj.set :uri_root, app_data.uri_root
-        app_obj.set :app_name, app_data.name
-        app_obj.set :app_file, app_data.app_file unless ::File.exist?(app_obj.app_file)
-        app_obj.set :root,     app_data.app_root unless app_data.app_root.blank?
-        app_obj.setup_application! # We need to initialize here the app.
-        run app_obj
-      end
+      app_obj.set :uri_root, app_data.uri_root
+      app_obj.set :app_name, app_data.name
+      app_obj.set :app_file, app_data.app_file unless ::File.exist?(app_obj.app_file)
+      app_obj.set :root,     app_data.app_root unless app_data.app_root.blank?
+      app_obj.set :public,   Padrino.root('public', app_data.uri_root)
+      app_obj.set :static,   File.exist?(app_obj.public)
+      app_obj.setup_application! # We need to initialize here the app.
+      router.map(:path => app_data.uri_root, :to => app_obj, :host => app_data.app_host)
     end
 
     ##

data/lib/padrino-core/application/rendering.rb

@@ -37,7 +37,36 @@ module Padrino
       #
       def layout(name=:layout, &block)
         return super(name, &block) if block_given?
-        @_layout = name
+        @layout = name
+      end
+
+      ##
+      # Returns the cached template file to render for a given url, content_type and locale.
+      #
+      # render_options = [template_path, content_type, locale]
+      #
+      def fetch_template_file(render_options)
+        (@_cached_templates ||= {})[render_options]
+      end
+
+      ###
+      # Caches the template file for the given rendering options
+      #
+      # render_options = [template_path, content_type, locale]
+      #
+      def cache_template_file!(template_file, render_options)
+        (@_cached_templates ||= {})[render_options] = template_file || []
+      end
+
+      def fetch_layout_path
+        layout_name = @layout || :application
+        @_cached_layout ||= {}
+        cached_layout_path = @_cached_layout[layout_name]
+        return cached_layout_path if cached_layout_path
+        has_layout_at_root = Dir["#{views}/#{layout_name}.*"].any?
+        layout_path = has_layout_at_root ? layout_name.to_sym : File.join('layouts', layout_name.to_s).to_sym
+        @_cached_layout[layout_name] = layout_path unless reload_templates?
+        layout_path
       end
     end
 
@@ -64,16 +93,16 @@ module Padrino
         data, engine = *resolve_template(engine, options) if data.nil?
 
         # Sinatra 1.0 requires an outvar for erb and erubis templates
-        options[:outvar] ||= '@_out_buf' if [:erb, :erubis].include?(engine)
+        options[:outvar] ||= '@_out_buf' if [:erb, :erubis] & [engine]
 
         # Resolve layouts similar to in Rails
         if (options[:layout].nil? || options[:layout] == true) && !self.class.templates.has_key?(:layout)
-          options[:layout] = resolved_layout
-          logger.debug "Resolving layout #{options[:layout]}" if defined?(logger) && options[:layout]
+          options[:layout] = resolved_layout || false # We need to force layout false so sinatra don't try to render it
+          logger.debug "Resolving layout #{options[:layout]}" if defined?(logger) && options[:layout].present?
         end
 
         # Pass arguments to Sinatra render method
-        super(engine, data, options, locals, &block)
+        super(engine, data, options.dup, locals, &block)
       end
 
       ##
@@ -85,10 +114,8 @@ module Padrino
       # => "/layouts/custom"
       #
       def resolved_layout
-        layout_var = self.class.instance_variable_get(:@_layout) || :application
-        has_layout_at_root = Dir["#{self.settings.views}/#{layout_var}.*"].any?
-        layout_path = has_layout_at_root ? layout_var.to_sym : File.join('layouts', layout_var.to_s).to_sym
-        resolve_template(layout_path, :strict_format => true)[0] rescue nil
+        located_layout = resolve_template(self.class.fetch_layout_path, :strict_format => true, :raise_exceptions => false)
+        located_layout ? located_layout[0] : false
       end
 
       ##
@@ -97,6 +124,7 @@ module Padrino
       # === Options
       #
       #   :strict_format::  The resolved template must match the content_type of the request (defaults to false)
+      #   :raise_exceptions::  Raises a +TemplateNotFound+ exception if the template cannot be located.
       #
       # ==== Example
       #
@@ -105,28 +133,44 @@ module Padrino
       #   # If you request "/foo" with I18n.locale == :de => [:"/path/to/foo.de.haml", :haml]
       #
       def resolve_template(template_path, options={})
-        options.reverse_merge!(:strict_format => false)
+        # Fetch cached template for rendering options
+        template_path = "/#{template_path}" unless template_path.to_s[0] == ?/
+        rendering_options = [template_path, content_type, locale]
+        cached_template = self.class.fetch_template_file(rendering_options)
+        return cached_template if cached_template
+
+        # Resolve view path and options
+        options.reverse_merge!(:strict_format => false, :raise_exceptions => true)
         view_path = options.delete(:views) || self.options.views || self.class.views || "./views"
-        template_path = "/#{template_path}" unless template_path.to_s =~ /^\//
         target_extension = File.extname(template_path)[1..-1] || "none" # retrieves explicit template extension
         template_path = template_path.chomp(".#{target_extension}")
 
+        # Generate potential template candidates
         templates = Dir[File.join(view_path, template_path) + ".*"].map do |file|
           template_engine = File.extname(file)[1..-1].to_sym # retrieves engine extension
-          template_file   =  file.sub(view_path, '').chomp(".#{template_engine}").to_sym # retrieves template filename
+          template_file   = file.sub(view_path, '').chomp(".#{template_engine}").to_sym # retrieves template filename
           [template_file, template_engine] unless IGNORE_FILE_PATTERN.any? { |pattern| template_engine.to_s =~ pattern }
         end
 
+        # Resolve final template to render
         located_template =
-          templates.find { |file, e| defined?(I18n) && file.to_s == "#{template_path}.#{I18n.locale}.#{content_type}" } ||
-          templates.find { |file, e| defined?(I18n) && file.to_s == "#{template_path}.#{I18n.locale}" && content_type == :html } ||
+          templates.find { |file, e| file.to_s == "#{template_path}.#{locale}.#{content_type}" } ||
+          templates.find { |file, e| file.to_s == "#{template_path}.#{locale}" && content_type == :html } ||
           templates.find { |file, e| File.extname(file.to_s) == ".#{target_extension}" or e.to_s == target_extension.to_s } ||
           templates.find { |file, e| file.to_s == "#{template_path}.#{content_type}" } ||
           templates.find { |file, e| file.to_s == "#{template_path}" && content_type == :html } ||
           templates.any? && !options[:strict_format] && templates.first # If not strict, fall back to the first located template
 
-        raise TemplateNotFound.new("Template path '#{template_path}' could not be located!") unless located_template
+        self.class.cache_template_file!(located_template, rendering_options) unless settings.reload_templates?
+        raise TemplateNotFound.new("Template path '#{template_path}' could not be located!") if !located_template && options[:raise_exceptions]
         located_template
       end
+
+      ##
+      # Return the I18n.locale if I18n is defined
+      #
+      def locale
+        I18n.locale if defined?(I18n)
+      end
   end # Rendering
-end # Padrino
+end # Padrino