padrino-core 0.11.3 → 0.11.4

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

@@ -5,16 +5,17 @@ module Padrino
   # @private
   class ShowExceptions < Sinatra::ShowExceptions
     private
-      def frame_class(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
+
+    def frame_class(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 # ShowExceptions
-end # Padrino
+    end
+  end
+end

data/lib/padrino-core/caller.rb

@@ -2,23 +2,23 @@ module Padrino
 
   # List of callers in a Padrino application that should be ignored as part of a stack trace.
   PADRINO_IGNORE_CALLERS = [
-    %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
+    %r{lib/padrino-.*$},
+    %r{/padrino-.*/(lib|bin)},
+    %r{/bin/padrino$},
+    %r{/sinatra(/(base|main|showexceptions))?\.rb$},
+    %r{lib/tilt.*\.rb$},
+    %r{lib/rack.*\.rb$},
+    %r{lib/mongrel.*\.rb$},
+    %r{lib/shotgun.*\.rb$},
+    %r{bin/shotgun$},
+    %r{\(.*\)},
+    %r{shoulda/context\.rb$},
+    %r{mocha/integration},
+    %r{test/unit},
+    %r{rake_test_loader\.rb},
+    %r{custom_require\.rb$},
+    %r{active_support},
+    %r{/thor}
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##
@@ -27,27 +27,27 @@ module Padrino
   PADRINO_IGNORE_CALLERS.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
 
   private
-    ##
-    # The filename for the file that is the direct caller (first caller).
-    #
-    # @return [String]
-    #   The file the caller method exists in.
-    #
-    def self.first_caller
-      caller_files.first
-    end
+  ##
+  # The filename for the file that is the direct caller (first caller).
+  #
+  # @return [String]
+  #   The file the caller method exists in.
+  #
+  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.
-    #
-    # @return [Array<String>]
-    #   The files of the calling methods.
-    #
-    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.
+  #
+  # @return [Array<String>]
+  #   The files of the calling methods.
+  #
+  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

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

@@ -18,7 +18,7 @@ module Padrino
             puts "=> #{options[:pid]} not found!"
           end
         end
-      end # self
-    end # Adapter
-  end # Cli
-end # Padrino
+      end
+    end
+  end
+end

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

@@ -71,7 +71,6 @@ module Padrino
       desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."
       map ["gen", "g"] => :generate
       def generate(*args)
-        # Build Padrino g as an alias of padrino-gen
         begin
           # We try to load the vendored padrino-gen if exist
           padrino_gen_path = File.expand_path('../../../../../padrino-gen/lib', __FILE__)
@@ -111,48 +110,50 @@ module Padrino
       end
 
       private
-        def prepare(task)
-          if options.help?
-            help(task.to_s)
-            raise SystemExit
-          end
-          ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= options.environment.to_s
-          chdir(options.chdir)
-          unless File.exist?('config/boot.rb')
-            puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
-            raise SystemExit
-          end
+
+      def prepare(task)
+        if options.help?
+          help(task.to_s)
+          raise SystemExit
+        end
+        ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= options.environment.to_s
+        chdir(options.chdir)
+        unless File.exist?('config/boot.rb')
+          puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
+          raise SystemExit
         end
+      end
 
       protected
-        def self.banner(task=nil, *args)
-          "padrino #{task.name}"
-        end
 
-        def chdir(dir)
-          return unless dir
-          begin
-            Dir.chdir(dir.to_s)
-          rescue Errno::ENOENT
-            puts "=> Specified Padrino root '#{dir}' does not appear to exist!"
-          rescue Errno::EACCES
-            puts "=> Specified Padrino root '#{dir}' cannot be accessed by the current user!"
-          end
+      def self.banner(task=nil, *args)
+        "padrino #{task.name}"
+      end
+
+      def chdir(dir)
+        return unless dir
+        begin
+          Dir.chdir(dir.to_s)
+        rescue Errno::ENOENT
+          puts "=> Specified Padrino root '#{dir}' does not appear to exist!"
+        rescue Errno::EACCES
+          puts "=> Specified Padrino root '#{dir}' cannot be accessed by the current user!"
         end
+      end
 
-        def capture(stream)
-          begin
-            stream = stream.to_s
-            eval "$#{stream} = StringIO.new"
-            yield
-            result = eval("$#{stream}").string
-          ensure
-            eval("$#{stream} = #{stream.upcase}")
-          end
-
-          result
+      def capture(stream)
+        begin
+          stream = stream.to_s
+          eval "$#{stream} = StringIO.new"
+          yield
+          result = eval("$#{stream}").string
+        ensure
+          eval("$#{stream} = #{stream.upcase}")
         end
-        alias :silence :capture
-    end # Base
-  end # Cli
-end # Padrino
+
+        result
+      end
+      alias :silence :capture
+    end
+  end
+end

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

@@ -7,9 +7,9 @@ require 'padrino-gen'
 
 module PadrinoTasks
   def self.init(init=false)
-    $LOAD_PATH.unshift(File.expand_path("lib")) # Adds "lib" to the load path
+    $LOAD_PATH.unshift(File.expand_path("lib"))
     Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
-    load(File.expand_path('../rake_tasks.rb', __FILE__)) # Load default rake tasks
+    load(File.expand_path('../rake_tasks.rb', __FILE__))
     Rake.application.load_imports
   end
 

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

@@ -1,4 +1,3 @@
-# Load rake tasks from common rake task definition locations
 Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
   begin
     load(file)
@@ -7,8 +6,8 @@ Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
   end
 end
 
-# Loads the Padrino applications mounted within the project
-# setting up the required environment for Padrino
+# 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)
 
@@ -22,7 +21,6 @@ task :secret do
   shell.say SecureRandom.hex(32)
 end
 
-# lists all routes of a given app
 def list_app_routes(app, args)
   app_routes = app.named_routes
   app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query.present?

data/lib/padrino-core/command.rb

@@ -3,7 +3,7 @@ require 'rbconfig'
 module Padrino
   ##
   # This method return the correct location of padrino bin or
-  # exec it using Kernel#system with the given args
+  # exec it using Kernel#system with the given args.
   #
   # @param [Array] args
   #   command or commands to execute
@@ -35,4 +35,4 @@ module Padrino
       ruby
     end
   end
-end # Padrino
+end

data/lib/padrino-core/loader.rb

@@ -64,7 +64,7 @@ module Padrino
 
       @_called_from = first_caller
       Padrino.set_encoding
-      Padrino.set_load_paths(*load_paths) # We set the padrino load paths
+      Padrino.set_load_paths(*load_paths)
       Padrino::Logger.setup! # Initialize our logger
       Padrino.require_dependencies("#{root}/config/database.rb", :nodeps => true) # Be sure to don't remove constants from dbs.
       Padrino::Reloader.lock! # Now we can remove constant from here to down
@@ -105,7 +105,7 @@ module Padrino
     end
 
     ##
-    # This adds the ablity to instantiate {Padrino.load!} after
+    # This adds the ability to instantiate {Padrino.load!} after
     # {Padrino::Application} definition.
     #
     def called_from
@@ -135,7 +135,7 @@ module Padrino
     #
     #   Dir["/models/*.rb"].each { |r| require r }
     #
-    # we get an error, because we try to require first +a.rb+ that need
+    # We get an error, because we try to require first +a.rb+ that need
     # _something_ of +b.rb+.
     #
     # With this method we don't have this problem.
@@ -153,21 +153,19 @@ module Padrino
       files = paths.flatten.map { |path| Dir[path] }.flatten.uniq.sort
 
       while files.present?
-        # List of errors and failed files
         errors, failed = [], []
 
-        # We need a size to make sure things are loading
         size_at_start = files.size
 
         # Now we try to require our dependencies, we dup files
         # so we don't perform delete on the original array during
-        # iteration, this prevent problems with rubinus
+        # iteration, this prevent problems with Rubinus
         files.dup.each do |file|
           begin
             Padrino::Reloader.safe_load(file, options.dup)
             files.delete(file)
           rescue NameError, LoadError => e
-            Padrino.logger.devel "Problem while loading #{file}: #{e.to_s}"
+            Padrino.logger.devel "Problem while loading #{file}: #{e}"
             errors << e
             failed << file
           rescue Exception => e
@@ -182,7 +180,7 @@ module Padrino
     end
 
     ##
-    # Returns default list of path globs to load as dependencies
+    # Returns default list of path globs to load as dependencies.
     # Appends custom dependency patterns to the be loaded for Padrino.
     #
     # @return [Array<String>]
@@ -206,20 +204,21 @@ module Padrino
       $:.uniq!; load_paths.uniq!
     end
 
-    private 
+    private
+
     def module_paths
       Padrino.modules.map(&:dependency_paths).flatten!
     end
 
     def dependency_paths_was
       [
-        "#{root}/config/database.rb", 
-        "#{root}/lib/**/*.rb", 
+        "#{root}/config/database.rb",
+        "#{root}/lib/**/*.rb",
         "#{root}/shared/lib/**/*.rb",
-        "#{root}/models/**/*.rb", 
-        "#{root}/shared/models/**/*.rb", 
+        "#{root}/models/**/*.rb",
+        "#{root}/shared/models/**/*.rb",
         "#{root}/config/apps.rb"
       ]
     end
-  end # self
-end # Padrino
+  end
+end

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

@@ -26,7 +26,6 @@ cs:
     am: "dop"
     pm: "odp"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -26,7 +26,6 @@ da:
     am: ""
     pm: ""
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -26,7 +26,6 @@ de:
     am: "am"
     pm: "pm"
 
-# Benutzt in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -26,7 +26,6 @@ en:
     am: "am"
     pm: "pm"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -13,7 +13,7 @@ es:
     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: 
+    order:
       - day
       - month
       - year
@@ -26,7 +26,6 @@ es:
     am: "am"
     pm: "pm"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -10,10 +10,10 @@ fr:
       only_day: "%e"
 
     day_names: [Dimanche, Lundi, Mardi, Mercredi, Jeudi, Vendredi, Samedi]
-    abbr_day_names: [Lun, Mar, Mer, Jeu, Ven, Sam, Dim]
+    abbr_day_names: [Dim, Lun, Mar, Mer, Jeu, Ven, Sam]
     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, Jun, Jul, Aou, Sep, Oct, Nov, Dec]
-    order: 
+    order:
       - day
       - month
       - year
@@ -26,7 +26,6 @@ fr:
     am: "am"
     pm: "pm"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -13,7 +13,7 @@ hu:
     abbr_day_names: [vas, hét, kedd, sze, csüt, pén, szo]
     month_names: [~, január, február, március, április, május, június, július, augusztus, szeptember, oktober, november, december]
     abbr_month_names: [~, jan, febr, márc, ápr, máj, jún, júl, aug, szept, okt, nov, dec]
-    order: 
+    order:
       - year
       - month
       - day
@@ -26,7 +26,6 @@ hu:
     am: "de"
     pm: "du"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "