padrino-core 0.13.1.beta1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7cd163789baddaf975d9fba8d190c6ebc9ac3a
-  data.tar.gz: 5436fc024ed5e7c1cdd605d82e8ca087366c72d3
+  metadata.gz: 3fc93251e3aa682cd94a019446ab096a31f4365d
+  data.tar.gz: b7c3653e92dc92655372e0359422307d84122b19
 SHA512:
-  metadata.gz: 6796d2b316dc62d1007c71efc1f8513df379f8852f6633aca39d12daaa00535c7e107ea2cdc4c002dd01c83efe8c1b73dadcd3bb1bcc1bcf5d6df72f713a4af5
-  data.tar.gz: 082b444f689877f4d5bcaa9c31ebbf100fa427458ca6c7900a9ec20998875eb04b3235746c37adc28e2808580fa0a2a8bb5cec865718a3a1ceaf421e6c71d3fb
+  metadata.gz: 54ff19551060bd54f259c55cf383ab8a39a737a4e31fa3ebd03dd44e2353a41dac726478ebfb42af22fc0a412abef9579e88e8d4adb240df6348fc943cba7f98
+  data.tar.gz: 54d8d4b3a35ffc91e16180b342fdcc8d04d043eb085f2e0e52bb88ee9b4ec3cbee00c9a016e6a972b29951abf772ac0ff6381e7abc7cd72ddf18484ff9abe1dd

data/lib/padrino-core/path_router/matcher.rb

@@ -38,7 +38,11 @@ module Padrino
       #
       def expand(params)
         params = params.merge(@default_values) if @default_values.is_a?(Hash)
+        params, query = params.each_with_object([{}, {}]) do |(key, val), parts|
+          parts[handler.names.include?(key.to_s) ? 0 : 1][key] = val
+        end
         expanded_path = handler.expand(:append, params)
+        expanded_path += ?? + Padrino::Utils.build_uri_query(query) unless query.empty?
         expanded_path
       end
   

data/lib/padrino-core/reloader/rack.rb

@@ -11,12 +11,15 @@ module Padrino
         @app = app
         @cooldown = cooldown
         @last = (Time.now - cooldown)
+        @mutex = Mutex.new
       end
 
       # Invoked in order to perform the reload as part of the request stack.
       def call(env)
         if @cooldown && Time.now > @last + @cooldown
-          Thread.list.size > 1 ? Thread.exclusive { Padrino.reload! } : Padrino.reload!
+          @mutex.synchronize do
+            Padrino.reload!
+          end
           @last = Time.now
         end
         @app.call(env)

data/lib/padrino-core/reloader.rb

@@ -221,7 +221,9 @@ module Padrino
     #
     def files_for_rotation
       files = Set.new
-      files += Dir.glob("#{Padrino.root}/{lib,models,shared}/**/*.rb")
+      Padrino.dependency_paths.each do |path|
+        files += Dir.glob(path)
+      end
       reloadable_apps.each do |app|
         files << app.app_file
         files += Dir.glob(app.app_obj.prerequisites)

data/lib/padrino-core/version.rb

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

data/test/fixtures/apps/custom_dependencies/custom_dependencies.rb

@@ -0,0 +1,11 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class CustomDependencies < Padrino::Application
+  set :reload, true
+end
+
+CustomDependencies.controllers do
+  get "/" do
+    "foo"
+  end
+end

data/test/test_application.rb

@@ -149,11 +149,18 @@ describe "Application" do
         assert_equal 'custom error', body
       end
 
-      it 'should raise NameError even if Kernel.require is extended' do
-        assert_raises NameError do
+      it 'should pass Routing#parent to Module#parent' do
+        # see naming collision in issue #1814
+        begin
           ConstTest = Class.new(Padrino::Application)
-          require 'active_support/dependencies'
-          ConstTest::UninitializedConstant
+          class Module
+            def parent
+              :dirty
+            end
+          end
+          assert_equal :dirty, ConstTest.parent
+        ensure
+          Module.instance_eval{ undef :parent }
         end
       end
     end

data/test/test_params_protection.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'active_support/core_ext/hash/conversions'
 
 describe "Padrino::ParamsProtection" do
   before do
@@ -7,6 +6,7 @@ describe "Padrino::ParamsProtection" do
     @kim = { 'name' => 'Kim Bauer', 'position' => 'daughter', 'child' => @teri }
     @jack = { 'name' => 'Jack Bauer', 'position' => 'terrorist', 'child' => @kim }
     @family = { 'name' => 'Bauer', 'persons' => { 1 => @teri, 2 => @kim, 3 => @jack } }
+    @jack_query = Padrino::Utils.build_uri_query(@jack)
   end
 
   it 'should drop all parameters except allowed ones' do
@@ -17,7 +17,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack.to_query
+    post '/basic?' + @jack_query
     assert_equal({ 'name' => @jack['name'] }, result)
   end
 
@@ -29,7 +29,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack.to_query
+    post '/basic?' + @jack_query
     assert_equal(@jack, result)
   end
 
@@ -41,7 +41,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack.to_query
+    post '/basic?' + @jack_query
     assert_equal(
       [
         { 'name' => @jack['name'], 'child' => { 'name' => @kim['name'], 'child' => { 'name' => @teri['name'] } } },
@@ -59,7 +59,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic?' + @jack.to_query
+    post '/basic?' + @jack_query
     assert_equal({ 'name' => @jack['name'], 'position' => 'anti-terrorist' }, result)
   end
 
@@ -71,7 +71,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic/24/42?' + @jack.to_query
+    post '/basic/24/42?' + @jack_query
     assert_equal({ 'name' => @jack['name'], 'id' => '24', 'tag' => '42' }, result)
   end
 
@@ -83,7 +83,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/basic/24?' + @jack.to_query
+    post '/basic/24?' + @jack_query
     assert_equal({ 'id' => '24' }, result)
   end
 
@@ -99,9 +99,9 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    get '/hide/1?' + @jack.to_query
+    get '/hide/1?' + @jack_query
     assert_equal({"id"=>"1"}, result)
-    get '/show/1?' + @jack.to_query
+    get '/show/1?' + @jack_query
     assert_equal({"id"=>"1"}.merge(@jack), result)
   end
 
@@ -133,13 +133,13 @@ describe "Padrino::ParamsProtection" do
         end
       end
     end
-    post '/persons/create?' + @jack.to_query
+    post '/persons/create?' + @jack_query
     assert_equal({ 'name' => @jack['name'], 'position' => 'terrorist' }, result)
     post '/persons/update/1?name=Chloe+O\'Brian&position=hacker'
     assert_equal({ 'id' => '1', 'name' => 'Chloe O\'Brian' }, result)
-    post '/persons/delete?' + @jack.to_query
+    post '/persons/delete?' + @jack_query
     assert_equal(@jack, result)
-    post '/persons/destroy/1?' + @jack.to_query
+    post '/persons/destroy/1?' + @jack_query
     assert_equal({"id"=>"1"}, result)
     get '/noparam?a=1;b=2'
     assert_equal({}, result)
@@ -153,7 +153,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/family?' + @family.to_query
+    post '/family?' + Padrino::Utils.build_uri_query(@family)
     assert_equal({"persons" => {"3" => {"name" => @jack["name"]}, "2" => {"name" => @kim["name"]}, "1" => {"name" => @teri["name"]}}}, result)
   end
 
@@ -165,7 +165,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/family?' + { :names => %w{Jack Kim Teri} }.to_query
+    post '/family?' + Padrino::Utils.build_uri_query(:names => %w{Jack Kim Teri})
     assert_equal({"names" => %w[Jack Kim Teri]}, result)
   end
 
@@ -177,7 +177,7 @@ describe "Padrino::ParamsProtection" do
         ''
       end
     end
-    post '/i?' + { :gotta => { :what => 'go', :who => 'self' } }.to_query
+    post '/i?' + Padrino::Utils.build_uri_query(:gotta => { :what => 'go', :who => 'self' })
     assert_equal({"gotta" => {"what" => "go"}}, result)
   end
 

data/test/test_reloader_system.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/kiq')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/static')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/custom_dependencies')
 
 describe "SystemReloader" do
   describe 'for wierd and difficult reload events' do
@@ -120,4 +121,23 @@ describe "SystemReloader" do
       Padrino.reload!
     end
   end
+
+  describe 'reloading custom dependencies' do
+    let(:custom_dependency_path) { File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/my_dependencies' }
+    let(:custom_dependency) { File.join(custom_dependency_path, 'my_dependency.rb') }
+
+    before do
+      @app = CustomDependencies
+      Padrino.clear!
+      Padrino.mount(CustomDependencies).to("/")
+      Padrino.dependency_paths << custom_dependency_path + '/*.rb'
+      Padrino.load!
+      get '/'
+    end
+
+    it 'should discover changed dependencies' do
+      FileUtils.touch(custom_dependency)
+      assert Padrino::Reloader.changed?, 'Change to custom dependency has not been recognised'
+    end
+  end
 end

data/test/test_routing.rb

@@ -259,6 +259,7 @@ describe "Routing" do
       get(:anchor) { url(:anchor, :anchor => 'comments') }
       get(:fragment) { url(:anchor, :fragment => 'comments') }
       get(:fragment2) { url(:anchor, :fragment => :comments) }
+      get(:gangsta) { url(:gangsta, :foo => { :bar => :baz }, :hoge => :fuga) }
       get([:hash, :id]){ url(:hash, :id => 1) }
       get(:array, :with => :id){ url(:array, 23) }
       get([:array, :id]){ url(:array, 23) }
@@ -307,6 +308,8 @@ describe "Routing" do
     assert_equal "/drugs/123/destroy", body
     delete "/123/destroy"
     assert_equal "/123/destroy", body
+    get "/gangsta"
+    assert_equal "/gangsta?foo%5Bbar%5D=baz&hoge=fuga", body
     get "/splatter/123/456"
     assert_equal "/splatter/123/456", body
   end
@@ -2077,7 +2080,7 @@ describe "Routing" do
     mock_app do
       get(:index) { "%s %s" % [params[:account][:name], params[:account][:surname]] }
     end
-    get "/?" + { :account => { :name => 'foo', :surname => 'bar' } }.to_query
+    get "/?" + Padrino::Utils.build_uri_query(:account => { :name => 'foo', :surname => 'bar' })
     assert_equal 'foo bar', body
     get @app.url(:index, "account[name]" => "foo", "account[surname]" => "bar")
     assert_equal 'foo bar', body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.1.beta1
+  version: 0.13.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,82 +19,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1.beta1
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1.beta1
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mustermann19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '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
@@ -105,9 +105,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -157,6 +157,8 @@ files:
 - test/fixtures/app_gem/lib/app_gem.rb
 - test/fixtures/app_gem/lib/app_gem/version.rb
 - test/fixtures/apps/complex.rb
+- test/fixtures/apps/custom_dependencies/custom_dependencies.rb
+- test/fixtures/apps/custom_dependencies/my_dependencies/my_dependency.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
 - test/fixtures/apps/demo_project/api/app.rb
@@ -218,19 +220,19 @@ 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.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
 rubygems_version: 2.4.8
@@ -244,6 +246,8 @@ test_files:
 - test/fixtures/app_gem/lib/app_gem.rb
 - test/fixtures/app_gem/lib/app_gem/version.rb
 - test/fixtures/apps/complex.rb
+- test/fixtures/apps/custom_dependencies/custom_dependencies.rb
+- test/fixtures/apps/custom_dependencies/my_dependencies/my_dependency.rb
 - test/fixtures/apps/demo_app.rb
 - test/fixtures/apps/demo_demo.rb
 - test/fixtures/apps/demo_project/api/app.rb