padrino-core 0.12.2 → 0.12.3

data/lib/padrino-core/reloader.rb

@@ -87,7 +87,7 @@ module Padrino
       began_at = Time.now
       file     = figure_path(file)
       return unless options[:force] || file_changed?(file)
-      return require(file) if external_feature?(file)
+      return require(file) if feature_excluded?(file)
 
       Storage.prepare(file) # might call #safe_load recursively
       logger.devel(file_new?(file) ? :loading : :reload, began_at, file)
@@ -95,13 +95,13 @@ module Padrino
         with_silence{ require(file) }
         Storage.commit(file)
         update_modification_time(file)
-      rescue Exception => e
+      rescue Exception => exception
         unless options[:cyclic]
-          logger.exception e, :short
+          logger.exception exception, :short
           logger.error "Failed to load #{file}; removing partially defined constants"
         end
         Storage.rollback(file)
-        raise e
+        raise
       end
     end
 
@@ -121,7 +121,7 @@ module Padrino
     # Remove a feature from $LOADED_FEATURES so it can be required again.
     #
     def remove_feature(file)
-      $LOADED_FEATURES.delete(file) unless external_feature?(file)
+      $LOADED_FEATURES.delete(file) unless feature_excluded?(file)
     end
 
     ##
@@ -156,7 +156,7 @@ module Padrino
     # Reloads the file if it's special. For now it's only I18n locale files.
     #
     def reload_special(file)
-      return unless special_files.any?{ |f| File.identical?(f, file) }
+      return unless special_files.any?{ |special_file| File.identical?(special_file, file) }
       if defined?(I18n)
         began_at = Time.now
         I18n.reload!
@@ -171,14 +171,14 @@ module Padrino
     #
     def reload_regular(file)
       apps = mounted_apps_of(file)
-      if apps.present?
-        apps.each { |app| app.app_obj.reload! }
-        update_modification_time(file)
-      else
+      if apps.empty?
         reloadable_apps.each do |app|
           app.app_obj.reload! if app.app_obj.dependencies.include?(file)
         end
         safe_load(file)
+      else
+        apps.each { |app| app.app_obj.reload! }
+        update_modification_time(file)
       end
     end
 
@@ -203,14 +203,6 @@ module Padrino
       MTIMES[file].nil?
     end
 
-    ##
-    # Return the mounted_apps providing the app location.
-    # Can be an array because in one app.rb we can define multiple Padrino::Application.
-    #
-    def mounted_apps_of(file)
-      Padrino.mounted_apps.select { |app| File.identical?(file, app.app_file) }
-    end
-
     ##
     # Searches Ruby files in your +Padrino.load_paths+ , Padrino::Application.load_paths
     # and monitors them for any changes.
@@ -229,25 +221,73 @@ module Padrino
     #
     def files_for_rotation
       files = Set.new
-      Padrino.load_paths.each{ |path| files += Dir.glob("#{path}/**/*.rb") }
+      files += Dir.glob("#{Padrino.root}/{lib,models,shared}/**/*.rb")
       reloadable_apps.each do |app|
         files << app.app_file
+        files += Dir.glob(app.app_obj.prerequisites)
         files += app.app_obj.dependencies
       end
       files + special_files
     end
 
     ##
-    # Tells if a feature is internal or external for Padrino project.
+    # Tells if a feature should be excluded from Reloader tracking.
     #
-    def external_feature?(file)
-      !file.start_with?(Padrino.root)
+    def feature_excluded?(file)
+      !file.start_with?(Padrino.root) || exclude.any?{ |excluded_path| file.start_with?(excluded_path) }
     end
 
+    ##
+    # Tells if a constant should be excluded from Reloader routines.
+    #
     def constant_excluded?(const)
-      (exclude_constants - include_constants).any?{ |c| const._orig_klass_name.start_with?(c) }
+      external_constant?(const) || (exclude_constants - include_constants).any?{ |excluded_constant| const._orig_klass_name.start_with?(excluded_constant) }
+    end
+
+    ##
+    # Tells if a constant is defined only outside of Padrino project path.
+    # If a constant has any methods defined inside of the project path it's
+    # considered internal and will be included in further testing.
+    #
+    def external_constant?(const)
+      sources = object_sources(const)
+      begin
+        if sample = ObjectSpace.each_object(const).first
+          sources += object_sources(sample)
+        end
+      rescue RuntimeError => error # JRuby 1.7.12 fails to ObjectSpace.each_object
+        raise unless RUBY_PLATFORM =='java' && error.message.start_with?("ObjectSpace is disabled")
+      end
+      !sources.any?{ |source| source.start_with?(Padrino.root) }
+    end
+
+    ##
+    # Gets all the sources in which target's class or instance methods are defined.
+    #
+    # Note: Method#source_location is for Ruby 1.9.3+ only.
+    #
+    def object_sources(target)
+      sources = Set.new
+      target.methods.each do |method_name|
+        method_object = target.method(method_name)
+        if method_object.owner == (target.class == Class ? target.singleton_class : target.class)
+          sources << method_object.source_location.first
+        end
+      end
+      sources
     end
 
+    ##
+    # Return the mounted_apps providing the app location.
+    # Can be an array because in one app.rb we can define multiple Padrino::Application.
+    #
+    def mounted_apps_of(file)
+      Padrino.mounted_apps.select { |app| File.identical?(file, app.app_file) }
+    end
+
+    ##
+    # Return the apps that allow reloading.
+    #
     def reloadable_apps
       Padrino.mounted_apps.select{ |app| app.app_obj.respond_to?(:reload) && app.app_obj.reload? }
     end

data/lib/padrino-core/server.rb

@@ -57,7 +57,9 @@ module Padrino
     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
+      super do |server|
+        server.threaded = true if server.respond_to?(:threaded=)
+      end
     ensure
       puts "<= Padrino leaves the gun, takes the cannoli" unless options[:daemonize]
     end

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     s.add_dependency("sinatra", "~> 1.4.2")
   end
   s.add_dependency("http_router", "~> 0.11.0")
-  s.add_dependency("thor", "~> 0.18.0")
+  s.add_dependency("thor", "~> 0.18")
   s.add_dependency("activesupport", ">= 3.1")
   s.add_dependency("rack-protection", ">= 1.5.0")
 end

data/test/fixtures/apps/helpers/class_methods_helpers.rb

@@ -0,0 +1,4 @@
+begin
+  require '/tmp/padrino_class_demo'
+rescue LoadError
+end

data/test/fixtures/apps/helpers/instance_methods_helpers.rb

@@ -0,0 +1,4 @@
+begin
+  require '/tmp/padrino_instance_demo'
+rescue LoadError
+end

data/test/fixtures/apps/system_class_methods_demo.rb

@@ -0,0 +1,7 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class SystemClassMethodsDemo < Padrino::Application
+  set :reload, true
+end
+
+Padrino.load!

data/test/fixtures/apps/system_instance_methods_demo.rb

@@ -0,0 +1,7 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class SystemInstanceMethodsDemo < Padrino::Application
+  set :reload, true
+end
+
+Padrino.load!

data/test/test_core.rb

@@ -30,6 +30,7 @@ describe "Core" do
     end
 
     it 'should have load paths' do
+    skip
       assert_equal [Padrino.root('lib'), Padrino.root('models'), Padrino.root('shared')], Padrino.load_paths
     end
 

data/test/test_logger.rb

@@ -2,9 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'logger'
 
 describe "PadrinoLogger" do
+  before do
+    @save_config = Padrino::Logger::Config[:test].dup
+    Padrino::Logger::Config[:test][:stream] = :null
+    Padrino::Logger.setup!
+  end
 
-  def setup
-    Padrino::Logger::Config[:test][:stream] = :null # The default
+  after do
+    Padrino::Logger::Config[:test] = @save_config
     Padrino::Logger.setup!
   end
 
@@ -14,9 +19,7 @@ describe "PadrinoLogger" do
   end
 
   describe 'for logger functionality' do
-
     describe 'check stream config' do
-
       it 'should use stdout if stream is nil' do
         Padrino::Logger::Config[:test][:stream] = nil
         Padrino::Logger.setup!
@@ -116,6 +119,7 @@ describe "PadrinoLogger" do
         access_to_mock_app
         assert_match /\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string
       end
+
       it 'should not output over debug level' do
         Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:info] }
         access_to_mock_app
@@ -141,13 +145,17 @@ describe "alternate logger" do
     end
   end
 
-  def setup_logger
+  before do
+    @save_logger = Padrino.logger
     @log = StringIO.new
     Padrino.logger = FancyLogger.new(@log)
   end
 
+  after do
+    Padrino.logger = @save_logger
+  end
+
   it 'should annotate the logger to support additional Padrino fancyness' do
-    setup_logger
     Padrino.logger.debug("Debug message")
     assert_match(/Debug message/, @log.string)
     Padrino.logger.exception(Exception.new 'scary message')
@@ -155,7 +163,6 @@ describe "alternate logger" do
   end
 
   it 'should colorize log output after colorize! is called' do
-    setup_logger
     Padrino.logger.colorize!
 
     mock_app do
@@ -169,19 +176,22 @@ describe "alternate logger" do
 end
 
 describe "alternate logger: stdlib logger" do
-  def setup_logger
+  before do
     @log = StringIO.new
+    @save_logger = Padrino.logger
     Padrino.logger = Logger.new(@log)
   end
 
+  after do
+    Padrino.logger = @save_logger
+  end
+
   it 'should annotate the logger to support additional Padrino fancyness' do
-    setup_logger
     Padrino.logger.debug("Debug message")
     assert_match(/Debug message/, @log.string)
   end
 
   it 'should colorize log output after colorize! is called' do
-    setup_logger
     Padrino.logger.colorize!
 
     mock_app do
@@ -202,7 +212,22 @@ describe "options :colorize_logging" do
     end
     get "/"
   end
+
+  before do
+    @save_config = Padrino::Logger::Config[:test].dup
+  end
+
+  after do
+    Padrino::Logger::Config[:test] = @save_config
+    Padrino::Logger.setup!
+  end
+
   describe 'default' do
+    before do
+      Padrino::Logger::Config[:test][:colorize_logging] = true
+      Padrino::Logger.setup!
+    end
+
     it 'should use colorize logging' do
       Padrino::Logger.setup!
 
@@ -210,11 +235,14 @@ describe "options :colorize_logging" do
       assert_match /\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string
     end
   end
+
   describe 'set value is false' do
-    it 'should not use colorize logging' do
+    before do
       Padrino::Logger::Config[:test][:colorize_logging] = false
       Padrino::Logger.setup!
+    end
 
+    it 'should not use colorize logging' do
       access_to_mock_app
       assert_match /200 OK/, Padrino.logger.log.string
     end

data/test/test_reloader_system.rb

@@ -17,6 +17,7 @@ describe "SystemReloader" do
     end
 
     it 'should reload children on parent change' do
+      Padrino.mount(SystemDemo).to("/")
       assert_equal Child.new.family, 'Danes'
       parent_file = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/models/parent.rb')
       new_class = <<-DOC
@@ -46,10 +47,11 @@ describe "SystemReloader" do
     end
 
     it 'should tamper with LOAD_PATH' do
+    skip
       SystemDemo.load_paths.each do |lib_dir|
         assert_includes $LOAD_PATH, lib_dir
       end
-      Padrino.send(:load_paths_was).each do |lib_dir|
+      Padrino.send(:default_load_paths).each do |lib_dir|
         assert_includes $LOAD_PATH, lib_dir
       end
     end
@@ -64,4 +66,58 @@ describe "SystemReloader" do
       Padrino.reload!
     end
   end
+
+  describe 'reloading external constants' do
+    it 'should not touch external constants defining singleton methods' do
+      new_class = <<-DOC
+        class SingletonClassTest
+          def self.external_test
+          end
+        end
+      DOC
+      tmp_file = '/tmp/padrino_class_demo.rb'
+      begin
+        File.open(tmp_file, "w") { |f| f.write(new_class) }
+        Padrino.clear!
+        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system_class_methods_demo.rb')
+        @app = SystemClassMethodsDemo
+        Padrino.mount(SystemClassMethodsDemo).to("/")
+        get '/'
+        assert defined?(SingletonClassTest), 'SingletonClassTest undefined'
+        assert_includes SingletonClassTest.singleton_methods, :external_test
+        FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/helpers/class_methods_helpers.rb')
+        Padrino.reload!
+        assert defined?(SingletonClassTest), 'SingletonClassTest undefined'
+        assert_includes SingletonClassTest.singleton_methods, :external_test
+      ensure
+        FileUtils.rm tmp_file
+      end
+    end
+
+    it 'should not touch external constants defining instance methods' do
+      new_class = <<-DOC
+        class InstanceTest
+          def instance_test
+          end
+        end
+      DOC
+      tmp_file = '/tmp/padrino_instance_demo.rb'
+      begin
+        File.open(tmp_file, "w") { |f| f.write(new_class) }
+        Padrino.clear!
+        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system_instance_methods_demo.rb')
+        @app = SystemInstanceMethodsDemo
+        Padrino.mount(SystemInstanceMethodsDemo).to("/")
+        get '/'
+        assert defined?(InstanceTest), 'InstanceTest undefined'
+        assert_includes InstanceTest.new.methods, :instance_test
+        FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/helpers/instance_methods_helpers.rb')
+        Padrino.reload!
+        assert defined?(InstanceTest), 'InstanceTest undefined'
+        assert_includes InstanceTest.new.methods, :instance_test
+      ensure
+        FileUtils.rm tmp_file
+      end
+    end
+  end
 end

data/test/test_routing.rb

@@ -228,6 +228,10 @@ describe "Routing" do
       get("/old-bar/:id"){ params[:id] }
       post(:mix, :map => "/mix-bar/:id"){ params[:id] }
       get(:mix, :map => "/mix-bar/:id"){ params[:id] }
+      get(:foo, '', :with => :id){ |id| "/#{id}" }
+      post(:foo, '', :with => :id){ |id| "/#{id}" }
+      delete(:drugs, :with => [:id, 'destroy']){ |id| "/drugs/#{id}/destroy" }
+      delete(:drugs, '', :with => [:id, 'destroy']){ |id| "/#{id}/destroy" }
     end
     get "/foo"
     assert_equal "/foo", body
@@ -251,6 +255,14 @@ describe "Routing" do
     assert_equal "4", body
     get "/mix-bar/4"
     assert_equal "4", body
+    get "/123"
+    assert_equal "/123", body
+    post "/123"
+    assert_equal "/123", body
+    delete "/drugs/123/destroy"
+    assert_equal "/drugs/123/destroy", body
+    delete "/123/destroy"
+    assert_equal "/123/destroy", body
   end
 
   it 'should generate url with format' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -124,9 +124,13 @@ files:
 - lib/padrino-core/cli/adapter.rb
 - lib/padrino-core/cli/base.rb
 - lib/padrino-core/cli/console.rb
+- lib/padrino-core/cli/launcher.rb
 - lib/padrino-core/cli/rake.rb
 - lib/padrino-core/cli/rake_tasks.rb
 - lib/padrino-core/command.rb
+- lib/padrino-core/ext/http_router.rb
+- lib/padrino-core/ext/sinatra.rb
+- lib/padrino-core/filter.rb
 - lib/padrino-core/images/404.png
 - lib/padrino-core/images/500.png
 - lib/padrino-core/loader.rb
@@ -149,6 +153,8 @@ files:
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
+- test/fixtures/apps/helpers/class_methods_helpers.rb
+- test/fixtures/apps/helpers/instance_methods_helpers.rb
 - test/fixtures/apps/helpers/support.rb
 - test/fixtures/apps/helpers/system_helpers.rb
 - test/fixtures/apps/kiq.rb
@@ -159,6 +165,8 @@ files:
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
+- test/fixtures/apps/system_class_methods_demo.rb
+- test/fixtures/apps/system_instance_methods_demo.rb
 - test/fixtures/dependencies/a.rb
 - test/fixtures/dependencies/b.rb
 - test/fixtures/dependencies/c.rb
@@ -217,6 +225,8 @@ test_files:
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
+- test/fixtures/apps/helpers/class_methods_helpers.rb
+- test/fixtures/apps/helpers/instance_methods_helpers.rb
 - test/fixtures/apps/helpers/support.rb
 - test/fixtures/apps/helpers/system_helpers.rb
 - test/fixtures/apps/kiq.rb
@@ -227,6 +237,8 @@ test_files:
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
+- test/fixtures/apps/system_class_methods_demo.rb
+- test/fixtures/apps/system_instance_methods_demo.rb
 - test/fixtures/dependencies/a.rb
 - test/fixtures/dependencies/b.rb
 - test/fixtures/dependencies/c.rb