padrino-core 0.10.7 → 0.11.0

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

@@ -3,20 +3,41 @@ require 'rake'
 require 'rake/dsl_definition'
 require 'thor'
 require 'securerandom' unless defined?(SecureRandom)
+require 'padrino-gen'
 
 module PadrinoTasks
   def self.init(init=false)
     Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
-    if init
-      Rake.application.init
-      Rake.application.instance_variable_set(:@rakefile, __FILE__)
-      load(File.expand_path('../rake_tasks.rb', __FILE__))
-      Rake.application.load_imports
-      Rake.application.top_level
-    else
-      load(File.expand_path('../rake_tasks.rb', __FILE__))
-      Rake.application.load_imports
+    load(File.expand_path('../rake_tasks.rb', __FILE__))
+    Rake.application.load_imports
+  end
+
+  def self.use(task)
+    tasks << task
+  end
+
+  def self.tasks
+    @tasks ||= []
+  end
+
+  def self.load?(task, constant_present)
+    if constant_present && !PadrinoTasks.tasks.include?(task)
+      warn <<-WARNING.undent
+        Loading #{task} tasks automatically.
+        This functionality will be disabled in future versions. Please put
+
+          PadrinoTasks.use(#{task.inspect})
+          PadrinoTasks.init
+
+        and remove
+
+          require File.expand_path('../config/boot.rb', __FILE__)
+
+        in you Rakefile instead.
+      WARNING
     end
+
+    constant_present || PadrinoTasks.tasks.include?(task)
   end
 end
 

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

@@ -1,11 +1,17 @@
 # Load rake tasks from common rake task definition locations
-Dir["lib/tasks/**/*.rake"].
-  concat(Dir["tasks/**/*.rake"]).
-  concat(Dir["{test,spec}/*.rake"]).each  { |rake| load(rake) }
+Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
+  begin
+    load(file)
+  rescue LoadError => e
+    warn "#{file}: #{e.message}"
+  end
+end
 
 # Loads the Padrino applications mounted within the project
 # setting up the required environment for Padrino
 task :environment do
+  require File.expand_path('config/boot.rb', Rake.application.original_dir)
+
   Padrino.mounted_apps.each do |app|
     app.app_obj.setup_application!
   end
@@ -46,14 +52,3 @@ namespace :routes do
     list_app_routes(app, args) if app
   end
 end
-
-desc "Generate the Rakefile"
-task :gen do
-  File.open(Padrino.root("Rakefile"), "w") do |file|
-    file.puts <<-RUBY.gsub(/^ {6}/, '')
-      require File.expand_path('../config/boot.rb', __FILE__)
-      require 'padrino-core/cli/rake'
-      PadrinoTasks.init
-    RUBY
-  end
-end

data/lib/padrino-core/loader.rb

@@ -60,6 +60,8 @@ module Padrino
     #
     def load!
       return false if loaded?
+      t = Time.now
+
       @_called_from = first_caller
       Padrino.set_encoding
       Padrino.set_load_paths(*load_paths) # We set the padrino load paths
@@ -71,6 +73,8 @@ module Padrino
       Padrino.after_load.each(&:call) # Run after hooks
       Padrino::Reloader.run!
       Thread.current[:padrino_loaded] = true
+
+      Padrino.logger.devel "Loaded Padrino in #{Time.now - t} seconds"
     end
 
     ##
@@ -162,10 +166,8 @@ module Padrino
           begin
             Padrino::Reloader.safe_load(file, options.dup)
             files.delete(file)
-          rescue LoadError => e
-            errors << e
-            failed << file
-          rescue NameError => e
+          rescue NameError, LoadError => e
+            Padrino.logger.devel "Problem while loading #{file}: #{e.to_s}"
             errors << e
             failed << file
           rescue Exception => e
@@ -190,11 +192,7 @@ module Padrino
     #   Padrino.dependency_paths << "#{Padrino.root}/uploaders/*.rb"
     #
     def dependency_paths
-      @_dependency_paths_was = [
-        "#{root}/config/database.rb", "#{root}/lib/**/*.rb", "#{root}/shared/lib/**/*.rb",
-        "#{root}/models/**/*.rb", "#{root}/shared/models/**/*.rb", "#{root}/config/apps.rb"
-      ]
-      @_dependency_paths ||= @_dependency_paths_was
+      @_dependency_paths ||= (dependency_paths_was + Array(module_paths))
     end
 
     ##
@@ -207,5 +205,21 @@ module Padrino
       $:.concat(paths); load_paths.concat(paths)
       $:.uniq!; load_paths.uniq!
     end
+
+    private 
+    def module_paths
+      Padrino.modules.map(&:dependency_paths).flatten!
+    end
+
+    def dependency_paths_was
+      [
+        "#{root}/config/database.rb", 
+        "#{root}/lib/**/*.rb", 
+        "#{root}/shared/lib/**/*.rb",
+        "#{root}/models/**/*.rb", 
+        "#{root}/shared/models/**/*.rb", 
+        "#{root}/config/apps.rb"
+      ]
+    end
   end # self
 end # Padrino

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

@@ -12,7 +12,7 @@ fr:
     day_names: [Dimanche, Lundi, Mardi, Mercredi, Jeudi, Vendredi, Samedi]
     abbr_day_names: [Lun, Mar, Mer, Jeu, Ven, Sam, Dim]
     month_names: [~, Janvier, Février, Mars, Avril, Mai, Juin, Juillet, Août, Septembre, Octobre, Novembre, Décembre]
-    abbr_month_names: [~, Jan, Fev, Mar, Avr, Mai, Jui, Jui, Aou, Sep, Oct, Nov, Dec]
+    abbr_month_names: [~, Jan, Fev, Mar, Avr, Mai, Jun, Jul, Aou, Sep, Oct, Nov, Dec]
     order: 
       - day
       - month

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

@@ -12,7 +12,7 @@ ru:
     day_names: [Воскресенье, Понедельник, Вторник, Среда, Четверг, Пятница, Суббота]
     abbr_day_names: [Вс, Пн, Вт, Ср, Чт, Пт, Сб]
     month_names: [~, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
-    abbr_month_names: [~, Янв, Феб, Мар, Апр, Май, Июн, Июл, Авг, Сен, Окт, Ноя, Дек]
+    abbr_month_names: [~, Янв, Фев, Мар, Апр, Май, Июн, Июл, Авг, Сен, Окт, Ноя, Дек]
     order:
       - year
       - month

data/lib/padrino-core/logger.rb

@@ -13,8 +13,7 @@ module Padrino
   #   logger.warn "bar"
   #
   def self.logger
-    Padrino::Logger.setup! if Thread.current[:padrino_logger].nil?
-    Thread.current[:padrino_logger]
+    Padrino::Logger.logger
   end
 
   ##
@@ -35,8 +34,7 @@ module Padrino
   #   Padrino.logger = Buffered.new(STDOUT)
   #
   def self.logger=(value)
-    value.extend(Padrino::Logger::Extensions) unless (Padrino::Logger::Extensions === value)
-    Thread.current[:padrino_logger] = value
+    Padrino::Logger.logger = value
   end
 
   ##
@@ -95,7 +93,7 @@ module Padrino
       #
       # @example
       #   logger.bench 'GET', started_at, '/blog/categories'
-      #   # => DEBUG - GET (0.056ms) - /blog/categories
+      #   # => DEBUG - GET (0.0056s) - /blog/categories
       #
       def bench(action, began_at, message, level=:debug, color=:yellow)
         @_pad  ||= 8
@@ -103,7 +101,7 @@ module Padrino
         duration = Time.now - began_at
         color    = :red if duration > 1
         action   = colorize(action.to_s.upcase.rjust(@_pad), color)
-        duration = colorize('%0.4fms' % duration, :bold, color)
+        duration = colorize('%0.4fs' % duration, :bold, color)
         push "#{action} (#{duration}) #{message}", level
       end
 
@@ -208,7 +206,6 @@ module Padrino
     end
 
     include Extensions
-    include Colorize
 
     attr_accessor :level
     attr_accessor :auto_flush
@@ -216,8 +213,7 @@ module Padrino
     attr_reader   :log
     attr_reader   :init_args
     attr_accessor :log_static
-
-    @@mutex = {}
+    attr_reader   :colorize_logging
 
     ##
     # Configuration for a given environment, possible options are:
@@ -233,6 +229,7 @@ module Padrino
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
     # :log_static:: Whether or not to show log messages for static files. Defaults to: false
+    # :colorize_logging:: Whether or not to colorize log messages. Defaults to: true
     #
     # @example
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :stream => :to_file }
@@ -254,11 +251,22 @@ module Padrino
     #
     Config = {
       :production  => { :log_level => :warn,  :stream => :to_file },
-      :development => { :log_level => :debug, :stream => :stdout, :format_datetime => ' ' },
+      :development => { :log_level => :debug, :stream => :stdout, :format_datetime => '' },
       :test        => { :log_level => :debug, :stream => :null }
     }
     Config.merge!(PADRINO_LOGGER) if PADRINO_LOGGER
 
+    @@mutex = Mutex.new
+    def self.logger
+      @_logger || setup!
+    end
+
+    def self.logger=(logger)
+      logger.extend(Padrino::Logger::Extensions)
+
+      @_logger = logger
+    end
+
     ##
     # Setup a new logger
     #
@@ -266,25 +274,27 @@ module Padrino
     #   A {Padrino::Logger} instance
     #
     def self.setup!
-      config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
-      config = Config[config_level]
+      self.logger = begin
+        config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
+        config = Config[config_level]
 
-      unless config
-        warn("No logging configuration for :#{config_level} found, falling back to :production")
-        config = Config[:production]
-      end
+        unless config
+          warn("No logging configuration for :#{config_level} found, falling back to :production")
+          config = Config[:production]
+        end
 
-      stream = case config[:stream]
-        when :to_file
-          FileUtils.mkdir_p(Padrino.root('log')) unless File.exists?(Padrino.root('log'))
-          File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
-        when :null   then StringIO.new
-        when :stdout then $stdout
-        when :stderr then $stderr
-        else config[:stream] # return itself, probabilly is a custom stream.
-      end
+        stream = case config[:stream]
+          when :to_file
+            FileUtils.mkdir_p(Padrino.root('log')) unless File.exists?(Padrino.root('log'))
+            File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+          when :null   then StringIO.new
+          when :stdout then $stdout
+          when :stderr then $stderr
+          else config[:stream] # return itself, probabilly is a custom stream.
+        end
 
-      Thread.current[:padrino_logger] = Padrino::Logger.new(config.merge(:stream => stream))
+        Padrino::Logger.new(config.merge(:stream => stream))
+      end
     end
 
     ##
@@ -311,16 +321,20 @@ module Padrino
     # @option options [Symbol] :log_static (false)
     #   Whether or not to show log messages for static files.
     #
+    # @option options [Symbol] :colorize_logging (true)
+    #   Whether or not to colorize log messages. Defaults to: true
+    #
     def initialize(options={})
       @buffer          = []
       @auto_flush      = options.has_key?(:auto_flush) ? options[:auto_flush] : true
       @level           = options[:log_level] ? Padrino::Logger::Levels[options[:log_level]] : Padrino::Logger::Levels[:debug]
       @log             = options[:stream]  || $stdout
       @log.sync        = true
-      @mutex           = @@mutex[@log] ||= Mutex.new
       @format_datetime = options[:format_datetime] || "%d/%b/%Y %H:%M:%S"
-      @format_message  = options[:format_message]  || "%s -%s%s"
+      @format_message  = options[:format_message]  || "%s - %s %s"
       @log_static      = options.has_key?(:log_static) ? options[:log_static] : false
+      @colorize_logging = options.has_key?(:colorize_logging) ? options[:colorize_logging] : true
+      colorize! if @colorize_logging
     end
 
     ##
@@ -328,8 +342,9 @@ module Padrino
     #
     def flush
       return unless @buffer.size > 0
-      @mutex.synchronize do
-        @log.write(@buffer.slice!(0..-1).join(''))
+      @@mutex.synchronize do
+        @log.write(@buffer.join(''))
+        @buffer.clear
       end
     end
 
@@ -360,7 +375,9 @@ module Padrino
     #
     def <<(message = nil)
       message << "\n" unless message[-1] == ?\n
-      @buffer << message
+      @@mutex.synchronize {
+        @buffer << message
+      }
       flush if @auto_flush
       message
     end
@@ -425,4 +442,3 @@ module Kernel # @private
     Padrino.logger
   end
 end # Kernel
-

data/lib/padrino-core/module.rb

@@ -0,0 +1,58 @@
+module Padrino
+  module Module
+    attr_accessor :root
+
+    ##
+    # Register this module as being loaded from a gem. This automatically
+    # sets the root and therefore the dependency paths correctly.
+    #
+    # @param [String] name
+    #   The name of the gem. Has to be the name as stated in the gemspec.
+    #
+    # @returns the gems root.
+    def gem!(name)
+      self.root = Padrino.gem(name, self)
+    end
+
+    ##
+    # Helper method for file references within a Padrino module.
+    #
+    # @param [Array<String>] args
+    #   The directories to join to {Module.root}.
+    #
+    # @return [String]
+    #   The absolute path.
+    #
+    # @example
+    #   module MyModule
+    #     extend Padrino::Module
+    #     gem! 'my_gem'
+    #   end
+    #   Module.root!
+    def root(*args)
+      File.expand_path(File.join(@root, *args))
+    end
+    
+    ##
+    # Returns the list of path globs to load as dependencies
+    # Appends custom dependency patterns to the be loaded for Padrino.
+    #
+    # @return [Array<String>]
+    #   The dependency paths.
+    #
+    # @example
+    #   module MyModule
+    #     extend Padrino::Module
+    #     gem! 'my_gem'
+    #   end
+    #
+    #   Module.dependency_paths << "#{MyModule.root}/uploaders/*.rb"
+    #
+    def dependency_paths
+      [
+        "#{root}/lib/**/*.rb", "#{root}/shared/lib/**/*.rb",
+        "#{root}/models/**/*.rb", "#{root}/shared/models/**/*.rb"
+      ]
+    end
+  end
+end

data/lib/padrino-core/mounter.rb

@@ -22,10 +22,12 @@ module Padrino
     # @option options [Symbol] :app_file (Automatically detected)
     # @option options [Symbol] :app_obj (Detected)
     # @option options [Symbol] :app_root (Directory of :app_file)
+    # @option options [Symbol] :gem The gem to load the app from (Detected from name)
     #
     def initialize(name, options={})
       @name      = name.to_s
       @app_class = options[:app_class] || @name.camelize
+      @gem       = options[:gem]       || @app_class.split("::").first.underscore
       @app_file  = options[:app_file]  || locate_app_file
       @app_obj   = options[:app_obj]   || app_constant || locate_app_object
       ensure_app_file! || ensure_app_object!
@@ -104,11 +106,12 @@ module Padrino
     #
     def named_routes
       app_obj.routes.map { |route|
-        name_array     = "(#{route.named.to_s.split("_").map { |piece| %Q[:#{piece}] }.join(", ")})"
-        request_method = route.conditions[:request_method][0]
-        full_path = File.join(uri_root, route.original_path)
-        next if route.named.blank? || request_method == 'HEAD'
-        OpenStruct.new(:verb => request_method, :identifier => route.named, :name => name_array, :path => full_path)
+        name_array     = "(#{route.name.to_s.split("_").map { |piece| %Q[:#{piece}] }.join(", ")})"
+        request_method = route.request_methods.first
+        next if route.name.blank? || request_method == 'HEAD'
+        original_path = route.original_path.is_a?(Regexp) ? route.original_path.inspect : route.original_path
+        full_path = File.join(uri_root, original_path)
+        OpenStruct.new(:verb => request_method, :identifier => route.name, :name => name_array, :path => full_path)
       }.compact
     end
 
@@ -158,6 +161,13 @@ module Padrino
         candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
         candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
         candidates << Padrino.mounted_root(name.downcase, "app.rb")
+        simple_name = name.split("::").last.downcase
+        mod_name = name.split("::")[0..-2].join("::")
+        Padrino.modules.each do |mod|
+          if mod.name == mod_name
+            candidates << mod.root(simple_name, "app.rb")
+          end
+        end
         candidates << Padrino.root("app", "app.rb")
         candidates.find { |candidate| File.exist?(candidate) }
       end