padrino-core 0.12.8.1 → 0.12.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 425a55cbc0605fb327daf1966a465f91d1625f27
-  data.tar.gz: cec37ed3c36d612e541c28368d43970f2f45a47d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Zjc3MmQyN2MyYjcyOTU2N2YyYTE0YWJmZTExM2MxODAwZTYwNTEyMg==
+  data.tar.gz: !binary |-
+    ZGYwNjcyNDY1YTRkMjFlOGU5YTUwNjZiNTUwNzhjNTljNDczMzkwOA==
 SHA512:
-  metadata.gz: 63e08191427c3a2f6c0054122efd63e1161f2d7563e14354fbcef1251bfff0971ca554532eaf4277b4b5101704a17b3cacfdad6d2d69e8e1d85802c63a12b9e8
-  data.tar.gz: 3bdd7a9d40c00e9815115bbad4d032b6271addee919cb48a794922f82a3764b3249cf26efcdbe8dbd8aaf6341c0320ba7bf5c3380f0ae802d787d30c01cd9fe8
+  metadata.gz: !binary |-
+    YTM0ZjYxOThkNGViZjhmYzI1YzdmYjk4MTBjOTIxOGQzYTYyYWM3ODczMjlj
+    MTkzOTM5ZDQ0YjMzMWQ2Nzg0YjkwN2Q2ZGMyMTE3ZTQ2NzdkMTg5NDA0MTdm
+    N2Y1Mzk0YTgwMmYyN2Y2MTRhODhlNjliMjUzZDI1MjU0NmExNmM=
+  data.tar.gz: !binary |-
+    OTRhOTFhZGYzN2M2MmZjYzBjNTIxNzdhNWE2MWFlM2E5MTY1YjExM2ZmNDUw
+    ODgyODU1NmZhNjZlMjZmNTNkMjE3ZTQ1OWUxMGNlY2E2NzFkODU0MWUzNGFi
+    NmZlZjc4NDYyZmY4ODdlNTBkMDZiNGQzNjllYjMzMmM5MDFjYmY=

data/Rakefile

@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/bin/padrino

@@ -6,4 +6,4 @@ padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
 
 require 'padrino-core/cli/base'
-Padrino::Cli::Base.start(ARGV)
+Padrino::Cli::Base.start(ARGV)

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

@@ -57,6 +57,7 @@ module Padrino
         set :uri_root,      '/'
         set :public_folder, proc { Padrino.root('public', uri_root) }
         set :images_path,   proc { File.join(public_folder, 'images') }
+        set :base_url,      'http://localhost'
       end
 
       def default_security
@@ -97,6 +98,7 @@ module Padrino
       # Also initializes the application after setting up the middleware.
       def setup_default_middleware(builder)
         setup_sessions builder
+        builder.use Sinatra::ExtendedRack           if defined?(EventMachine)
         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?

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

@@ -1,9 +1,3 @@
-begin
-  require 'active_support/core_ext/object/deep_dup' # AS 4.1
-rescue LoadError
-  require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1
-end
-
 module Padrino
   ##
   # Padrino application module providing means for mass-assignment protection.
@@ -45,7 +39,7 @@ module Padrino
       def params(*allowed_params)
         allowed_params = prepare_allowed_params(allowed_params)
         condition do
-          @original_params = params.deep_dup
+          @original_params = Utils.deep_dup(params)
           filter_params!(params, allowed_params)
         end
       end

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

@@ -340,6 +340,14 @@ module Padrino
       end
       alias :url_for :url
 
+      ##
+      # Returns absolute url. By default adds 'http://localhost' before generated url.
+      # To change that `set :base_url, 'http://example.com'` in your app.
+      #
+      def absolute_url(*args)
+        base_url + url(*args)
+      end
+
       def get(path, *args, &block)
         conditions = @conditions.dup
         route('GET', path, *args, &block)
@@ -562,6 +570,7 @@ module Padrino
       # controllers, parents, 'with' parameters, and other options.
       #
       def parse_route(path, options, verb)
+        path = path.dup if path.kind_of?(String)
         route_options = {}
 
         if options[:params] == true
@@ -714,7 +723,7 @@ module Padrino
 
           accept_format = CONTENT_TYPE_ALIASES[type] || type
           if types.include?(accept_format)
-            content_type(accept_format || :html, :charset => 'utf-8')
+            content_type(accept_format || :html)
           else
             catch_all ? true : halt(406)
           end
@@ -734,7 +743,7 @@ module Padrino
         mime_types = types.map{ |type| mime_type(CONTENT_TYPE_ALIASES[type] || type) }
         condition do
           halt 406 unless mime_types.include?(request.media_type)
-          content_type(mime_symbol(request.media_type), :charset => 'utf-8')
+          content_type(mime_symbol(request.media_type))
         end
       end
 
@@ -877,7 +886,6 @@ module Padrino
       #
       def content_type(type=nil, params={})
         return @_content_type unless type
-        params.delete(:charset) if type == :json
         super(type, params)
         @_content_type = type
       end
@@ -887,7 +895,7 @@ module Padrino
       def provides_any?(formats)
         accepted_format = formats.first
         type = accepted_format ? mime_symbol(accepted_format) : :html
-        content_type(CONTENT_TYPE_ALIASES[type] || type, :charset => 'utf-8')
+        content_type(CONTENT_TYPE_ALIASES[type] || type)
       end
 
       def provides_format?(types, format)
@@ -897,7 +905,7 @@ module Padrino
           halt 406 if settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept
           false
         else
-          content_type(format || :html, :charset => 'utf-8')
+          content_type(format || :html)
         end
       end
 
@@ -910,6 +918,8 @@ module Padrino
       end
 
       def dispatch!
+        @params = defined?(Sinatra::IndifferentHash) ? Sinatra::IndifferentHash[@request.params] : indifferent_params(@request.params)
+        force_encoding(@params)
         invoke do
           static! if settings.static? && (request.get? || request.head?)
           route!

data/lib/padrino-core/caller.rb

@@ -18,7 +18,8 @@ module Padrino
     %r{rake_test_loader\.rb},
     %r{custom_require\.rb$},
     %r{active_support},
-    %r{/thor}
+    %r{/thor},
+    %r{/lib/bundler},
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##

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

@@ -12,10 +12,19 @@ module Padrino
           options.symbolize_keys!
           if File.exist?(options[:pid])
             pid = File.read(options[:pid]).to_i
-            print "=> Sending INT to process with pid #{pid} wait "
-            Process.kill(2, pid) rescue nil
+            puts "=> Sending INT to process with pid #{pid}"
+            begin
+              Process.kill(2, pid)
+            rescue Errno::ESRCH, RangeError => error
+              puts error.message
+              exit
+            rescue Errno::EPERM => error
+              puts error.message
+              abort
+            end
           else
             puts "=> #{options[:pid]} not found!"
+            abort
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Padrino
   module Cli
     class Base < Launcher
       desc "rake", "Execute rake tasks."
-      method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
+      method_option :environment, :type => :string,  :aliases => "-e"
       method_option :list,        :type => :string,  :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
       method_option :trace,       :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
       def rake(*args)
@@ -28,16 +28,20 @@ module Padrino
       def console(*args)
         prepare :console
         require File.expand_path("../../version", __FILE__)
-        ARGV.clear
-        require 'irb'
-        begin
-          require "irb/completion"
-        rescue LoadError
-        end
         require File.expand_path('config/boot.rb')
         puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
         require File.expand_path('../console', __FILE__)
-        IRB.start
+        ARGV.clear
+        if defined? Pry
+          Pry.start
+        else
+          require 'irb'
+          begin
+            require "irb/completion"
+          rescue LoadError
+          end
+          IRB.start
+        end
       end
 
       desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."

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

@@ -6,7 +6,7 @@ module Padrino
       include Thor::Actions
 
       class_option :chdir, :type => :string, :aliases => "-c", :desc => "Change to dir before starting."
-      class_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development, :desc => "Padrino Environment."
+      class_option :environment, :type => :string,  :aliases => "-e", :desc => "Padrino Environment."
       class_option :help, :type => :boolean, :desc => "Show help usage"
 
       desc "start", "Starts the Padrino application (alternatively use 's')."
@@ -70,13 +70,17 @@ module Padrino
       def prepare(task)
         if options.help?
           help(task.to_s)
-          raise SystemExit
+          exit
+        end
+        if options.environment
+          ENV["RACK_ENV"] = options.environment.to_s
+        else
+          ENV["RACK_ENV"] ||= 'development'
         end
-        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
+          abort
         end
       end
 
@@ -90,6 +94,10 @@ module Padrino
           puts "=> Specified Padrino root '#{dir}' cannot be accessed by the current user!"
         end
       end
+
+      def self.exit_on_failure?
+        true
+      end
     end
   end
 end

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

@@ -1,11 +1,3 @@
-Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
-  begin
-    load(File.expand_path(file))
-  rescue LoadError => e
-    warn "#{file}: #{e.message}"
-  end
-end
-
 # Loads the Padrino applications mounted within the project.
 # Setting up the required environment for Padrino.
 task :environment do
@@ -16,13 +8,10 @@ task :environment do
   end
 end
 
-# Loads skeleton Padrino environment, no models, no application settings.
 task :skeleton do
-  module Padrino::Reloader
-    def self.safe_load(file, options)
-      super unless file.include?('/models/')
-    end
-  end
+  PADRINO_ROOT ||= Rake.application.original_dir
+  require 'padrino-core'
+  Padrino.send(:dependency_paths).reject!{ |path| path.include?('/models/') }
   require File.expand_path('config/boot.rb', Rake.application.original_dir)
 end
 
@@ -46,6 +35,19 @@ def list_app_routes(app, args)
   end
 end
 
+def env_migration_version
+  version = ENV["MIGRATION_VERSION"]
+  if version.nil? && ENV["VERSION"]
+    deprecated = true
+    warn "Environment variable VERSION is deprecated, use MIGRATION_VERSION"
+    version = ENV["VERSION"]
+  end
+  version ? Integer(version) : nil
+rescue ArgumentError
+  warn "Environment variable #{deprecated ? '' : 'MIGRATION_'}VERSION=#{version} should be non-existant or Integer"
+  nil
+end
+
 desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
 task :routes, [:query] => :environment do |t, args|
   Padrino.mounted_apps.each do |app|
@@ -60,3 +62,11 @@ namespace :routes do
     list_app_routes(app, args) if app
   end
 end
+
+Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
+  begin
+    load(File.expand_path(file))
+  rescue LoadError => e
+    warn "#{file}: #{e.message}"
+  end
+end

data/lib/padrino-core/configuration.rb

@@ -0,0 +1,40 @@
+require 'ostruct'
+
+module Padrino
+  ##
+  # Padrino simple configuration module
+  #
+  module Configuration
+    ##
+    # Returns the configuration structure allowing to get and set it's values.
+    # Padrino.config is a simple Ruby OpenStruct object with no additional magic.
+    #
+    # Example:
+    #
+    #   Padrino.config.value1 = 42
+    #   exit if Padrino.config.exiting
+    #
+    def config
+      @config ||= OpenStruct.new
+    end
+
+    ##
+    # Allows to configure different environments differently. Requires a block.
+    #
+    # Example:
+    #
+    #   Padrino.configure :development do |config|
+    #     config.value2 = 'only development'
+    #   end
+    #   Padrino.configure :development, :production do |config|
+    #     config.value2 = 'both development and production'
+    #   end
+    #   Padrino.configure do |config|
+    #     config.value2 = 'any environment'
+    #   end
+    #
+    def configure(*environments)
+      yield(config) if environments.empty? || environments.include?(Padrino.env)
+    end
+  end
+end

data/lib/padrino-core/loader.rb

@@ -193,8 +193,7 @@ module Padrino
         "#{root}/config/database.rb",
         "#{root}/lib/**/*.rb",
         "#{root}/models/**/*.rb",
-        "#{root}/shared/lib/**/*.rb",
-        "#{root}/shared/models/**/*.rb",
+        "#{root}/shared/**/*.rb",
         "#{root}/config/apps.rb",
       ]
     end

data/lib/padrino-core/logger.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 # Defines the log level for a Padrino project.
 PADRINO_LOG_LEVEL = ENV['PADRINO_LOG_LEVEL'] unless defined?(PADRINO_LOG_LEVEL)
 
@@ -70,6 +72,9 @@ module Padrino
           if args.size > 1
             bench(args[0], args[1], args[2], name)
           else
+            if location = resolve_source_location(caller(1).shift)
+              args.unshift(location)
+            end if enable_source_location?
             push(args * '', name)
           end
         end
@@ -79,6 +84,28 @@ module Padrino
         end
       end
 
+      SOURCE_LOCATION_REGEXP = /^(.*?):(\d+?)(?::in `.+?')?$/.freeze
+
+      ##
+      # Returns true if :source_location is set to true.
+      #
+      def enable_source_location?
+        respond_to?(:source_location?) && source_location?
+      end
+
+      ##
+      # Resolves a filename and line-number from caller.
+      #
+      def resolve_source_location(message)
+        path, line = *message.scan(SOURCE_LOCATION_REGEXP).first
+        return unless path && line
+        root = Padrino.root
+        path = File.realpath(path) if Pathname.new(path).relative?
+        if path.start_with?(root) && !path.start_with?(Padrino.root("vendor"))
+          "[#{path.gsub("#{root}/", "")}:#{line}] "
+        end
+      end
+
       ##
       # Append a to development logger a given action with time.
       #
@@ -237,6 +264,9 @@ module Padrino
     #
     # :log_level:: Once of [:fatal, :error, :warn, :info, :debug]
     # :stream:: Once of [:to_file, :null, :stdout, :stderr] our your custom stream
+    # :log_path:: Defines log file path or directory if :stream is :to_file
+    #   If it's a file, its location is created by mkdir_p.
+    #   If it's a directory, it must exist. In this case log name is '<env>.log'
     # :log_level::
     #   The log level from, e.g. :fatal or :info. Defaults to :warn in the
     #   production environment and :debug otherwise.
@@ -252,6 +282,10 @@ module Padrino
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :stream => :to_file }
     #   # or you can edit our defaults
     #   Padrino::Logger::Config[:development][:log_level] = :error
+    #   # or change log file path
+    #   Padrino::Logger::Config[:development][:log_path] = 'logs/app-development.txt'
+    #   # or change log file directory
+    #   Padrino::Logger::Config[:development][:log_path] = '/var/logs/padrino'
     #   # or you can use your stream
     #   Padrino::Logger::Config[:development][:stream] = StringIO.new
     #
@@ -302,8 +336,18 @@ module Padrino
 
         stream = case config[:stream]
           when :to_file
-            FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
-            File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+            if filename = config[:log_path]
+              filename = Padrino.root(filename) unless Pathname.new(filename).absolute?
+              if File.directory?(filename)
+                filename = File.join(filename, "#{Padrino.env}.log")
+              else
+                FileUtils.mkdir_p(File.dirname(filename))
+              end
+              File.new(filename, 'a+')
+            else
+              FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
+              File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+            end
           when :null   then StringIO.new
           when :stdout then $stdout
           when :stderr then $stderr
@@ -341,26 +385,42 @@ module Padrino
     # @option options [Symbol] :colorize_logging (true)
     #   Whether or not to colorize log messages. Defaults to: true.
     #
+    # @option options [Symbol] :sanitize_encoding (false)
+    #   Logger will replace undefined or broken characters with
+    #   “uFFFD” for Unicode and “?” otherwise.
+    #   Can be an encoding, false or true.
+    #   If it's true, logger sanitizes to Encoding.default_external.
+    #
     def initialize(options={})
-      @buffer          = []
-      @auto_flush      = options.has_key?(:auto_flush) ? options[:auto_flush] : true
-      @level           = options[:log_level] ? Padrino::Logger::Levels[options[:log_level]] : Padrino::Logger::Levels[:debug]
-      @log             = options[:stream]  || $stdout
-      @log.sync        = true
-      @format_datetime = options[:format_datetime] || "%d/%b/%Y %H:%M:%S"
-      @format_message  = options[:format_message]  || "%s - %s %s"
-      @log_static      = options.has_key?(:log_static) ? options[:log_static] : false
+      @buffer           = []
+      @auto_flush       = options.has_key?(:auto_flush) ? options[:auto_flush] : true
+      @level            = options[:log_level] ? Padrino::Logger::Levels[options[:log_level]] : Padrino::Logger::Levels[:debug]
+      @log              = options[:stream]  || $stdout
+      @log.sync         = true
+      @format_datetime  = options[:format_datetime] || "%d/%b/%Y %H:%M:%S"
+      @format_message   = options[:format_message]  || "%s - %s %s"
+      @log_static       = options.has_key?(:log_static) ? options[:log_static] : false
       @colorize_logging = options.has_key?(:colorize_logging) ? options[:colorize_logging] : true
+      @source_location  = options[:source_location]
+      @sanitize_encoding = options[:sanitize_encoding] || false
+      @sanitize_encoding = Encoding.default_external if @sanitize_encoding == true
       colorize! if @colorize_logging
     end
 
+    def source_location?
+      !!@source_location
+    end
+
     ##
     # Flush the entire buffer to the log object.
     #
     def flush
       return unless @buffer.size > 0
       @@mutex.synchronize do
-        @log.write(@buffer.join(''))
+        @buffer.each do |line|
+          line.encode!(@sanitize_encoding, :invalid => :replace, :undef => :replace) if @sanitize_encoding
+          @log.write(line)
+        end
         @buffer.clear
       end
     end

data/lib/padrino-core/mounter/application_extension.rb

@@ -0,0 +1,55 @@
+module Padrino
+  class Mounter
+    module ApplicationExtension
+      attr_accessor :uri_root, :mounter_options
+      attr_writer :public_folder
+
+      def dependencies
+        @__dependencies ||= Dir.glob("#{root}/**/*.rb").delete_if { |path| path == app_file }
+      end
+
+      def prerequisites
+        @__prerequisites ||= []
+      end
+
+      def app_file
+        @__app_file ||= trace_method(:app_file) { mounter_options[:app_file] }
+      end
+
+      def root
+        @__root ||= trace_method(:root) { File.expand_path("#{app_file}/../") }
+      end
+
+      def public_folder
+        @public_folder ||= trace_method(:public_folder) { "" }
+      end
+
+      def app_name
+        @__app_name ||= mounter_options[:app_name] || self.to_s.underscore.to_sym
+      end
+
+      def setup_application!
+        @configured ||= trace_method(:setup_application!) do
+          $LOAD_PATH.concat(prerequisites)
+          require_dependencies if root.start_with?(Padrino.root)
+          true
+        end
+      end
+
+      private
+
+      def require_dependencies
+        Padrino.require_dependencies(dependencies, :force => true)
+      end
+
+      def trace_method(method_name)
+        value = baseclass.send(method_name) if baseclass != self && baseclass.respond_to?(method_name)
+        value || yield
+      end
+
+      def baseclass
+        @__baseclass ||= respond_to?(:superclass) ? superclass : self
+      end
+    end
+  end
+end