padrino-core 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fabe3c04b7784dac19fe6673af74663794e3477
-  data.tar.gz: 73e8310a4d9f5a9207ed8f19379c492135c28e00
+  metadata.gz: a00a9aa092a6863518b87ff722f5caeecad136f0
+  data.tar.gz: 3a03270ae3055db921d9a65c0ebabfef56307158
 SHA512:
-  metadata.gz: 4d3814cb0118bfdbd1c358b1a0da1e4b66a3a5336ed11316489a43a968cf45821cde9d04708932e25d3d396885b693fd0d4ce60564a82bd5bce9748f3d20c61f
-  data.tar.gz: 08a08b2236f7b41cfabc97bcb0273ec8a4036e99058f137ee0c56b9efb78ae63f52e7cfd3fbcf5237de7dbbbe48341352c0dbdd548c8f4b90ed4c3e695eb5d05
+  metadata.gz: d91332ef20783e0dd5e1580b79e235f8a3435bf98194558f2ac81b87eb1993e80361efefffb5faa514432546ed0607a1d04fc9853368217f555b893362371456
+  data.tar.gz: 7f3a2c369c6c5634e7cef139f5ebfcb210ae0a137c8f7d7f3084a468dabd3f2c264db25b8dbc1b665e40901344e973ef23b9823622cde25eab0d0ecb023a3544

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

@@ -394,7 +394,7 @@ module Padrino
         replace_instance_variable(:@_controller, args)
         replace_instance_variable(:@_defaults, options)
         replace_instance_variable(:@filters, :before => @filters[:before].dup, :after => @filters[:after].dup)
-        replace_instance_variable(:@layout, nil)
+        replace_instance_variable(:@layout, @layout)
 
         yield
 
@@ -715,8 +715,7 @@ module Padrino
           if types.include?(accept_format)
             content_type(accept_format || :html, :charset => 'utf-8')
           else
-            halt 406 unless catch_all
-            false
+            catch_all ? true : halt(406)
           end
         end
       end

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

@@ -1,6 +1,6 @@
 Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
   begin
-    load(file)
+    load(File.expand_path(file))
   rescue LoadError => e
     warn "#{file}: #{e.message}"
   end

data/lib/padrino-core/reloader.rb

@@ -74,7 +74,8 @@ module Padrino
     #
     def lock!
       klasses = ObjectSpace.classes do |klass|
-        klass._orig_klass_name.split('::').first
+        original_klass_name = klass._orig_klass_name
+        original_klass_name.split('::').first if original_klass_name
       end
       klasses |= Padrino.mounted_apps.map(&:app_class)
       exclude_constants.merge(klasses)
@@ -251,18 +252,13 @@ module Padrino
     #
     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
+      # consider methodless constants not external
+      return false if sources.empty?
       !sources.any?{ |source| source.start_with?(Padrino.root) }
     end
 
     ##
-    # Gets all the sources in which target's class or instance methods are defined.
+    # Gets all the sources in which target class is defined.
     #
     # Note: Method#source_location is for Ruby 1.9.3+ only.
     #
@@ -271,7 +267,14 @@ module Padrino
       target.methods.each do |method_name|
         next unless method_name.kind_of?(Symbol)
         method_object = target.method(method_name)
-        if method_object.owner == (target.class == Class ? target.singleton_class : target.class)
+        if method_object.owner == target.singleton_class
+          sources << method_object.source_location.first
+        end
+      end
+      target.instance_methods.each do |method_name|
+        next unless method_name.kind_of?(Symbol)
+        method_object = target.instance_method(method_name)
+        if method_object.owner == target
           sources << method_object.source_location.first
         end
       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.5' unless defined?(Padrino::VERSION)
+  VERSION = '0.12.6' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/fixtures/apps/stealthy/app.rb

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

data/test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb

@@ -0,0 +1,13 @@
+class Boo
+  def self.class_method
+    "BooClass"
+  end
+end
+
+class Woo < Boo
+  def poo
+  end
+end
+
+class Soo < Boo
+end

data/test/test_reloader_system.rb

@@ -109,5 +109,15 @@ describe "SystemReloader" do
         FileUtils.rm tmp_file
       end
     end
+
+    it 'should not fail with superclass mismatch when reloading descendant classes with no instances' do
+      Padrino.clear!
+      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/app.rb')
+      @app = SystemStealthyClassDemo
+      Padrino.mount(SystemStealthyClassDemo).to("/")
+      get '/'
+      FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb')
+      Padrino.reload!
+    end
   end
 end

data/test/test_routing.rb

@@ -406,6 +406,16 @@ describe "Routing" do
     assert_equal 406, status
   end
 
+  it 'should provide proper content when :provides is specified and Accept: `*/*` requested' do
+    mock_app do
+      get(:text, :provides => :text) { "text" }
+    end
+    header 'Accept', '*/*'
+    get "/text"
+    assert_equal 200, status
+    assert_equal "text", body
+  end
+
   it 'should return 404 on file extensions it does not provide and flag is not set' do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,96 +19,96 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.12.6
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 description: The Padrino core gem required for use of this framework
@@ -119,9 +119,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".yardopts"
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -183,6 +183,8 @@ files:
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.html
 - test/fixtures/apps/static.rb
+- test/fixtures/apps/stealthy/app.rb
+- test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
 - test/fixtures/apps/system_instance_methods_demo.rb
@@ -220,22 +222,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem
@@ -264,6 +266,8 @@ test_files:
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.html
 - test/fixtures/apps/static.rb
+- test/fixtures/apps/stealthy/app.rb
+- test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
 - test/fixtures/apps/system_instance_methods_demo.rb