padrino-core 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f87c42ee6dafccf2f672e07adc52c3bb79102e09
-  data.tar.gz: b25c8da4bc6a104c7a688b7a62e69b17aeb5ad50
+  metadata.gz: 4fabe3c04b7784dac19fe6673af74663794e3477
+  data.tar.gz: 73e8310a4d9f5a9207ed8f19379c492135c28e00
 SHA512:
-  metadata.gz: fb6c04b20312a6fd49a9a75343a1fc75fb19a2a359e0321ba4dd67132c7e15d83e063a41f0125b34570476344fc327cd9bbb51b089761764487152404f369fc4
-  data.tar.gz: 57ca2a537531341e765ba190ed9be1b1a6510846d1964bef9f65a734cfc73fcbcee0ea1071bef87e0d680c1e5b422f8dd2bd8547a6f77b030d0395416a7ca240
+  metadata.gz: 4d3814cb0118bfdbd1c358b1a0da1e4b66a3a5336ed11316489a43a968cf45821cde9d04708932e25d3d396885b693fd0d4ce60564a82bd5bce9748f3d20c61f
+  data.tar.gz: 08a08b2236f7b41cfabc97bcb0273ec8a4036e99058f137ee0c56b9efb78ae63f52e7cfd3fbcf5237de7dbbbe48341352c0dbdd548c8f4b90ed4c3e695eb5d05

data/lib/padrino-core/application.rb

@@ -43,9 +43,10 @@ module Padrino
       def inherited(base)
         begun_at = Time.now
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
+        super(base)
+        base.prerequisites.replace(self.prerequisites.dup)
         base.default_configuration!
         logger.devel :setup, begun_at, base
-        super(base)
       end
 
       ##

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

@@ -567,7 +567,7 @@ module Padrino
           options.delete(:params)
         elsif options.include?(:params)
           options[:params] ||= []
-          options[:params] += options[:with] if options[:with]
+          options[:params] |= Array(options[:with]) if options[:with]
         end
 
         # We need check if path is a symbol, if that it's a named route.

data/lib/padrino-core/loader.rb

@@ -72,6 +72,7 @@ module Padrino
       @_dependency_paths = nil
       before_load.clear
       after_load.clear
+      global_configurations.clear
       Reloader.clear!
       Thread.current[:padrino_loaded] = nil
     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.4' unless defined?(Padrino::VERSION)
+  VERSION = '0.12.5' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/padrino-core.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
   if ENV["SINATRA_EDGE"]
     s.add_dependency("sinatra")
   else
+    # remove this rack dependency after Sinatra > 1.4.5
+    s.add_dependency("rack", "< 1.6.0")
     s.add_dependency("sinatra", "~> 1.4.2")
   end
   s.add_dependency("http_router", "~> 0.11.0")

data/test/test_application.rb

@@ -65,6 +65,13 @@ describe "Application" do
       assert_equal 'shared', body
     end
 
+    it 'should be able to execute the register keyword inside the configure_apps block' do
+      Asdf = Module.new
+      Padrino.configure_apps { register Asdf }
+      class GodFather < Padrino::Application; end
+      assert_includes GodFather.extensions, Asdf
+    end
+
     it 'should able to set custome session management' do
       class PadrinoTestApp3 < Padrino::Application
         set :sessions, :use => Rack::Session::Pool
@@ -142,5 +149,17 @@ describe "Application" do
         assert_equal 'custom error', body
       end
     end
+
+    describe 'global prerequisites' do
+      after do
+        Padrino::Application.prerequisites.clear
+      end
+
+      it 'should be inherited by children of Padrino::Application' do
+        Padrino::Application.prerequisites << 'my_prerequisites'
+        class InheritanceTest < Padrino::Application; end
+        assert_includes InheritanceTest.prerequisites, 'my_prerequisites'
+      end
+    end
   end # application functionality
 end

data/test/test_params_protection.rb

@@ -75,6 +75,18 @@ describe "Padrino::ParamsProtection" do
     assert_equal({ 'name' => @jack['name'], 'id' => '24', 'tag' => '42' }, result)
   end
 
+  it 'should not fail if :with is not an Array' do
+    result = nil
+    mock_app do
+      post :basic, :with => :id, :params => [ :id ] do
+        result = params
+        ''
+      end
+    end
+    post '/basic/24?' + @jack.to_query
+    assert_equal({ 'id' => '24' }, result)
+  end
+
   it 'should understand true or false values' do
     result = nil
     mock_app do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.12.5
+- !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