padrino-core 0.9.20 → 0.9.21

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

@@ -40,10 +40,14 @@ module Padrino
       # Use layout like rails does or if a block given then like sinatra.
       # If used without a block, sets the current layout for the route.
       #
-      # By default, searches in your +app+/+views+/+layouts+/+application+.(+haml+|+erb+|+xxx+)
+      # By default, searches in your:
+      #
+      # +app+/+views+/+layouts+/+application+.(+haml+|+erb+|+xxx+)
+      # +app+/+views+/+layout_name+.(+haml+|+erb+|+xxx+)
       #
       # If you define +layout+ :+custom+ then searches for your layouts in
       # +app+/+views+/+layouts+/+custom+.(+haml+|+erb+|+xxx+)
+      # +app+/+views+/+custom+.(+haml+|+erb+|+xxx+)
       #
       def layout(name=:layout, &block)
         return super(name, &block) if block_given?
@@ -71,8 +75,8 @@ module Padrino
       ##
       # Retunrs the cached layout path.
       #
-      def fetch_layout_path
-        layout_name = @layout || :application
+      def fetch_layout_path(given_layout=nil)
+        layout_name = given_layout || @layout || :application
         @_cached_layout ||= {}
         cached_layout_path = @_cached_layout[layout_name]
         return cached_layout_path if cached_layout_path
@@ -115,8 +119,14 @@ module Padrino
 
           # Resolve layouts similar to in Rails
           if (options[:layout].nil? || options[:layout] == true) && !settings.templates.has_key?(:layout)
-            options[:layout] = resolved_layout || false # We need to force layout false so sinatra don't try to render it
+            layout_path, layout_engine = *resolved_layout
+            options[:layout] = layout_path || false # We need to force layout false so sinatra don't try to render it
+            options[:layout] = false unless layout_engine == engine # TODO allow different layout engine
+            options[:layout_engine] = layout_engine || engine if options[:layout]
             logger.debug "Resolving layout #{options[:layout]}" if defined?(logger) && options[:layout].present?
+          elsif options[:layout].present?
+            options[:layout] = settings.fetch_layout_path(options[:layout])
+            logger.debug "Resolving layout #{options[:layout]}" if defined?(logger)
           end
 
           # Pass arguments to Sinatra render method
@@ -124,16 +134,17 @@ module Padrino
         end
 
         ##
-        # Returns the located layout to be used for the rendered template (if available)
+        # Returns the located layout tuple to be used for the rendered template (if available)
         #
         # ==== Example
         #
-        # resolve_layout(true)
-        # => "/layouts/custom"
+        # resolve_layout
+        # => ["/layouts/custom", :erb]
+        # => [nil, nil]
         #
         def resolved_layout
-          located_layout = resolve_template(settings.fetch_layout_path, :raise_exceptions => false)
-          located_layout ? located_layout[0] : false
+          located_layout = resolve_template(settings.fetch_layout_path, :raise_exceptions => false, :strict_format => true)
+          located_layout ? located_layout : [nil, nil]
         end
 
         ##

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

@@ -175,6 +175,7 @@ module Padrino
           @_controller, original_controller = args, @_controller
           @_parents,    original_parent     = options.delete(:parent), @_parents
           @_provides,   original_provides   = options.delete(:provides), @_provides
+          @_use_format, original_use_format = options.delete(:use_format), @_use_format
           @_cache,      original_cache      = options.delete(:cache), @_cache
           @_map,        original_map        = options.delete(:map), @_map
           @_defaults,   original_defaults   = options, @_defaults
@@ -192,6 +193,7 @@ module Padrino
           # Controller defaults
           @_controller, @_parents, @_cache = original_controller, original_parent, original_cache
           @_defaults, @_provides, @_map  = original_defaults, original_provides, original_map
+          @_use_format = original_use_format
         else
           include(*args) if extensions.any?
         end
@@ -349,10 +351,7 @@ module Padrino
           invoke_hook(:route_added, verb, path, block)
 
           # HTTPRouter route construction
-          route = case path
-            when Regexp then router.add('/?*').match_path(path)
-            else             router.add(path)
-          end
+          route = router.add(path)
 
           route.name(name) if name
           route.cache = options.key?(:cache) ? options.delete(:cache) : @_cache
@@ -420,7 +419,7 @@ module Padrino
             # Now we need to parse our provides
             options.delete(:provides) if options[:provides].nil?
 
-            if format_params = options[:provides]
+            if @_use_format or format_params = options[:provides]
               process_path_for_provides(path, format_params)
             end
 
@@ -453,7 +452,8 @@ module Padrino
             path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
 
             # Small reformats
-            path.gsub!(%r{/?index/?}, '')                  # Remove index path
+            path.gsub!(%r{/?index/?}, '/')                 # Remove index path
+            path.gsub!(%r{//$}, '/')                       # Remove index path
             path[0,0] = "/" unless path =~ %r{^\(?/}       # Paths must start with a /
             path.sub!(%r{/(\))?$}, '\\1') if path != "/"   # Remove latest trailing delimiter
             path.gsub!(/\/(\(\.|$)/, '\\1')                # Remove trailing slashes
@@ -499,6 +499,7 @@ module Padrino
         # Allow paths for the given request head or request format
         #
         def provides(*types)
+          @_use_format = true
           condition do
             mime_types        = types.map { |t| mime_type(t) }
             accepts           = request.accept.map { |a| a.split(";")[0].strip }
@@ -595,8 +596,15 @@ module Padrino
             if match.first.respond_to?(:path)
               match.each do |matched_path|
                 request.match = matched_path
-                @block_params = matched_path.param_values
-                (@params ||= {}).merge!(matched_path.params)
+                if request.match.path.route.regex?
+                  params_list = @request.env['rack.request.query_hash']['router.regex_match'].to_a
+                  params_list.shift
+                  @block_params = params_list
+                  @params.update({:captures => params_list}.merge(@params || {}))
+                else
+                  @block_params = matched_path.param_values
+                  @params.update(matched_path.params.merge(@params || {}))
+                end
                 pass_block = catch(:pass) do
                   # If present set current controller layout
                   parent_layout = base.instance_variable_get(:@layout)

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

@@ -0,0 +1,30 @@
+zh_cn:
+  date:
+    formats:
+      # 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日"
+
+    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
+    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%Y年%b%d日 %A %H:%M:%S %Z"
+      short: "%b%d日 %H:%M"
+      long: "%Y年%b%d日 %H:%M"
+    am: "上午"
+    pm: "下午"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " 和 "
+      last_word_connector: ", 和 "

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

@@ -0,0 +1,30 @@
+zh_tw:
+  date:
+    formats:
+      # 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日"
+
+    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
+    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%Y年%b%d日 %A %H:%M:%S %Z"
+      short: "%b%d日 %H:%M"
+      long: "%Y年%b%d日 %H:%M"
+    am: "上午"
+    pm: "下午"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " 和 "
+      last_word_connector: ", 和 "

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.20' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.21' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
   s.add_dependency("sinatra", ">= 1.1.0")
-  s.add_dependency("http_router", "~> 0.5.0")
+  s.add_dependency("http_router", "~> 0.5.4")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'test/unit'
 require 'rack/test'
 require 'rack'
 require 'shoulda'
+require 'phocus'
 
 module Kernel
   # Silences the output by redirecting to stringIO

data/test/test_rendering.rb

@@ -159,6 +159,41 @@ class TestRendering < Test::Unit::TestCase
     end
   end
 
+  should 'solve layout in layouts paths' do
+    create_layout :foo, "foo layout <%= yield %>"
+    create_layout :"layouts/bar", "bar layout <%= yield %>"
+    mock_app do
+      get("/") { render :erb, "none" }
+      get("/foo") { render :erb, "foo", :layout => :foo }
+      get("/bar") { render :erb, "bar", :layout => :bar }
+    end
+    get "/"
+    assert_equal "none", body
+    get "/foo"
+    assert_equal "foo layout foo", body
+    get "/bar"
+    assert_equal "bar layout bar", body
+  end
+
+  should 'render correctly if layout was not found or not exist' do
+    create_layout :application, "application layout for <%= yield %>"
+    create_view :foo, "index", :format => :html
+    create_view :foo, "xml.rss", :format => :rss
+    mock_app do
+      get("/foo", :provides => [:html, :rss]) { render('foo') }
+      get("/baz", :provides => :js) { render(:erb, 'baz') }
+      get("/bar") { render :haml, "haml" }
+    end
+    get "/foo"
+    assert_equal "application layout for index", body
+    get "/foo.rss"
+    assert_equal "<rss/>", body.chomp
+    get "/baz.js"
+    assert_equal "baz", body
+    get "/bar"
+    assert_equal "haml", body.chomp
+  end
+
   context 'for application render functionality' do
 
     should 'be compatible with sinatra render' do

data/test/test_routing.rb

@@ -34,6 +34,9 @@ class TestRouting < Test::Unit::TestCase
     mock_app do
       get(%r{/fob|/baz}) { "regexp" }
       get("/foo")        { "str" }
+      get %r{/([0-9]+)/} do |num|
+       "Your lucky number: #{num} #{params[:captures].first}"
+      end
     end
     get "/foo"
     assert_equal "str", body
@@ -41,6 +44,8 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "regexp", body
     get "/baz"
     assert_equal "regexp", body
+    get "/1234/"
+    assert_equal "Your lucky number: 1234 1234", body
   end
 
   should "parse routes with question marks" do
@@ -217,6 +222,25 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "mini", body
   end
 
+  should "support not_found" do
+    mock_app do
+      not_found do
+        response.status = 404
+        'whatever'
+      end
+
+      get :index, :map => "/" do
+        'index'
+      end
+    end
+    get '/something'
+    assert_equal 'whatever', body
+    assert_equal 404, status
+    get '/'
+    assert_equal 'index', body
+    assert_equal 200, status
+  end
+
   should "should inject the route into the request" do
     mock_app do
       controller :posts do
@@ -227,6 +251,22 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "posts_index", body
   end
 
+  should "preserve the format if you set it manually" do
+    mock_app do
+      before do
+        params[:format] = :json
+      end
+
+      get "test", :provides => [:html, :json] do
+        params[:format].inspect
+      end
+    end
+    get "/test"
+    assert_equal ":json", body
+    get "/test.html"
+    assert_equal ":json", body
+  end
+
   should "generate routes for format with controller" do
     mock_app do
       controller :posts do
@@ -365,23 +405,34 @@ class TestRouting < Test::Unit::TestCase
   should 'use named controllers' do
     mock_app do
       controller :admin do
-        get(:index){ "index" }
+        get(:index, :with => :id){ params[:id] }
         get(:show, :with => :id){ "show #{params[:id]}" }
       end
       controllers :foo, :bar do
         get(:index){ "foo_bar_index" }
       end
     end
-    get "/admin"
-    assert_equal "index", body
+    get "/admin/1"
+    assert_equal "1", body
     get "/admin/show/1"
     assert_equal "show 1", body
-    assert_equal "/admin", @app.url(:admin_index)
+    assert_equal "/admin/1", @app.url(:admin_index, :id => 1)
     assert_equal "/admin/show/1", @app.url(:admin_show, :id => 1)
     get "/foo/bar"
     assert_equal "foo_bar_index", body
   end
 
+  should 'use map and with' do
+    mock_app do
+      get :index, :map => '/bugs', :with => :id do
+        params[:id]
+      end
+    end
+    get '/bugs/4'
+    assert_equal '4', body
+    assert_equal "/bugs/4", @app.url(:index, :id => 4)
+  end
+
   should "ignore trailing delimiters within a named controller" do
     mock_app do
       controller :posts do
@@ -974,6 +1025,16 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "This is the post index", body
   end
 
+  should "use optionals params" do
+    mock_app do
+      get(:index, :map => "/(:foo(/:bar))") { "#{params[:foo]}-#{params[:bar]}" }
+    end
+    get "/foo"
+    assert_equal "foo-", body
+    get "/foo/bar"
+    assert_equal "foo-bar", body
+  end
+
   should "parse two routes with the same path but different http verbs and provides" do
     mock_app do
       get(:index, :provides => [:html, :json]) { "This is the get index.#{content_type}" }
@@ -1101,6 +1162,17 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "foo", body
   end
 
+  should "use provides as conditional" do
+    mock_app do
+      provides :json
+      get "/" do
+        "foo"
+      end
+    end
+    get "/.json"
+    assert_equal "foo", body
+  end
+
   should "parse params with class level provides" do
     mock_app do
       controllers :posts, :provides => [:html, :js] do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 21
+  version: 0.9.21
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 4
+        version: 0.5.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,8 @@ files:
 - lib/padrino-core/locale/ru.yml
 - lib/padrino-core/locale/tr.yml
 - lib/padrino-core/locale/uk.yml
+- lib/padrino-core/locale/zh_cn.yml
+- lib/padrino-core/locale/zh_tw.yml
 - lib/padrino-core/logger.rb
 - lib/padrino-core/mounter.rb
 - lib/padrino-core/reloader.rb
@@ -202,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem