padrino-core 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef4204b99783ae0f813af61c5ae43a5edb5b9c99
-  data.tar.gz: 9752a0075e390a6fd24c7b56f60b76f1719d3bf1
+  metadata.gz: f503cfe1974ffddc13bc280ad2abfbe7a47f397b
+  data.tar.gz: 9d7b43288edeb327d60848ac5a7f539e05f5ec0b
 SHA512:
-  metadata.gz: 8f716e4b5e8f068047a87ae18d19dbf2abcdf0ff4bcce8c538a4e05dd7933ac0c3374e80174340d74f80f9d4862da4de097d8d328e4d703e24281dde03aac722
-  data.tar.gz: 3917aed536dedd954528f03e4e650830bc721235b68c8ae07fccb546bef08d7c77a382c95d35ad05a868181d0babf6486ee79474415f53d71c12e5c74bfe7bea
+  metadata.gz: 5503c652282579166fbafe304e349f97b8956555eaabb7edfae2952daaec2e18c5656f742055fb98a5e3386f3e0d47183ef00ea294a8eafe5a9c1cdc4ea6b14f
+  data.tar.gz: a250c8dc4dc33f17a6f5c3072f918733b9de07005753c1a8efc55662a6f9ba2db1d2c31a53c988283ac3c45f098a25ffdbcf2b5881006ddd20fff493c58f18a9

data/lib/padrino-core.rb

@@ -1,6 +1,6 @@
 require 'sinatra/base'
 require 'padrino-core/version'
-require 'padrino-core/support_lite'
+require 'padrino-support'
 require 'padrino-core/application'
 
 require 'padrino-core/caller'
@@ -14,9 +14,9 @@ require 'padrino-core/server'
 require 'padrino-core/tasks'
 require 'padrino-core/module'
 
-if ENV["PADRINO_ENV"]
+if ENV["PADRINO_ENV"] || defined?(PADRINO_ENV)
   warn 'Environment variable PADRINO_ENV is deprecated. Please, use RACK_ENV.'
-  ENV["RACK_ENV"] ||= ENV["PADRINO_ENV"]
+  ENV["RACK_ENV"] ||= ENV["PADRINO_ENV"] ||= PADRINO_ENV
 end
 RACK_ENV = ENV["RACK_ENV"] ||= "development"  unless defined?(RACK_ENV)
 PADRINO_ROOT = ENV["PADRINO_ROOT"] ||= File.dirname(Padrino.first_caller) unless defined?(PADRINO_ROOT)
@@ -66,7 +66,7 @@ module Padrino
     #   No applications were mounted.
     #
     def application
-      raise ApplicationLoadError, "At least one app must be mounted!" unless Padrino.mounted_apps.present?
+      warn 'WARNING! No apps are mounted. Please, mount apps in `config/apps.rb`' unless Padrino.mounted_apps.present?
       router = Padrino::Router.new
       Padrino.mounted_apps.each { |app| app.map_onto(router) }
       middleware.present? ? add_middleware(router) : router

data/lib/padrino-core/application.rb

@@ -1,8 +1,8 @@
 require 'padrino-core/application/flash'
-require 'padrino-core/application/rendering'
 require 'padrino-core/application/routing'
 require 'padrino-core/application/show_exceptions'
 require 'padrino-core/application/authenticity_token'
+require 'padrino-core/application/application_setup'
 
 module Padrino
   ##
@@ -12,7 +12,7 @@ module Padrino
   # Padrino applications as well.
   #
   class Application < Sinatra::Base
-    # Support for advanced routing, controllers, url_for
+    register Padrino::ApplicationSetup
     register Padrino::Routing
 
     ##
@@ -61,9 +61,9 @@ module Padrino
         reset_router!
         Padrino.require_dependencies(settings.app_file, :force => true)
         require_dependencies
-        default_filters!
-        default_routes!
-        default_errors!
+        default_filters
+        default_routes
+        default_errors
         I18n.reload! if defined?(I18n)
         true
       end
@@ -78,7 +78,7 @@ module Padrino
       #
       def reset_routes!
         reset_router!
-        default_routes!
+        default_routes
         true
       end
 
@@ -112,26 +112,6 @@ module Padrino
         view_path("layouts/#{layout}")
       end
 
-      ##
-      # Setup the application by registering initializers, load paths and logger.
-      # Invoked automatically when an application is first instantiated.
-      #
-      # @return [TrueClass]
-      #
-      def setup_application!
-        return if @_configured
-        settings.require_dependencies
-        settings.default_filters!
-        settings.default_routes!
-        settings.default_errors!
-        if defined?(I18n)
-          Reloader.special_files += settings.locale_path
-          I18n.load_path << settings.locale_path
-          I18n.reload!
-        end
-        @_configured = true
-      end
-
       ##
       # Run the Padrino app as a self-hosted server using
       # Thin, Mongrel or WEBrick (in that order).
@@ -207,101 +187,6 @@ module Padrino
 
       protected
 
-      ##
-      # Defines default settings for Padrino application.
-      #
-      def default_configuration!
-        set :app_file, File.expand_path(caller_files.first || $0)
-        set :app_name, settings.to_s.underscore.to_sym
-
-        set :environment, Padrino.env
-        set :reload, Proc.new { development? }
-        set :logging, Proc.new { development? }
-
-        set :method_override, true
-        set :default_builder, 'StandardFormBuilder'
-
-        # TODO: Remove this hack after getting rid of thread-unsafe http_router:
-        set :init_mutex, Mutex.new
-
-        # TODO: Remove this line after sinatra version up.
-        set :add_charset, %w[javascript xml xhtml+xml].map {|t| "application/#{t}" }
-
-        default_paths!
-        default_security!
-        global_configuration!
-        setup_prerequisites!
-      end
-
-      def setup_prerequisites!
-        prerequisites.concat(default_prerequisites).uniq!
-        Padrino.require_dependencies(prerequisites)
-      end
-
-      def default_paths!
-        set :locale_path,   Proc.new { Dir.glob File.join(root, 'locale/**/*.{rb,yml}') }
-        set :views,         Proc.new { File.join(root, 'views') }
-
-        set :uri_root,      '/'
-        set :public_folder, Proc.new { Padrino.root('public', uri_root) }
-        set :images_path,   Proc.new { File.join(public_folder, 'images') }
-      end
-      
-      def default_security!
-        set :protection, :except => :path_traversal
-        set :authentication, false
-        set :sessions, false
-        set :protect_from_csrf, false
-        set :allow_disabled_csrf, false
-      end
-
-      ##
-      # Applies global padrino configuration blocks to current application.
-      #
-      def global_configuration!
-        Padrino.global_configurations.each do |configuration|
-          class_eval(&configuration)
-        end
-      end
-
-      ##
-      # We need to add almost __sinatra__ images.
-      #
-      def default_routes!
-        configure :development do
-          get '*__sinatra__/:image.png' do
-            content_type :png
-            filename = File.dirname(__FILE__) + "/images/#{params[:image]}.png"
-            send_file filename
-          end
-        end
-      end
-
-      ##
-      # This filter it's used for know the format of the request, and
-      # automatically set the content type.
-      #
-      def default_filters!
-        before do
-          response['Content-Type'] = 'text/html;charset=utf-8' unless @_content_type
-        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 unless errors.has_key?(::Exception)
-        end
-      end
-
       ##
       # Requires all files within the application load paths.
       #
@@ -309,80 +194,6 @@ module Padrino
         Padrino.set_load_paths(*load_paths)
         Padrino.require_dependencies(dependencies, :force => true)
       end
-
-      ##
-      # Returns globs of default paths of application prerequisites.
-      #
-      def default_prerequisites
-        [
-          '/models.rb',
-          '/models/**/*.rb',
-          '/lib.rb',
-          '/lib/**/*.rb',
-        ].map{ |glob| File.join(settings.root, glob) }
-      end
-
-      private
-
-      # Overrides the default middleware for Sinatra based on Padrino conventions.
-      # Also initializes the application after setting up the middleware.
-      def setup_default_middleware(builder)
-        setup_sessions builder
-        builder.use Padrino::ShowExceptions         if show_exceptions?
-        builder.use Padrino::Logger::Rack, uri_root if Padrino.logger && logging?
-        builder.use Padrino::Reloader::Rack         if reload?
-        builder.use Rack::MethodOverride            if method_override?
-        builder.use Rack::Head
-        register    Padrino::Flash
-        setup_protection builder
-        setup_csrf_protection builder
-        setup_application!
-      end
-
-      # sets up csrf protection for the app:
-      def setup_csrf_protection(builder)
-        check_csrf_protection_dependency
-
-        if protect_from_csrf?
-          options = options_for_csrf_protection_setup
-          options.merge!(protect_from_csrf) if protect_from_csrf.kind_of?(Hash)
-          builder.use(options[:except] ? Padrino::AuthenticityToken : Rack::Protection::AuthenticityToken, options)
-        end
-      end
-
-      # returns the options used in the builder for csrf protection setup
-      def options_for_csrf_protection_setup
-        options = { :logger => logger }
-
-        if allow_disabled_csrf?
-          options.merge!({
-                             :reaction   => :report,
-                             :report_key => 'protection.csrf.failed'
-                         })
-        end
-        options
-      end
-
-      # throw an exception if the protect_from_csrf is active but sessions not.
-      def check_csrf_protection_dependency
-        if (protect_from_csrf? && !sessions?) && !defined?(Padrino::IGNORE_CSRF_SETUP_WARNING)
-          warn(<<-ERROR)
-`protect_from_csrf` is activated, but `sessions` seem to be off. To enable csrf
-protection, use:
-
-    enable :sessions
-
-or deactivate protect_from_csrf:
-
-    disable :protect_from_csrf
-
-If you use a different session store, ignore this warning using:
-
-    # in boot.rb:
-    Padrino::IGNORE_CSRF_SETUP_WARNING = true
-          ERROR
-        end
-      end
     end
   end
 end

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

@@ -0,0 +1,199 @@
+module Padrino
+  ##
+  # Holds setup-oriented methods for Padrino::Application.
+  #
+  module ApplicationSetup
+    def self.registered(app)
+      app.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      ##
+      # Defines default settings for Padrino application.
+      #
+      def default_configuration!
+        set :app_file, File.expand_path(caller_files.first || $0)
+        set :app_name, settings.to_s.underscore.to_sym
+
+        set :environment, Padrino.env
+        set :reload, proc { development? }
+        set :logging, proc { development? }
+
+        set :method_override, true
+        set :default_builder, 'StandardFormBuilder'
+
+        # TODO: Remove this hack after getting rid of thread-unsafe http_router:
+        set :init_mutex, Mutex.new
+
+        # TODO: Remove this line after sinatra version up.
+        set :add_charset, %w[javascript xml xhtml+xml].map{ |type| "application/#{type}" }
+
+        default_paths
+        default_security
+        global_configuration
+        setup_prerequisites
+      end
+
+      ##
+      # Setup the application by registering initializers, load paths and logger.
+      # Invoked automatically when an application is first instantiated.
+      #
+      # @return [TrueClass]
+      #
+      def setup_application!
+        return if @_configured
+        require_dependencies
+        default_filters
+        default_routes
+        default_errors
+        setup_locale
+        @_configured = true
+      end
+
+      private
+
+      def default_paths
+        set :locale_path,   proc { Dir.glob File.join(root, 'locale/**/*.{rb,yml}') }
+        set :views,         proc { File.join(root, 'views') }
+
+        set :uri_root,      '/'
+        set :public_folder, proc { Padrino.root('public', uri_root) }
+        set :images_path,   proc { File.join(public_folder, 'images') }
+      end
+
+      def default_security
+        set :protection, :except => :path_traversal
+        set :sessions, false
+        set :protect_from_csrf, false
+        set :report_csrf_failure, false
+        set :allow_disabled_csrf, false
+      end
+
+      ##
+      # Applies global padrino configuration blocks to current application.
+      #
+      def global_configuration
+        Padrino.global_configurations.each do |configuration|
+          class_eval(&configuration)
+        end
+      end
+
+      def setup_prerequisites
+        prerequisites.concat(default_prerequisites).uniq!
+        Padrino.require_dependencies(prerequisites)
+      end
+
+      ##
+      # Returns globs of default paths of application prerequisites.
+      #
+      def default_prerequisites
+        [
+          '/models.rb',
+          '/models/**/*.rb',
+          '/lib.rb',
+          '/lib/**/*.rb',
+        ].map{ |glob| File.join(settings.root, glob) }
+      end
+
+      # Overrides the default middleware for Sinatra based on Padrino conventions.
+      # Also initializes the application after setting up the middleware.
+      def setup_default_middleware(builder)
+        setup_sessions builder
+        builder.use Padrino::ShowExceptions         if show_exceptions?
+        builder.use Padrino::Logger::Rack, uri_root if Padrino.logger && logging?
+        builder.use Padrino::Reloader::Rack         if reload?
+        builder.use Rack::MethodOverride            if method_override?
+        builder.use Rack::Head
+        register Padrino::Flash
+        setup_protection builder
+        setup_csrf_protection builder
+        setup_application!
+      end
+
+      ##
+      # This filter it's used for know the format of the request, and
+      # automatically set the content type.
+      #
+      def default_filters
+        before do
+          response['Content-Type'] = 'text/html;charset=utf-8' unless @_content_type
+        end
+      end
+
+      ##
+      # We need to add almost __sinatra__ images.
+      #
+      def default_routes
+        configure :development do
+          get '*__sinatra__/:image.png' do
+            content_type :png
+            send_file(File.dirname(__FILE__) + "/../images/#{params[:image]}.png")
+          end
+        end
+      end
+
+      ##
+      # This log errors for production environments.
+      #
+      def default_errors
+        configure :production do
+          error ::Exception do
+            logger.exception env['sinatra.error']
+            halt(500, { 'Content-Type' => 'text/html' }, ['<h1>Internal Server Error</h1>'])
+          end unless errors.has_key?(::Exception)
+        end
+      end
+
+      def setup_locale
+        return unless defined? I18n
+        Reloader.special_files += locale_path
+        I18n.load_path << locale_path
+        I18n.reload!
+      end
+
+      # sets up csrf protection for the app
+      def setup_csrf_protection(builder)
+        check_csrf_protection_dependency
+
+        if protect_from_csrf?
+          options = options_for_csrf_protection_setup
+          options.merge!(protect_from_csrf) if protect_from_csrf.kind_of?(Hash)
+          builder.use(options[:except] ? Padrino::AuthenticityToken : Rack::Protection::AuthenticityToken, options)
+        end
+      end
+
+      # returns the options used in the builder for csrf protection setup
+      def options_for_csrf_protection_setup
+        options = { :logger => logger }
+        if report_csrf_failure? || allow_disabled_csrf?
+          options.merge!(
+            :reaction   => :report,
+            :report_key => 'protection.csrf.failed'
+          )
+        end
+        options
+      end
+
+      # warn if the protect_from_csrf is active but sessions are not
+      def check_csrf_protection_dependency
+        if (protect_from_csrf? && !sessions?) && !defined?(Padrino::IGNORE_CSRF_SETUP_WARNING)
+          warn(<<-ERROR)
+  `protect_from_csrf` is activated, but `sessions` seem to be off. To enable csrf
+  protection, use:
+
+      enable :sessions
+
+  or deactivate protect_from_csrf:
+
+      disable :protect_from_csrf
+
+  If you use a different session store, ignore this warning using:
+
+      # in boot.rb:
+      Padrino::IGNORE_CSRF_SETUP_WARNING = true
+          ERROR
+        end
+      end
+    end
+  end
+end