padrino-core 0.14.0.rc1 → 0.14.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66c818246cf52288c834007f8c222f4a3454e3b
-  data.tar.gz: 7b5e2bdd2e2d5be9f6d5b1bba60acea97cefe4bc
+  metadata.gz: 8404b8357ac37d668e460e0d3c696917e6ff9856
+  data.tar.gz: 3db11b004865f9764c20d32c4e46593a6e72245b
 SHA512:
-  metadata.gz: f492f4522edc15844bd53c497777df32f0694b5f567def36be94d14a202bacf13c1074f1c369e6f0e21f68f021c7f2866da4e786c6c4d53aea849d34b11c9fe7
-  data.tar.gz: 83f4a64e0f95c10091a2be9f2bb8c4c6555bda8a761de454679089bc6f68b5ec2930bce948df1abc2448a900a75b86969ffaa4dbc5cfa99391ed3b8c7d4fdfe2
+  metadata.gz: 0fcac954da380e620eb81d654682c88c58b3a7693e2bc5b5826576588983a8e5fce2ea5a2315adaee44dc3c05640b6d95a234e5319cec9512aff2a132bbb0074
+  data.tar.gz: b733600e6602e99991f2a73dcac2cba57eb3e0fdfa7d4b03cb905b7f286f9f105e239aed3be9412df6d62b4546b5e62b4511eed9017d27dd772b1b583164b237

data/lib/padrino-core.rb

@@ -112,8 +112,8 @@ module Padrino
     # @return [NilClass]
     #
     def set_encoding
-      Encoding.default_external = Encoding::UTF_8
-      Encoding.default_internal = Encoding::UTF_8
+      # remove after 0.15
+      warn 'Warning! Padrino.set_encoding is deprecated. Padrino no longer manages ruby default encodings'
       nil
     end
 

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

@@ -185,11 +185,11 @@ module Padrino
       #
       # @overload redirect(url, status_code)
       #   @param [String] url
-      #   @param [Fixnum] status_code
+      #   @param [Integer] status_code
       #
       # @overload redirect(url, status_code, flash_messages)
       #   @param [String] url
-      #   @param [Fixnum] status_code
+      #   @param [Integer] status_code
       #   @param [Hash]   flash_messages
       #
       # @overload redirect(url, flash_messages)

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

@@ -1,3 +1,5 @@
+require 'padrino-support'
+
 module Padrino
   module Cli
     module Adapter

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

@@ -10,15 +10,6 @@ end
 
 module PadrinoTasks
   def self.init(init=false)
-    lib_path = File.expand_path("lib")
-    unless $LOAD_PATH.any?{ |path| File.expand_path(path) == lib_path }
-      warn <<-EOT
-WARNING! In Padrino >= 0.14.0 cli command `padrino rake` will NOT add
-'./lib' folder to $LOAD_PATH. Please alter your `require` calls accordingly
-if you depend on this behavior.
-      EOT
-      $LOAD_PATH.unshift lib_path
-    end
     Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
     load(File.expand_path('../rake_tasks.rb', __FILE__))
     Rake.application.load_imports

data/lib/padrino-core/loader.rb

@@ -51,7 +51,6 @@ module Padrino
       return false if loaded?
       began_at = Time.now
       @_called_from = first_caller
-      set_encoding
       Padrino.logger
       Reloader.lock!
       before_load.each(&:call)

data/lib/padrino-core/logger.rb

@@ -309,7 +309,7 @@ module Padrino
 
     @@mutex = Mutex.new
     def self.logger
-      @_logger || setup!
+      (@_logger ||= nil) || setup!
     end
 
     def self.logger=(logger)

data/lib/padrino-core/module.rb

@@ -1,6 +1,6 @@
 module Padrino
   module Module
-    attr_accessor :root
+    attr_writer :root
 
     ##
     # Register this module as being loaded from a gem. This automatically

data/lib/padrino-core/mounter.rb

@@ -129,6 +129,8 @@ module Padrino
     #   Array of routes.
     #
     def named_routes
+      return [] unless app_obj.respond_to?(:routes)
+
       app_obj.routes.map { |route|
         request_method = route.request_methods.first
         next if !route.name || request_method == 'HEAD'

data/lib/padrino-core/path_router.rb

@@ -58,8 +58,8 @@ module Padrino
         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|
-          (params.keys.map(&:to_s) - route.matcher.names).length }.shift
+        route = candidates.sort_by! { |candidate|
+          (params.keys.map(&:to_s) - candidate.matcher.names).length }.shift
         matcher = route.matcher
         params_for_expand = params.dup
         if !args.empty? && matcher.mustermann?

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

@@ -14,7 +14,7 @@ module Padrino
         @capture = options[:capture]
         @default_values = options[:default_values]
       end
-  
+
       ##
       # Matches a pattern with the route matcher.
       #
@@ -32,12 +32,12 @@ module Padrino
       def to_regexp
         mustermann? ? handler.to_regexp : handler
       end
-  
+
       ##
       # Expands the path by using parameters.
       #
       def expand(params)
-        params = params.merge(@default_values) if @default_values.is_a?(Hash)
+        params = @default_values.merge(params) 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
@@ -45,7 +45,7 @@ module Padrino
         expanded_path += ?? + Padrino::Utils.build_uri_query(query) unless query.empty?
         expanded_path
       end
-  
+
       ##
       # Returns true if handler is an instance of Mustermann.
       #
@@ -72,7 +72,7 @@ module Padrino
         end
         params
       end
-  
+
       ##
       # Returns the handler which is an instance of Mustermann or Regexp.
       #
@@ -87,14 +87,14 @@ module Padrino
             @path
           end
       end
-  
+
       ##
       # Converts the handler into string.
       #
       def to_s
         handler.to_s
       end
-  
+
       ##
       # Returns names of the handler.
       # @see Regexp#names

data/lib/padrino-core/server.rb

@@ -104,7 +104,7 @@ module Padrino
     #
     def self.parse_server_options(options)
       parsed_server_options = Array(options).flat_map{ |option| option.split('=', 2) }
-      Hash[*parsed_server_options].symbolize_keys
+      Utils.symbolize_keys(Hash[*parsed_server_options])
     end
 
     # Detects Host and Port for Rack server.

data/lib/padrino-core/version.rb

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

data/test/test_core.rb

@@ -20,13 +20,7 @@ describe "Core" do
     it 'should validate global helpers' do
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
-      refute_nil Padrino.version
-    end
-
-    it 'should set correct utf-8 encoding' do
-      Padrino.set_encoding
-      assert_equal Encoding.default_external, Encoding::UTF_8
-      assert_equal Encoding.default_internal, Encoding::UTF_8
+      assert Padrino.version
     end
 
     it 'should raise application error if I instantiate a new padrino application without mounted apps' do

data/test/test_filters.rb

@@ -337,7 +337,7 @@ describe "Filters" do
   end
 
   it 'should catch exceptions in before filters' do
-    doodle = nil
+    doodle = ''
     mock_app do
       after do
         doodle = 'Been after'
@@ -355,7 +355,7 @@ describe "Filters" do
 
     get '/'
     assert_equal 'We broke before', body
-    assert_equal nil, doodle
+    assert_equal '', doodle
   end
 
   it 'should catch exceptions in after filters if no exceptions caught before' do

data/test/test_flash.rb

@@ -45,7 +45,7 @@ describe Padrino::Flash do
 
     it 'should not know the values you set right away' do
       @storage[:foo] = 'bar'
-      assert_nil @storage[:foo]
+      refute_includes @storage, :foo
     end
 
     it 'should knows the values you set next time' do
@@ -62,7 +62,7 @@ describe Padrino::Flash do
     it 'should forgets values you set only for now next time' do
       @storage.now[:foo] = 'bar'
       @storage.sweep
-      assert_nil @storage[:foo]
+      refute_includes @storage, :foo
     end
   end
 

data/test/test_router.rb

@@ -94,13 +94,13 @@ describe "Router" do
 
     res = Rack::MockRequest.new(map).get("/werewolf")
     assert_equal 404, res.status
-    assert_equal nil, res["X-API"]
-    assert_equal nil, res["X-ScriptName"]
-    assert_equal nil, res["X-PathInfo"]
+    refute_includes res, "X-API"
+    refute_includes res, "X-ScriptName"
+    refute_includes res, "X-PathInfo"
 
     res = Rack::MockRequest.new(map).get("/bar/mitzvah")
     assert res.ok?
-    assert_equal nil, res["X-API"]
+    refute_includes res, "X-API"
     assert_equal 'text/plain', res["Content-Type"]
     assert_equal "/bar", res["X-ScriptName"]
     assert_equal "/mitzvah", res["X-PathInfo"]
@@ -114,7 +114,7 @@ describe "Router" do
 
     res = Rack::MockRequest.new(map).get("/bar/scary")
     assert_equal 404, res.status
-    assert_equal nil, res["X-API"]
+    refute_includes res, "X-API"
     assert_equal 'text/plain', res["Content-Type"]
     assert_equal "/bar", res["X-ScriptName"]
     assert_equal "/scary", res["X-PathInfo"]

data/test/test_routing.rb

@@ -1247,6 +1247,17 @@ describe "Routing" do
     assert_equal "lang is en", body
   end
 
+  it 'should override default values when parameters are passed' do
+    mock_app do
+      controller lang: :it do
+        get(:index, map: '/:lang') { "lang is #{params[:lang]}" }
+      end
+    end
+    assert_equal '/pt', @app.url(:index, lang: 'pt')
+    get '/pt'
+    assert_equal 'lang is pt', body
+  end
+
   it 'should transitions to the next matching route on pass' do
     mock_app do
       get '/:foo' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc1
+  version: 0.14.0.rc2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-19 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.14.0.rc1
+        version: 0.14.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc1
+        version: 0.14.0.rc2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement