padrino-core 0.12.0.rc3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6ea54a7ca6507bdf5a70d33d0474da425b14980
-  data.tar.gz: e614251aa0601ede038832b7b3c0b198320f90d4
+  metadata.gz: ef4204b99783ae0f813af61c5ae43a5edb5b9c99
+  data.tar.gz: 9752a0075e390a6fd24c7b56f60b76f1719d3bf1
 SHA512:
-  metadata.gz: 29acbac657d342ba26fe4c728cda9d4822daba4055301530aca6e91761f5f96c8a2a1d92c4cc8e48971a31126c24439dcb4befc9859d7ac95b9e861f0fadb8b4
-  data.tar.gz: 0675c7fe47f31dc155cc8d1b8f4707bdbf05c2790e98d47313dae2dff0f701d3671d590266ea3df8e13c029c8eec2c8c3faacd63d37f0ff39d6b5587052dabf5
+  metadata.gz: 8f716e4b5e8f068047a87ae18d19dbf2abcdf0ff4bcce8c538a4e05dd7933ac0c3374e80174340d74f80f9d4862da4de097d8d328e4d703e24281dde03aac722
+  data.tar.gz: 3917aed536dedd954528f03e4e650830bc721235b68c8ae07fccb546bef08d7c77a382c95d35ad05a868181d0babf6486ee79474415f53d71c12e5c74bfe7bea

data/lib/padrino-core/application.rb

@@ -344,13 +344,9 @@ module Padrino
         check_csrf_protection_dependency
 
         if protect_from_csrf?
-          if protect_from_csrf.is_a?(Hash) && protect_from_csrf[:except]
-            builder.use(AuthenticityToken,
-                        options_for_csrf_protection_setup.merge(:except => protect_from_csrf[:except]))
-          else
-            builder.use(Rack::Protection::AuthenticityToken,
-                        options_for_csrf_protection_setup)
-          end
+          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
       end
 

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

@@ -11,7 +11,7 @@ module Padrino
       if except?(env)
         @app.call(env)
       else
-        super(env)
+        super
       end
     end
 

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

@@ -580,7 +580,7 @@ module Padrino
         name = names[0, 2].join(" ").to_sym    # route name is concatenated with underscores
         if params.is_a?(Hash)
           params[:format] = params[:format].to_s unless params[:format].nil?
-          params = value_to_param(params)
+          params = value_to_param(params.symbolize_keys)
         end
         url =
           if params_array.empty?
@@ -884,10 +884,10 @@ module Padrino
       def provides(*types)
         @_use_format = true
         condition do
-          mime_types        = types.map { |t| mime_type(t) }.compact
-          url_format        = params[:format].to_sym if params[:format]
-          accepts           = request.accept.map(&:to_str)
-          accepts           = [] if accepts == ["*/*"]
+          mime_types = types.map { |t| mime_type(t) }.compact
+          url_format = params[:format].to_sym if params[:format]
+          accepts    = request.accept.map(&:to_str)
+          accepts.clear if accepts == ["*/*"]
 
           # Per rfc2616-sec14:
           # Assume */* if no ACCEPT header is given.

data/lib/padrino-core/locale/nl.yml

@@ -11,7 +11,7 @@ nl:
 
     day_names: [zondag, maandag, dinsdag, woensdag, donderdag, vrijdag, zaterdag]
     abbr_day_names: [zo, ma, di, wo, do, vr, za]
-    month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november]
+    month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
     abbr_month_names: [~, jan, feb, maa, apr, mei, jun, jul, aug, sep, okt, nov, dec]
     order:
       - day

data/lib/padrino-core/reloader.rb

@@ -168,7 +168,7 @@ module Padrino
         update_modification_time(file)
       else
         safe_load(file)
-        Padrino.mounted_apps.each do |app|
+        reloadable_apps.each do |app|
           app.app_obj.reload! if app.app_obj.dependencies.include?(file)
         end
       end
@@ -222,7 +222,7 @@ module Padrino
     def files_for_rotation
       files = Set.new
       Padrino.load_paths.each{ |path| files += Dir.glob("#{path}/**/*.rb") }
-      Padrino.mounted_apps.each do |app|
+      reloadable_apps.each do |app|
         files << app.app_file
         files += app.app_obj.dependencies
       end
@@ -233,6 +233,10 @@ module Padrino
       (exclude_constants - include_constants).any?{ |c| const._orig_klass_name.start_with?(c) }
     end
 
+    def reloadable_apps
+      Padrino.mounted_apps.select{ |app| app.app_obj.respond_to?(:reload) && app.app_obj.reload? }
+    end
+
     ##
     # Disables output, yields block, switches output back.
     #

data/lib/padrino-core/support_lite.rb

@@ -2,9 +2,9 @@
 # This file loads certain extensions required by Padrino from ActiveSupport.
 #
 require 'active_support/core_ext/module/aliasing'           # alias_method_chain
-require 'active_support/core_ext/hash/keys'                 # symbolize_keys
 require 'active_support/core_ext/hash/reverse_merge'        # reverse_merge
-require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/keys'                 # symbolize_keys
+require 'active_support/core_ext/hash/indifferent_access'   # params[:foo]
 require 'active_support/core_ext/hash/slice'                # slice
 require 'active_support/core_ext/object/blank'              # present?
 require 'active_support/core_ext/array/extract_options'     # extract_options

data/lib/padrino-core/version.rb

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

data/test/fixtures/apps/static.rb

@@ -0,0 +1,10 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class StaticDemo < Padrino::Application
+  disable :reload
+  def self.reload!
+    fail 'reload! called'
+  end
+end
+
+Padrino.load!

data/test/test_csrf_protection.rb

@@ -119,6 +119,21 @@ describe "Application" do
       end
     end
 
+    context "with custom protection options" do
+      before do
+        mock_app do
+          enable :sessions
+          set :protect_from_csrf, :authenticity_param => 'foobar'
+          post("/a") { "a" }
+        end
+      end
+
+      should "allow configuring protection options" do
+        post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
+        assert_equal 200, status
+      end
+    end
+
     context "with middleware" do
       before do
         class Middleware < Sinatra::Base

data/test/test_reloader_system.rb

@@ -1,5 +1,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')
 
 describe "SystemReloader" do
   context 'for wierd and difficult reload events' do
@@ -39,7 +41,7 @@ describe "SystemReloader" do
         File.open(parent_file, "w") { |f| f.write(backup) }
       end
     end
-    
+
     should 'tamper with LOAD_PATH' do
       SystemDemo.load_paths.each do |lib_dir|
         assert_includes $LOAD_PATH, lib_dir
@@ -48,5 +50,15 @@ describe "SystemReloader" do
         assert_includes $LOAD_PATH, lib_dir
       end
     end
+
+    should 'not fail horribly on reload event with non-padrino apps' do
+      Padrino.mount("kiq").to("/")
+      Padrino.reload!
+    end
+
+    should 'not reload apps with disabled reload' do
+      Padrino.mount(StaticDemo).to("/")
+      Padrino.reload!
+    end
   end
 end

data/test/test_routing.rb

@@ -284,6 +284,14 @@ describe "Routing" do
     assert_equal "https://example.org/hash/1", body
   end
 
+  should 'generate absolute urls from stringified keys' do
+    mock_app do
+      get(:hash, with: :id) { absolute_url(:hash, "id" => 1) }
+    end
+    get "/hash/2"
+    assert_equal "http://example.org/hash/1", body
+  end
+
   should 'generate proper absolute urls for mounted apps' do
     class Test < Padrino::Application
       get :foo do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc3
+  version: 0.12.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -181,6 +181,7 @@ files:
 - test/fixtures/apps/models/parent.rb
 - test/fixtures/apps/render.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/views/blog/post.erb
 - test/fixtures/dependencies/a.rb
@@ -227,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
 rubygems_version: 2.0.6
@@ -253,6 +254,7 @@ test_files:
 - test/fixtures/apps/models/parent.rb
 - test/fixtures/apps/render.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/static.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/views/blog/post.erb
 - test/fixtures/dependencies/a.rb