padrino-core 0.12.0.rc2 → 0.12.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ae10f9e389e527fa9dcec4bba7bf0d043d5e53
-  data.tar.gz: e35bacd38ed575f456711d63a3f2c4482980bf16
+  metadata.gz: c6ea54a7ca6507bdf5a70d33d0474da425b14980
+  data.tar.gz: e614251aa0601ede038832b7b3c0b198320f90d4
 SHA512:
-  metadata.gz: 076b43b1a789f3c6a84f04f578cd4b592ea45bb3fbde45d29bee659a1064240acd6df9c99c654485138b42d3fcc5f7e5bd3c148f69bfdb6f65fbc4214a48dea8
-  data.tar.gz: 673d23844abf49d4e2aa1f2c7bae616cfe25b177e78bfdf338ec045b620fc7c69a4f225cc5656e81387c5fb246c13088fc3b80f25722d941b67643de9023ea23
+  metadata.gz: 29acbac657d342ba26fe4c728cda9d4822daba4055301530aca6e91761f5f96c8a2a1d92c4cc8e48971a31126c24439dcb4befc9859d7ac95b9e861f0fadb8b4
+  data.tar.gz: 0675c7fe47f31dc155cc8d1b8f4707bdbf05c2790e98d47313dae2dff0f701d3671d590266ea3df8e13c029c8eec2c8c3faacd63d37f0ff39d6b5587052dabf5

data/lib/padrino-core.rb

@@ -14,7 +14,11 @@ require 'padrino-core/server'
 require 'padrino-core/tasks'
 require 'padrino-core/module'
 
-PADRINO_ENV  = ENV["PADRINO_ENV"]  ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
+if ENV["PADRINO_ENV"]
+  warn 'Environment variable PADRINO_ENV is deprecated. Please, use RACK_ENV.'
+  ENV["RACK_ENV"] ||= ENV["PADRINO_ENV"]
+end
+RACK_ENV = ENV["RACK_ENV"] ||= "development"  unless defined?(RACK_ENV)
 PADRINO_ROOT = ENV["PADRINO_ROOT"] ||= File.dirname(Padrino.first_caller) unless defined?(PADRINO_ROOT)
 
 module Padrino
@@ -43,13 +47,13 @@ module Padrino
     end
 
     ##
-    # Helper method that return {PADRINO_ENV}.
+    # Helper method that return {RACK_ENV}.
     #
     # @return [Symbol]
     #   The Padrino Environment.
     #
     def env
-      @_env ||= PADRINO_ENV.to_s.downcase.to_sym
+      @_env ||= RACK_ENV.to_s.downcase.to_sym
     end
 
     ##

data/lib/padrino-core/application.rb

@@ -1,7 +1,7 @@
 require 'padrino-core/application/flash'
 require 'padrino-core/application/rendering'
 require 'padrino-core/application/routing'
-require 'padrino-core/application/showexceptions'
+require 'padrino-core/application/show_exceptions'
 require 'padrino-core/application/authenticity_token'
 
 module Padrino
@@ -201,6 +201,10 @@ module Padrino
         @_prerequisites ||= []
       end
 
+      def default(option, *args, &block)
+        set(option, *args, &block) unless respond_to?(option)
+      end
+
       protected
 
       ##

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

@@ -204,7 +204,7 @@ module Padrino
           options[:layout] = false unless is_included_extension ? layout_engine : layout_engine == engine
           options[:layout_engine] = layout_engine || engine if options[:layout]
         elsif options[:layout].present?
-          options[:layout], options[:layout_engine] = *resolve_template(settings.fetch_layout_path(options[:layout]))
+          options[:layout], options[:layout_engine] = *resolve_template(settings.fetch_layout_path(options[:layout]), options)
         end
         # Default to original layout value if none found.
         options[:layout] ||= layout_was
@@ -274,7 +274,7 @@ module Padrino
         end
 
         # Resolve view path and options.
-        options.reverse_merge!(DEFAULT_RENDERING_OPTIONS)
+        options = DEFAULT_RENDERING_OPTIONS.merge(options)
         view_path = options.delete(:views) || settings.views || "./views"
         target_extension = File.extname(template_path)[1..-1] || "none" # explicit template extension
         template_path = template_path.chomp(".#{target_extension}")

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

@@ -514,7 +514,13 @@ module Padrino
 
       def compiled_router
         if @deferred_routes
-          deferred_routes.each { |routes| routes.each { |(route, dest)| route.to(dest) } }
+          deferred_routes.each do |routes|
+            routes.each do |(route, dest)|
+              route.to(dest)
+              route.before_filters.flatten!
+              route.after_filters.flatten!
+            end
+          end
           @deferred_routes = nil
           router.sort!
         end
@@ -724,8 +730,8 @@ module Padrino
         invoke_hook(:padrino_route_added, route, verb, path, args, options, block)
 
         # Add Application defaults.
-        route.before_filters.concat(@filters[:before])
-        route.after_filters.concat(@filters[:after])
+        route.before_filters << @filters[:before]
+        route.after_filters << @filters[:after]
         if @_controller
           route.use_layout = @layout
           route.controller = Array(@_controller)[0].to_s

data/lib/padrino-core/caller.rb

@@ -5,7 +5,7 @@ module Padrino
     %r{lib/padrino-.*$},
     %r{/padrino-.*/(lib|bin)},
     %r{/bin/padrino$},
-    %r{/sinatra(/(base|main|showexceptions))?\.rb$},
+    %r{/sinatra(/(base|main|show_?exceptions))?\.rb$},
     %r{lib/tilt.*\.rb$},
     %r{lib/rack.*\.rb$},
     %r{lib/mongrel.*\.rb$},

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

@@ -124,7 +124,7 @@ module Padrino
           help(task.to_s)
           raise SystemExit
         end
-        ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= options.environment.to_s
+        ENV["RACK_ENV"] ||= options.environment.to_s
         chdir(options.chdir)
         unless File.exist?('config/boot.rb')
           puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"

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

@@ -4,9 +4,9 @@ zh_cn:
       # Use the strftime parameters for formats.
       # When no format has been given, it uses default.
       # You can provide other formats here if you like!
-      default: "%Y 年 %m 月 %d 日"
-      short: "%b 月 %d 日"
-      long: "公元 %Y 年 %B 月 %d 日"
+      default: "%Y年%m月%d日"
+      short: "%b月%d日"
+      long: "%Y年%B月%d日"
       only_day: "%e"
 
     day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
@@ -20,9 +20,9 @@ zh_cn:
 
   time:
     formats:
-      default: "%Y 年 %b 月 %d 日 %H:%M:%S %z"
-      short: "%d 月 %b 日 %H:%M"
-      long: "%Y 年 %B 月 %d 日 %H 时 %M 分"
+      default: "%Y年%b月%d日 %H:%M:%S %z"
+      short: "%b月%d日 %H:%M"
+      long: "%Y年%B%d日 %H时%M分"
     am: "上午"
     pm: "下午"
 

data/lib/padrino-core/reloader.rb

@@ -89,7 +89,7 @@ module Padrino
       return unless options[:force] || file_changed?(file)
 
       Storage.prepare(file) # might call #safe_load recursively
-      logger.debug(file_new?(file) ? :loading : :reload, began_at, file)
+      logger.devel(file_new?(file) ? :loading : :reload, began_at, file)
       begin
         with_silence{ require(file) }
         Storage.commit(file)
@@ -153,7 +153,7 @@ module Padrino
         began_at = Time.now
         I18n.reload!
         update_modification_time(file)
-        logger.debug :reload, began_at, file
+        logger.devel :reload, began_at, file
       end
       true
     end

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.rc2' unless defined?(Padrino::VERSION)
+  VERSION = '0.12.0.rc3' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/fixtures/app_gem/lib/app_gem.rb

@@ -4,4 +4,4 @@ module AppGem
   extend Padrino::Module
 
   gem! 'app_gem'
-end
+end

data/test/fixtures/apps/simple.rb

@@ -1,5 +1,5 @@
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
-# Remove this comment if you want do some like this: ruby PADRINO_ENV=test app.rb
+# Remove this comment if you want do some like this: ruby RACK_ENV=test app.rb
 #
 # require 'rubygems'
 # require 'padrino-core'

data/test/fixtures/layouts/layout.erb

@@ -0,0 +1 @@
+<%= yield %> absolute layout

data/test/helper.rb

@@ -1,4 +1,4 @@
-ENV['PADRINO_ENV'] = 'test'
+ENV['RACK_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
 require File.expand_path('../../../load_paths', __FILE__)

data/test/test_core.rb

@@ -69,5 +69,18 @@ describe "Core" do
       res = Rack::MockRequest.new(Padrino.application).get("/")
       assert_equal "yes", res["Middleware-Called"]
     end
+
+    should "properly set default options" do
+      mock_app do
+        default :foo, :bar
+        default :zoo, :baz
+        set :foo, :bam
+        set :moo, :bam
+        default :moo, :ban
+      end
+      assert_equal @app.settings.foo, :bam
+      assert_equal @app.settings.zoo, :baz
+      assert_equal @app.settings.moo, :bam
+    end
   end
 end

data/test/test_rendering.rb

@@ -446,7 +446,14 @@ describe "Rendering" do
       I18n.locale = :en
       get "/foo.pk"
       assert_equal 404, status
+    end
 
+    should 'resolve templates and layouts located in absolute paths' do
+      mock_app do
+        get("/foo") { render 'apps/views/blog/post', :layout => 'layout', :views => File.dirname(__FILE__)+'/fixtures' }
+      end
+      get '/foo'
+      assert_match /okay absolute layout/, body
     end
 
     should 'resolve template content_type and locale with layout' do

data/test/test_routing.rb

@@ -1488,6 +1488,51 @@ describe "Routing" do
     assert_equal '{"test"=>"what"}', body
   end
 
+  should "work only for the given controller and route when using before-filter with route's name" do
+    mock_app do
+      controller :foo do
+        before(:index) { @a = "only to :index" }
+        get(:index) { @a }
+        get(:main) { @a }
+      end
+    end
+    get '/foo/'
+    assert_equal 'only to :index', body
+    get '/foo/main'
+    assert_equal '', body
+  end
+
+  should "work only for the given controller and route when using after-filter with route's name" do
+    mock_app do
+      controller :after_controller do
+        global = "global variable"
+        get(:index) { global }
+        get(:main) { global }
+        after(:index) { global = nil }
+      end
+    end
+    get '/after_controller'
+    assert_equal 'global variable', body
+    get '/after_controller'
+    assert_equal '', body
+  end
+
+  should "execute the before/after filters when they are inserted after the target route" do
+    mock_app do
+      controller :after_test do
+        global = "global variable"
+        get(:index) { global }
+        get(:foo) { global }
+        before(:index) { global.delete!(" ") }
+        after(:index) { global = "after" }
+      end
+    end
+    get '/after_test'
+    assert_equal 'globalvariable', body
+    get '/after_test/foo'
+    assert_equal 'after', body
+  end
+
   should 'work with controller and arbitrary params' do
     mock_app do
       get(:testing) { params[:foo] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc2
+  version: 0.12.0.rc3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -121,7 +121,7 @@ files:
 - lib/padrino-core/application/rendering/extensions/haml.rb
 - lib/padrino-core/application/rendering/extensions/slim.rb
 - lib/padrino-core/application/routing.rb
-- lib/padrino-core/application/showexceptions.rb
+- lib/padrino-core/application/show_exceptions.rb
 - lib/padrino-core/caller.rb
 - lib/padrino-core/cli/adapter.rb
 - lib/padrino-core/cli/base.rb
@@ -190,6 +190,7 @@ files:
 - test/fixtures/dependencies/circular/f.rb
 - test/fixtures/dependencies/circular/g.rb
 - test/fixtures/dependencies/d.rb
+- test/fixtures/layouts/layout.erb
 - test/helper.rb
 - test/mini_shoulda.rb
 - test/test_application.rb
@@ -261,6 +262,7 @@ test_files:
 - test/fixtures/dependencies/circular/f.rb
 - test/fixtures/dependencies/circular/g.rb
 - test/fixtures/dependencies/d.rb
+- test/fixtures/layouts/layout.erb
 - test/helper.rb
 - test/mini_shoulda.rb
 - test/test_application.rb