padrino-core 0.9.28 → 0.9.29

data/lib/padrino-core/server.rb

@@ -1,5 +1,4 @@
 module Padrino
-
   ##
   # Run the Padrino apps as a self-hosted server using:
   # thin, mongrel, webrick in that order.
@@ -11,64 +10,61 @@ module Padrino
   #
   def self.run!(options={})
     Padrino.load!
-    Server.build(options)
+    Server.start(Padrino.application, options)
   end
 
   ##
   # This module build a Padrino server
   #
-  module Server
-
-    class LoadError < RuntimeError; end
-
-    Handlers = %w[thin mongrel webrick] unless const_defined?(:Handlers)
+  class Server < Rack::Server
+    # Server Handlers
+    Handlers = [:thin, :mongrel, :webrick]
 
-    private
-      def self.build(options={})
-        host    = options[:host] || "localhost"
-        port    = options[:port] || 3000
-        adapter = options[:adapter]
+    def self.start(app, opts={})
+      options = {}.merge(opts) # We use a standard hash instead of Thor::CoreExt::HashWithIndifferentAccess
+      options.symbolize_keys!
+      options[:Host] = options.delete(:host)
+      options[:Port] = options.delete(:port)
+      options[:AccessLog] = []
+      if options[:daemonize]
+        options[:pid] = options[:pid].blank? ? File.expand_path('tmp/pids/server.pid') : opts[:pid]
+        FileUtils.mkdir_p(File.dirname(options[:pid]))
+      end
+      options[:server] = detect_rack_handler if options[:server].blank?
+      new(options, app).start
+    end
 
-        handler_name = adapter ? adapter.to_s.capitalize : detect_handler.name.gsub(/.*::/, '')
+    def initialize(options, app)
+      @options, @app = options, app
+    end
 
-        begin
-          handler = Rack::Handler.get(handler_name.downcase)
-        rescue
-          raise LoadError, "#{handler_name} not supported yet, available adapters are: #{Handlers.inspect}"
-          exit
-        end
+    def start
+      puts "=> Padrino/#{Padrino.version} has taken the stage #{Padrino.env} at http://#{options[:Host]}:#{options[:Port]}"
+      [:INT, :TERM].each { |sig| trap(sig) { exit } }
+      super
+    ensure
+      puts "<= Padrino has ended his set (crowd applauds)" unless options[:daemonize]
+    end
 
-        puts "=> Padrino/#{Padrino.version} has taken the stage #{Padrino.env} on #{port}"
+    def app
+      @app
+    end
+    alias :wrapped_app :app
 
-        handler.run Padrino.application, :Host => host, :Port => port do |server|
-          trap(:INT) do
-            # Use thins' hard #stop! if available, otherwise just #stop
-            server.respond_to?(:stop!) ? server.stop! : server.stop
-            puts "<= Padrino has ended his set (crowd applauds)"
-          end
-        end
-      rescue RuntimeError => e
-        if e.message =~ /no acceptor/
-          if port < 1024 && RUBY_PLATFORM !~ /mswin|win|mingw/ && Process.uid != 0
-            puts "=> Only root may open a priviledged port #{port}!"
-          else
-            puts "=> Someone is already performing on port #{port}!"
-          end
-        else
-          raise e
-        end
-      rescue Errno::EADDRINUSE
-        puts "=> Someone is already performing on port #{port}!"
-      end
+    def options
+      @options
+    end
 
-      def self.detect_handler
-        Handlers.each do |server_name|
+    private
+      def self.detect_rack_handler
+        Handlers.each do |handler|
           begin
-            return Rack::Handler.get(server_name.downcase)
-          rescue Exception
+            return handler if Rack::Handler.get(handler.to_s.downcase)
+          rescue LoadError
+          rescue NameError
           end
         end
-        raise LoadError, "Server handler (#{servers.join(',')}) not found."
+        fail "Server handler (#{Handlers.join(', ')}) not found."
       end
   end # Server
 end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -1,95 +1,41 @@
 ##
 # This file loads certain extensions required by Padrino from ActiveSupport.
 #
-# Why use ActiveSupport and not our own library or extlib?
-#
-# 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)
+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)
 require 'active_support/core_ext/class/attribute_accessors' unless Class.method_defined?(:cattr_reader)
-require 'active_support/core_ext/hash/keys'          unless Hash.method_defined?(:symbolize_keys!)
-require 'active_support/core_ext/hash/deep_merge'    unless Hash.method_defined?(:deep_merge)
-require 'active_support/core_ext/hash/reverse_merge' unless Hash.method_defined?(:reverse_merge)
-require 'active_support/core_ext/hash/slice'         unless Hash.method_defined?(:slice)
-require 'active_support/core_ext/object/blank'       unless Object.method_defined?(:present?)
-require 'active_support/core_ext/array'              unless Array.method_defined?(:from)
-require 'active_support/ordered_hash'                unless defined?(ActiveSupport::OrderedHash)
-require 'active_support/inflector'                   unless String.method_defined?(:humanize)
-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
-  # AS 3.0 has been removed it because is now available in Ruby > 1.8.7 but we want keep Ruby 1.8.6 support.
-  class Symbol
-    # Turns the symbol into a simple proc, which is especially useful for enumerations like: people.map(&:name)
-    def to_proc
-      Proc.new { |*args| args.shift.__send__(self, *args) }
-    end
-  end unless :to_proc.respond_to?(:to_proc)
-end
-
-# On ActiveSupport < 3.0.0 this is called misc
-begin
-  require 'active_support/core_ext/object/with_options'
-rescue LoadError
-  require 'active_support/core_ext/object/misc'
-end unless Object.method_defined?(:with_options)
-
-if defined?(ActiveSupport::CoreExtensions::Hash) && !Hash.method_defined?(:slice)
-  # This mean that we are using AS 2.3.x
-  class Hash
-    include ActiveSupport::CoreExtensions::Hash::Keys
-    include ActiveSupport::CoreExtensions::Hash::DeepMerge
-    include ActiveSupport::CoreExtensions::Hash::ReverseMerge
-    include ActiveSupport::CoreExtensions::Hash::Slice
-
-    def ordered_collect(&block)
-      keys = self.stringify_keys.keys.sort
-      keys.map { |key| block.call(key, self[key.to_sym]) }
-    end
-  end
-end
+require 'active_support/core_ext/hash/keys'                 unless Hash.method_defined?(:symbolize_keys!)
+require 'active_support/core_ext/hash/deep_merge'           unless Hash.method_defined?(:deep_merge)
+require 'active_support/core_ext/hash/reverse_merge'        unless Hash.method_defined?(:reverse_merge)
+require 'active_support/core_ext/hash/slice'                unless Hash.method_defined?(:slice)
+require 'active_support/core_ext/object/blank'              unless Object.method_defined?(:present?)
+require 'active_support/core_ext/array'                     unless Array.method_defined?(:from)
+require 'active_support/ordered_hash'                       unless defined?(ActiveSupport::OrderedHash)
+require 'active_support/inflector'                          unless String.method_defined?(:humanize)
+require 'active_support/core_ext/float/rounding'            unless Float.method_defined?(:round)
+require 'active_support/option_merger'                      unless defined?(ActiveSupport::OptionMerger)
+require 'active_support/core_ext/object/with_options'       unless Object.method_defined?(:with_options)
 
 ##
 # Used to know if this file has already been required
 #
-module SupportLite; end unless defined?(SupportLite)
+module SupportLite; end
 
 module ObjectSpace
   class << self
     # Returns all the classes in the object space.
     def classes
-      klasses = []
-      ObjectSpace.each_object(Class)  { |o| klasses << o }
-      klasses
+      ObjectSpace.each_object(Module).select do |klass|
+        Class.class_eval { klass } rescue false
+      end
     end
   end
-end unless ObjectSpace.respond_to?(:classes)
-
-class Object
-  def full_const_get(name)
-    list = name.split("::")
-    list.shift if list.first.blank?
-    obj = self
-    list.each do |x|
-      # This is required because const_get tries to look for constants in the
-      # ancestor chain, but we only want constants that are HERE
-      obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
-    end
-    obj
-  end
-end unless Object.method_defined?(:full_const_get)
+end
 
+##
 # FileSet helper method for iterating and interacting with files inside a directory
+#
 class FileSet
   # Iterates over every file in the glob pattern and yields to a block
   # Returns the list of files matching the glob pattern
@@ -106,10 +52,12 @@ class FileSet
   def self.glob_require(glob_pattern, file_path=nil)
     self.glob(glob_pattern, file_path) { |f| require f }
   end
-end unless defined?(FileSet)
+end
 
+##
 # 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)
 

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -20,10 +20,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
+
+  # TODO remove after a couple versions
+  s.post_install_message = "\e[32m  When upgrading, please 'enable :sessions' for each application"
+  s.post_install_message << " as shown here:\e[0m http://bit.ly/kODKMx"
+
   s.add_dependency("tilt", "~> 1.3.0")
   s.add_dependency("sinatra", "~> 1.2.6")
-  s.add_dependency("http_router", "~> 0.7.5")
+  s.add_dependency("http_router", "~> 0.7.8")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
-  s.add_dependency("tzinfo")
 end

data/test/fixtures/apps/simple.rb

@@ -14,7 +14,7 @@ end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 4!' # Change only the number!!!
+    'The magick number is: 72!' # Change only the number!!!
   end
 
   get "/rand" do

data/test/test_application.rb

@@ -5,7 +5,7 @@ class PadrinoTestApp2 < Padrino::Application; end
 
 class TestApplication < Test::Unit::TestCase
   def setup
-    Padrino.mounted_apps.clear
+    Padrino.clear!
   end
 
   def teardown

data/test/test_core.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestCore < Test::Unit::TestCase
-  def teardown
-    Padrino.clear_middleware!
+  def setup
+    Padrino.clear!
   end
 
   context 'for core functionality' do
@@ -31,6 +31,9 @@ class TestCore < Test::Unit::TestCase
       Padrino.set_encoding
       if RUBY_VERSION <'1.9'
         assert_equal 'UTF8', $KCODE
+      else
+        assert_equal Encoding.default_external, Encoding::UTF_8
+        assert_equal Encoding.default_internal, Encoding::UTF_8
       end
     end
 
@@ -39,10 +42,18 @@ class TestCore < Test::Unit::TestCase
     end
 
     should 'raise application error if I instantiate a new padrino application without mounted apps' do
-      Padrino.mounted_apps.clear
       assert_raise(Padrino::ApplicationLoadError) { Padrino.application.new }
     end
 
+    should "check before/after padrino load hooks" do
+      Padrino.before_load { @_foo  = 1 }
+      Padrino.after_load  { @_foo += 1 }
+      Padrino.load!
+      assert_equal 1, Padrino.before_load.size
+      assert_equal 1, Padrino.after_load.size
+      assert_equal 2, @_foo
+    end
+
     should "add middlewares in front if specified" do
       test = Class.new {
         def initialize(app)
@@ -56,10 +67,13 @@ class TestCore < Test::Unit::TestCase
         end
       }
 
+      class Foo < Padrino::Application; end
+
       Padrino.use(test)
+      Padrino.mount(Foo).to("/")
 
       res = Rack::MockRequest.new(Padrino.application).get("/")
       assert_equal "yes", res["Middleware-Called"]
     end
   end
-end
+end

data/test/test_mounter.rb

@@ -4,7 +4,7 @@ class TestMounter < Test::Unit::TestCase
 
   def setup
     $VERBOSE, @_verbose_was = nil, $VERBOSE
-    Padrino.mounted_apps.clear
+    Padrino.clear!
   end
 
   def teardown

data/test/test_reloader_complex.rb

@@ -6,7 +6,7 @@ class TestComplexReloader < Test::Unit::TestCase
   context 'for complex reload functionality' do
 
     should 'correctly instantiate Complex(1-2)Demo fixture' do
-      Padrino.mounted_apps.clear
+      Padrino.clear!
       Padrino.mount("complex_1_demo").to("/complex_1_demo")
       Padrino.mount("complex_2_demo").to("/complex_2_demo")
       assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.map(&:uri_root)
@@ -36,7 +36,7 @@ class TestComplexReloader < Test::Unit::TestCase
       get "/complex_2_demo/old"
       assert_equal 200, status
 
-      new_phrase = "The magick number is: #{rand(100)}!"
+      new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(Complex1Demo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
       begin

data/test/test_reloader_simple.rb

@@ -45,7 +45,7 @@ class TestSimpleReloader < Test::Unit::TestCase
   context 'for simple reload functionality' do
 
     should 'correctly instantiate SimpleDemo fixture' do
-      Padrino.mounted_apps.clear
+      Padrino.clear!
       Padrino.mount("simple_demo").to("/")
       assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
       assert SimpleDemo.reload?
@@ -56,7 +56,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       @app = SimpleDemo
       get "/"
       assert ok?
-      new_phrase = "The magick number is: #{rand(100)}!"
+      new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(SimpleDemo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
       File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }

data/test/test_rendering.rb

@@ -204,6 +204,36 @@ class TestRendering < Test::Unit::TestCase
       assert_equal "3", body
     end
 
+    should "support passing locals into render" do
+      create_layout :application, "layout <%= yield %>"
+      create_view :index, "<%= foo %>"
+      mock_app do
+        get("/") { render "index", { :layout => true }, { :foo => "bar" } }
+      end
+      get "/"
+      assert_equal "layout bar", body
+    end
+
+    should "support passing locals into sinatra render" do
+      create_layout :application, "layout <%= yield %>"
+      create_view :index, "<%= foo %>"
+      mock_app do
+        get("/") { render :erb, :index, { :layout => true }, { :foo => "bar" } }
+      end
+      get "/"
+      assert_equal "layout bar", body
+    end
+
+    should "support passing locals into special nil engine render" do
+      create_layout :application, "layout <%= yield %>"
+      create_view :index, "<%= foo %>"
+      mock_app do
+        get("/") { render nil, :index, { :layout => true }, { :foo => "bar" } }
+      end
+      get "/"
+      assert_equal "layout bar", body
+    end
+
     should 'be compatible with sinatra views' do
       with_view :index, "<%= 1+2 %>" do
         mock_app do

data/test/test_router.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/simple')
 
 class TestRouter < Test::Unit::TestCase
 
+  def setup
+    Padrino.clear!
+  end
+
   should "dispatch paths correctly" do
     app = lambda { |env|
       [200, {
@@ -104,7 +108,6 @@ class TestRouter < Test::Unit::TestCase
   end
 
   should "works with padrino core applications" do
-    Padrino.mounted_apps.clear
     Padrino.mount("simple_demo").host("padrino.org")
     assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
     assert_equal ["padrino.org"], Padrino.mounted_apps.map(&:app_host)
@@ -120,7 +123,6 @@ class TestRouter < Test::Unit::TestCase
   end
 
   should "works with padrino applications" do
-    Padrino.mounted_apps.clear
     Padrino.mount("simple_demo").to("/foo").host(/.*\.padrino.org/)
 
     res = Rack::MockRequest.new(Padrino.application).get("/")