padrino-core 0.7.5 → 0.7.6

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/lib/padrino-core/application.rb

@@ -8,7 +8,7 @@ module Padrino
   class Application < Sinatra::Application
 
     class << self
-      def inherited(subclass)
+      def inherited(subclass) #:nodoc:
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         subclass.default_configuration!
         Padrino.set_load_paths File.join(subclass.root, "/models")
@@ -70,7 +70,7 @@ module Padrino
       ##
       # Usher router, for fatures and configurations see: http://github.com/joshbuddy/usher
       # 
-      # Examples:
+      # ==== Examples
       # 
       #   router.add_route('/greedy/{!:greed,.*}')
       #   router.recognize_path('/simple')
@@ -86,6 +86,8 @@ module Padrino
       ##
       # Instance method for url generation like:
       # 
+      # ==== Examples
+      # 
       #   url(:show, :id => 1)
       #   url(:show, :name => :test)
       #   url("/show/:id/:name", :id => 1, :name => foo)
@@ -120,6 +122,12 @@ module Padrino
       ##
       # Reloads the application files from all defined load paths
       # 
+      # This method is used from our Padrino Reloader.
+      # 
+      # ==== Examples
+      # 
+      #   MyApp.reload!
+      # 
       def reload!
         reset_routes! # remove all existing user-defined application routes
         Padrino.load_dependency(self.app_file)  # reload the app file
@@ -129,6 +137,10 @@ module Padrino
       ##
       # Resets application routes to only routes not defined by the user
       # 
+      # ==== Examples
+      # 
+      #   MyApp.reset_routes!
+      # 
       def reset_routes!
         router.reset!
         default_routes!
@@ -229,9 +241,9 @@ module Padrino
         # Requires the middleware and initializer modules to configure components
         # 
         def register_initializers
-          use Padrino::RackLogger
-          use Padrino::Reloader   if reload?
-          use Rack::Flash         if flash?
+          use Padrino::Logger::Rack
+          use Padrino::Reloader::Rack  if reload?
+          use Rack::Flash              if flash?
           @initializer_path ||= Padrino.root + '/config/initializers/*.rb'
           Dir[@initializer_path].each { |file| register_initializer(file) }
         end
@@ -242,7 +254,7 @@ module Padrino
         def register_framework_extensions
           register Padrino::Mailer        if padrino_mailer?
           register Padrino::Helpers       if padrino_helpers?
-          register Padrino::AccessControl if authentication?
+          register Padrino::Admin::AccessControl if authentication?
         end
 
         ##
@@ -284,6 +296,8 @@ module Padrino
         ##
         # Rewrite default because now routes can be:
         # 
+        # ==== Examples
+        # 
         #   get :index                                    # => "/"
         #   get :index, :map => "/"                       # => "/"
         #   get :show,  :map => "/show-me"                # => "/show-me"
@@ -384,6 +398,8 @@ module Padrino
     ##
     # Return the request format, this is useful when we need to respond to a given content_type like:
     # 
+    # ==== Examples
+    # 
     #   get :index, :respond_to => :any do
     #     case content_type
     #       when :js    then ...
@@ -399,6 +415,8 @@ module Padrino
     ##
     # Instance method for url generation like:
     # 
+    # ==== Examples
+    # 
     #   url(:show, :id => 1)
     #   url(:show, :name => :test)
     #   url("/show/:id/:name", :id => 1, :name => foo)
@@ -470,6 +488,8 @@ module Padrino
       ##
       # When we set :auto_locale, true then if we use param locale like:
       # 
+      # ==== Examples
+      # 
       #   get "/:locale/some/foo" do; ...; end
       # 
       # we automatically set the I18n locale to params[:locale]

data/lib/padrino-core/caller.rb

@@ -36,12 +36,9 @@ module Padrino
   # line / method information; the resulting array contains filenames only.
   # 
   def self.caller_files
-    caller_locations.map { |file,line| file }
-  end
-
-  def self.caller_locations
     caller(1).
       map    { |line| line.split(/:(?=\d|in )/)[0,2] }.
-      reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }
+      reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
+      map    { |file,line| file }
   end
 end # Padrino

data/lib/padrino-core/loader.rb

@@ -11,7 +11,7 @@ module Padrino
       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
-      Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
+      Reloader::Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
       Thread.current[:padrino_loaded] = true
     end
 
@@ -19,8 +19,8 @@ module Padrino
     # Method for reloading required applications and their files
     # 
     def reload!
-      return unless Stat.changed?
-      Stat.reload! # detects the modified files
+      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
 
@@ -55,7 +55,7 @@ module Padrino
     # 
     # With +require_dependencies+ we don't have this problem.
     # 
-    # Example:
+    # ==== Examples
     #   # For require all our app libs we need to do:
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     # 

data/lib/padrino-core/logger.rb

@@ -6,7 +6,7 @@ module Padrino
   ##
   # Returns the padrino logger
   # 
-  # Examples:
+  # ==== Examples
   # 
   #   logger.debug "foo"
   #   logger.warn "bar"
@@ -15,6 +15,14 @@ module Padrino
     Thread.current[:padrino_logger] ||= Padrino::Logger.setup!
   end
 
+  ##
+  # Extensions to the built in Ruby logger.
+  # 
+  # ==== Examples
+  # 
+  #   logger.debug "foo"
+  #   logger.warn  "bar"
+  # 
   class Logger
 
     attr_accessor :level
@@ -31,6 +39,7 @@ module Padrino
     # :warn:: A warning
     # :info:: generic (useful) information about system operation
     # :debug:: low-level information for developers
+    # 
     Levels = {
       :fatal => 7,
       :error => 6,
@@ -55,7 +64,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\"""
     # 
-    # Example:
+    # ==== Examples
     # 
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :to_file }
     #   # or you can edit our defaults
@@ -98,7 +107,7 @@ module Padrino
     ##
     # To initialize the logger you create a new object, proxies to set_log.
     #
-    # ==== Options can be:
+    # ==== Options
     # 
     # :stream:: Either an IO object or a name of a logfile. Defaults to $stdout
     # :log_level::
@@ -109,6 +118,7 @@ module Padrino
     #   added. Defaults to true.
     # :format_datetime:: Format of datetime. Defaults to: "%d/%b/%Y %H:%M:%S"
     # :format_message:: Format of message. Defaults to: ""%s - - [%s] \"%s\"""
+    # 
     def initialize(options={})
       @buffer            = []
       @auto_flush        = options.has_key?(:auto_flush) ? options[:auto_flush] : true
@@ -147,6 +157,9 @@ module Padrino
       self << @format_message % [level.to_s.upcase, Time.now.strftime(@format_datetime), message.to_s]
     end
 
+    ##
+    # Directly append message to the log.
+    # 
     def <<(message = nil)
       message << "\n" unless message[-1] == ?\n
       @buffer << message
@@ -202,63 +215,60 @@ module Padrino
       LEVELMETHODS
     end
 
-  end
-  
-  ##
-  # RackLogger 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 RackLogger
     ##
-    # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
-    # "lilith.local - - GET / HTTP/1.1 500 -"
-    #  %{%s - %s %s %s%s %s - %d %s %0.4f}
+    # Padrino::Loggger::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.
     # 
-    FORMAT = %{%s - %s %s %s%s %s - %d %s %0.4f}
-
-    def initialize(app)
-      @app = app
-    end
+    class Rack
+      ##
+      # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
+      # "lilith.local - - GET / HTTP/1.1 500 -"
+      #  %{%s - %s %s %s%s %s - %d %s %0.4f}
+      # 
+      FORMAT = %{%s - %s %s %s%s %s - %d %s %0.4f}
 
-    def call(env)
-      began_at = Time.now
-      status, header, body = @app.call(env)
-      log(env, status, header, began_at)
-      [status, header, body]
-    end
+      def initialize(app)
+        @app = app
+      end
 
-    private
+      def call(env)
+        began_at = Time.now
+        status, header, body = @app.call(env)
+        log(env, status, header, began_at)
+        [status, header, body]
+      end
 
-    def log(env, status, header, began_at)
-      now = Time.now
-      length = extract_content_length(header)
+      private
+        def log(env, status, header, began_at)
+          now = Time.now
+          length = extract_content_length(header)
 
-      logger.debug FORMAT % [
-        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
-        env["REMOTE_USER"] || "-",
-        env["REQUEST_METHOD"],
-        env["PATH_INFO"],
-        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
-        env["HTTP_VERSION"],
-        status.to_s[0..3],
-        length,
-        now - began_at ]
-    end
+          logger.debug FORMAT % [
+            env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+            env["REMOTE_USER"] || "-",
+            env["REQUEST_METHOD"],
+            env["PATH_INFO"],
+            env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+            env["HTTP_VERSION"],
+            status.to_s[0..3],
+            length,
+            now - began_at ]
+        end
 
-    def extract_content_length(headers)
-      headers.each do |key, value|
-        if key.downcase == 'content-length'
-          return value.to_s == '0' ? '-' : value
+        def extract_content_length(headers)
+          headers.each do |key, value|
+            if key.downcase == 'content-length'
+              return value.to_s == '0' ? '-' : value
+            end
+          end
+          '-'
         end
-      end
-      '-'
-    end
+    end # Rack
   end # Logger
 end # Padrino
 
 module Kernel #:nodoc:
-
   ##
   # Define a logger available every where in our app
   # 

data/lib/padrino-core/mounter.rb

@@ -3,7 +3,7 @@ module Padrino
   # Represents a particular mounted padrino application
   # Stores the name of the application (app folder name) and url mount path
   # 
-  # Example:
+  # ==== Examples
   # 
   #   Mounter.new("blog_app", :app_class => "Blog").to("/blog")
   #   Mounter.new("blog_app", :app_file => "/path/to/blog/app.rb").to("/blog")
@@ -22,7 +22,8 @@ module Padrino
     ##
     # Registers the mounted application onto Padrino
     # 
-    # Example:
+    # ==== Examples
+    # 
     #   Mounter.new("blog_app").to("/blog")
     # 
     def to(mount_url)
@@ -102,7 +103,7 @@ module Padrino
     ##
     # Mounts the core application onto Padrino project with given app settings (file, class, root)
     # 
-    # Examples:
+    # ==== Examples
     # 
     #   Padrino.mount_core("Blog")
     #   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")

data/lib/padrino-core/reloader.rb

@@ -1,33 +1,124 @@
+require 'pathname'
+
 module Padrino
   ##
   # High performant source 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.
-  # 
-  class Reloader
-
-    def initialize(app, cooldown = 1)
-      @app = app
-      @cooldown = cooldown
-      @last = (Time.now - cooldown)
-    end
+  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.
+    # 
+    class Rack
+      def initialize(app, cooldown = 1)
+        @app = app
+        @cooldown = cooldown
+        @last = (Time.now - cooldown)
+      end
+
+      def call(env)
+        if @cooldown and Time.now > @last + @cooldown
+          if Thread.list.size > 1
+            Thread.exclusive { Padrino.reload! }
+          else
+            Padrino.reload!
+          end
 
-    def call(env)
-      if @cooldown and Time.now > @last + @cooldown
-        if Thread.list.size > 1
-          Thread.exclusive { Padrino.reload! }
-        else
-          Padrino.reload!
+          @last = Time.now
         end
 
-        @last = Time.now
+        @app.call(env)
       end
-
-      @app.call(env)
     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).
+    #
+    # Please note that this will not reload files in the background, it does so
+    # only when actively called.
+    # 
+    module Stat
+      class << self
+        CACHE  = {}
+        MTIMES = {}
+
+        def reload!
+          rotation do |file, mtime|
+            previous_mtime = MTIMES[file] ||= mtime
+            safe_load(file, mtime) if mtime > previous_mtime
+          end
+        end
+
+        def changed?
+          changed = false
+          rotation do |file, mtime|
+            previous_mtime = MTIMES[file] ||= mtime
+            changed = true if mtime > MTIMES[file]
+          end
+          changed
+        end
+
+        ##
+        # A safe Kernel::load, issuing the hooks depending on the results
+        # 
+        def safe_load(file, mtime)
+          logger.debug "Reloading #{file}"
+          load(file)
+          file
+        rescue LoadError, SyntaxError => ex
+          logger.error ex
+        ensure
+          MTIMES[file] = mtime
+        end
+
+        def rotation
+          files = [$0, *$LOADED_FEATURES].uniq
+          paths = ['./', *$:].uniq
+
+          files.map{ |file|
+            next if file =~ /\.(so|bundle)$/ # cannot reload compiled files
+            found, stat = figure_path(file, paths)
+            next unless found && stat && mtime = stat.mtime
+
+            CACHE[file] = found
+
+            yield(found, mtime)
+          }.compact
+        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.
+        # 
+        def figure_path(file, paths)
+          found = CACHE[file]
+          found = file if !found and Pathname.new(file).absolute?
+          found, stat = safe_stat(found)
+          return found, stat if found
+
+          paths.find do |possible_path|
+            path = ::File.join(possible_path, file)
+            found, stat = safe_stat(path)
+            return ::File.expand_path(found), stat if found
+          end
+
+          return false, false
+        end
+
+        def safe_stat(file)
+          return unless file
+          stat = ::File.stat(file)
+          return file, stat if stat.file?
+        rescue Errno::ENOENT, Errno::ENOTDIR
+          CACHE.delete(file) and false
+        end
+      end # self
+    end # Stat
   end # Reloader
 end # Padrino
 

data/lib/padrino-core/server.rb

@@ -4,7 +4,7 @@ module Padrino
   # Run the Padrino apps as a self-hosted server using:
   # thin, mongrel, webrick in that order.
   # 
-  # Examples:
+  # ==== Examples
   # 
   #   Padrino.run! # with these defaults => host: "localhost", port: "3000", adapter: the first found
   #   Padrino.run!("localhost", "4000", "mongrel") # use => host: "localhost", port: "3000", adapter: "mongrel"

data/lib/padrino-core/support_lite/as_support.rb

@@ -1,6 +1,8 @@
 # This requires necessary pieces of ActiveSupport for the dependencies required by Padrino
 
-## ActiveSupport::Deprecation
+## ActiveSupport#Version
+require 'active_support/version'
+## ActiveSupport#Deprecation
 unless defined?(ActiveSupport::Deprecation)
   require 'active_support/core_ext/kernel' unless Kernel.method_defined?(:silence_warnings)
   require 'active_support/core_ext/module' unless Module.method_defined?(:mattr_accessor)
@@ -24,8 +26,11 @@ require 'active_support/core_ext/blank' unless Object.method_defined?(:blank?)
 require 'active_support/core_ext/array' unless Array.method_defined?(:extract_options!)
 ## Module#alias_method_chain
 require 'active_support/core_ext/module' unless Module.method_defined?(:alias_method_chain)
-## SupportLite::OrderedHash
+## SupportLite#OrderedHash
 require 'active_support/ordered_hash' unless defined?(ActiveSupport::OrderedHash)
+## Float#round
+require 'active_support/core_ext/float/rounding'
+
 unless defined?(SupportLite::OrderedHash)
   module SupportLite
     OrderedHash = ::ActiveSupport::OrderedHash

data/lib/padrino-core/support_lite/extlib_support.rb

@@ -182,3 +182,26 @@ unless Module.method_defined?(:alias_method_chain)
     end
   end
 end
+
+## Float#round
+unless Float.method_defined?(:round)
+  class Float
+    alias precisionless_round round
+    private :precisionless_round
+
+    # Rounds the float with the specified precision.
+    #
+    #   x = 1.337
+    #   x.round    # => 1
+    #   x.round(1) # => 1.3
+    #   x.round(2) # => 1.34
+    def round(precision = nil)
+      if precision
+        magnitude = 10.0 ** precision
+        (self * magnitude).round / magnitude
+      else
+        precisionless_round
+      end
+    end
+  end
+end

data/lib/padrino-core/tasks.rb

@@ -5,7 +5,11 @@ module Padrino
   # thirdy party tasks, in your gem/plugin/extension you
   # need only do this:
   # 
+  # ==== Examples
+  # 
   #   Padrino::Tasks.files << yourtask.rb
+  #   Padrino::Tasks.files.concat(Dir["/path/to/all/my/tasks/*.rb"])
+  #   Padrino::Tasks.files.unshift("yourtask.rb")
   # 
   module Tasks
 

data/lib/padrino-core.rb

@@ -13,7 +13,7 @@ module Padrino
     ##
     # Helper method for file references.
     #
-    # Example:
+    # ==== Examples
     #   # Referencing a file in config called settings.yml
     #   Padrino.root("config", "settings.yml")
     #   # returns PADRINO_ROOT + "/config/setting.yml"

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-02-10}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
      "lib/padrino-core/mounter.rb",
      "lib/padrino-core/reloader.rb",
      "lib/padrino-core/server.rb",
-     "lib/padrino-core/stat.rb",
      "lib/padrino-core/support_lite.rb",
      "lib/padrino-core/support_lite/as_support.rb",
      "lib/padrino-core/support_lite/extlib_support.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,6 @@ files:
 - lib/padrino-core/mounter.rb
 - lib/padrino-core/reloader.rb
 - lib/padrino-core/server.rb
-- lib/padrino-core/stat.rb
 - lib/padrino-core/support_lite.rb
 - lib/padrino-core/support_lite/as_support.rb
 - lib/padrino-core/support_lite/extlib_support.rb

data/lib/padrino-core/stat.rb

@@ -1,90 +0,0 @@
-require 'pathname'
-
-module Padrino
-  ##
-  # 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).
-  #
-  # Please note that this will not reload files in the background, it does so
-  # only when actively called.
-  # 
-  module Stat
-    class << self
-      CACHE  = {}
-      MTIMES = {}
-
-      def reload!
-        rotation do |file, mtime|
-          previous_mtime = MTIMES[file] ||= mtime
-          safe_load(file, mtime) if mtime > previous_mtime
-        end
-      end
-
-      def changed?
-        changed = false
-        rotation do |file, mtime|
-          previous_mtime = MTIMES[file] ||= mtime
-          changed = true if mtime > MTIMES[file]
-        end
-        changed
-      end
-
-      ##
-      # A safe Kernel::load, issuing the hooks depending on the results
-      # 
-      def safe_load(file, mtime)
-        logger.debug "Reloading #{file}"
-        load(file)
-        file
-      rescue LoadError, SyntaxError => ex
-        $stderr.puts ex
-      ensure
-        MTIMES[file] = mtime
-      end
-
-      def rotation
-        files = [$0, *$LOADED_FEATURES].uniq
-        paths = ['./', *$:].uniq
-
-        files.map{ |file|
-          next if file =~ /\.(so|bundle)$/                   # cannot reload compiled files
-          found, stat = figure_path(file, paths)
-          next unless found && stat && mtime = stat.mtime
-
-          CACHE[file] = found
-
-          yield(found, mtime)
-        }.compact
-      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.
-      # 
-      def figure_path(file, paths)
-        found = CACHE[file]
-        found = file if !found and Pathname.new(file).absolute?
-        found, stat = safe_stat(found)
-        return found, stat if found
-
-        paths.find do |possible_path|
-          path = ::File.join(possible_path, file)
-          found, stat = safe_stat(path)
-          return ::File.expand_path(found), stat if found
-        end
-
-        return false, false
-      end
-
-      def safe_stat(file)
-        return unless file
-        stat = ::File.stat(file)
-        return file, stat if stat.file?
-      rescue Errno::ENOENT, Errno::ENOTDIR
-        CACHE.delete(file) and false
-      end
-    end # self
-  end # Stat
-end # Padrino