padrino-core 0.16.0.pre4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0598394e65fde3235a6a76871f740444771c3d7b3f9844a4d9dd9590e219da35'
-  data.tar.gz: d20d12d95e74e282f8b637957a26c2d656d70335701aa7279361e47a1694db6b
+  metadata.gz: 905df870641a62de881388a397652fd8e3b571527f4b716b714dca3a9706cdd3
+  data.tar.gz: c3eaaad8dd89f106fdc7a69b2ca30b3fafca57c44cfbbeca7ea2f4b31d602b35
 SHA512:
-  metadata.gz: a8e9cd927d836b26837025b4b508cedfc2e4accb28245762b350bc3b247e33dd3c9fc25db9cfa07e11b56add4d179ae5c76502401e4334f8840ffacd0731b1da
-  data.tar.gz: 3e315bef9862e3ba489b87fd5c5342a54ff7dab2b648b5136c26227a3d61c5293f14f9974e0c7bdba3f7da108dcc4a0a7acc01ed99714caec7070109c94362f9
+  metadata.gz: f07ecd54029247a4fb104223c1c9bc5edd0c3f03ef849d841689cdbccd086a0390c6795f6f0f57b2945eb64ed5ee0e20c002fb09448be1736448ad9c550b9a65
+  data.tar.gz: ee2c9d16ca33f397f1a6d4906b958706951d8d170d0cb660a851abff480ca83f313dbaa1a4c113ea94d14da9073f3daf128a0d94c849a87f182f50751ebbb410

data/README.rdoc

@@ -87,7 +87,7 @@ the padrino framework's functionalities.
 Let us first take a look at the simplest possible Padrino application:
 
   # app.rb
-  PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+  PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
   require 'padrino'
   Padrino.load!
 
@@ -114,8 +114,8 @@ within a more structured layout. Simply add a <tt>controllers</tt> or <tt>app/co
 
   # Simple Example
   SimpleApp.controllers do
-    get "/test" do
-      "Text to return"
+    get '/test' do
+      'Text to return'
     end
   end
 
@@ -127,7 +127,7 @@ You can also do more complex route alias definitions:
       ...
     end
 
-    get :show, :with => :id do
+    get :show, with: :id do
       # url generated is '/posts/show/:id'
       # access params[:id]
     end
@@ -141,7 +141,7 @@ as well as mapping the route aliases to an explicit url:
       ...
     end
 
-    get :account, :map => '/the/accounts/:name/and/:id' do
+    get :account, map: '/the/accounts/:name/and/:id' do
       # access params[:name] and params[:index]
     end
   end
@@ -150,11 +150,11 @@ and even configure the +provides+ for each route:
 
   # app/controllers/example.rb
   SimpleApp.controllers :admin do
-    get :show, :with => :id, :provides => :js do
+    get :show, with: :id, provides: :js do
       "Url is /admin/show/#{params[:id]}.#{params[:format]}"
     end
 
-    get :other, :with => [:id, :name], :provides => [:html, :json] do
+    get :other, with: [:id, :name], provides: [:html, :json] do
       case content_type
         when :js    then ... end
         when :json  then ... end
@@ -166,7 +166,7 @@ or auto lookup for current locale or content_type
 
   # app/controllers/example.rb
   SimpleApp.controllers :admin do
-    get :show, :with => :id, :provides => [:html, :js] do
+    get :show, with: :id, provides: [:html, :js] do
       render "admin/show"
     end
   end

data/Rakefile

@@ -1 +1 @@
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require_relative '../gem_rake_helper'

data/bin/padrino

@@ -3,7 +3,7 @@ require 'padrino-core/cli/binstub'
 Padrino.replace_with_binstub('padrino')
 
 padrino_core_path = File.expand_path('../lib', __dir__)
-$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
+$LOAD_PATH.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$LOAD_PATH.include?(padrino_core_path)
 
 require 'padrino-core/cli/base'
 Padrino::Cli::Base.start(ARGV)

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

@@ -12,7 +12,7 @@ module Padrino
       # Defines default settings for Padrino application.
       #
       def default_configuration!
-        set :app_file, File.expand_path(caller_files.first || $0)
+        set :app_file, File.expand_path(caller_files.first || $PROGRAM_NAME)
         set :app_name, Inflections.underscore(settings).to_sym
 
         set :environment, Padrino.env
@@ -66,7 +66,7 @@ module Padrino
       end
 
       def default_security
-        set :protection, :except => :path_traversal
+        set :protection, except: :path_traversal
         set :sessions, false
         set :protect_from_csrf, false
         set :report_csrf_failure, false
@@ -96,7 +96,7 @@ module Padrino
           '/models/**/*.rb',
           '/lib.rb',
           '/lib/**/*.rb'
-        ].map{ |glob| File.join(settings.root, glob) }
+        ].map { |glob| File.join(settings.root, glob) }
       end
 
       # Overrides the default middleware for Sinatra based on Padrino conventions.
@@ -122,7 +122,7 @@ module Padrino
         configure :development do
           get '*__sinatra__/:image.png' do
             content_type :png
-            send_file(File.dirname(__FILE__) + "/../images/#{params[:image]}.png")
+            send_file("#{__dir__}/../images/#{params[:image]}.png")
           end
         end
       end
@@ -132,15 +132,18 @@ module Padrino
       #
       def default_errors
         configure :production do
+          return if errors.key?(::Exception)
+
           error ::Exception do
             logger.exception env['sinatra.error']
             halt(500, { 'content-type' => 'text/html' }, ['<h1>Internal Server Error</h1>'])
-          end unless errors.has_key?(::Exception)
+          end
         end
       end
 
       def setup_locale
         return unless defined? I18n
+
         Reloader.special_files += locale_path
         I18n.load_path << locale_path
         I18n.reload!
@@ -148,7 +151,7 @@ module Padrino
 
       # allow custome session management
       def setup_sessions(builder)
-        if sessions.kind_of?(Hash) && sessions[:use]
+        if sessions.is_a?(Hash) && sessions[:use]
           builder.use sessions[:use], sessions[:config] || {}
         else
           super
@@ -158,21 +161,20 @@ module Padrino
       # sets up csrf protection for the app
       def setup_csrf_protection(builder)
         check_csrf_protection_dependency
+        return unless protect_from_csrf?
 
-        if protect_from_csrf?
-          options = options_for_csrf_protection_setup
-          options.merge!(protect_from_csrf) if protect_from_csrf.kind_of?(Hash)
-          builder.use(options[:except] ? Padrino::AuthenticityToken : Rack::Protection::AuthenticityToken, options)
-        end
+        options = options_for_csrf_protection_setup
+        options.merge!(protect_from_csrf) if protect_from_csrf.is_a?(Hash)
+        builder.use(options[:except] ? Padrino::AuthenticityToken : Rack::Protection::AuthenticityToken, options)
       end
 
       # returns the options used in the builder for csrf protection setup
       def options_for_csrf_protection_setup
-        options = { :logger => logger }
+        options = { logger: logger }
         if report_csrf_failure? || allow_disabled_csrf?
           options.merge!(
-            :reaction   => :report,
-            :report_key => 'protection.csrf.failed'
+            reaction: :report,
+            report_key: 'protection.csrf.failed'
           )
         end
         options
@@ -180,23 +182,23 @@ module Padrino
 
       # warn if the protect_from_csrf is active but sessions are not
       def check_csrf_protection_dependency
-        if (protect_from_csrf? && !sessions?) && !defined?(Padrino::IGNORE_CSRF_SETUP_WARNING)
-          warn(<<-ERROR)
-  `protect_from_csrf` is activated, but `sessions` seem to be off. To enable csrf
-  protection, use:
+        return unless protect_from_csrf? && !sessions? && !defined?(Padrino::IGNORE_CSRF_SETUP_WARNING)
 
-      enable :sessions
+        warn(<<~ERROR)
+          `protect_from_csrf` is activated, but `sessions` seem to be off. To enable csrf
+          protection, use:
 
-  or deactivate protect_from_csrf:
+              enable :sessions
 
-      disable :protect_from_csrf
+          or deactivate protect_from_csrf:
 
-  If you use a different session store, ignore this warning using:
+              disable :protect_from_csrf
 
-      # in boot.rb:
-      Padrino::IGNORE_CSRF_SETUP_WARNING = true
-          ERROR
-        end
+          If you use a different session store, ignore this warning using:
+
+              # in boot.rb:
+              Padrino::IGNORE_CSRF_SETUP_WARNING = true
+        ERROR
       end
     end
   end

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

@@ -17,9 +17,10 @@ module Padrino
 
     def except?(env)
       return false unless @except
+      return @except.call(env) if @except.is_a?(Proc)
+
       path_info = env['PATH_INFO']
-      @except.is_a?(Proc) ? @except.call(env) : @except.any?{|path|
-        path.is_a?(Regexp) ? path.match(path_info) : path == path_info }
+      @except.any? { |path| path.is_a?(Regexp) ? path.match(path_info) : path == path_info }
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module Padrino
   module Flash
-
     class << self
       def registered(app)
         app.helpers Helpers
@@ -14,7 +13,7 @@ module Padrino
       include Enumerable
 
       # @private
-      def initialize(session=nil)
+      def initialize(session = nil)
         @_now  = session || {}
         @_next = {}
       end
@@ -77,7 +76,7 @@ module Padrino
         @_now.update(hash)
         self
       end
-      alias_method :merge!, :update
+      alias merge! update
 
       # @since 0.10.8
       # @api public
@@ -130,7 +129,7 @@ module Padrino
       def length
         @_now.length
       end
-      alias_method :size, :length
+      alias size length
 
       # @since 0.10.8
       # @api public
@@ -212,7 +211,7 @@ module Padrino
 
         super(url, args)
       end
-      alias_method :redirect_to, :redirect
+      alias redirect_to redirect
 
       ###
       # Returns the flash storage object.

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

@@ -19,21 +19,21 @@ module Padrino
       # Implements filtering of url query params. Can prevent mass-assignment.
       #
       # @example
-      #   post :update, :params => [:name, :email]
-      #   post :update, :params => [:name, :id => Integer]
-      #   post :update, :params => [:name => proc{ |v| v.reverse }]
-      #   post :update, :params => [:name, :parent => [:name, :position]]
-      #   post :update, :params => false
-      #   post :update, :params => true
+      #   post :update, params: [:name, :email]
+      #   post :update, params: [:name, { id: Integer }]
+      #   post :update, params: [{ name: proc { |v| v.reverse } }]
+      #   post :update, params: [:name, { parent: [:name, :position] }]
+      #   post :update, params: false
+      #   post :update, params: true
       # @example
-      #   params :name, :email, :password => prox{ |v| v.reverse }
+      #   params :name, :email, password: proc { |v| v.reverse }
       #   post :update
       # @example
-      #   App.controller :accounts, :params => [:name, :position] do
+      #   App.controller :accounts, params: [:name, :position] do
       #     post :create
-      #     post :update, :with => [ :id ], :params => [:name, :position, :addition]
-      #     get :show, :with => :id, :params => false
-      #     get :search, :params => true
+      #     post :update, with: [:id], params: [:name, :position, :addition]
+      #     get :show, with: :id, params: false
+      #     get :search, params: true
       #   end
       #
       def params(*allowed_params)
@@ -48,11 +48,10 @@ module Padrino
 
       def prepare_allowed_params(allowed_params)
         param_filter = {}
-        allowed_params.each do |key,value|
-          case
-          when key.kind_of?(Hash) && !value
+        allowed_params.each do |key, value|
+          if key.is_a?(Hash) && !value
             param_filter.update(prepare_allowed_params(key))
-          when value.kind_of?(Hash) || value.kind_of?(Array)
+          elsif value.is_a?(Hash) || value.is_a?(Array)
             param_filter[key.to_s] = prepare_allowed_params(value)
           else
             param_filter[key.to_s] = value == false ? false : (value || true)
@@ -75,38 +74,36 @@ module Padrino
       #   scalar classes are: Integer (empty string is cast to nil).
       #
       # @example
-      #   filter_params!( { "a" => "1", "b" => "abc", "d" => "drop" },
-      #                   { "a" => Integer, "b" => true } )
-      #   # => { "a" => 1, "b" => "abc" }
-      #   filter_params!( { "id" => "", "child" => { "name" => "manny" } },
-      #                   { "id" => Integer, "child" => { "name" => proc{ |v| v.camelize } } } )
-      #   # => { "id" => nil, "child" => { "name" => "Manny" } }
-      #   filter_params!( { "a" => ["1", "2", "3"] },
-      #                   { "a" => true } )
-      #   # => { "a" => ["1", "2", "3"] }
-      #   filter_params!( { "persons" => {"p-1" => { "name" => "manny", "age" => "50" }, "p-2" => { "name" => "richard", "age" => "50" } } },
-      #                   { "persons" => { "name" => true } } )
-      #   # => { "persons" => {"p-1" => { "name" => "manny" }, "p-2" => { "name" => "richard" } } }
+      #   filter_params!( { 'a' => '1', 'b' => 'abc', 'd' => 'drop' },
+      #                   { 'a' => Integer, 'b' => true } )
+      #   # => { 'a' => 1, 'b' => 'abc' }
+      #   filter_params!( { 'id' => '', 'child' => { 'name' => 'manny' } },
+      #                   { 'id' => Integer, 'child' => { 'name' => proc{ |v| v.camelize } } } )
+      #   # => { 'id' => nil, 'child' => { 'name' => 'Manny' } }
+      #   filter_params!( { 'a' => ['1', '2', '3'] },
+      #                   { 'a' => true } )
+      #   # => { 'a' => ['1', '2', '3'] }
+      #   filter_params!( { 'persons' => { 'p-1' => { 'name' => 'manny', 'age' => '50' }, 'p-2' => { 'name' => 'richard', 'age' => '50' } } },
+      #                   { 'persons' => { 'name' => true } } )
+      #   # => { 'persons' => { 'p-1' => { 'name' => 'manny' }, 'p-2' => { 'name' => 'richard' } } }
       #
       def filter_params!(params, allowed_params)
-        params.each do |key,value|
+        params.each do |key, value|
           type = allowed_params[key]
-          next if value.kind_of?(Array) && type
-          case
-          when type.kind_of?(Hash) && value.kind_of?(Hash)
-            if key == Inflections.pluralize(key) && value.values.first.kind_of?(Hash)
-              value.each do |array_index,array_value|
+          next if value.is_a?(Array) && type
+          if type.is_a?(Hash) && value.is_a?(Hash)
+            if key == Inflections.pluralize(key) && value.values.first.is_a?(Hash)
+              value.each do |array_index, array_value|
                 value[array_index] = filter_params!(array_value, type)
               end
             else
               params[key] = filter_params!(value, type)
             end
-          when type == Integer
+          elsif type == Integer
             params[key] = value.empty? ? nil : value.to_i
-          when type.kind_of?(Proc)
+          elsif type.is_a?(Proc)
             params[key] = type.call(value)
-          when type == true
-          else
+          elsif type != true
             params.delete(key)
           end
         end