padrino-core 0.13.3 → 0.13.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7babb0beba45716e2ff3af2f78dbc0f6a3e842
-  data.tar.gz: 1a047b4858de0f5c60d42a18289d824cc43b519d
+  metadata.gz: 33124fc7a2cac824324138a48c0fda3a890aae3f
+  data.tar.gz: d051bf2e1b63df26a05aa63cdc6d77e97429c51a
 SHA512:
-  metadata.gz: ea91c7f77ca7a01beefd69e03288619b142e64696e68ec36b860491dacf18561867b75b3334580841c2c3705b2bfca7bcc834b4834c1d2398402df279bed6549
-  data.tar.gz: dd67394786c89aa8f52584cc933a164e0a221c534de89c2189141797b5d6103abf79c542fe54e6aae55760333185b5de30a9aead6db67f56cef56280fdefa9f0
+  metadata.gz: 00d7e8413a335c6b8faa73c114f93ecf8bc73174b25f508c71c0f2f939c591029b608a7251ae0944a9378df0c22bf9a26d4c5dba09d3793f8ee06af38400681c
+  data.tar.gz: c874f43d918e9d8f819b69ddeb0e404c0659cc5de995da64774d3f73578fb0b103d66c217d360fc5400dbc99e841f88ae8b60e8c16fae098ab7e83986e22601b

data/lib/padrino-core.rb

@@ -68,10 +68,10 @@ module Padrino
     #   No applications were mounted.
     #
     def application
-      warn 'WARNING! No apps are mounted. Please, mount apps in `config/apps.rb`' unless Padrino.mounted_apps.present?
+      warn 'WARNING! No apps are mounted. Please, mount apps in `config/apps.rb`' if Padrino.mounted_apps.empty?
       router = Padrino::Router.new
       Padrino.mounted_apps.each { |app| app.map_onto(router) }
-      middleware.present? ? add_middleware(router) : router
+      middleware.empty? ? router : add_middleware(router)
     end
 
     ##

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

@@ -340,7 +340,7 @@ module Padrino
       def url(*args)
         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))
+        path = make_path_with_params(args, value_to_param(params))
         rebase_url(fragment ? path << '#' << fragment.to_s : path)
       end
       alias :url_for :url
@@ -377,7 +377,7 @@ module Padrino
           new_url << conform_uri(uri_root) if defined?(uri_root)
           new_url << url
         else
-          url.blank? ? '/' : url
+          url.empty? ? '/' : url
         end
       end
 
@@ -398,6 +398,7 @@ module Padrino
 
       private
 
+      # temporary variables named @_parent, @_provides, @_use_format, @_cache, @_expires, @_map, @_conditions, @_accepts, @_params
       CONTROLLER_OPTIONS = [ :parent, :provides, :use_format, :cache, :expires, :map, :conditions, :accepts, :params ].freeze
 
       # Saves controller options, yields the block, restores controller options.
@@ -624,7 +625,7 @@ module Padrino
 
           unless controller.empty?
             # Now we need to add our controller path only if not mapped directly
-            if map.blank? and !absolute_map
+            if !map && !absolute_map
               controller_path = controller.join("/")
               path.gsub!(%r{^\(/\)|/\?}, "")
               path = File.join(controller_path, path)  unless @_map
@@ -638,7 +639,7 @@ module Padrino
           end
 
           # Add any controller level map to the front of the path.
-          path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
+          path = "#{@_map}/#{path}".squeeze('/') unless absolute_map || !@_map
 
           # Small reformats
           path.gsub!(%r{/\?$}, '(/)')                  # Remove index path
@@ -655,7 +656,7 @@ module Padrino
         name = options.delete(:name) if name.nil? && options.key?(:name)
         if name
           controller_name = controller.join("_")
-          name = "#{controller_name} #{name}".to_sym unless controller_name.blank?
+          name = "#{controller_name} #{name}".to_sym unless controller_name.empty?
         end
 
         options[:default_values] = @_defaults unless options.has_key?(:default_values)
@@ -832,12 +833,12 @@ module Padrino
       #
       def current_path(*path_params)
         if path_params.last.is_a?(Hash)
-          path_params[-1] = params.merge(path_params[-1].with_indifferent_access)
+          path_params[-1] = params.merge(path_params[-1])
         else
           path_params << params
         end
 
-        path_params[-1] = path_params[-1].symbolize_keys
+        path_params[-1] = Utils.symbolize_keys(path_params[-1])
         @route.path(*path_params)
       end
 
@@ -960,7 +961,7 @@ module Padrino
           @params, @layout = original_params, parent_layout
         end
 
-        if routes.present?
+        unless routes.empty?
           verb = request.request_method
           candidacies, allows = routes.partition{|route| route.verb == verb }
           if candidacies.empty?
@@ -1008,7 +1009,7 @@ module Padrino
       end
 
       def captures_from_params(params)
-        if params[:captures].instance_of?(Array) && params[:captures].present?
+        if params[:captures].instance_of?(Array) && !params[:captures].empty?
           params.delete(:captures)
         else
           params.values_at(*route.matcher.names).flatten

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

@@ -4,12 +4,12 @@ module Padrino
       class << self
         # Start for the given options a rackup handler
         def start(options)
-          Padrino.run!(options.symbolize_keys)
+          Padrino.run!(Utils.symbolize_keys(options))
         end
 
         # Method that stop (if exist) a running Padrino.application
         def stop(options)
-          options.symbolize_keys!
+          options = Utils.symbolize_keys(options)
           if File.exist?(options[:pid])
             pid = File.read(options[:pid]).to_i
             puts "=> Sending INT to process with pid #{pid}"

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

@@ -22,7 +22,7 @@ end
 
 def list_app_routes(app, args)
   app_routes = app.named_routes
-  app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query.present?
+  app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query && !args.query.empty?
   app_routes.map! { |r| [r.verb, r.name, r.path] }
   return if app_routes.empty?
   shell.say "\nApplication: #{app.app_class}", :yellow

data/lib/padrino-core/mounter.rb

@@ -130,6 +130,8 @@ module Padrino
     #
     def named_routes
       app_obj.routes.map { |route|
+        request_method = route.request_methods.first
+        next if !route.name || request_method == 'HEAD'
         route_name = route.name.to_s
         route_name =
           if route.controller
@@ -138,8 +140,6 @@ module Padrino
             ":#{route_name}"
           end
         name_array = "(#{route_name})"
-        request_method = route.request_methods.first
-        next if route.name.blank? || request_method == 'HEAD'
         original_path = route.original_path.is_a?(Regexp) ? route.original_path.inspect : route.original_path
         full_path = File.join(uri_root, original_path)
         OpenStruct.new(:verb => request_method, :identifier => route.name, :name => name_array, :path => full_path)

data/lib/padrino-core/server.rb

@@ -39,11 +39,11 @@ module Padrino
 
     # Starts the application on the available server with specified options.
     def self.start(app, options={})
-      options = options.to_hash.symbolize_keys
+      options = Utils.symbolize_keys(options.to_hash)
       options.update(parse_server_options(options.delete(:options)))
       options.update(detect_address(options))
       options[:pid] = prepare_pid(options[:pid]) if options[:daemonize]
-      options[:server] = detect_rack_handler if options[:server].blank?
+      options[:server] ||= detect_rack_handler
       # disable Webrick AccessLog
       options[:AccessLog] = []
       new(options, app).start
@@ -95,7 +95,7 @@ module Padrino
     # Prepares a directory for pid file.
     #
     def self.prepare_pid(pid)
-      pid = 'tmp/pids/server.pid' if pid.blank?
+      pid ||= 'tmp/pids/server.pid'
       FileUtils.mkdir_p(File.dirname(pid))
       File.expand_path(pid)
     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.3' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.3.1' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/padrino-core.gemspec

@@ -24,11 +24,7 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  if ENV["SINATRA_EDGE"]
-    s.add_dependency("sinatra")
-  else
-    s.add_dependency("sinatra", "~> 1.4.6")
-  end
+  s.add_dependency("sinatra", ">= 1.4.6")
   s.add_dependency("mustermann19")
   s.add_dependency("thor", "~> 0.18")
   s.add_dependency("activesupport", ">= 3.1")

data/test/test_csrf_protection.rb

@@ -6,6 +6,7 @@ describe "Application" do
   describe 'CSRF protection' do
     describe "with CSRF protection on" do
       before do
+        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
         mock_app do
           enable :sessions
           enable :protect_from_csrf
@@ -19,25 +20,24 @@ describe "Application" do
       end
 
       it 'should allow requests with correct tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+        post "/", {"authenticity_token" => @token}, 'rack.session' => {:csrf => @token}
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+        post "/", {"authenticity_token" => "b"}, 'rack.session' => {:csrf => @token}
         assert_equal 403, status
       end
 
       it 'should allow requests with correct X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "a"
+        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => @token
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "b"
+        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => "b"
         assert_equal 403, status
       end
-
     end
 
     describe "without CSRF protection on" do
@@ -142,6 +142,7 @@ describe "Application" do
 
     describe "with custom protection options" do
       before do
+        @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
         mock_app do
           enable :sessions
           set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'
@@ -150,7 +151,7 @@ describe "Application" do
       end
 
       it 'should allow configuring protection options' do
-        post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
+        post "/a", {"foobar" => @token}, 'rack.session' => {:csrf => @token}
         assert_equal 200, status
       end
 

data/test/test_locale.rb

@@ -6,16 +6,16 @@ describe "Locales" do
     name = File.basename(file, '.yml')
     it "should should have correct locale for #{name}" do
       base = base_original[name]['date']['formats']
-      assert base['default'].present?
-      assert base['short'].present?
-      assert base['long'].present?
-      assert base['only_day'].present?
+      assert base['default']
+      assert base['short']
+      assert base['long']
+      assert base['only_day']
       base = base_original[name]['date']
-      assert base['day_names'].present?
-      assert base['abbr_day_names'].present?
-      assert base['month_names'].present?
-      assert base['abbr_month_names'].present?
-      assert base['order'].present?
+      assert base['day_names']
+      assert base['abbr_day_names']
+      assert base['month_names']
+      assert base['abbr_month_names']
+      assert base['order']
     end
   end
 end

data/test/test_routing.rb

@@ -2149,14 +2149,14 @@ describe "Routing" do
       get(:simple, :map => "/simple/:id") { }
       get(:with_format, :with => :id, :provides => :js) { }
     end
-    assert_equal [:"foo bar", { :id => "fantastic" }.with_indifferent_access], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
-    assert_equal [:"foo bar", { :id => "18" }.with_indifferent_access], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
-    assert_equal [:simple, { :id => "bar" }.with_indifferent_access], @app.recognize_path(@app.url(:simple, :id => "bar"))
-    assert_equal [:simple, { :id => "true" }.with_indifferent_access], @app.recognize_path(@app.url(:simple, :id => true))
-    assert_equal [:simple, { :id => "9" }.with_indifferent_access], @app.recognize_path(@app.url(:simple, :id => 9))
-    assert_equal [:with_format, { :id => "bar", :format => "js" }.with_indifferent_access], @app.recognize_path(@app.url(:with_format, :id => "bar", :format => :js))
-    assert_equal [:with_format, { :id => "true", :format => "js" }.with_indifferent_access], @app.recognize_path(@app.url(:with_format, :id => true, :format => "js"))
-    assert_equal [:with_format, { :id => "9", :format => "js" }.with_indifferent_access], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
+    assert_equal [:"foo bar", { "id" => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
+    assert_equal [:"foo bar", { "id" => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
+    assert_equal [:simple, { "id" => "bar" }], @app.recognize_path(@app.url(:simple, :id => "bar"))
+    assert_equal [:simple, { "id" => "true" }], @app.recognize_path(@app.url(:simple, :id => true))
+    assert_equal [:simple, { "id" => "9" }], @app.recognize_path(@app.url(:simple, :id => 9))
+    assert_equal [:with_format, { "id" => "bar", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => "bar", :format => :js))
+    assert_equal [:with_format, { "id" => "true", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => true, :format => "js"))
+    assert_equal [:with_format, { "id" => "9", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
   end
 
   it 'should have current_path' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.3.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,26 +19,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.3.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
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem