padrino-core 0.12.8.1 → 0.12.9

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[]=Jack&names[]=Kim&names[]=Teri'
+    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&gotta[who]=self'
+    post '/i?' + Padrino::Utils.build_uri_query(:gotta => { :what => 'go', :who => 'self' })
     assert_equal({"gotta" => {"what" => "go"}}, result)
   end
 

data/test/test_reloader_simple.rb

@@ -80,7 +80,7 @@ describe "SimpleReloader" do
       assert ok?
       last_body = body
       assert_equal 1, @app.filters[:before].size
-      assert_equal 1, @app.errors.size
+      assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
       assert_equal 2, @app.filters[:after].size # app + content-type + padrino-flash
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
@@ -90,7 +90,7 @@ describe "SimpleReloader" do
       get "/rand"
       refute_equal last_body, body
       assert_equal 1, @app.filters[:before].size
-      assert_equal 1, @app.errors.size
+      assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
       assert_equal 2, @app.filters[:after].size
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2

data/test/test_reloader_storage.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "Padrino::Reloader::Storage" do
+  describe "#classes" do
+    it 'should take an snapshot of the current loaded classes' do
+      snapshot = Padrino::Reloader::Storage.send(:object_classes)
+      assert_equal snapshot.include?(Padrino::Logger), true
+    end
+
+    it 'should return a Set object' do
+      snapshot = Padrino::Reloader::Storage.send(:object_classes)
+      assert_equal snapshot.kind_of?(Set), true
+    end
+
+    it 'should be able to process a the class name given a block' do
+      klasses = Padrino::Reloader::Storage.send(:object_classes) do |klass|
+        next unless klass.respond_to?(:name) # fix JRuby < 1.7.22
+        if klass.name =~ /^Padrino::/
+          klass
+        end
+      end
+
+      assert_equal (klasses.size > 1), true
+      klasses.each do |klass|
+        assert_match /^Padrino::/, klass.to_s
+      end
+    end
+  end
+
+  describe "#new_classes" do
+    before do
+      @snapshot = Padrino::Reloader::Storage.send(:object_classes)
+    end
+
+    it 'should return list of new classes' do
+      class OSTest; end
+      module OSTestModule; class B; end; end
+
+      new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
+
+      assert_equal new_classes.size, 2
+      assert_equal new_classes.include?(OSTest), true
+      assert_equal new_classes.include?(OSTestModule::B), true
+    end
+
+    it 'should return a Set object' do
+      new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
+      assert_equal new_classes.kind_of?(Set), true
+    end
+  end
+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

@@ -737,12 +737,27 @@ describe "Routing" do
     assert_equal 'application/json', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
-    assert_equal 'application/foo;charset=utf-8', response["Content-Type"]
+    assert_equal 'application/foo', response["Content-Type"]
     get "/a"
     assert_equal "html", body
     assert_equal 'text/html;charset=utf-8', response["Content-Type"]
   end
 
+  it 'should not drop json charset' do
+    mock_app do
+      get '/' do
+        content_type :json, :charset => 'utf-16'
+      end
+      get '/a' do
+        content_type :json, 'charset' => 'utf-16'
+      end
+    end
+    get '/'
+    assert_equal 'application/json;charset=utf-16', response["Content-Type"]
+    get '/a'
+    assert_equal 'application/json;charset=utf-16', response["Content-Type"]
+  end
+
   it 'should use controllers' do
     mock_app do
       controller "/admin" do
@@ -2033,7 +2048,7 @@ describe "Routing" do
     mock_app do
       get(:index) { "%s %s" % [params[:account][:name], params[:account][:surname]] }
     end
-    get "/?account[name]=foo&account[surname]=bar"
+    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
@@ -2174,4 +2189,18 @@ describe "Routing" do
     put "/b/x/y"
     assert_equal '{"b"=>"x", "c"=>"y"}', body
   end
+
+  it 'should generate urls and absolute urls' do
+    mock_app do
+      get(:index) { settings.url(:index) }
+      get(:absolute) { settings.absolute_url(:absolute) }
+    end
+    get '/'
+    assert_equal '/', body
+    get '/absolute'
+    assert_equal 'http://localhost/absolute', body
+    @app.set :base_url, 'http://example.com'
+    get '/absolute'
+    assert_equal 'http://example.com/absolute', body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.8.1
+  version: 0.12.9
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,98 +19,94 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
-- !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
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: !binary |-
+          MS40LjY=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: !binary |-
+          MS40LjY=
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: !binary |-
+          MC4xMS4w
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: !binary |-
+          MC4xMS4w
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: !binary |-
+          MC4xOA==
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: !binary |-
+          MC4xOA==
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: !binary |-
+          My4x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: !binary |-
+          My4x
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: !binary |-
+          MS41LjA=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: !binary |-
+          MS41LjA=
 description: The Padrino core gem required for use of this framework
 email: padrinorb@gmail.com
 executables:
@@ -119,9 +115,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -143,6 +139,7 @@ files:
 - lib/padrino-core/cli/rake.rb
 - lib/padrino-core/cli/rake_tasks.rb
 - lib/padrino-core/command.rb
+- lib/padrino-core/configuration.rb
 - lib/padrino-core/ext/http_router.rb
 - lib/padrino-core/ext/sinatra.rb
 - lib/padrino-core/filter.rb
@@ -152,6 +149,7 @@ files:
 - lib/padrino-core/logger.rb
 - lib/padrino-core/module.rb
 - lib/padrino-core/mounter.rb
+- lib/padrino-core/mounter/application_extension.rb
 - lib/padrino-core/reloader.rb
 - lib/padrino-core/reloader/rack.rb
 - lib/padrino-core/reloader/storage.rb
@@ -166,14 +164,17 @@ 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
 - test/fixtures/apps/demo_project/api/lib/api_lib.rb
 - test/fixtures/apps/demo_project/app.rb
+- test/fixtures/apps/external_apps/fake_lib.rb
+- test/fixtures/apps/external_apps/fake_root.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
 - test/fixtures/apps/lib/myklass.rb
@@ -201,6 +202,7 @@ files:
 - test/fixtures/reloadable_apps/main/app.rb
 - test/helper.rb
 - test/test_application.rb
+- test/test_configuration.rb
 - test/test_core.rb
 - test/test_csrf_protection.rb
 - test/test_dependencies.rb
@@ -213,6 +215,7 @@ files:
 - test/test_reloader_complex.rb
 - test/test_reloader_external.rb
 - test/test_reloader_simple.rb
+- test/test_reloader_storage.rb
 - test/test_reloader_system.rb
 - test/test_restful_routing.rb
 - test/test_router.rb
@@ -223,22 +226,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.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem

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

@@ -1 +0,0 @@
-require 'active_support/logger_silence'