padrino-core 0.11.3 → 0.11.4

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

@@ -33,7 +33,6 @@ it:
     am: 'am'
     pm: 'pm'
 
-# Used in array.to_sentence.
   support:
     array:
       sentence_connector: "e"

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

@@ -13,7 +13,7 @@ ja:
     abbr_day_names: [日, 月, 火, 水, 木, 金, 土]
     month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     abbr_month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    order: 
+    order:
       - year
       - month
       - day
@@ -26,7 +26,6 @@ ja:
     am: "午前"
     pm: "午後"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -26,7 +26,6 @@ lv:
     am: "priekšpusdiena"
     pm: "pēcpusdiena"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

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

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

@@ -26,10 +26,8 @@
     am: ""
     pm: ""
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "
       two_words_connector: " og "
       last_word_connector: " og "
-

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

@@ -26,7 +26,6 @@ pl:
     am: "przed południem"
     pm: "po południu"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

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

@@ -33,7 +33,6 @@ pt_br:
     am: 'am'
     pm: 'pm'
 
-# Used in array.to_sentence.
   support:
     array:
       sentence_connector: "e"

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

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

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,6 @@ zh_cn:
     am: "上午"
     pm: "下午"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: "，"

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

@@ -26,7 +26,6 @@ zh_tw:
     am: "上午"
     pm: "下午"
 
-# Used in array.to_sentence.
   support:
     array:
       words_connector: ", "

data/lib/padrino-core/logger.rb

@@ -17,13 +17,13 @@ module Padrino
   end
 
   ##
-  # Set the padrino logger
+  # Set the padrino logger.
   #
   # @param [Object] value
   #   an object that respond to <<, write, puts, debug, warn etc..
   #
   # @return [Object]
-  #   the given value
+  #   The given value.
   #
   # @example using ruby default logger
   #   require 'logger'
@@ -44,7 +44,7 @@ module Padrino
     ##
     # Ruby (standard) logger levels:
     #
-    # :fatal:: An unhandleable error that results in a program crash
+    # :fatal:: An not handleable error that results in a program crash
     # :error:: A handleable error condition
     # :warn:: A warning
     # :info:: generic (useful) information about system operation
@@ -80,16 +80,16 @@ module Padrino
       end
 
       ##
-      # Append a to development logger a given action with time
+      # Append a to development logger a given action with time.
       #
       # @param [string] action
-      #   The action
+      #   The action.
       #
       # @param [float] time
-      #   Time duration for the given action
+      #   Time duration for the given action.
       #
       # @param [message] string
-      #   The message that you want to log
+      #   The message that you want to log.
       #
       # @example
       #   logger.bench 'GET', started_at, '/blog/categories'
@@ -110,10 +110,10 @@ module Padrino
       # the output of this block will be appended to the message.
       #
       # @param [String] message
-      #   The message that you want write to your stream
+      #   The message that you want write to your stream.
       #
       # @param [String] level
-      #   The level one of :debug, :warn etc...
+      #   The level one of :debug, :warn etc. ...
       #
       #
       def push(message = nil, level = nil)
@@ -125,10 +125,10 @@ module Padrino
       # logger components such as {Padrino::Logger}.
       #
       # @param [String] message
-      #   The message to format
+      #   The message to format.
       #
       # @param [String,Symbol] level
-      #   The log level, one of :debug, :warn...
+      #   The log level, one of :debug, :warn ...
       def format(message, level)
         message
       end
@@ -140,7 +140,7 @@ module Padrino
       #   stylized_level(:debug) => DEBUG
       #
       # @param [String,Symbol] level
-      #   The log level
+      #   The log level.
       #
       def stylized_level(level)
         level.to_s.upcase.rjust(7)
@@ -186,7 +186,7 @@ module Padrino
       } unless defined?(ColoredLevels)
 
       ##
-      # Colorize our level
+      # Colorize our level.
       #
       # @param [String, Symbol] level
       #
@@ -263,7 +263,7 @@ module Padrino
     end
 
     ##
-    # Setup a new logger
+    # Setup a new logger.
     #
     # @return [Padrino::Logger]
     #   A {Padrino::Logger} instance
@@ -308,16 +308,16 @@ module Padrino
     #   added. Defaults to true.
     #
     # @option options [Symbol] :format_datetime (" [%d/%b/%Y %H:%M:%S] ")
-    #   Format of datetime
+    #   Format of datetime.
     #
     # @option options [Symbol] :format_message ("%s -%s%s")
-    #    Format of message
+    #    Format of message.
     #
     # @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
+    #   Whether or not to colorize log messages. Defaults to: true.
     #
     def initialize(options={})
       @buffer          = []
@@ -357,7 +357,6 @@ module Padrino
     ##
     # Adds a message to the log - for compatibility with other loggers.
     #
-    # @private
     def add(level, message = nil)
       write(message)
     end
@@ -383,18 +382,17 @@ module Padrino
     end
 
     ##
-    # Padrino::Loggger::Rack forwards every request to an +app+ given, and
+    # Padrino::Logger::Rack forwards every request to an +app+ given, and
     # logs a line in the Apache common log format to the +logger+, or
     # rack.errors by default.
     #
     class Rack
-
-      def initialize(app, uri_root) # @private
+      def initialize(app, uri_root)
         @app = app
         @uri_root = uri_root.sub(/\/$/,"")
       end
 
-      def call(env) # @private
+      def call(env)
         env['rack.logger'] = Padrino.logger
         began_at = Time.now
         status, header, body = @app.call(env)
@@ -403,6 +401,7 @@ module Padrino
       end
 
       private
+
       def log(env, status, header, began_at)
         return if env['sinatra.static_file'] && (!logger.respond_to?(:log_static) || !logger.log_static)
         logger.bench(
@@ -425,15 +424,15 @@ module Padrino
       def code_to_name(status)
         ::Rack::Utils::HTTP_STATUS_CODES[status.to_i] || ''
       end
-    end # Rack
-  end # Logger
-end # Padrino
+    end
+  end
+end
 
-module Kernel # @private
+module Kernel
   ##
   # Define a logger available every where in our app
   #
   def logger
     Padrino.logger
   end
-end # Kernel
+end

data/lib/padrino-core/module.rb

@@ -32,9 +32,9 @@ module Padrino
     def root(*args)
       File.expand_path(File.join(@root, *args))
     end
-    
+
     ##
-    # Returns the list of path globs to load as dependencies
+    # Returns the list of path globs to load as dependencies.
     # Appends custom dependency patterns to the be loaded for Padrino.
     #
     # @return [Array<String>]
@@ -55,4 +55,4 @@ module Padrino
       ]
     end
   end
-end
+end

data/lib/padrino-core/mounter.rb

@@ -1,21 +1,21 @@
 module Padrino
   ##
-  # Represents a particular mounted padrino application
-  # Stores the name of the application (app folder name) and url mount path
+  # Represents a particular mounted Padrino application.
+  # Stores the name of the application (app folder name) and url mount path.
   #
   # @example
   #   Mounter.new("blog_app", :app_class => "Blog").to("/blog")
   #   Mounter.new("blog_app", :app_file => "/path/to/blog/app.rb").to("/blog")
   #
   class Mounter
-    class MounterException < RuntimeError # @private
+    class MounterException < RuntimeError
     end
 
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host
 
     ##
     # @param [String, Padrino::Application] name
-    #   The app name or the {Padrino::Application} class
+    #   The app name or the {Padrino::Application} class.
     #
     # @param [Hash] options
     # @option options [Symbol] :app_class (Detected from name)
@@ -37,10 +37,10 @@ module Padrino
     end
 
     ##
-    # Registers the mounted application onto Padrino
+    # Registers the mounted application onto Padrino.
     #
     # @param [String] mount_url
-    #   Path where we mount the app
+    #   Path where we mount the app.
     #
     # @example
     #   Mounter.new("blog_app").to("/blog")
@@ -52,10 +52,10 @@ module Padrino
     end
 
     ##
-    # Registers the mounted application onto Padrino for the given host
+    # Registers the mounted application onto Padrino for the given host.
     #
     # @param [String] mount_host
-    #   Host name
+    #   Host name.
     #
     # @example
     #   Mounter.new("blog_app").to("/blog").host("blog.padrino.org")
@@ -69,8 +69,8 @@ module Padrino
     end
 
     ##
-    # Maps Padrino application onto a Padrino::Router
-    # For use in constructing a Rack application
+    # Maps Padrino application onto a Padrino::Router.
+    # For use in constructing a Rack application.
     #
     # @param [Padrino::Router]
     #
@@ -92,17 +92,17 @@ module Padrino
     end
 
     ###
-    # Returns the route objects for the mounted application
+    # Returns the route objects for the mounted application.
     #
     def routes
       app_obj.routes
     end
 
     ###
-    # Returns the basic route information for each named route
+    # Returns the basic route information for each named route.
     #
     # @return [Array]
-    #   Array of routes
+    #   Array of routes.
     #
     def named_routes
       app_obj.routes.map { |route|
@@ -116,7 +116,7 @@ module Padrino
     end
 
     ##
-    # Makes two Mounters equal if they have the same name and uri_root
+    # Makes two Mounters equal if they have the same name and uri_root.
     #
     # @param [Padrino::Mounter] other
     #
@@ -126,7 +126,7 @@ module Padrino
 
     ##
     # @return [Padrino::Application]
-    #  the class object for the app if defined, nil otherwise
+    #  the class object for the app if defined, nil otherwise.
     #
     def app_constant
       klass = Object
@@ -142,51 +142,51 @@ module Padrino
     end
 
     protected
-      ##
-      # Locates and requires the file to load the app constant
-      #
-      def locate_app_object
-        @_app_object ||= begin
-          ensure_app_file!
-          Padrino.require_dependencies(app_file)
-          app_constant
-        end
+    ##
+    # Locates and requires the file to load the app constant.
+    #
+    def locate_app_object
+      @_app_object ||= begin
+        ensure_app_file!
+        Padrino.require_dependencies(app_file)
+        app_constant
       end
+    end
 
-      ##
-      # Returns the determined location of the mounted application main file
-      #
-      def locate_app_file
-        candidates  = []
-        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
+    ##
+    # Returns the determined location of the mounted application main file.
+    #
+    def locate_app_file
+      candidates  = []
+      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
-        candidates << Padrino.root("app", "app.rb")
-        candidates.find { |candidate| File.exist?(candidate) }
       end
+      candidates << Padrino.root("app", "app.rb")
+      candidates.find { |candidate| File.exist?(candidate) }
+    end
 
-      ###
-      # Raises an exception unless app_file is located properly
-      #
-      def ensure_app_file!
-        message = "Unable to locate source file for app '#{app_class}', try with :app_file => '/path/app.rb'"
-        raise MounterException, message unless @app_file
-      end
+    ###
+    # Raises an exception unless app_file is located properly.
+    #
+    def ensure_app_file!
+      message = "Unable to locate source file for app '#{app_class}', try with :app_file => '/path/app.rb'"
+      raise MounterException, message unless @app_file
+    end
 
-      ###
-      # Raises an exception unless app_obj is defined properly
-      #
-      def ensure_app_object!
-        message = "Unable to locate app for '#{app_class}', try with :app_class => 'MyAppClass'"
-        raise MounterException, message unless @app_obj
-      end
+    ###
+    # Raises an exception unless app_obj is defined properly.
+    #
+    def ensure_app_object!
+      message = "Unable to locate app for '#{app_class}', try with :app_class => 'MyAppClass'"
+      raise MounterException, message unless @app_obj
+    end
   end
 
   class << self
@@ -196,7 +196,7 @@ module Padrino
     # @param [Array] args
     #
     # @return [String]
-    #   the root to the mounted apps base directory
+    #   the root to the mounted apps base directory.
     #
     def mounted_root(*args)
       Padrino.root(@mounted_root ||= "", *args)
@@ -211,7 +211,7 @@ module Padrino
     end
 
     ##
-    # Inserts a Mounter object into the mounted applications (avoids duplicates)
+    # Inserts a Mounter object into the mounted applications (avoids duplicates).
     #
     # @param [Padrino::Mounter] mounter
     #
@@ -220,7 +220,7 @@ module Padrino
     end
 
     ##
-    # Mounts a new sub-application onto Padrino project
+    # Mounts a new sub-application onto Padrino project.
     #
     # @see Padrino::Mounter#new
     #
@@ -230,5 +230,5 @@ module Padrino
     def mount(name, options={})
       Mounter.new(name, options)
     end
-  end # Mounter
-end # Padrino
+  end
+end