padrino-core 0.9.6 → 0.9.7

data/README.rdoc

@@ -4,9 +4,9 @@ Padrino is the godfather of Sinatra.
 
 == Preface
 
-Padrino is a ruby framework built upon the excellent {Sinatra Microframework}[http://www.sinatrarb.com]. 
-Sinatra is a DSL for creating simple web applications in Ruby with speed and minimal effort. 
-This framework tries hard to make it as fun and easy as possible to code much more advanced web applications by 
+Padrino is a ruby framework built upon the excellent {Sinatra Microframework}[http://www.sinatrarb.com].
+Sinatra is a DSL for creating simple web applications in Ruby with speed and minimal effort.
+This framework tries hard to make it as fun and easy as possible to code much more advanced web applications by
 building upon the Sinatra philosophies and foundation.
 
 == Introduction
@@ -31,9 +31,9 @@ Mailer:: Fast and simple delivery support for sending emails (akin to ActionMail
 Admin:: Builtin Admin interface (like Django)
 Logging:: Provide a unified logger that can interact with your ORM or any library.
 Reloading::	Automatically reloads server code during development.
-Localization:: Full support of I18n language localization and can auto-set user’s locale. 
+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 
+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]
 or use them altogether for a comprehensive upgrade to Sinatra (a full-stack Padrino application).
 
@@ -42,21 +42,21 @@ or use them altogether for a comprehensive upgrade to Sinatra (a full-stack Padr
 To install the padrino framework, simply grab the latest version from gemcutter:
 
   $ sudo gem install padrino
-  
+
 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, 
+For a more detailed look at Padrino installation,
 check out the {Installation Guide}[http://wiki.github.com/padrino/padrino-framework/installation].
 
 == Usage
 
-Padrino is a framework which builds on the existing functionality and Sinatra and provides a variety of 
+Padrino is a framework which builds on the existing functionality and Sinatra and provides a variety of
 additional tools and helpers to build upon that foundation. This README and Padrino documentation in general will focus
-on the enhancements to the core Sinatra functionality. To use Padrino, one should be familiar with the basic 
-usage of Sinatra itself. 
+on the enhancements to the core Sinatra functionality. To use Padrino, one should be familiar with the basic
+usage of Sinatra itself.
 
-Please check out the 
+Please check out the
 {Understanding Sinatra}[http://wiki.github.com/padrino/padrino-framework/underlying-sinatra-overview] guide
 to learn more about these fundamentals.
 
@@ -80,7 +80,7 @@ functionality afforded by Sinatra.
 
 Padrino has support for an enhanced base application class <tt>Padrino::Application</tt>. <tt>Padrino::Application</tt>
 expands the capabilities of Sinatra::Application and automatically provides the resulting application access to all of
-the padrino framework's functionalities. 
+the padrino framework's functionalities.
 
 === Simple Application Definition
 
@@ -95,7 +95,7 @@ Let us first take a look at the simplest possible Padrino application:
     get '/' do
       'Hello world'
     end
-    
+
     # and for read better we can divide with controllers
     controller '/admin' do
       get '/foo' do
@@ -106,7 +106,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, 
+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].
 
 Suppose we wanted to add additional routes to our Padrino application, and we want to organize the routes
@@ -118,7 +118,7 @@ within a more structured layout. Simply add a <tt>controllers</tt> or <tt>app/co
       "Text to return"
     end
   end
-  
+
 You can also do more complex route alias definitions:
 
   # app/controllers/example.rb
@@ -134,7 +134,7 @@ You can also do more complex route alias definitions:
   end
 
 as well as mapping the route aliases to an explicit url:
-  
+
   # app/controllers/example.rb
   SimpleApp.controllers do
     get :index, :map => '/index' do
@@ -145,9 +145,9 @@ as well as mapping the route aliases to an explicit url:
       # access params[:name] and params[:index]
     end
   end
-  
+
 and even configure the respond_to for each route:
-  
+
   # app/controllers/example.rb
   SimpleApp.controllers :admin do
     get :show, :with => :id, :respond_to => :js do
@@ -174,23 +174,23 @@ or auto lookup for current locale or content_type
 When you visit :+show+ and your I18n.locale == :ru Padrino try to look for "admin/show.ru.js.*" if nothing match that path
 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 
+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].
-  
+
 === Rendering
 
 Unlike Sinatra, Padrino supports automatic template lookups such as:
 
   # searches for 'account/index.{erb,haml,...}
   render 'account/index'
-  
-This render does not require any template engine to be specified and will choose the first one that is discovered. 
+
+This render does not require any template engine to be specified and will choose the first one that is discovered.
 The existing render function works as well if an engine type should be specified:
 
 # example.haml
 render :haml, 'account/index'
 
-For a complete overview of the Padrino rendering system, check out the 
+For a complete overview of the Padrino rendering system, check out the
 {Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
 
 === Layout
@@ -198,39 +198,39 @@ For a complete overview of the Padrino rendering system, check out the
 With Padrino you can (like rails do) use for your custom layout, disable it
 
   class SimpleApp < Padrino::Application
-    
+
     # Disable layouts
     disable layout
-    
+
     # Use the layout located in views/layouts/custom.haml
     layout :custom
-    
-For a complete overview of the layout functionality, 
+
+For a complete overview of the layout functionality,
 check out the {Routing and Controller guide}[http://wiki.github.com/padrino/padrino-framework/controllers].
 
 === Mounting Applications
 
 Padrino applications are all automatically mountable into other Padrino projects. This means that a given Padrino
 project directory can easily mount multiple applications. This allows for better organization of complex applications,
-re-usable applications that can be applied (i.e admin, auth, blog) and even more flexibility. 
+re-usable applications that can be applied (i.e admin, auth, blog) and even more flexibility.
 
-You can think of mountable applications as a 'full-featured' merb slice or rails engine. Instead of a separate construct, 
+You can think of mountable applications as a 'full-featured' merb slice or rails engine. Instead of a separate construct,
 any application can simply be packaged and mounted into another project.
 
 Padrino stores application mounting information by default within <tt>config/apps.rb</tt>. This file is intended
-to keep all information regarding what applications are mounted to which uri's. 
+to keep all information regarding what applications are mounted to which uri's.
 
-For a complete look at mounting applications within a Padrino project, 
+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].
 
 === Auto Load Paths
 
 Padrino also intelligently supports requiring useful files within your application automatically and provides
 functionality for easily splitting up your application into separate files. Padrino automatically requires <tt>config/database.rb</tt>
-as a convention for establishing database connection. Also, any files within the <tt>lib</tt> folder will be required 
+as a convention for establishing database connection. Also, any files within the <tt>lib</tt> folder will be required
 automatically by Padrino.
 
-For a complete overview of auto-loaded paths within 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].
 
 === Application Logging
@@ -238,7 +238,7 @@ check out the {Padrino Development Guide}[http://wiki.github.com/padrino/padrino
 Padrino also supports robust logging capabilities. By default, logging information will
 go to the STDOUT in development (for use in a console) and in an environment-specific log file <tt>log/development.log</tt>
 in test and production environments.
-  
+
 To use the logger within a Padrino application, simply refer to the <tt>logger</tt> method accessible
 within your app and any controller or views:
 
@@ -246,20 +246,20 @@ within your app and any controller or views:
   SimpleApp.controllers do
     get("/test") { logger.info "This is a test" }
   end
-  
-For a complete overview of Padrino logger functionality, check out the 
+
+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].
 
 === Development Reloader
 
 Padrino applications also have the enabled ability to automatically reload all changing application files without
 the need to restart the server. Through the use of a customized Rack middleware, all files on the 'load path'
-are monitored and reloaded whenever changes are applied. 
+are monitored and reloaded whenever changes are applied.
 
-This makes rapid development much easier and provides a better alternative to 'shotgun' or 'rerun' 
+This makes rapid development much easier and provides a better alternative to 'shotgun' or 'rerun'
 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, 
+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].
 
 === Terminal Commands
@@ -272,21 +272,21 @@ The following commands are available:
   # starts the app server (non-daemonized)
   $ padrino start
   # starts the app server (daemonized) with given port, environment and adapter
-  $ padrino start -d -p 3000 -e development -a thin 
-  
+  $ padrino start -d -p 3000 -e development -a thin
+
   # Stops a daemonized app server
   $ padrino stop
-  
+
   # Bootup the Padrino console (irb)
   $ padrino console
-  
+
   # Run/List tasks
   $ padrino rake
 
-You can also create custom rake tasks as well. Using these commands can simplify common tasks 
+You can also create custom rake tasks as well. Using these commands can simplify common tasks
 making development that much smoother.
 
-For a complete overview of Padrino terminal commands, check out the 
+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].
 
 == Copyright

data/Rakefile

@@ -64,4 +64,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "padrino-core #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/lib/padrino-core.rb

@@ -15,25 +15,25 @@ module Padrino
     # Helper method for file references.
     #
     # ==== Examples
-    # 
+    #
     #   # Referencing a file in config called settings.yml
     #   Padrino.root("config", "settings.yml")
     #   # returns PADRINO_ROOT + "/config/setting.yml"
-    # 
+    #
     def root(*args)
       File.expand_path(File.join(PADRINO_ROOT, *args))
     end
 
     ##
     # Helper method that return PADRINO_ENV
-    # 
+    #
     def env
       PADRINO_ENV.to_s.downcase.to_sym
     end
 
     ##
     # Returns the resulting rack builder mapping each 'mounted' application
-    # 
+    #
     def application
       raise ApplicationLoadError.new("At least one app must be mounted!") unless self.mounted_apps && self.mounted_apps.any?
       builder = Rack::Builder.new
@@ -53,7 +53,7 @@ module Padrino
 
     ##
     # Returns the used $LOAD_PATHS from padrino
-    # 
+    #
     def load_paths
       %w(
         lib
@@ -65,7 +65,7 @@ module Padrino
     ##
     # Return bundle status :+:locked+ if .bundle/environment.rb exist :+:unlocked if Gemfile exist
     # otherwise return nil
-    # 
+    #
     def bundle
       return :locked   if File.exist?(root('.bundle/environment.rb'))
       return :unlocked if File.exist?(root("Gemfile"))

data/lib/padrino-core/application.rb

@@ -35,20 +35,6 @@ module Padrino
         super(*args, &bk)
       end
 
-      ##
-      # 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
-
       ##
       # Reloads the application files from all defined load paths
       #
@@ -94,7 +80,6 @@ module Padrino
       end
 
       protected
-
         ##
         # Defines default settings for Padrino application
         #
@@ -189,7 +174,8 @@ 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", "mailers.rb", "controllers/**/*.rb", "controllers.rb", "helpers/**/*.rb", "helpers.rb"]
+          @load_paths ||= ["urls.rb", "config/urls.rb", "mailers/*.rb", "mailers.rb",
+                           "controllers/**/*.rb", "controllers.rb", "helpers/**/*.rb", "helpers.rb"]
         end
 
         ##
@@ -206,6 +192,15 @@ module Padrino
           @view_paths = ["views"].collect { |path| File.join(self.root, path) }
           @view_paths.find { |path| Dir[File.join(path, '/**/*')].any? }
         end
-    end # Class Methods
+    end # self
+
+    private
+      def clean_backtrace(trace)
+        return trace unless options.clean_trace?
+        trace.reject { |line|
+          line =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/ ||
+            (defined?(Gem) && line.include?(Gem.dir))
+        }.map! { |line| line.gsub(/^\.\//, '') }
+      end
   end # Application
-end # Padrino
+end # Padrino

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

@@ -2,12 +2,12 @@ module Padrino
   ##
   # Represents a particular mounted padrino application
   # Stores the name of the application (app folder name) and url mount path
-  # 
+  #
   # ==== Examples
-  # 
+  #
   #   Mounter.new("blog_app", :app_class => "Blog").to("/blog")
   #   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
 
@@ -21,11 +21,11 @@ module Padrino
 
     ##
     # Registers the mounted application onto Padrino
-    # 
+    #
     # ==== Examples
-    # 
+    #
     #   Mounter.new("blog_app").to("/blog")
-    # 
+    #
     def to(mount_url)
       @uri_root  = mount_url
       Padrino.insert_mounted_app(self)
@@ -35,9 +35,9 @@ module Padrino
     ##
     # Maps Padrino application onto a Rack::Builder
     # For use in constructing a Rack application
-    # 
+    #
     #   @app.map_onto(@builder)
-    # 
+    #
     def map_onto(builder)
       app_data, app_obj = self, @app_obj
       builder.map self.uri_root do
@@ -52,7 +52,7 @@ module Padrino
 
     ##
     # Return the class for the app
-    # 
+    #
     def app_object
       app_class.constantize rescue Padrino.require_dependency(app_file)
       app_class.constantize
@@ -60,7 +60,7 @@ module Padrino
 
     ##
     # Returns the determined location of the mounted application main file
-    # 
+    #
     def locate_app_file
       callers_are_identical = File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
       callers_are_identical ? Padrino.first_caller : Padrino.mounted_root(name, "app.rb")
@@ -68,7 +68,7 @@ module Padrino
 
     ##
     # Makes two Mounters equal if they have the same name and uri_root
-    # 
+    #
     def ==(other)
       other.is_a?(Mounter) && self.name == other.name && self.uri_root == other.uri_root
     end
@@ -79,21 +79,21 @@ module Padrino
 
     ##
     # Returns the root to the mounted apps base directory
-    # 
+    #
     def mounted_root(*args)
       Padrino.root(@mounted_root ||= "", *args)
     end
 
     ##
     # Returns the mounted padrino applications (MountedApp objects)
-    # 
+    #
     def mounted_apps
       @mounted_apps ||= []
     end
 
     ##
     # Inserts a Mounter object into the mounted applications (avoids duplicates)
-    # 
+    #
     def insert_mounted_app(mounter)
       return false if Padrino.mounted_apps.include?(mounter)
       Padrino.mounted_apps << mounter
@@ -101,12 +101,12 @@ module Padrino
 
     ##
     # Mounts the core application onto Padrino project with given app settings (file, class, root)
-    # 
+    #
     # ==== Examples
-    # 
+    #
     #   Padrino.mount_core("Blog")
     #   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
-    # 
+    #
     def mount_core(*args)
       options = args.extract_options!
       app_class = args.size > 0 ? args.first.to_s.camelize : nil
@@ -116,11 +116,11 @@ module Padrino
 
     ##
     # Mounts a new sub-application onto Padrino project
-    # 
+    #
     #   Padrino.mount("blog_app").to("/blog")
-    # 
+    #
     def mount(name, options={})
       Mounter.new(name, options)
     end
   end # Mounter
-end # Padrino
+end # Padrino