padrino-core 0.9.26 → 0.9.27

data/lib/padrino-core.rb

@@ -51,6 +51,27 @@ module Padrino
       end
     end
 
+    ##
+    # Configure Global Project Settings for mounted apps. These can be overloaded
+    # in each individual app's own personal configuration. This can be used like:
+    #
+    #   Padrino.configure_apps do
+    #     enable  :sessions
+    #     disable :raise_errors
+    #   end
+    #
+    def configure_apps(&block)
+      @_global_configuration = block if block_given?
+    end
+
+    ###
+    # Returns project-wide configuration settings
+    # defined in 'configure_apps' block
+    #
+    def apps_configuration
+      @_global_configuration
+    end
+
     ##
     # Default encoding to UTF8.
     #

data/lib/padrino-core/application.rb

@@ -29,7 +29,11 @@ module Padrino
       #
       def new(*args, &bk)
         setup_application!
+        logging, logging_was = false, logging
+        show_exceptions, show_exceptions_was = false, show_exceptions
         super(*args, &bk)
+      ensure
+        logging, show_exceptions = logging_was, show_exceptions_was
       end
 
       ##
@@ -127,25 +131,23 @@ module Padrino
           # Overwriting Sinatra defaults
           set :app_file, File.expand_path(caller_files.first || $0) # Assume app file is first caller
           set :environment, Padrino.env
-          set :raise_errors, true if development?
-          set :reload, true if development?
-          set :logging, false
-          set :padrino_logging, true
+          set :reload, Proc.new { development? }
+          set :logging, Proc.new { development? }
           set :method_override, true
           set :sessions, false
-          set :session_path, '/'
           set :public, Proc.new { Padrino.root('public', uri_root) }
           set :views, Proc.new { File.join(root,   "views") }
           set :images_path, Proc.new { File.join(public, "images") }
           # Padrino specific
           set :uri_root, "/"
-          set :reload, Proc.new { development? }
           set :app_name, self.to_s.underscore.to_sym
           set :default_builder, 'StandardFormBuilder'
           set :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
 
         ##
@@ -190,7 +192,8 @@ module Padrino
         # Requires the Padrino middleware
         #
         def register_initializers
-          use Padrino::Logger::Rack, uri_root if Padrino.logger && (Padrino.logger.level == 0 && padrino_logging?)
+          use Padrino::ShowExceptions         if show_exceptions?
+          use Padrino::Logger::Rack, uri_root if Padrino.logger && logging?
           use Padrino::Reloader::Rack         if reload?
           use Rack::Flash                     if flash?
         end
@@ -209,26 +212,6 @@ module Padrino
         def require_load_paths
           load_paths.each { |path| Padrino.require_dependencies(File.join(self.root, path)) }
         end
-
-      private
-
-        def setup_sessions(builder)
-          return unless sessions?
-          options = {}
-          options[:secret] = session_secret if session_secret?
-          options[:path]   = session_path   if session_path?
-          options.merge!(sessions.to_hash)  if sessions.respond_to?(:to_hash)
-          builder.use Rack::Session::Cookie, options
-        end
     end # self
-
-    private
-      def clean_backtrace(trace)
-        return trace unless settings.clean_trace?
-        trace.reject { |line|
-          line =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/ ||
-            (defined?(Gem) && line.include?(Gem.dir))
-        }.map! { |line| line.gsub(/^\.\//, '') }
-      end
   end # Application
-end # Padrino
+end # Padrino

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

@@ -110,7 +110,10 @@ module Padrino
           # If engine is a hash then render data converted to json
           return engine.to_json if engine.is_a?(Hash)
 
-          # Data can actually be a hash of options in certain cases
+          # If engine is nil, ignore engine parameter
+          engine, data = data, options if engine.nil? && data
+
+          # Data can actually be a hash of options in certain render cases
           options.merge!(data) && data = nil if data.is_a?(Hash)
 
           # If an engine is a string then this is a likely a path to be resolved

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

@@ -1,7 +1,7 @@
 require 'http_router' unless defined?(HttpRouter)
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 
-class Sinatra::Request
+class Sinatra::Request #:nodoc:
   attr_accessor :route_obj
 
   def controller
@@ -233,8 +233,19 @@ module Padrino
       end
       alias :urls :router
 
+      def recognition_router
+        @recognition_router ||= HttpRouter.new
+      end
+
       def reset_router!
-        @router = HttpRouter.new
+        router.reset!
+        recognition_router.reset!
+      end
+
+      def recognize_path(path)
+        if response = @recognition_router.recognize(Rack::MockRequest.env_for(path))
+          [response.path.route.named, response.params]
+        end
       end
 
       ##
@@ -277,11 +288,6 @@ module Padrino
         route('HEAD', path, *args, &block)
       end
 
-      def put(path, *args, &bk);    route 'PUT',    path, *args, &bk end
-      def post(path, *args, &bk);   route 'POST',   path, *args, &bk end
-      def delete(path, *args, &bk); route 'DELETE', path, *args, &bk end
-      def head(path, *args, &bk);   route 'HEAD',   path, *args, &bk end
-
       private
         # Parse params from the url method
         def value_to_param(value)
@@ -382,6 +388,8 @@ module Padrino
             end
           end
 
+          recognition_router.add(path).name(name).to(name)
+
           # Add Sinatra conditions
           options.each { |option, args|
             if route.respond_to?(option)
@@ -432,6 +440,7 @@ module Padrino
                   # Now we can eval route, but because we have "throw halt" we need to be
                   # (en)sure to reset old layout and run controller after filters.
                   begin
+                    @route = route
                     @_response_buffer = catch(:halt) { route_eval(&block) }
                     processed = true
                   ensure
@@ -513,7 +522,7 @@ module Padrino
             path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
 
             # Small reformats
-            path.gsub!(%r{/\?$}, '(/)')                 # Remove index path
+            path.gsub!(%r{/\?$}, '(/)')                    # Remove index path
             path.gsub!(%r{/?index/?}, '/')                 # Remove index path
             path.gsub!(%r{//$}, '/')                       # Remove index path
             path[0,0] = "/" unless path =~ %r{^\(?/}       # Paths must start with a /
@@ -650,6 +659,19 @@ module Padrino
       end
       alias :url_for :url
 
+      def recognize_path(path)
+        self.class.recognize_path(path)
+      end
+
+      def current_path(*path_params)
+        if path_params.last.is_a?(Hash)
+          path_params[-1] = params.merge(path_params[-1])
+        else
+          path_params << params
+        end
+        @route.url(*path_params)
+      end
+
       ##
       # This is mostly just a helper so request.path_info isn't changed when
       # serving files from the public directory

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

@@ -2,13 +2,8 @@ module Padrino
   ##
   # This module extend Sinatra::ShowExceptions adding Padrino as "Framework"
   #
-  module ShowExceptions
-
-    def self.included(base)
-      base.alias_method_chain :frame_class, :padrino
-    end
-
-    def frame_class_with_padrino(frame)
+  class ShowExceptions < Sinatra::ShowExceptions
+    def frame_class(frame)
       if frame.filename =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/
         "framework"
       elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
@@ -20,6 +15,4 @@ module Padrino
       end
     end
   end # ShowExceptions
-end # Padrino
-
-Sinatra::ShowExceptions.send(:include, Padrino::ShowExceptions)
+end # Padrino

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

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../tasks')
 require 'rake'
+require 'securerandom' unless defined?(SecureRandom)
 Rake.application.instance_variable_set(:@rakefile, __FILE__)
 
 module PadrinoTasks
@@ -30,7 +31,7 @@ end
 
 desc "Generate a secret key"
 task :secret do
-  shell.say '%x' % rand(2**255)
+  shell.say SecureRandom.hex(32)
 end
 
 # lists all routes of a given app

data/lib/padrino-core/logger.rb

@@ -68,7 +68,7 @@ module Padrino
     #
     # ==== Examples
     #
-    #   Padrino::Logger::Config[:development] = { :log_level => :debug, :to_file }
+    #   Padrino::Logger::Config[:development] = { :log_level => :debug, :stream => :to_file }
     #   # or you can edit our defaults
     #   Padrino::Logger::Config[:development][:log_level] = :error
     #   # or you can use your stream
@@ -284,6 +284,7 @@ module Padrino
       end
 
       def call(env)
+        env['rack.logger'] = Padrino.logger
         began_at = Time.now
         status, header, body = @app.call(env)
         log(env, status, header, began_at)

data/lib/padrino-core/reloader.rb

@@ -214,7 +214,7 @@ module Padrino
           files  = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten.uniq
 
           files.map { |file|
-            next if Padrino::Reloader.exclude.any? { |base| file =~ /^#{base}/ }
+            next if Padrino::Reloader.exclude.any? { |base| file =~ /^#{Regexp.escape(base)}/ }
 
             found, stat = figure_path(file, paths)
             next unless found && stat && mtime = stat.mtime

data/lib/padrino-core/support_lite.rb

@@ -3,11 +3,12 @@
 #
 # Why use ActiveSupport and not our own library or extlib?
 #
-# 1) Rewriting custom method extensions needed (i.e string inflectors) is not a good use of time.
+# 1) Rewriting custom method extensions required (i.e string inflectors) is not a good use of time.
 # 2) Loading custom method extensions or separate gems would conflict with AS when AR or MM has been loaded.
 # 3) Datamapper 1.0 supports ActiveSupport 3.0 and no longer requires extlib.
 #
 
+# ActiveSupport Required Extensions
 require 'active_support/core_ext/string/conversions' unless String.method_defined?(:to_date)
 require 'active_support/core_ext/kernel'             unless Kernel.method_defined?(:silence_warnings)
 require 'active_support/core_ext/module'             unless Module.method_defined?(:alias_method_chain)
@@ -23,6 +24,7 @@ require 'active_support/inflector'                   unless String.method_define
 require 'active_support/core_ext/float/rounding'     unless Float.method_defined?(:round)
 require 'active_support/option_merger'               unless defined?(ActiveSupport::OptionMerger)
 
+# Loads symbol to proc extensions
 begin
   require 'active_support/core_ext/symbol'
 rescue LoadError
@@ -58,7 +60,7 @@ if defined?(ActiveSupport::CoreExtensions::Hash) && !Hash.method_defined?(:slice
 end
 
 ##
-# Used to know if this file was required
+# Used to know if this file has already been required
 #
 module SupportLite; end unless defined?(SupportLite)
 
@@ -106,7 +108,12 @@ class FileSet
   end
 end unless defined?(FileSet)
 
+# YAML Engine Parsing Fix
+# https://github.com/padrino/padrino-framework/issues/424
+require 'yaml' unless defined?(YAML)
+YAML::ENGINE.yamler = "syck" if defined?(YAML::ENGINE)
+
 ##
-# Loads our locales configuration files
+# Loads our locale configuration files
 #
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.26' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.27' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("tilt", "~> 1.3.0")
-  s.add_dependency("sinatra", "~> 1.2.3")
+  s.add_dependency("sinatra", "~> 1.2.6")
   s.add_dependency("http_router", "~> 0.7.5")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")

data/test/test_application.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class PadrinoTestApp < Padrino::Application; end
+class PadrinoTestApp2 < Padrino::Application; end
 
 class TestApplication < Test::Unit::TestCase
   def setup
@@ -20,8 +21,11 @@ class TestApplication < Test::Unit::TestCase
       assert_equal Padrino.root("views"), PadrinoTestApp.views
       assert PadrinoTestApp.raise_errors
       assert !PadrinoTestApp.logging
-      assert PadrinoTestApp.padrino_logging
       assert !PadrinoTestApp.sessions
+      assert !PadrinoTestApp.dump_errors
+      assert !PadrinoTestApp.show_exceptions
+      assert PadrinoTestApp.raise_errors
+      assert !Padrino.configure_apps
     end
 
     should 'check padrino specific options' do
@@ -34,6 +38,29 @@ class TestApplication < Test::Unit::TestCase
       assert !PadrinoTestApp.flash
     end
 
+    should 'set global project settings' do
+      Padrino.configure_apps { enable :sessions; set :foo, "bar" }
+      PadrinoTestApp.send(:default_configuration!)
+      PadrinoTestApp2.send(:default_configuration!)
+      assert PadrinoTestApp.sessions, "should have sessions enabled"
+      assert_equal "bar", PadrinoTestApp.settings.foo, "should have foo assigned"
+      assert_equal PadrinoTestApp.session_secret, PadrinoTestApp2.session_secret
+    end
+
+    should "have shared sessions accessible in project" do
+      Padrino.configure_apps { enable :sessions; set :session_secret, 'secret' }
+      Padrino.mount("PadrinoTestApp").to("/write")
+      Padrino.mount("PadrinoTestApp2").to("/read")
+      PadrinoTestApp.tap { |app| app.send(:default_configuration!)
+        app.get("/") { session[:foo] = "shared" } }
+      PadrinoTestApp2.tap { |app| app.send(:default_configuration!)
+        app.get("/") { session[:foo] } }
+      browser = Rack::Test::Session.new(Rack::MockSession.new(Padrino.application))
+      browser.get '/write'
+      browser.get '/read'
+      assert_equal 'shared', browser.last_response.body
+    end
+
     # compare to: test_routing: allow global provides
     should "set content_type to :html if none can be determined" do
       mock_app do
@@ -50,6 +77,7 @@ class TestApplication < Test::Unit::TestCase
 
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
       assert_equal "Foo in html", body
-    end
-  end
-end
+    end # content_type to :html
+  end # application functionality
+
+end

data/test/test_core.rb

@@ -16,8 +16,10 @@ class TestCore < Test::Unit::TestCase
       assert_respond_to Padrino, :reload!
       assert_respond_to Padrino, :version
       assert_respond_to Padrino, :bundle
+      assert_respond_to Padrino, :configure_apps
     end
 
+
     should 'validate global helpers' do
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
@@ -60,4 +62,4 @@ class TestCore < Test::Unit::TestCase
       assert_equal "yes", res["Middleware-Called"]
     end
   end
-end
+end

data/test/test_logger.rb

@@ -55,7 +55,10 @@ class TestPadrinoLogger < Test::Unit::TestCase
     end
 
     should 'log an application' do
-      mock_app { get("/"){ "Foo" } }
+      mock_app do
+        enable :logging
+        get("/"){ "Foo" }
+      end
       get "/"
       assert_equal "Foo", body
       assert_match /GET/, Padrino.logger.log.string
@@ -63,7 +66,10 @@ class TestPadrinoLogger < Test::Unit::TestCase
 
     context "static asset logging" do
       should 'not log static assets by default' do
-        mock_app { get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" } }
+        mock_app do
+          enable :logging
+          get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" }
+        end
         get "/images/something.png"
         assert_equal "Foo", body
         assert_match "", Padrino.logger.log.string
@@ -71,7 +77,10 @@ class TestPadrinoLogger < Test::Unit::TestCase
 
       should 'allow turning on static assets logging' do
         Padrino.logger.instance_eval{ @log_static = true }
-        mock_app { get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" } }
+        mock_app do
+          enable :logging
+          get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" }
+        end
         get "/images/something.png"
         assert_equal "Foo", body
         assert_match /GET/, Padrino.logger.log.string
@@ -79,4 +88,4 @@ class TestPadrinoLogger < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_reloader_simple.rb

@@ -78,7 +78,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
       assert_equal 1, @app.errors.size
       assert_equal 1, @app.filters[:after].size
-      assert_equal 2, @app.middleware.size # [Padrino::Logger::Rack, Padrino::Reloader::Rack]
+      assert_equal 1, @app.middleware.size # [Padrino::Reloader::Rack]
       assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
       assert_equal 2, @app.extensions.size # [Padrino::Routing, Padrino::Rendering]
       assert_equal 0, @app.templates.size
@@ -88,7 +88,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
       assert_equal 1, @app.errors.size
       assert_equal 1, @app.filters[:after].size
-      assert_equal 2, @app.middleware.size # only logger Padrino::Logger::Rack
+      assert_equal 1, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2
       assert_equal 2, @app.extensions.size # [Padrino::Routing, Padrino::Rendering]
       assert_equal 0, @app.templates.size

data/test/test_routing.rb

@@ -1355,7 +1355,7 @@ class TestRouting < Test::Unit::TestCase
     mock_app { set :environment, :development }
     get "/"
     assert_equal 404, status
-    assert_match /Sinatra doesn\'t know this ditty./, body
+    assert_match /Sinatra doesn&rsquo;t know this ditty./, body
   end
 
   should 'render a custom NotFound page' do
@@ -1375,4 +1375,44 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 404, status
     assert_match /not found/, body
   end
+
+  should 'recognize paths' do
+    mock_app do
+      controller :foo do
+        get(:bar, :map => "/my/:id/custom-route") { }
+      end
+      get(:simple, :map => "/simple/:id") { }
+      get(:with_format, :with => :id, :provides => :js) { }
+    end
+    assert_equal [:foo_bar, { :id => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
+    assert_equal [:foo_bar, { :id => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
+    assert_equal [:simple, { :id => "bar" }], @app.recognize_path(@app.url(:simple, :id => "bar"))
+    assert_equal [:simple, { :id => "true" }], @app.recognize_path(@app.url(:simple, :id => true))
+    assert_equal [:simple, { :id => "9" }], @app.recognize_path(@app.url(:simple, :id => 9))
+    assert_equal [:with_format, { :id => "bar", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => "bar", :format => :js))
+    assert_equal [:with_format, { :id => "true", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => true, :format => "js"))
+    assert_equal [:with_format, { :id => "9", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
+  end
+
+  should 'have current_path' do
+    mock_app do
+      controller :foo do
+        get :bar, :map => "/paginate/:page" do
+          current_path
+        end
+      end
+    end
+    get @app.url(:foo, :bar, :page => 10)
+    assert_equal "/paginate/10", body
+  end
+
+  should 'change params in current_path' do
+    mock_app do
+      get :index, :map => "/paginate/:page" do
+        current_path(:page => 66)
+      end
+    end
+    get @app.url(:index, :page => 10)
+    assert_equal "/paginate/66", body
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 9
-  - 26
-  version: 0.9.26
+  - 27
+  version: 0.9.27
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 6
+        version: 1.2.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency