padrino-core 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851c38a957c7a3b50110244d3b5eb5691091f845
-  data.tar.gz: 131c5ba7f4a596a9079aab6d0571b7cc09eb408c
+  metadata.gz: 3a7babb0beba45716e2ff3af2f78dbc0f6a3e842
+  data.tar.gz: 1a047b4858de0f5c60d42a18289d824cc43b519d
 SHA512:
-  metadata.gz: ae1ff61464492c25cbb92ee965631a3ed05430f51df3a5431cbd6763c39c4d262c5a9ca0ec92bb8661fe5c9194a8f912414771773b47d02f322a2a0e9fd46437
-  data.tar.gz: 4b37b25021834707ed9b6c267345538b3a2073e428175fe4b0620e3825d167eb0c973ea058e58590e4f223272defb1ec4b254caca66a541d15ae8e0840b36e1d
+  metadata.gz: ea91c7f77ca7a01beefd69e03288619b142e64696e68ec36b860491dacf18561867b75b3334580841c2c3705b2bfca7bcc834b4834c1d2398402df279bed6549
+  data.tar.gz: dd67394786c89aa8f52584cc933a164e0a221c534de89c2189141797b5d6103abf79c542fe54e6aae55760333185b5de30a9aead6db67f56cef56280fdefa9f0

data/bin/padrino

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
+require 'padrino-core/cli/binstub'
+Padrino.replace_with_binstub('padrino')
 
 padrino_core_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)

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

@@ -203,7 +203,7 @@ module Padrino
       # @since 0.10.8
       # @api public
       def redirect(url, *args)
-        flashes = args.extract_options!
+        flashes = args.last.is_a?(Hash) ? args.pop : {}
 
         flashes.each do |type, message|
           message = I18n.translate(message) if message.is_a?(Symbol) && defined?(I18n)

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

@@ -1,9 +1,3 @@
-begin
-  require 'active_support/core_ext/object/deep_dup' # AS 4.1
-rescue LoadError
-  require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1
-end
-
 module Padrino
   ##
   # Padrino application module providing means for mass-assignment protection.
@@ -45,7 +39,7 @@ module Padrino
       def params(*allowed_params)
         allowed_params = prepare_allowed_params(allowed_params)
         condition do
-          @original_params = params.deep_dup
+          @original_params = Utils.deep_dup(params)
           filter_params!(params, allowed_params)
         end
       end

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

@@ -217,10 +217,11 @@ module Padrino
       # @see http://www.padrinorb.com/guides/controllers#route-filters
       #
       def construct_filter(*args, &block)
-        options = args.extract_options!
+        options = args.last.is_a?(Hash) ? args.pop : {}
         if except = options.delete(:except)
           fail "You cannot use :except with other options specified" unless args.empty? && options.empty?
-          options = Array(except).extract_options!
+          except = Array(except)
+          options = except.last.is_a?(Hash) ? except.pop : {}
         end
         Filter.new(!except, @_controller, options, Array(except || args), &block)
       end
@@ -337,7 +338,7 @@ module Padrino
       #   url(:index, :fragment => 'comments')
       #
       def url(*args)
-        params = args.extract_options!
+        params = args.last.is_a?(Hash) ? args.pop : {}
         fragment = params.delete(:fragment) || params.delete(:anchor)
         path = make_path_with_params(args, value_to_param(params.symbolize_keys))
         rebase_url(fragment ? path << '#' << fragment.to_s : path)
@@ -401,7 +402,7 @@ module Padrino
 
       # Saves controller options, yields the block, restores controller options.
       def with_new_options(*args)
-        options = args.extract_options!
+        options = args.last.is_a?(Hash) ? args.pop : {}
 
         CONTROLLER_OPTIONS.each{ |key| replace_instance_variable("@_#{key}", options.delete(key)) }
         replace_instance_variable(:@_controller, args)
@@ -538,7 +539,7 @@ module Padrino
           route.default_values = defaults if defaults
         end
         options.delete_if do |option, captures|
-          if route.significant_variable_names.include?(option)
+          if route.significant_variable_names.include?(option.to_s)
             route.capture[option] = Array(captures).first
             true
           end
@@ -579,6 +580,7 @@ module Padrino
       # controllers, parents, 'with' parameters, and other options.
       #
       def parse_route(path, options, verb)
+        path = path.dup if path.kind_of?(String)
         route_options = {}
 
         if options[:params] == true
@@ -926,6 +928,10 @@ module Padrino
       end
 
       def dispatch!
+        unless @params
+          @params = indifferent_params(@request.params)
+          force_encoding(@params)
+        end
         invoke do
           static! if settings.static? && (request.get? || request.head?)
           route!
@@ -977,7 +983,11 @@ module Padrino
         @route = request.route_obj = route
         captured_params = captures_from_params(params)
 
-        @params.merge!(params) { |key, original, newval| original } unless params.empty?
+        # Should not overwrite params by given query
+        @params.merge!(params) do |key, original, newval|
+          @route.significant_variable_names.include?(key) ? newval : original
+        end unless params.empty?
+
         @params[:format] = params[:format] if params[:format]
         @params[:captures] = captured_params if !captured_params.empty? && route.path.is_a?(Regexp)
 

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

@@ -28,16 +28,20 @@ module Padrino
       def console(*args)
         prepare :console
         require File.expand_path("../../version", __FILE__)
-        ARGV.clear
-        require 'irb'
-        begin
-          require "irb/completion"
-        rescue LoadError
-        end
         require File.expand_path('config/boot.rb')
         puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
         require File.expand_path('../console', __FILE__)
-        IRB.start
+        ARGV.clear
+        if defined? Pry
+          Pry.start
+        else
+          require 'irb'
+          begin
+            require "irb/completion"
+          rescue LoadError
+          end
+          IRB.start
+        end
       end
 
       desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."

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

@@ -0,0 +1,27 @@
+module Padrino
+  ##
+  # Replaces the current process with it's binstub.
+  #
+  def self.replace_with_binstub(executable)
+    begin
+      return if Bundler.definition.missing_specs.empty?
+    rescue NameError, NoMethodError
+    end
+
+    project_root = Dir.pwd
+    until project_root.empty?
+      break if File.file?(File.join(project_root, 'Gemfile'))
+      project_root = project_root.rpartition('/').first
+    end
+
+    if %w(Gemfile .components).all? { |file| File.file?(File.join(project_root, file)) }
+      binstub = File.join(project_root, 'bin', executable)
+      if File.file?(binstub)
+        exec Gem.ruby, binstub, *ARGV
+      else
+        puts 'Please run `bundler install --binstubs` from your project root to generate bundle-specific executables'
+        exit!
+      end
+    end
+  end
+end

data/lib/padrino-core/loader.rb

@@ -143,7 +143,8 @@ module Padrino
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     #
     def require_dependencies(*paths)
-      options = paths.extract_options!.merge( :cyclic => true )
+      options = (paths.last.is_a?(Hash) ? paths.pop : {}).merge( :cyclic => true )
+
       files = paths.flatten.flat_map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.uniq
 
       until files.empty?

data/lib/padrino-core/path_router.rb

@@ -55,7 +55,7 @@ module Padrino
       # Finds a path which is matched with conditions from arguments
       #
       def path(name, *args)
-        params = args.extract_options!
+        params = args.last.is_a?(Hash) ? args.pop : {}
         candidates = @routes.select { |route| route.name == name }
         fail InvalidRouteException if candidates.empty?
         route = candidates.sort_by! { |route|

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

@@ -63,9 +63,9 @@ module Padrino
       def significant_variable_names
         @significant_variable_names ||=
           if @path.is_a?(String)
-            @path.scan(SIGNIFICANT_VARIABLES_REGEX).map{ |p| p.last.to_sym }
+            @path.scan(SIGNIFICANT_VARIABLES_REGEX).map(&:last)
           elsif @path.is_a?(Regexp) and @path.respond_to?(:named_captures)
-            @path.named_captures.keys.map(&:to_sym)
+            @path.named_captures.keys
           else
             []
           end

data/lib/padrino-core/reloader.rb

@@ -74,7 +74,7 @@ module Padrino
     #
     def lock!
       klasses = Storage.send(:object_classes) do |klass|
-        original_klass_name = klass._orig_klass_name
+        original_klass_name = constant_name(klass)
         original_klass_name.split('::').first if original_klass_name
       end
       klasses |= Padrino.mounted_apps.map(&:app_class)
@@ -244,7 +244,7 @@ module Padrino
     # Tells if a constant should be excluded from Reloader routines.
     #
     def constant_excluded?(const)
-      external_constant?(const) || (exclude_constants - include_constants).any?{ |excluded_constant| const._orig_klass_name.start_with?(excluded_constant) }
+      external_constant?(const) || (exclude_constants - include_constants).any?{ |excluded_constant| constant_name(const).start_with?(excluded_constant) }
     end
 
     ##
@@ -310,5 +310,11 @@ module Padrino
     ensure
       $-v = verbosity_level
     end
+
+    def constant_name(constant)
+      constant._orig_klass_name
+    rescue NoMethodError
+      constant.name
+    end
   end
 end

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

@@ -57,7 +57,7 @@ module Padrino
       def object_classes
         klasses = Set.new
 
-        ObjectSpace.each_object(Class).each do |klass|
+        ObjectSpace.each_object(::Class).each do |klass|
           if block_given?
             if filtered_class = yield(klass)
               klasses << filtered_class

data/lib/padrino-core/server.rb

@@ -110,9 +110,9 @@ module Padrino
     # Detects Host and Port for Rack server.
     #
     def self.detect_address(options)
-      address = DEFAULT_ADDRESS.merge options.slice(:Host, :Port)
-      address[:Host] = options[:host] if options[:host].present?
-      address[:Port] = options[:port] if options[:port].present?
+      address = DEFAULT_ADDRESS.merge options.select{ |key| [:Host, :Port].include?(key) }
+      address[:Host] = options[:host] if options[:host]
+      address[:Port] = options[:port] if options[:port]
       address
     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.13.2' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.3' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

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

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

data/test/fixtures/apps/concerned/models/mixins/badmodule.rb

@@ -0,0 +1,4 @@
+module BadModule
+  @happy_global_variable ||= 0
+  @happy_global_variable += 1
+end

data/test/fixtures/apps/system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 class SystemDemo < Padrino::Application

data/test/test_logger.rb

@@ -102,7 +102,8 @@ describe "PadrinoLogger" do
       @logger.error binary_data
       @logger.error utf8_data
       @logger.flush
-      assert_match /\?.*фыв/m, @log.string.encode(Encoding.default_external)
+      assert @log.string.force_encoding(encoding).include?("?\n".encode(encoding))
+      assert @log.string.force_encoding(encoding).include?(utf8_data.encode(encoding))
     end
 
     it 'should log an application' do

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,52 @@
+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
+      skip
+      class OSTest; end
+      module OSTestModule; class B; end; end
+
+      new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
+
+      assert_equal new_classes.size, 3
+      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

@@ -140,4 +140,20 @@ describe "SystemReloader" do
       assert Padrino::Reloader.changed?, 'Change to custom dependency has not been recognised'
     end
   end
+
+  describe 'reloading module constants' do
+    it 'should remove constants of misdesigned modules' do
+      skip
+      Padrino.clear!
+      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/concerned/app.rb')
+      @app = SystemConcernedClassDemo
+      Padrino.mount(SystemConcernedClassDemo).to("/")
+      get '/'
+
+      original_value = BadModule.instance_variable_get(:@happy_global_variable)
+      FileUtils.touch File.dirname(__FILE__) + '/fixtures/apps/concerned/models/mixins/badmodule.rb'
+      Padrino.reload!
+      assert_equal original_value, BadModule.instance_variable_get(:@happy_global_variable)
+    end
+  end
 end

data/test/test_routing.rb

@@ -2403,4 +2403,14 @@ describe "Routing" do
     get '/update/1?product[title]=test'
     assert_equal 'test==test', body
   end
+
+  it "prevent overwriting params by given query" do
+    mock_app do
+      get '/prohibit/:id' do
+        params[:id]
+      end
+    end
+    get '/prohibit/123?id=456'
+    assert_equal '123', body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-08-17 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.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,7 @@ files:
 - lib/padrino-core/caller.rb
 - lib/padrino-core/cli/adapter.rb
 - lib/padrino-core/cli/base.rb
+- lib/padrino-core/cli/binstub.rb
 - lib/padrino-core/cli/console.rb
 - lib/padrino-core/cli/launcher.rb
 - lib/padrino-core/cli/rake.rb
@@ -157,6 +158,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/concerned/app.rb
+- test/fixtures/apps/concerned/models/mixins/badmodule.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
@@ -209,6 +212,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
@@ -234,71 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem
-test_files:
-- test/fixtures/app_gem/Gemfile
-- test/fixtures/app_gem/app/app.rb
-- test/fixtures/app_gem/app_gem.gemspec
-- 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/system_helpers.rb
-- test/fixtures/apps/kiq.rb
-- test/fixtures/apps/lib/myklass.rb
-- test/fixtures/apps/lib/myklass/mysubklass.rb
-- test/fixtures/apps/models/child.rb
-- test/fixtures/apps/models/parent.rb
-- test/fixtures/apps/mountable_apps/rack_apps.rb
-- test/fixtures/apps/mountable_apps/static.html
-- test/fixtures/apps/precompiled_app.rb
-- test/fixtures/apps/simple.rb
-- 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
-- test/fixtures/dependencies/a.rb
-- test/fixtures/dependencies/b.rb
-- test/fixtures/dependencies/c.rb
-- test/fixtures/dependencies/circular/e.rb
-- test/fixtures/dependencies/circular/f.rb
-- test/fixtures/dependencies/circular/g.rb
-- test/fixtures/dependencies/d.rb
-- test/fixtures/reloadable_apps/external/app/app.rb
-- test/fixtures/reloadable_apps/external/app/controllers/base.rb
-- 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
-- test/test_filters.rb
-- test/test_flash.rb
-- test/test_locale.rb
-- test/test_logger.rb
-- test/test_mounter.rb
-- test/test_params_protection.rb
-- test/test_reloader_complex.rb
-- test/test_reloader_external.rb
-- test/test_reloader_simple.rb
-- test/test_reloader_system.rb
-- test/test_restful_routing.rb
-- test/test_router.rb
-- test/test_routing.rb
-has_rdoc: 
+test_files: []