padrino-core 0.9.6 → 0.9.7

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

@@ -1,9 +1,33 @@
 module Padrino
+  ##
+  # Padrino enhances the Sinatra ‘render’ method to have support for automatic template engine detection,
+  # among other more advanced features.
+  #
   module Rendering
     def self.registered(app)
       app.send(:include, Padrino::Rendering)
     end
 
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      ##
+      # Use layout like rails does or if a block given then like sinatra.
+      # If used without a block, sets the current layout for the route.
+      #
+      # By default, searches in your +app+/+views+/+layouts+/+application+.(+haml+|+erb+|+xxx+)
+      #
+      # If you define +layout+ :+custom+ then searches for your layouts in
+      # +app+/+views+/+layouts+/+custom+.(+haml+|+erb+|+xxx+)
+      #
+      def layout(name=:layout, &block)
+        return super(name, &block) if block_given?
+        @_layout = name
+      end
+    end
+
     private
       ##
       # Hijacking the sinatra render for:
@@ -12,6 +36,7 @@ module Padrino
       # * Use render 'path/to/my/template' (without symbols)
       # * Use render 'path/to/my/template' (with auto enegine lookup)
       # * Use render 'path/to/template', :layout => false
+      # * Use render 'path/to/template', :layout => false, :engine => 'haml'
       # * Use render { :a => 1, :b => 2, :c => 3 } # => return a json string
       #
       def render(engine, data=nil, options={}, locals={}, &block)
@@ -31,11 +56,10 @@ module Padrino
 
         # Use layout as rails do
         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
-            # 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]}" if defined?(logger)
+          if layout = self.class.instance_variable_defined?(:@_layout) ? self.class.instance_variable_get(:@_layout) : :application
+            layout = Dir["#{self.options.views}/#{layout}.*"].any? ? layout.to_sym : File.join('layouts', layout.to_s).to_sym
+            options[:layout] = resolve_template(layout)[0] rescue nil
+            logger.debug "Rendering layout #{options[:layout]}" if defined?(logger) && options[:layout]
           end
         end
         super(engine, data, options, locals, &block)
@@ -43,27 +67,30 @@ module Padrino
 
       ##
       # Returns the template path and engine that match (if presents) content_type, I18n.locale.
-      # 
+      #
       # ==== Example
-      # 
+      #
       #   get "/foo", :respond_to => [:html, :js] do; render 'path/to/foo'; end
       #   # If you request "/foo.js" with I18n.locale == :ru => [:"/path/to/foo.ru.js", :erb]
       #   # If you request "/foo" with I18n.locale == :de => [:"/path/to/foo.de.haml", :haml]
-      # 
+      #
       def resolve_template(template_path, options={})
         view_path = options.delete(:views) || self.options.views || self.class.views || "./views"
-        template_path   = File.join(view_path, template_path.to_s)
-        regexs = [/^[^\.]+\.[^\.]+$/]
-        regexs.unshift(/^[^\.]+\.#{content_type}\.[^\.]+$/) if content_type.present?
-        if defined?(I18n) && I18n.locale.present?
-          regexs.unshift(/^[^\.]+\.#{I18n.locale}\.[^\.]+$/)
-          regexs.unshift(/^[^\.]+\.#{I18n.locale}\.#{content_type}\.[^\.]+$/) if content_type.present?
+        template_path = "/#{template_path}" unless template_path.to_s =~ /^\//
+        templates = Dir[File.join(view_path, template_path) + ".*"].map do |file|
+          template_file =  file.sub(view_path, '').chomp(File.extname(file)).to_sym # retrieves relative file path
+          template_engine = options[:engine] || File.extname(file)[1..-1].to_sym    # retrieves engine extension
+          [template_file, template_engine]
         end
-        template_file = regexs.map { |regex| Dir[template_path + ".*"].find { |file| File.basename(file) =~ regex } }.compact.first
-        raise "Template path '#{template_path}' could not be located in views!" unless template_file
-        engine   = File.extname(template_file)[1..-1]
-        template = template_file.gsub(view_path, '').gsub(/\.#{engine}$/, '')
-        [template.to_sym, engine.to_sym]
+
+        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}.#{content_type}" } ||
+          templates.find { |file, e| file.to_s == "#{template_path}" && content_type == :html }
+
+        raise "Template path '#{template_path}' could not be located and rendered!" unless located_template
+        located_template
       end
 
       ##
@@ -76,5 +103,5 @@ module Padrino
         is_in_development = (defined?(Padrino) && Padrino.respond_to?(:env) && Padrino.env != :production)
         @template_cache.clear if is_in_development && can_clear_cache
       end
-  end
-end
+  end # Rendering
+end # Padrino

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

@@ -2,7 +2,17 @@ require 'usher' unless defined?(Usher)
 require 'padrino-core/support_lite' unless String.method_defined?(:blank!)
 
 module Padrino
+  ##
+  # Padrino provides advanced routing definition support to make routes and url generation much easier.
+  # This routing system supports named route aliases and easy access to url paths.
+  # The benefits of this is that instead of having to hard-code route urls into every area of your application,
+  # now we can just define the urls in a single spot and then attach an alias which can be used to refer
+  # to the url throughout the application.
+  #
   module Routing
+    class UnrecognizedException < RuntimeError #:nodoc:
+    end
+
     def self.registered(app)
       app.send(:include, Padrino::Routing)
     end
@@ -170,6 +180,9 @@ module Padrino
         url = router.generator.generate(name, params)
         url = uri_root + url if defined?(uri_root) && uri_root != "/"
         url
+      rescue Usher::UnrecognizedException
+        route_error = "route mapping for url(#{name.inspect}) could not be found!"
+        raise Padrino::Routing::UnrecognizedException.new(route_error)
       end
       alias :url_for :url
 
@@ -238,8 +251,9 @@ module Padrino
             end
 
             # Little reformats
-            path.sub!(%r{\bindex$}, "")                           # If the route end with /index we remove them
-            path = (uri_root == "/" ? "/" : "(/)") if path.blank? # Add a trailing delimiter if path is empty
+            path.sub!(%r{\bindex$}, "")                               # If the route end with /index we remove them
+            path.sub!(%r^/index(\(.\{:format[\,\w\$\|]*\}\))$^, '\1') # Remove index from formatted routes
+            path = (uri_root == "/" ? "/" : "(/)") if path.blank?     # Add a trailing delimiter if path is empty
 
             # We need to have a path that start with / in some circumstances and that don't end with /
             if path != "(/)" && path != "/"
@@ -306,8 +320,8 @@ module Padrino
               container % match
             else ".{:format,#{format_params}}"
           end
-          path << format_suffix
+          path + format_suffix
         end
-    end
-  end
-end
+    end # ClassMethods
+  end # Routing
+end # Padrino

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

@@ -0,0 +1,25 @@
+module Padrino
+  ##
+  # This module extend Sinatra::ShowExceptions adding Padrino as "Framework"
+  #
+  module ShowExceptions
+
+    def self.included(base)
+      base.alias_method_chain :frame_class, :padrino
+    end
+
+    def frame_class_with_padrino(frame)
+      if frame.filename =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/
+        "framework"
+      elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
+            frame.filename =~ /\/bin\/(\w+)$/ ||
+            frame.filename =~ /Ruby\/Gems/
+        "system"
+      else
+        "app"
+      end
+    end
+  end # ShowExceptions
+end # Padrino
+
+Sinatra::ShowExceptions.send(:include, Padrino::ShowExceptions)

data/lib/padrino-core/caller.rb

@@ -1,46 +1,45 @@
 module Padrino
   PADRINO_IGNORE_CALLERS = [
-   %r{lib/padrino-.*$},         # all padrino code
-   %r{/padrino-.*/(lib|bin)},   # all padrino code
-   %r{/bin/padrino$},           # all padrino code
-   %r{/sinatra},                # all sinatra code
-   %r{lib/tilt.*\.rb$},         # all tilt code
-   %r{lib/rack.*\.rb$},         # all rack code
-   %r{lib/mongrel.*\.rb$},      # all mongrel code
-   %r{lib/shotgun.*\.rb$},      # all shotgun lib
-   %r{bin/shotgun$},            # shotgun binary
-   %r{\(.*\)},                  # generated code
-   %r{shoulda/context\.rb$},    # shoulda hacks
-   %r{mocha/integration},       # mocha hacks
-   %r{test/unit},               # test unit hacks
-   %r{rake_test_loader\.rb},    # rake hacks
-   %r{custom_require\.rb$},     # rubygems require hacks
-   %r{active_support},          # active_support require hacks
-   %r{/thor},                   # thor require hacks
+   %r{lib/padrino-.*$},                             # all padrino code
+   %r{/padrino-.*/(lib|bin)},                       # all padrino code
+   %r{/bin/padrino$},                               # all padrino code
+   %r{/sinatra(/(base|main|showexceptions))?\.rb$}, # all sinatra code
+   %r{lib/tilt.*\.rb$},                             # all tilt code
+   %r{lib/rack.*\.rb$},                             # all rack code
+   %r{lib/mongrel.*\.rb$},                          # all mongrel code
+   %r{lib/shotgun.*\.rb$},                          # all shotgun lib
+   %r{bin/shotgun$},                                # shotgun binary
+   %r{\(.*\)},                                      # generated code
+   %r{shoulda/context\.rb$},                        # shoulda hacks
+   %r{mocha/integration},                           # mocha hacks
+   %r{test/unit},                                   # test unit hacks
+   %r{rake_test_loader\.rb},                        # rake hacks
+   %r{custom_require\.rb$},                         # rubygems require hacks
+   %r{active_support},                              # active_support require hacks
+   %r{/thor},                                       # thor require hacks
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##
   # Add rubinius (and hopefully other VM impls) ignore patterns ...
-  # 
+  #
   PADRINO_IGNORE_CALLERS.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
 
   private
+    ##
+    # Returns the filename for the file that is the direct caller (first caller)
+    #
+    def self.first_caller
+      caller_files.first
+    end
 
-  ##
-  # Returns the filename for the file that is the direct caller (first caller)
-  # 
-  def self.first_caller
-    caller_files.first
-  end
-
-  ##
-  # Like Kernel#caller but excluding certain magic entries and without
-  # line / method information; the resulting array contains filenames only.
-  # 
-  def self.caller_files
-    caller(1).
-      map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
-      reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
-      map    { |file,line| file }
-  end
-end # Padrino
+    ##
+    # Like Kernel#caller but excluding certain magic entries and without
+    # line / method information; the resulting array contains filenames only.
+    #
+    def self.caller_files
+      caller(1).
+        map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
+        reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
+        map    { |file,line| file }
+    end
+end # Padrino

data/lib/padrino-core/cli/adapter.rb

@@ -46,8 +46,7 @@ module Padrino
             puts " done."
           end
         end
-
-      end
-    end
-  end
-end
+      end # self
+    end # Adapter
+  end # Cli
+end # Padrino

data/lib/padrino-core/cli/base.rb

@@ -105,7 +105,7 @@ module Padrino
             eval "$#{stream} = StringIO.new"
             yield
             result = eval("$#{stream}").string
-          ensure 
+          ensure
             eval("$#{stream} = #{stream.upcase}")
           end
 

data/lib/padrino-core/cli/rake.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../tasks'
 require 'rake'
-
 Rake.application.instance_variable_set(:@rakefile, __FILE__)
 
 module PadrinoTasks

data/lib/padrino-core/loader.rb

@@ -2,7 +2,7 @@ module Padrino
   class << self
     ##
     # Requires necessary dependencies as well as application files from root lib and models
-    # 
+    #
     def load!
       return false if loaded?
       @_called_from = first_caller
@@ -17,7 +17,7 @@ module Padrino
 
     ##
     # Method for reloading required applications and their files
-    # 
+    #
     def reload!
       return unless Reloader::Stat.changed?
       Reloader::Stat.reload! # detects the modified files
@@ -26,14 +26,14 @@ module Padrino
 
     ##
     # This adds the ablity to instantiate Padrino.load! after Padrino::Application definition.
-    # 
+    #
     def called_from
       @_called_from || first_caller
     end
 
     ##
     # Return true if Padrino was loaded with Padrino.load!
-    # 
+    #
     def loaded?
       Thread.current[:padrino_loaded]
     end
@@ -42,23 +42,23 @@ module Padrino
     # Attempts to require all dependency libs that we need.
     # If you use this method we can perform correctly a Padrino.reload!
     # Another good thing that this method are dependency check, for example:
-    # 
+    #
     #   models
     #    \-- a.rb => require something of b.rb
     #    \-- b.rb
-    # 
+    #
     # In the example above if we do:
-    # 
+    #
     #   Dir["/models/*.rb"].each { |r| require r }
-    # 
+    #
     # we get an error, because we try to require first a.rb that need +something+ of b.rb.
-    # 
+    #
     # With +require_dependencies+ we don't have this problem.
-    # 
+    #
     # ==== Examples
     #   # For require all our app libs we need to do:
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
-    # 
+    #
     def require_dependencies(*paths)
       # Extract all files to load
       files = paths.map { |path| Dir[path] }.flatten
@@ -101,7 +101,7 @@ module Padrino
 
     ##
     # Concat to $LOAD_PATH the given paths
-    # 
+    #
     def set_load_paths(*paths)
       $:.concat(paths)
       $:.uniq!

data/lib/padrino-core/locale/en.yml

@@ -21,7 +21,7 @@ en:
       long: "%B %d, %Y %H:%M"
     am: "am"
     pm: "pm"
-      
+
 # Used in array.to_sentence.
   support:
     array:

data/lib/padrino-core/locale/it.yml

@@ -8,13 +8,13 @@ it:
       short: "%d %b"
       long: "%d %B %Y"
       only_day: "%e"
- 
+
     day_names: [Domenica, Lunedì, Martedì, Mercoledì, Giovedì, Venerdì, Sabato]
     abbr_day_names: [Dom, Lun, Mar, Mer, Gio, Ven, Sab]
     month_names: [~, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
     abbr_month_names: [~, Gen, Feb, Mar, Apr, Mag, Giu, Lug, Ago, Set, Ott, Nov, Dic]
     order: [ :day, :month, :year ]
-  
+
   time:
     formats:
       default: "%a %d %b %Y, %H:%M:%S %z"
@@ -22,11 +22,11 @@ it:
       short: "%d %b %H:%M"
       long: "%d %B %Y %H:%M"
       only_second: "%S"
-      
+
       datetime:
         formats:
           default: "%d-%m-%YT%H:%M:%S%Z"
-          
+
     am: 'am'
     pm: 'pm'
 

data/lib/padrino-core/logger.rb

@@ -5,24 +5,24 @@ module Padrino
 
   ##
   # Returns the padrino logger
-  # 
+  #
   # ==== Examples
-  # 
+  #
   #   logger.debug "foo"
   #   logger.warn "bar"
-  # 
+  #
   def self.logger
     Thread.current[:padrino_logger] ||= Padrino::Logger.setup!
   end
 
   ##
   # Extensions to the built in Ruby logger.
-  # 
+  #
   # ==== Examples
-  # 
+  #
   #   logger.debug "foo"
   #   logger.warn  "bar"
-  # 
+  #
   class Logger
 
     attr_accessor :level
@@ -33,13 +33,13 @@ module Padrino
 
     ##
     # Ruby (standard) logger levels:
-    # 
+    #
     # :fatal:: An unhandleable error that results in a program crash
     # :error:: A handleable error condition
     # :warn:: A warning
     # :info:: generic (useful) information about system operation
     # :debug:: low-level information for developers
-    # 
+    #
     Levels = {
       :fatal => 7,
       :error => 6,
@@ -52,7 +52,7 @@ module Padrino
 
     ##
     # Configuration for a given environment, possible options are:
-    # 
+    #
     # :log_level:: Once of [:fatal, :error, :warn, :info, :debug]
     # :stream:: Once of [:to_file, :null, :stdout, :stderr] our your custom stream
     # :log_level::
@@ -63,21 +63,21 @@ module Padrino
     #   added. Defaults to true.
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
-    # 
+    #
     # ==== Examples
-    # 
+    #
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :to_file }
     #   # or you can edit our defaults
     #   Padrino::Logger::Config[:development][:log_level] = :error
     #   # or you can use your stream
     #   Padrino::Logger::Config[:development][:stream] = StringIO.new
-    # 
+    #
     # Defaults are:
-    # 
+    #
     #   :production  => { :log_level => :warn, :stream => :to_file }
     #   :development => { :log_level => :debug, :stream => :stdout }
     #   :test        => { :log_level => :fatal, :stream => :null }
-    # 
+    #
     Config = {
       :production  => { :log_level => :warn,  :stream => :to_file },
       :development => { :log_level => :debug, :stream => :stdout },
@@ -86,7 +86,7 @@ module Padrino
 
     ##
     # Setup a new logger
-    # 
+    #
     def self.setup!
       config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
       config = Config[config_level]
@@ -108,7 +108,7 @@ module Padrino
     # To initialize the logger you create a new object, proxies to set_log.
     #
     # ==== Options
-    # 
+    #
     # :stream:: Either an IO object or a name of a logfile. Defaults to $stdout
     # :log_level::
     #   The log level from, e.g. :fatal or :info. Defaults to :debug in the
@@ -118,7 +118,7 @@ module Padrino
     #   added. Defaults to true.
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
-    # 
+    #
     def initialize(options={})
       @buffer            = []
       @auto_flush        = options.has_key?(:auto_flush) ? options[:auto_flush] : true
@@ -132,7 +132,7 @@ module Padrino
 
     ##
     # Flush the entire buffer to the log object.
-    # 
+    #
     def flush
       return unless @buffer.size > 0
       @mutex.synchronize do
@@ -142,7 +142,7 @@ module Padrino
 
     ##
     # Close and remove the current log object.
-    # 
+    #
     def close
       flush
       @log.close if @log.respond_to?(:close) && !@log.tty?
@@ -159,7 +159,7 @@ module Padrino
 
     ##
     # Directly append message to the log.
-    # 
+    #
     def <<(message = nil)
       message << "\n" unless message[-1] == ?\n
       @buffer << message
@@ -169,7 +169,7 @@ module Padrino
 
     ##
     # Generate the logging methods for Padrino.logger for each log level.
-    # 
+    #
     Levels.each_pair do |name, number|
       class_eval <<-LEVELMETHODS, __FILE__, __LINE__
 
@@ -219,13 +219,13 @@ module Padrino
     # Padrino::Loggger::Rack forwards every request to an +app+ given, and
     # logs a line in the Apache common log format to the +logger+, or
     # rack.errors by default.
-    # 
+    #
     class Rack
       ##
       # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
       # "lilith.local - - GET / HTTP/1.1 500 -"
       #  %{%s - %s %s %s%s %s - %d %s %0.4f}
-      # 
+      #
       FORMAT = %{%s - %s %s %s%s %s - %d %s %0.4f}
 
       def initialize(app)
@@ -271,7 +271,7 @@ end # Padrino
 module Kernel #:nodoc:
   ##
   # Define a logger available every where in our app
-  # 
+  #
   def logger
     Padrino.logger
   end