padrino-core 0.10.6.e → 0.10.6

data/lib/padrino-core/application.rb

@@ -22,16 +22,17 @@ module Padrino
     class << self
 
       def inherited(base) # @private
-        logger.devel "Setup #{base}"
+        begun_at = Time.now
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         base.default_configuration!
         base.prerequisites.concat([
-          File.join(base.root, "/models.rb"),
-          File.join(base.root, "/models/**/*.rb"),
-          File.join(base.root, "/lib.rb"),
-          File.join(base.root, "/lib/**/*.rb")
+          File.join(base.root, '/models.rb'),
+          File.join(base.root, '/models/**/*.rb'),
+          File.join(base.root, '/lib.rb'),
+          File.join(base.root, '/lib/**/*.rb')
         ]).uniq!
         Padrino.require_dependencies(base.prerequisites)
+        logger.devel :setup, begun_at, base
         super(base) # Loading the subclass inherited method
       end
 
@@ -47,11 +48,10 @@ module Padrino
       #   MyApp.reload!
       #
       def reload!
-        logger.devel "Reloading #{self}"
-        @_dependencies = nil # Reset dependencies
+        logger.devel "Reloading #{settings}"
         reset! # Reset sinatra app
         reset_router! # Reset all routes
-        Padrino.require_dependencies(self.app_file, :force => true) # Reload the app file
+        Padrino.require_dependencies(settings.app_file, :force => true) # Reload the app file
         require_dependencies # Reload dependencies
         default_filters!     # Reload filters
         default_routes!      # Reload default routes
@@ -92,12 +92,12 @@ module Padrino
       #
       def setup_application!
         return if @_configured
-        self.require_dependencies
-        self.default_filters!
-        self.default_routes!
-        self.default_errors!
+        settings.require_dependencies
+        settings.default_filters!
+        settings.default_routes!
+        settings.default_errors!
         if defined?(I18n)
-          I18n.load_path << self.locale_path
+          I18n.load_path << settings.locale_path
           I18n.reload!
         end
         @_configured = true
@@ -112,7 +112,7 @@ module Padrino
       #
       def run!(options={})
         return unless Padrino.load!
-        Padrino.mount(self.to_s).to("/")
+        Padrino.mount(settings.to_s).to('/')
         Padrino.run!(options)
       end
 
@@ -121,7 +121,7 @@ module Padrino
       #   directory that need to be added to +$LOAD_PATHS+ from this application
       #
       def load_paths
-        @_load_paths ||= %w(models lib mailers controllers helpers).map { |path| File.join(self.root, path) }
+        @_load_paths ||= %w[models lib mailers controllers helpers].map { |path| File.join(settings.root, path) }
       end
 
       ##
@@ -136,10 +136,10 @@ module Padrino
       #   MyApp.dependencies << Padrino.root('other_app', 'controllers.rb')
       #
       def dependencies
-        @_dependencies ||= [
-          "urls.rb", "config/urls.rb", "mailers/*.rb", "mailers.rb",
-          "controllers/**/*.rb", "controllers.rb", "helpers/**/*.rb", "helpers.rb"
-        ].map { |file| Dir[File.join(self.root, file)] }.flatten
+        [
+          'urls.rb', 'config/urls.rb', 'mailers/*.rb', 'mailers.rb',
+          'controllers/**/*.rb', 'controllers.rb', 'helpers/**/*.rb', 'helpers.rb'
+        ].map { |file| Dir[File.join(settings.root, file)] }.flatten
       end
 
       ##
@@ -161,110 +161,109 @@ module Padrino
       end
 
       protected
-        ##
-        # Defines default settings for Padrino application
-        #
-        def default_configuration!
-          # Overwriting Sinatra defaults
-          set :app_file, File.expand_path(caller_files.first || $0) # Assume app file is first caller
-          set :environment, Padrino.env
-          set :reload, Proc.new { development? }
-          set :logging, Proc.new { development? }
-          set :method_override, true
-          set :sessions, false
-          set :public_folder, Proc.new { Padrino.root('public', uri_root) }
-          set :views, Proc.new { File.join(root,   "views") }
-          set :images_path, Proc.new { File.join(public, "images") }
-          set :protection, false
-          # Padrino specific
-          set :uri_root, "/"
-          set :app_name, self.to_s.underscore.to_sym
-          set :default_builder, 'StandardFormBuilder'
-          set :flash, defined?(Sinatra::Flash) || defined?(Rack::Flash)
-          set :authentication, false
-          # Padrino locale
-          set :locale_path, Proc.new { Dir[File.join(self.root, "/locale/**/*.{rb,yml}")] }
-          # Load the Global Configurations
-          class_eval(&Padrino.apps_configuration) if Padrino.apps_configuration
-        end
+      ##
+      # Defines default settings for Padrino application
+      #
+      def default_configuration!
+        # Overwriting Sinatra defaults
+        set :app_file, File.expand_path(caller_files.first || $0) # Assume app file is first caller
+        set :environment, Padrino.env
+        set :reload, Proc.new { development? }
+        set :logging, Proc.new { development? }
+        set :method_override, true
+        set :sessions, false
+        set :public_folder, Proc.new { Padrino.root('public', uri_root) }
+        set :views, Proc.new { File.join(root,   "views") }
+        set :images_path, Proc.new { File.join(public, "images") }
+        set :protection, false
+        # Padrino specific
+        set :uri_root, '/'
+        set :app_name, settings.to_s.underscore.to_sym
+        set :default_builder, 'StandardFormBuilder'
+        set :flash, defined?(Sinatra::Flash) || defined?(Rack::Flash)
+        set :authentication, false
+        # Padrino locale
+        set :locale_path, Proc.new { Dir[File.join(settings.root, '/locale/**/*.{rb,yml}')] }
+        # Load the Global Configurations
+        class_eval(&Padrino.apps_configuration) if Padrino.apps_configuration
+      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
+      ##
+      # 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
-            unless @_content_type
-              @_content_type = :html
-              response['Content-Type'] = 'text/html;charset=utf-8'
-            end
+      ##
+      # This filter it's used for know the format of the request, and automatically set the content type.
+      #
+      def default_filters!
+        before do
+          unless @_content_type
+            @_content_type = :html
+            response['Content-Type'] = 'text/html;charset=utf-8'
           end
         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
+      ##
+      # 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
-        #
-        def require_dependencies
-          Padrino.set_load_paths(*load_paths)
-          Padrino.require_dependencies(dependencies, :force => true)
-        end
+      ##
+      # Requires all files within the application load paths
+      #
+      def require_dependencies
+        Padrino.set_load_paths(*load_paths)
+        Padrino.require_dependencies(dependencies, :force => true)
+      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
+        setup_flash 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
+        setup_protection builder
+        setup_application!
+      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
-          setup_flash 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
-          setup_protection builder
-          setup_application!
-        end
-
-         # TODO Remove this in a few versions (rack-flash deprecation)
-         # Move register Sinatra::Flash into setup_default_middleware
-         # Initializes flash using sinatra-flash or rack-flash
-        def setup_flash(builder)
-          register Sinatra::Flash if flash? && defined?(Sinatra::Flash)
-          if defined?(Rack::Flash) && !defined?(Sinatra::Flash)
-            logger.warn %Q{
-              [Deprecation] In Gemfile, 'rack-flash' should be replaced with 'sinatra-flash'!
-              Rack-Flash is not compatible with later versions of Rack and should be replaced.
-            }
-            builder.use Rack::Flash, :sweep => true     if flash?
-          end
+       # TODO Remove this in a few versions (rack-flash deprecation)
+       # Move register Sinatra::Flash into setup_default_middleware
+       # Initializes flash using sinatra-flash or rack-flash
+      def setup_flash(builder)
+        register Sinatra::Flash if flash? && defined?(Sinatra::Flash)
+        if defined?(Rack::Flash) && !defined?(Sinatra::Flash)
+          logger.warn %Q{
+            [Deprecation] In Gemfile, 'rack-flash' should be replaced with 'sinatra-flash'!
+            Rack-Flash is not compatible with later versions of Rack and should be replaced.
+          }
+          builder.use Rack::Flash, :sweep => true if flash?
         end
+      end
     end # self
   end # Application
 end # Padrino

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

@@ -13,7 +13,7 @@ it:
     abbr_day_names: [Dom, Lun, Mar, Mer, Gio, Ven, Sab]
     month_names: [~, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
     abbr_month_names: [~, Gen, Feb, Mar, Apr, Mag, Giu, Lug, Ago, Set, Ott, Nov, Dic]
-    order: 
+    order:
       - day
       - month
       - year

data/lib/padrino-core/logger.rb

@@ -70,7 +70,7 @@ module Padrino
         define_method(name) do |*args|
           return if number < level
           if args.size > 1
-            bench(*args)
+            bench(args[0], args[1], args[2], name)
           else
             push(args * '', name)
           end
@@ -102,7 +102,9 @@ module Padrino
         @_pad    = action.to_s.size if action.to_s.size > @_pad
         duration = Time.now - began_at
         color    = :red if duration > 1
-        push "%s (" % colorize(action.to_s.upcase.rjust(@_pad), color) + colorize("%0.4fms", :bold, color) % duration + ") %s" % message.to_s, level
+        action   = colorize(action.to_s.upcase.rjust(@_pad), color)
+        duration = colorize('%0.4fms' % duration, :bold, color)
+        push "#{action} (#{duration}) #{message}", level
       end
 
       ##
@@ -274,8 +276,8 @@ module Padrino
 
       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+")
+          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
@@ -368,8 +370,6 @@ module Padrino
       @format_message % [stylized_level(level), colorize(Time.now.strftime(@format_datetime), :yellow), message.to_s.strip]
     end
 
-    
-
     ##
     # Padrino::Loggger::Rack forwards every request to an +app+ given, and
     # logs a line in the Apache common log format to the +logger+, or
@@ -391,28 +391,28 @@ module Padrino
       end
 
       private
-        def log(env, status, header, began_at)
-          return if env['sinatra.static_file'] and !logger.log_static
-          logger.bench(
-            env["REQUEST_METHOD"],
-            began_at,
-            [
-              @uri_root.to_s,
-              env["PATH_INFO"],
-              env["QUERY_STRING"].empty? ? "" : "?" + env["QUERY_STRING"],
-              ' - ',
-              logger.colorize(status.to_s[0..3], :bold),
-              ' ',
-              code_to_name(status)
-            ] * '',
-            :debug,
-            :magenta
-          )
-        end
+      def log(env, status, header, began_at)
+        return if env['sinatra.static_file'] && (!logger.respond_to?(:log_static) || !logger.log_static)
+        logger.bench(
+          env["REQUEST_METHOD"],
+          began_at,
+          [
+            @uri_root.to_s,
+            env["PATH_INFO"],
+            env["QUERY_STRING"].empty? ? "" : "?" + env["QUERY_STRING"],
+            ' - ',
+            logger.colorize(status.to_s[0..3], :bold),
+            ' ',
+            code_to_name(status)
+          ] * '',
+          :debug,
+          :magenta
+        )
+      end
 
-        def code_to_name(status)
-          ::Rack::Utils::HTTP_STATUS_CODES[status.to_i] || ''
-        end
+      def code_to_name(status)
+        ::Rack::Utils::HTTP_STATUS_CODES[status.to_i] || ''
+      end
     end # Rack
   end # Logger
 end # Padrino

data/lib/padrino-core/reloader.rb

@@ -92,7 +92,7 @@ module Padrino
         changed = false
         rotation do |file, mtime|
           new_file = MTIMES[file].nil?
-          previous_mtime = MTIMES[file] ||= mtime
+          previous_mtime = MTIMES[file]
           changed = true if new_file || mtime > previous_mtime
         end
         changed
@@ -103,7 +103,7 @@ module Padrino
       # We lock dependencies sets to prevent reloading of protected constants
       #
       def lock!
-        klasses = ObjectSpace.classes.map { |klass| klass.name.to_s.split("::")[0] }.uniq
+        klasses = ObjectSpace.classes.map { |klass| klass.name.split('::')[0] }.uniq
         klasses = klasses | Padrino.mounted_apps.map { |app| app.app_class }
         Padrino::Reloader.exclude_constants.concat(klasses)
       end
@@ -183,50 +183,50 @@ module Padrino
       # Removes the specified class and constant.
       #
       def remove_constant(const)
-        return if exclude_constants.compact.uniq.any? { |c| (const.to_s =~ %r{^#{Regexp.escape(c)}}) } &&
-                 !include_constants.compact.uniq.any? { |c| (const.to_s =~ %r{^#{Regexp.escape(c)}}) }
+        return if exclude_constants.compact.uniq.any? { |c| const.name.index(c) == 0 } &&
+                 !include_constants.compact.uniq.any? { |c| const.name.index(c) == 0 }
         begin
-          parts  = const.to_s.split("::")
-          base   = parts.size == 1 ? Object : parts[0..-2].join("::").constantize
-          object = parts[-1].to_s
-          base.send(:remove_const, object)
-          logger.devel "Removed constant: #{const}"
+          parts  = const.to_s.sub(/^::(Object)?/, 'Object::').split('::')
+          object = parts.pop
+          base   = parts.empty? ? Object : Inflector.constantize(parts * '::')
+          base.send :remove_const, object
+          logger.devel "Removed constant: #{const} from #{base}"
         rescue NameError; end
       end
 
       private
-        ##
-        # Return the mounted_apps providing the app location
-        # Can be an array because in one app.rb we can define multiple Padrino::Appplications
-        #
-        def mounted_apps_of(file)
-          file = figure_path(file)
-          Padrino.mounted_apps.find_all { |app| File.identical?(file, app.app_file) }
-        end
+      ##
+      # Return the mounted_apps providing the app location
+      # Can be an array because in one app.rb we can define multiple Padrino::Appplications
+      #
+      def mounted_apps_of(file)
+        file = figure_path(file)
+        Padrino.mounted_apps.find_all { |app| File.identical?(file, app.app_file) }
+      end
 
-        ##
-        # Returns true if file is in our Padrino.root
-        #
-        def in_root?(file)
-          # This is better but slow:
-          #   Pathname.new(Padrino.root).find { |f| File.identical?(Padrino.root(f), figure_path(file)) }
-          figure_path(file) =~ %r{^#{Regexp.escape(Padrino.root)}}
-        end
+      ##
+      # Returns true if file is in our Padrino.root
+      #
+      def in_root?(file)
+        # This is better but slow:
+        #   Pathname.new(Padrino.root).find { |f| File.identical?(Padrino.root(f), figure_path(file)) }
+        figure_path(file).index(Padrino.root) == 0
+      end
 
-        ##
-        # Searches Ruby files in your +Padrino.load_paths+ , Padrino::Application.load_paths
-        # and monitors them for any changes.
-        #
-        def rotation
-          files  = Padrino.load_paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
-          files  = files | Padrino.mounted_apps.map { |app| app.app_file }
-          files  = files | Padrino.mounted_apps.map { |app| app.app_obj.dependencies }.flatten
-          files.uniq.map { |file|
-            file = File.expand_path(file)
-            next if Padrino::Reloader.exclude.any? { |base| file =~ %r{^#{Regexp.escape(base)}} } || !File.exist?(file)
-            yield(file, File.mtime(file))
-          }.compact
-        end
+      ##
+      # Searches Ruby files in your +Padrino.load_paths+ , Padrino::Application.load_paths
+      # and monitors them for any changes.
+      #
+      def rotation
+        files  = Padrino.load_paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
+        files  = files | Padrino.mounted_apps.map { |app| app.app_file }
+        files  = files | Padrino.mounted_apps.map { |app| app.app_obj.dependencies }.flatten
+        files.uniq.map do |file|
+          file = File.expand_path(file)
+          next if Padrino::Reloader.exclude.any? { |base| file.index(base) == 0 } || !File.exist?(file)
+          yield file, File.mtime(file)
+        end.compact
+      end
     end # self
 
     ##

data/lib/padrino-core/support_lite.rb

@@ -11,7 +11,7 @@ require 'active_support/inflector/methods'                  # constantize
 require 'active_support/inflector/inflections'              # pluralize
 require 'active_support/inflections'                        # load default inflections
 require 'yaml' unless defined?(YAML)                        # load yaml for i18n
-require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/    # ruby color suppor for win
+require 'win32console' if RUBY_PLATFORM =~ /(win|m)32/      # ruby color support for win
 
 ##
 # This is an adapted version of active_support/core_ext/string/inflections.rb
@@ -113,8 +113,8 @@ module ObjectSpace
     # Returns all the classes in the object space.
     def classes
       ObjectSpace.each_object(Module).select do |klass|
-        # Why this? Ruby when you remove a constant don't clean it from
-        # rb_tables, this mean that here we can found classes that was
+        # Why? Ruby, when you remove a costant dosen't remove it from
+        # rb_tables, this mean that here we can find classes that was
         # removed.
         klass.name rescue false
       end

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.10.6.e' unless defined?(Padrino::VERSION)
+  VERSION = '0.10.6' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: -1109933050
-  prerelease: 7
-  segments: 
-  - 0
-  - 10
-  - 6
-  - e
-  version: 0.10.6.e
+  prerelease: 
+  version: 0.10.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -19,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -29,11 +23,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id001
@@ -45,11 +34,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id002
@@ -61,11 +45,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 10
-        - 2
         version: 0.10.2
   type: :runtime
   version_requirements: *id003
@@ -77,11 +56,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 0
-        - 14
-        - 3
         version: 0.14.3
   type: :runtime
   version_requirements: *id004
@@ -93,11 +67,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
         version: 3.2.0
   type: :runtime
   version_requirements: *id005
@@ -199,25 +168,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem
@@ -248,4 +209,3 @@ test_files:
 - test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb
-has_rdoc: