padrino-core 0.9.10 → 0.9.11

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

@@ -4,13 +4,8 @@ module Padrino
       class << self
         # Start for the given options a rackup handler
         def start(options)
-
-          puts "=> Padrino/#{Padrino.version} has taken the stage #{options.environment} on port #{options.port}"
-
           if options.daemonize?
-
             stop # Need to stop a process if it exists
-
             fork do
               Process.setsid
               exit if fork
@@ -27,11 +22,11 @@ module Padrino
                 File.open(pid, 'w'){ |f| f.write("#{Process.pid}") }
               end
 
-              Padrino.run!(options.host, options.port, options.adapter)
+              Padrino.run!(options.symbolize_keys)
               exit
             end
           else
-            Padrino.run!(options.host, options.port, options.adapter)
+            Padrino.run!(options.symbolize_keys)
           end
         end
 

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

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'thor'
 
 module Padrino
@@ -19,7 +20,7 @@ module Padrino
       def start
         prepare :start
         require File.expand_path(File.dirname(__FILE__) + "/adapter")
-        require 'config/boot'
+        require File.expand_path('config/boot.rb')
         Padrino::Cli::Adapter.start(options)
       end
 
@@ -45,7 +46,7 @@ module Padrino
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
         ENV['PADRINO_LOG_LEVEL'] ||= "test"
         require File.expand_path(File.dirname(__FILE__) + '/rake')
-        silence(:stdout) { require 'config/boot' }
+        silence(:stdout) { require File.expand_path('config/boot.rb') }
         PadrinoTasks.init
       end
 
@@ -57,7 +58,7 @@ module Padrino
         puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
         require 'irb'
         require "irb/completion"
-        require 'config/boot'
+        require File.expand_path('config/boot.rb')
         require File.expand_path(File.dirname(__FILE__) + '/console')
         IRB.start
       end
@@ -76,6 +77,7 @@ module Padrino
             raise SystemExit
           end
           ENV["PADRINO_ENV"] ||= options.environment.to_s
+          ENV["RACK_ENV"] = ENV["PADRINO_ENV"] # Also set this for middleware
           chdir(options.chdir)
           unless File.exist?('config/boot.rb')
             puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"

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

@@ -16,6 +16,5 @@ end
 # Load apps
 Padrino.mounted_apps.each do |app|
   puts "=> Loading Application #{app.app_object}"
-  Padrino.require_dependency(app.app_file)
   app.app_object.setup_application!
 end

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

@@ -23,7 +23,6 @@ Dir["lib/tasks/**/*.rake"].
 # setting up the required environment for Padrino
 task :environment do
   Padrino.mounted_apps.each do |app|
-    Padrino.require_dependency(app.app_file)
     app.app_object.setup_application!
   end
 end
@@ -32,14 +31,14 @@ desc "Displays a listing of the named routes within a project"
 task :routes, :query, :needs => :environment do |t, args|
   Padrino.mounted_apps.each do |app|
     app_routes = app.app_object.router.routes
-    app_routes.reject! { |r| r.named.blank?  || r.conditions[:request_method] == 'HEAD' }
+    app_routes.reject! { |r| r.named.blank? || r.as_options[:conditions][:request_method].try(:first) == 'HEAD' }
     app_routes.reject! { |r| r.named.to_s !~ /#{args.query}/ } if args.query.present?
     next if app_routes.empty?
     shell.say "\nApplication: #{app.name}", :yellow
     app_routes.map! do |route|
       name_string     = "(#{route.named.to_s.split("_").map { |piece| %Q[:#{piece}] }.join(", ")})"
-      request_method = route.conditions[:request_method]
-      [request_method, name_string, route.original_path]
+      request_method = route.as_options[:conditions][:request_method].try(:first)
+      [request_method, name_string, route.path]
     end
     app_routes.unshift(["REQUEST", "URL", "PATH"])
     max_col_1 = app_routes.max { |a, b| a[0].size <=> b[0].size }[0].size

data/lib/padrino-core/command.rb

@@ -0,0 +1,27 @@
+require 'rbconfig'
+
+module Padrino
+  ##
+  # This method return the correct location of padrino bin or
+  # exec it using Kernel#system with the given args
+  #
+  def self.bin(*args)
+    @_padrino_bin ||= [self.ruby_command, File.expand_path("../../../bin/padrino", __FILE__)]
+    args.empty? ? @_padrino_bin : system(args.unshift(@_padrino_bin).join(" "))
+  end
+
+  ##
+  # Return the path to the ruby interpreter taking into account multiple
+  # installations and windows extensions.
+  #
+  def self.ruby_command
+    @ruby_command ||= begin
+      ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+      ruby << Config::CONFIG['EXEEXT']
+
+      # escape string in case path to ruby executable contain spaces.
+      ruby.sub!(/.*\s.*/m, '"\&"')
+      ruby
+    end
+  end
+end # Padrino

data/lib/padrino-core/loader.rb

@@ -7,11 +7,9 @@ module Padrino
       return false if loaded?
       @_called_from = first_caller
       set_encoding
-      set_load_paths(*load_paths) # we set the padrino load paths
-      require_dependencies("#{root}/lib/**/*.rb", "#{root}/shared/lib/**/*.rb") # load root libs
-      require_dependencies("#{root}/models/**/*.rb", "#{root}/shared/models/**/*.rb") # load root models
-      require_dependencies("#{root}/config/database.rb", "#{root}/config/apps.rb") # load configuration
-      Reloader::Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
+      set_load_paths(*load_paths) # We set the padrino load paths
+      dependency_paths.each { |path| require_dependency(path) }
+      Reloader::Stat.run! # We need to fill our Stat::CACHE
       Padrino.logger # Initialize our logger
       Thread.current[:padrino_loaded] = true
     end
@@ -20,9 +18,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
-      Padrino.mounted_apps.each { |m| m.app_object.reload! } # finally we reload all files for each app
     end
 
     ##
@@ -74,7 +70,7 @@ module Padrino
         # Now we try to require our dependencies
         files.each do |file|
           begin
-            require file
+            Reloader::Stat.safe_load(file)
             files.delete(file)
           rescue Exception => e
             errors << e
@@ -89,13 +85,35 @@ module Padrino
     end
     alias :require_dependency :require_dependencies
 
+    ##
+    # Returns default list of path globs to load as dependencies
+    #
+    def dependency_paths
+      # Load db adapter, libs, root models, app configuration
+      @dependency_paths ||= [
+        "#{root}/config/database.rb", "#{root}/lib/**/*.rb", "#{root}/shared/lib/**/*.rb",
+        "#{root}/models/**/*.rb", "#{root}/shared/models/**/*.rb", @custom_dependencies,
+        "#{root}/config/apps.rb"
+      ].flatten.compact
+    end
+
+    ##
+    # Appends custom dependency patterns to the be loaded for Padrino
+    # ==== Examples
+    #    Padrino.custom_dependencies("#{Padrino.root}/foo/bar/*.rb")
+    #
+    def custom_dependencies(*globs)
+      @custom_dependencies ||= []
+      @custom_dependencies.concat(globs)
+    end
+
     ##
     # Attempts to load all dependency libs that we need.
     # If you use this method we can perform correctly a Padrino.reload!
     #
     def load_dependencies(*paths)
       paths.each do |path|
-        Dir[path].each { |file| load(file) }
+        FileSet.glob(path) { |file| load(file) }
       end
     end
     alias :load_dependency :load_dependencies

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

@@ -0,0 +1,30 @@
+cz:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d. %m. %Y"
+      short: "%d %b"
+      long: "%d. %B %Y"
+
+    day_names: [Neděle, Pondělí, Úterý, Středa, Čtvrtek, Pátek, Sobota]
+    abbr_day_names: [Ne, Po, Út, St, Čt, Pá, So]
+    month_names: [~, Leden, Únor, Březen, Duben, Květen, Červen, Červenec, Srpen, Září, Říjen, Listopad, Prosinec]
+    abbr_month_names: [~, Led, Úno, Bře, Dub, Kvě, Čvn, Čvc, Srp, Zář, Říj, Lis, Pro]
+    order: [:day, :month, :year]
+
+  time:
+    formats:
+      default: "%a %d. %B %Y %H:%M %z"
+      short: "%d. %m. %H:%M"
+      long: "%A %d. %B %Y %H:%M"
+    am: "dop"
+    pm: "odp"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " a "
+      last_word_connector: " a "

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

@@ -1,18 +1,18 @@
 de:
   date:
     formats:
-      # Benutze die strftime Parameter f¸r die Formatierung
-      # Wenn keine Formate angegeben wurde, wird "default" benutzt.
-      # Du kannst andere Formate hier bieten, wenn Du willst.
+      # Benutze die strftime Parameter für die Formatierung
+      # Wenn keine Formate angegeben werden, wird "default" benutzt.
+      # Du kannst auch weitere Formate hinzufügen, wenn Du möchtest.
       default: "&d.&m.%Y"
       short: "%b %d"
       long: "%B %d, %Y"
 
-    day_names: [Sontag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
-    abbr_day_names: [Son, Mon, Die, Mit, Don, Fre, Sam]
-    month_names: [~, Januar, Februar, Marz, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
-    abbr_month_names: [~, Jan, Feb, Mar, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
-    order: [ day, :month, :year ]
+    day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
+    abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
+    month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
+    order: [ :day, :month, :year ]
 
   time:
     formats:

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

@@ -0,0 +1,30 @@
+es:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d-%m-%Y"
+      short: "%b %d"
+      long: "%B %d, %Y"
+
+    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
+    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
+    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
+    order: [ :day, :month, :year]
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%B %d, %Y %H:%M"
+    am: "am"
+    pm: "pm"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " y "
+      last_word_connector: ", y "

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

@@ -0,0 +1,30 @@
+tr:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d/%m/%Y"
+      short: "%d %b"
+      long: "%d %B %Y"
+
+    day_names: [Pazar, Pazartesi, Salı, Çarşamba, Perşembe, Cuma, Cumartesi]
+    abbr_day_names: [Paz, Pts, Sal, Çar, Per, Cum, Cts]
+    month_names: [~, Ocak, Şubat, Mart, Nisan, Mayıs, Haziran, Temmuz, Ağustos, Eylül, Ekim, Kasım, Aralık]
+    abbr_month_names: [~, Oca, Şub, Mar, Nis, May, Haz, Tem, Ağu, Eyl, Eki, Kas, Ara]
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%a, %b %b %Y %H:%M:%S %z"
+      short: "%b %d %H:%M"
+      long: "%d %B, %Y %H:%M"
+    am: "öö"
+    pm: "ös"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " ve "
+      last_word_connector: " ve "

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

@@ -0,0 +1,30 @@
+uk:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%d.%m.%Y"
+      short: "%d %b"
+      long: "%e %B, %Y"
+
+    day_names: [Неділя, Понеділок, Вівторок, Середа, Четвер, Пятница, Субота]
+    abbr_day_names: [Нд, Пн, Вт, Ср, Чт, Пт, Сб]
+    month_names: [~, Січено, Лютий, Березень, Квітень, Травень, Червень, Липень, Серпень, Вересень, Жовтень, Листопад, Грудень]
+    abbr_month_names: [~, Січ, Лют, Бер, Кві, Тра, Чер, Лип, Сер, Вер, Жов, Лис, Гру]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%e %B, %Y %H:%M"
+    am: "д.п."
+    pm: "п.п"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " і "
+      last_word_connector: ", і "

data/lib/padrino-core/reloader.rb

@@ -2,14 +2,13 @@ require 'pathname'
 
 module Padrino
   ##
-  # High performant source reloader
+  # High performance source code reloader middleware
   #
   module Reloader
     ##
-    # This class acts as Rack middleware.
-    #
-    # It is performing a check/reload cycle at the start of every request, but
-    # also respects a cool down time, during which nothing will be done.
+    # This class acts as a Rack middleware to be added to the application stack. This middleware performs a
+    # check and reload for source files at the start of each request, but also respects a specified cool down time
+    # during which no further action will be taken.
     #
     class Rack
       def initialize(app, cooldown = 1)
@@ -34,63 +33,201 @@ module Padrino
     end
 
     ##
-    # You can exclude some folders from reload its contents.
-    # Defaults excluded directories of Padrino.root are: test, spec, features, tmp, config, lib, db and public
+    # Specified folders can be excluded from the code reload detection process.
+    # Default excluded directories at Padrino.root are: test, spec, features, tmp, config, lib, db and public
     #
     def self.exclude
       @_exclude ||= %w(test spec tmp features config lib public db).map { |path| Padrino.root(path) }
     end
 
     ##
-    # What makes it especially suited for use in a any environment is that
-    # any file will only be checked once and there will only be made one system
-    # call stat(2).
+    # Specified constants can be excluded from the code unloading process.
+    # Default excluded constants are: Padrino, Sinatra
+    #
+    def self.exclude_constants
+      @_exclude_constants ||= %w(Padrino::Application Sinatra::Application Sinatra::Base)
+    end
+
+    ##
+    # Specified constants can be configured to be reloaded on every request.
+    # Default included constants are: [none]
     #
-    # Please note that this will not reload files in the background, it does so
-    # only when actively called.
+    def self.include_constants
+      @_include_constants ||= []
+    end
+
+    ##
+    # This reloader is suited for use in a many environments because each file
+    # will only be checked once and only one system call to stat(2) is made.
+    #
+    # Please note that this will not reload files in the background, and does so
+    # only when explicitly invoked.
     #
     module Stat
       class << self
-        CACHE  = {}
-        MTIMES = {}
+        CACHE                = {}
+        MTIMES               = {}
+        FILES_LOADED         = {}
+        LOADED_CLASSES       = {}
 
+        ##
+        # Reload all files with changes detected.
+        #
         def reload!
           rotation do |file, mtime|
+            # Retrive the last modified time
+            new_file = MTIMES[file].nil?
             previous_mtime = MTIMES[file] ||= mtime
-            safe_load(file, mtime) if mtime > previous_mtime
+            logger.debug "Detected a new file #{file}" if new_file
+            # We skip to next file if it is not new and not modified
+            next unless new_file || mtime > previous_mtime
+            # If the file is related to their app (i.e. a controller/mailer/helper)
+            if app = Padrino.mounted_apps.find { |a| file =~ /^#{File.dirname(a.app_file)}/ }
+              # We need to reload their own app
+              app.app_object.reload!
+              # App reloading will also perform safe_load of itself so we can go next
+              if File.identical?(app.app_file, file)
+                MTIMES[file] = mtime # This prevent a loop
+                next
+              end
+            end
+            # Now we can reload our file
+            safe_load(file, mtime)
           end
         end
 
+        ##
+        # Returns true if any file changes are detected and populates the MTIMES cache
+        #
         def changed?
           changed = false
           rotation do |file, mtime|
+            new_file = MTIMES[file].nil?
             previous_mtime = MTIMES[file] ||= mtime
-            changed = true if mtime > MTIMES[file]
+            changed = true if new_file || mtime > previous_mtime
           end
           changed
         end
+        alias :run! :changed?
+
+        ##
+        # A safe Kernel::load which issues the necessary hooks depending on results
+        #
+        def safe_load(file, mtime=nil)
+          reload = mtime && mtime > MTIMES[file]
+
+          logger.debug "Reloading #{file}" if reload
+
+          # Removes all classes declared in the specified file
+          if klasses = LOADED_CLASSES.delete(file)
+            klasses.each { |klass| remove_constant(klass) }
+          end
+
+          # Keeps track of which constants were loaded and the files
+          # that have been added so that the constants can be removed
+          # and the files can be removed from $LOADED_FEAUTRES
+          if FILES_LOADED[file]
+            FILES_LOADED[file].each do |fl|
+              next if fl == file
+              $LOADED_FEATURES.delete(fl)
+            end
+          end
+
+          # Now reload the file ignoring any syntax errors
+          $LOADED_FEATURES.delete(file)
+
+          # Duplicate objects and loaded features in the file
+          klasses = ObjectSpace.classes.dup
+          files_loaded = $LOADED_FEATURES.dup
+
+          # Start to re-require old dependencies
+          #
+          # Why we need to reload the dependencies i.e. of a model?
+          #
+          # In some circumstances (i.e. with MongoMapper) reloading a model require:
+          #
+          # 1) Clean objectspace
+          # 2) Reload model dependencies
+          #
+          # We need to clean objectspace because for example we don't need to apply two times validations keys etc...
+          #
+          # We need to reload MongoMapper dependencies for re-initialize them.
+          #
+          # In other cases i.e. in a controller (specially with dependencies that uses autoload) reload stuff like sass
+          # is not really necessary... but how to distinguish when it is (necessary) since it is not?
+          #
+          if FILES_LOADED[file]
+            FILES_LOADED[file].each do |fl|
+              next if fl == file
+              # Swich off for a while warnings expecially "already initialized constant" stuff
+              begin
+                verbosity = $-v
+                $-v = nil
+                require(fl)
+              ensure
+                $-v = verbosity
+              end
+            end
+          end
+
+          # And finally reload the specified file
+          begin
+            require(file)
+          rescue SyntaxError => ex
+            logger.error "Cannot require #{file} because of syntax error: #{ex.message}"
+          ensure
+            MTIMES[file] = mtime if mtime
+          end
+
+          # Store the file details after successful loading
+          LOADED_CLASSES[file] = ObjectSpace.classes - klasses
+          FILES_LOADED[file]   = $LOADED_FEATURES - files_loaded
+
+          nil
+        end
 
         ##
-        # A safe Kernel::load, issuing the hooks depending on the results
+        # Removes the specified class and constant.
+        #
+        # Additionally this removes the specified class from the subclass list of every superclass that
+        # tracks it's subclasses in an array returned by _subclasses_list. Classes that wish to use this
+        # functionality are required to alias the reader for their list of subclasses
+        # to _subclasses_list. Plugins for ORMs and other libraries should keep this in mind.
         #
-        def safe_load(file, mtime)
-          logger.debug "Reloading #{file}"
-          load(file)
-          file
-        rescue LoadError, SyntaxError => ex
-          logger.error ex
-        ensure
-          MTIMES[file] = mtime
+        def remove_constant(const)
+          return if Padrino::Reloader.exclude_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) } &&
+                   !Padrino::Reloader.include_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) }
+
+          superklass = const
+          until (superklass = superklass.superclass).nil?
+            if superklass.respond_to?(:_subclasses_list)
+              superklass.send(:_subclasses_list).delete(klass)
+              superklass.send(:_subclasses_list).delete(klass.to_s)
+            end
+          end
+
+          parts = const.to_s.split("::")
+          base = parts.size == 1 ? Object : Object.full_const_get(parts[0..-2].join("::"))
+          object = parts[-1].to_s
+          begin
+            base.send(:remove_const, object)
+          rescue NameError
+          end
+
+          nil
         end
 
         ##
-        # Search Ruby files in your +Padrino.root+ and monitor them for changes.
+        # Searches Ruby files in your +Padrino.root+ and monitors them for any changes.
         #
         def rotation
-          paths = Dir[Padrino.root("*")].reject { |path| Padrino::Reloader.exclude.include?(path) || !File.directory?(path) }
+          paths = Dir[Padrino.root("*")].unshift(Padrino.root).reject { |path| !File.directory?(path) }
+
           files = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
 
           files.map{ |file|
+            next if Padrino::Reloader.exclude.any? { |base| file =~ /^#{base}/ }
+
             found, stat = figure_path(file, paths)
             next unless found && stat && mtime = stat.mtime
 
@@ -101,9 +238,8 @@ module Padrino
         end
 
         ##
-        # Takes a relative or absolute +file+ name, a couple possible +paths+ that
-        # the +file+ might reside in. Returns the full path and File::Stat for the
-        # path.
+        # Takes a relative or absolute +file+ name and a couple possible +paths+ that
+        # the +file+ might reside in. Returns the full path and File::Stat for that path.
         #
         def figure_path(file, paths)
           found = CACHE[file]