padrino-core 0.10.0 → 0.10.1

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

@@ -2,12 +2,7 @@ require 'http_router' unless defined?(HttpRouter)
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 
 class Sinatra::Request #:nodoc:
-  attr_accessor :route_obj, :runner
-
-  def runner=(runner)
-    @runner = runner
-    env['padrino.instance'] = runner
-  end
+  attr_accessor :route_obj
 
   def controller
     route_obj && route_obj.controller
@@ -19,7 +14,7 @@ class HttpRouter #:nodoc:
   def rewrite_path_info(env, request); end
 
   def process_destination_path(path, env)
-    env['padrino.instance'].instance_eval do
+    Thread.current['padrino.instance'].instance_eval do
       request.route_obj = path.route
       @_response_buffer = nil
       @params ||= {}
@@ -95,10 +90,9 @@ module Padrino
     end
 
     def apply?(request)
-      return true if @args.empty? && @options.empty?
       detect = @args.any? do |arg|
         case arg
-        when Symbol then request.route_obj.named == arg or request.route_obj.named == [@scoped_controller, arg].flatten.join("_").to_sym
+        when Symbol then request.route_obj && (request.route_obj.named == arg or request.route_obj.named == [@scoped_controller, arg].flatten.join("_").to_sym)
         else             arg === request.path_info
         end
       end || @options.any? { |name, val|
@@ -111,10 +105,12 @@ module Padrino
     end
 
     def to_proc
-      filter = self
-      proc {
-        instance_eval(&filter.block) if filter.apply?(request)
-      }
+      if @args.empty? && @options.empty?
+        block
+      else
+        filter = self
+        proc { instance_eval(&filter.block) if filter.apply?(request) }
+      end
     end
   end
 
@@ -618,7 +614,7 @@ module Padrino
         def process_path_for_parent_params(path, parent_params)
           parent_prefix = parent_params.flatten.compact.uniq.map do |param|
             map  = (param.respond_to?(:map) && param.map ? param.map : param.to_s)
-            part = "#{map}/:#{param}_id/"
+            part = "#{map}/:#{param.to_s.singularize}_id/"
             part = "(#{part})" if param.respond_to?(:optional) && param.optional?
             part
           end
@@ -665,7 +661,7 @@ module Padrino
           condition do
             mime_types        = types.map { |t| mime_type(t) }
             request.path_info =~ /\.([^\.\/]+)$/
-            url_format        = $1.to_sym if $1
+            url_format        = params[:format].to_sym if params[:format]
             accepts           = request.accept.map { |a| a.split(";")[0].strip }
 
             # per rfc2616-sec14:
@@ -673,9 +669,7 @@ module Padrino
             catch_all = (accepts.delete "*/*" || accepts.empty?)
             matching_types = accepts.empty? ? mime_types.slice(0,1) : (accepts & mime_types)
 
-            if params[:format]
-              accept_format = params[:format]
-            elsif !url_format && matching_types.first
+            if !url_format && matching_types.first
               type = ::Rack::Mime::MIME_TYPES.find { |k, v| v == matching_types.first }[0].sub(/\./,'').to_sym
               accept_format = CONTENT_TYPE_ALIASES[type] || type
             elsif catch_all
@@ -784,16 +778,18 @@ module Padrino
           static! if settings.static? && (request.get? || request.head?)
           route!
         rescue Sinatra::NotFound => boom
+          filter! :before
           handle_not_found!(boom)
         rescue ::Exception => boom
+          filter! :before
           handle_exception!(boom)
         ensure
           @_pending_after_filters.each { |filter| instance_eval(&filter)} if @_pending_after_filters
         end
 
         def route!(base=self.class, pass_block=nil)
-          @request.env['padrino.instance'] = self
-          if base.compiled_router and match = base.router.call(@request.env)
+          Thread.current['padrino.instance'] = self
+          if base.compiled_router and match = base.compiled_router.call(@request.env)
             if match.respond_to?(:each)
               route_eval do
                 match[1].each {|k,v| response[k] = v}
@@ -818,4 +814,4 @@ module Padrino
         end
     end # InstanceMethods
   end # Routing
-end # Padrino
+end # Padrino

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

@@ -3,16 +3,17 @@ module Padrino
   # This module extend Sinatra::ShowExceptions adding Padrino as "Framework"
   #
   class ShowExceptions < Sinatra::ShowExceptions
-    def frame_class(frame)
-      if frame.filename =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/
-        "framework"
-      elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
-            frame.filename =~ /\/bin\/(\w+)$/ ||
-            frame.filename =~ /Ruby\/Gems/
-        "system"
-      else
-        "app"
+    private
+      def frame_class(frame)
+        if frame.filename =~ /lib\/sinatra.*\.rb|lib\/padrino.*\.rb/
+          "framework"
+        elsif (defined?(Gem) && frame.filename.include?(Gem.dir)) ||
+              frame.filename =~ /\/bin\/(\w+)$/ ||
+              frame.filename =~ /Ruby\/Gems/
+          "system"
+        else
+          "app"
+        end
       end
-    end
   end # ShowExceptions
-end # Padrino
+end # Padrino

data/lib/padrino-core/application.rb

@@ -186,7 +186,7 @@ module Padrino
         #
         def default_routes!
           configure :development do
-            get '/__sinatra__/:image.png' do
+            get '*__sinatra__/:image.png' do
               content_type :png
               filename = File.dirname(__FILE__) + "/images/#{params[:image]}.png"
               send_file filename

data/lib/padrino-core/command.rb

@@ -16,8 +16,8 @@ module Padrino
   #
   def self.ruby_command
     @ruby_command ||= begin
-      ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-      ruby << Config::CONFIG['EXEEXT']
+      ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+      ruby << RbConfig::CONFIG['EXEEXT']
 
       # escape string in case path to ruby executable contain spaces.
       ruby.sub!(/.*\s.*/m, '"\&"')

data/lib/padrino-core/locale/{cz.yml → cs.yml}

@@ -1,4 +1,4 @@
-cz:
+cs:
   date:
     formats:
       # Use the strftime parameters for formats.
@@ -7,6 +7,7 @@ cz:
       default: "%d. %m. %Y"
       short: "%d %b"
       long: "%d. %B %Y"
+      only_day: "%e"
 
     day_names: [Neděle, Pondělí, Úterý, Středa, Čtvrtek, Pátek, Sobota]
     abbr_day_names: [Ne, Po, Út, St, Čt, Pá, So]

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

@@ -7,6 +7,7 @@ da:
       default: "%d.%m.%Y"
       short: "%e. %b %Y"
       long: "%e. %B %Y"
+      only_day: "%e"
 
     day_names: [søndag, mandag, tirsdag, onsdag, torsdag, fredag, lørdag]
     abbr_day_names: [sø, ma, ti, 'on', to, fr, lø]
@@ -27,4 +28,4 @@ da:
     array:
       words_connector: ", "
       two_words_connector: " og "
-      last_word_connector: " og "
+      last_word_connector: " og "

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

@@ -7,6 +7,7 @@ de:
       default: "&d.&m.%Y"
       short: "%b %d"
       long: "%B %d, %Y"
+      only_day: "%e"
 
     day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
     abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
@@ -27,4 +28,4 @@ de:
     array:
       words_connector: ", "
       two_words_connector: " und "
-      last_word_connector: ", und "
+      last_word_connector: ", und "

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

@@ -7,6 +7,7 @@ en:
       default: "%Y-%m-%d"
       short: "%b %d"
       long: "%B %d, %Y"
+      only_day: "%e"
 
     day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
     abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
@@ -27,4 +28,4 @@ en:
     array:
       words_connector: ", "
       two_words_connector: " and "
-      last_word_connector: ", and "
+      last_word_connector: ", and "

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

@@ -7,6 +7,7 @@ es:
       default: "%d-%m-%Y"
       short: "%b %d"
       long: "%B %d, %Y"
+      only_day: "%e"
 
     day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
     abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
@@ -27,4 +28,4 @@ es:
     array:
       words_connector: ", "
       two_words_connector: " y "
-      last_word_connector: ", y "
+      last_word_connector: ", y "

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

@@ -7,6 +7,7 @@ fr:
       default: "%d-%m-%Y"
       short: "%b %d"
       long: "%B %d, %Y"
+      only_day: "%e"
 
     day_names: [Dimanche, Lundi, Mardi, Mercredi, Jeudi, Vendredi, Samedi]
     abbr_day_names: [Lun, Mar, Mer, Jeu, Ven, Sam, Dim]
@@ -27,4 +28,4 @@ fr:
     array:
       words_connector: ", "
       two_words_connector: " et "
-      last_word_connector: ", et "
+      last_word_connector: ", et "

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

@@ -7,6 +7,7 @@ hu:
       default: "%Y-%m-%d"
       short: "%b. %d."
       long: "%Y. %B %d."
+      only_day: "%e"
 
     day_names: [vasárnap, hétfő, kedd, szerda, csütörtök, péntek, szombat]
     abbr_day_names: [vas, hét, kedd, sze, csüt, pén, szo]
@@ -27,4 +28,4 @@ hu:
     array:
       words_connector: ", "
       two_words_connector: " és "
-      last_word_connector: " és "
+      last_word_connector: " és "

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

@@ -7,6 +7,7 @@ ja:
       default: "%Y/%m/%d"
       short: "%m/%d"
       long: "%Y年%m月%d日"
+      only_day: "%e"
 
     day_names: [日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日]
     abbr_day_names: [日, 月, 火, 水, 木, 金, 土]

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

@@ -7,6 +7,7 @@ nl:
       default: "%d-%m-%Y"
       short: "%d %b"
       long: "%d %B %Y"
+      only_day: "%e"
 
     day_names: [zondag, maandag, dinsdag, woensdag, donderdag, vrijdag, zaterdag]
     abbr_day_names: [zo, ma, di, wo, do, vr, za]
@@ -27,4 +28,4 @@ nl:
     array:
       words_connector: ", "
       two_words_connector: " en "
-      last_word_connector: " en "
+      last_word_connector: " en "

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

@@ -7,6 +7,7 @@
       default: "%d.%m.%Y"
       short: "%e. %b %Y"
       long: "%e. %B %Y"
+      only_day: "%e"
 
     day_names: [søndag, mandag, tirsdag, onsdag, torsdag, fredag, lørdag]
     abbr_day_names: [sø, ma, ti, 'on', to, fr, lø]

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

@@ -7,6 +7,7 @@ pl:
       default: "%Y-%m-%d"
       short: "%d %b"
       long: "%d %B %Y"
+      only_day: "%e"
 
     day_names: [Niedziela, Poniedziałek, Wtorek, Środa, Czwartek, Piątek, Sobota]
     abbr_day_names: [nie, pon, wto, śro, czw, pia, sob]

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

@@ -1,4 +1,4 @@
-it:
+pt_br:
   date:
     formats:
       # Use the strftime parameters for formats.

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

@@ -7,11 +7,12 @@ ru:
       default: "%d.%m.%Y"
       short: "%d %b"
       long: "%e %B, %Y"
+      only_day: "%e"
 
     day_names: [Воскресенье, Понедельник, Вторник, Среда, Четверг, Пятница, Суббота]
     abbr_day_names: [Вс, Пн, Вт, Ср, Чт, Пт, Сб]
     month_names: [~, Январь, Февраль, Март, Апрель, Май, Июнь, Июль, Август, Сентябрь, Октябрь, Ноябрь, Декабрь]
-    abbr_month_names: [~, Янв, Феб, Мар, Апр, Май, Июн, Июл, Авг, Сен, Окт, Нов, Дек]
+    abbr_month_names: [~, Янв, Феб, Мар, Апр, Май, Июн, Июл, Авг, Сен, Окт, Ноя, Дек]
     order: [ :year, :month, :day ]
 
   time:
@@ -20,11 +21,12 @@ ru:
       short: "%d %b %H:%M"
       long: "%e %B, %Y %H:%M"
     am: "д.п."
-    pm: "п.п"
+    pm: "п.п."
 
 # Used in array.to_sentence.
   support:
     array:
       words_connector: ", "
       two_words_connector: " и "
-      last_word_connector: ", и "
+      last_word_connector: " и "
+

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

@@ -7,6 +7,7 @@ tr:
       default: "%d/%m/%Y"
       short: "%d %b"
       long: "%d %B %Y"
+      only_day: "%e"
 
     day_names: [Pazar, Pazartesi, Salı, Çarşamba, Perşembe, Cuma, Cumartesi]
     abbr_day_names: [Paz, Pts, Sal, Çar, Per, Cum, Cts]

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

@@ -7,6 +7,7 @@ uk:
       default: "%d.%m.%Y"
       short: "%d %b"
       long: "%e %B, %Y"
+      only_day: "%e"
 
     day_names: [Неділя, Понеділок, Вівторок, Середа, Четвер, Пятница, Субота]
     abbr_day_names: [Нд, Пн, Вт, Ср, Чт, Пт, Сб]

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

@@ -7,6 +7,7 @@ zh_cn:
       default: "%Y-%m-%d"
       short: "%b%d日"
       long: "%Y年%b%d日"
+      only_day: "%e"
 
     day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
     abbr_day_names: [日, 一, 二, 三, 四, 五, 六]

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

@@ -7,6 +7,7 @@ zh_tw:
       default: "%Y-%m-%d"
       short: "%b%d日"
       long: "%Y年%b%d日"
+      only_day: "%e"
 
     day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
     abbr_day_names: [日, 一, 二, 三, 四, 五, 六]

data/lib/padrino-core/logger.rb

@@ -1,5 +1,6 @@
-# Defines our PADRINO_LOG_LEVEL
+# Defines our PADRINO_LOGGER constants
 PADRINO_LOG_LEVEL = ENV['PADRINO_LOG_LEVEL'] unless defined?(PADRINO_LOG_LEVEL)
+PADRINO_LOGGER    = ENV['PADRINO_LOGGER'] unless defined?(PADRINO_LOGGER)
 
 module Padrino
 
@@ -66,7 +67,7 @@ module Padrino
     # :log_level:: Once of [:fatal, :error, :warn, :info, :debug]
     # :stream:: Once of [:to_file, :null, :stdout, :stderr] our your custom stream
     # :log_level::
-    #   The log level from, e.g. :fatal or :info. Defaults to :debug in the
+    #   The log level from, e.g. :fatal or :info. Defaults to :warn in the
     #   production environment and :debug otherwise.
     # :auto_flush::
     #   Whether the log should automatically flush after new messages are
@@ -89,11 +90,17 @@ module Padrino
     #   :development => { :log_level => :debug, :stream => :stdout }
     #   :test        => { :log_level => :fatal, :stream => :null }
     #
+    # In some cases, configuring the loggers before loading the framework is necessary.
+    # You can do so by setting PADRINO_LOGGER:
+    #
+    #   PADRINO_LOGGER = { :staging => { :log_level => :debug, :stream => :to_file }}
+    #
     Config = {
       :production  => { :log_level => :warn,  :stream => :to_file },
       :development => { :log_level => :debug, :stream => :stdout },
       :test        => { :log_level => :debug, :stream => :null }
     }
+    Config.merge!(PADRINO_LOGGER) if PADRINO_LOGGER
 
     # Embed in a String to clear all previous ANSI sequences.
     CLEAR      = "\e[0m"
@@ -132,6 +139,12 @@ module Padrino
     def self.setup!
       config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
       config = Config[config_level]
+
+      unless config
+        warn("No logging configuration for :#{config_level} found, falling back to :production")
+        config = Config[:production]
+      end
+
       stream = case config[:stream]
         when :to_file
           FileUtils.mkdir_p(Padrino.root("log")) unless File.exists?(Padrino.root("log"))
@@ -341,4 +354,4 @@ module Kernel #:nodoc:
   def logger
     Padrino.logger
   end
-end # Kernel
+end # Kernel

data/lib/padrino-core/support_lite.rb

@@ -32,6 +32,18 @@ class String
     ActiveSupport::Inflector.pluralize(self)
   end
 
+  # Returns the singular form of the word in the string.
+  #
+  #   "posts".singularize            # => "post"
+  #   "octopi".singularize           # => "octopus"
+  #   "sheep".singularize            # => "sheep"
+  #   "words".singularize            # => "word"
+  #   "the blue mailmen".singularize # => "the blue mailman"
+  #   "CamelOctopi".singularize      # => "CamelOctopus"
+  def singularize
+    ActiveSupport::Inflector.singularize(self)
+  end
+
   # +constantize+ tries to find a declared constant with the name specified
   # in the string. It raises a NameError when the name is not in CamelCase
   # or is not initialized.

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("tilt", "~> 1.3.0")
   s.add_dependency("sinatra", "~> 1.2.6")
-  s.add_dependency("http_router", "~> 0.8.10")
+  s.add_dependency("http_router", "~> 0.9.4")
   s.add_dependency("thor", "~> 0.14.3")
   s.add_dependency("activesupport", "~> 3.0.0")
 end

data/test/test_filters.rb

@@ -263,4 +263,15 @@ class TestFilters < Test::Unit::TestCase
     get '/bar/main'
     assert_equal 'also before', body
   end
+
+  should "call before filters even if there was no match" do
+    test = nil
+    mock_app do
+      before(:index, '/foo') { test = 'before' }
+      get :index do
+      end
+    end
+    get '/foo'
+    assert_equal 'before', test
+  end
 end

data/test/test_locale.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestLocales < Test::Unit::TestCase 
+  Dir[File.expand_path("../../lib/padrino-core/locale/*.yml", __FILE__)].each do |file|
+    base_original = YAML.load_file(file)
+    name = File.basename(file, '.yml')
+    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?
+      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?
+    end
+  end
+end

data/test/test_restful_routing.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestRouting < Test::Unit::TestCase
+  should 'perform restul routing' do
+    mock_app do
+      controller :parent => :parents do
+        get :index do
+          "#{url_for(:index, params[:parent_id])} get"
+        end
+
+        put :index, :with => :asset_id do
+          "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} put"
+        end
+
+        post :index, :with => :asset_id do
+          "#{url_for(:index, :parent_id => params[:parent_id], :asset_id => params[:asset_id])} post"
+        end
+
+        delete :index, :with => :asset_id do
+          "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} delete"
+        end
+      end
+    end
+    get "/parents/1"
+    assert_equal "/parents/1 get", body
+    put "/parents/1/hi"
+    assert_equal "/parents/1/hi put", body
+    post "/parents/1/hi"
+    assert_equal "/parents/1/hi post", body
+    delete "/parents/1/hi"
+    assert_equal "/parents/1/hi delete", body
+  end
+end

data/test/test_routing.rb

@@ -348,17 +348,48 @@ class TestRouting < Test::Unit::TestCase
   should "preserve the format if you set it manually" do
     mock_app do
       before do
-        params[:format] = :json
+        params[:format] = "json"
       end
 
       get "test", :provides => [:html, :json] do
-        params[:format].inspect
+        content_type.inspect
       end
     end
     get "/test"
     assert_equal ":json", body
     get "/test.html"
     assert_equal ":json", body
+    get "/test.php"
+    assert_equal ":json", body
+  end
+
+  should "correctly accept '.' in the route" do
+    mock_app do
+      get "test.php", :provides => [:html, :json] do
+        content_type.inspect
+      end
+    end
+    get "/test.php"
+    assert_equal ":html", body
+    get "/test.php.json"
+    assert_equal ":json", body
+  end
+
+  should "correctly accept priority of format" do
+    mock_app do
+      get "test.php", :provides => [:html, :json, :xml] do
+        content_type.inspect
+      end
+    end
+
+    get "/test.php"
+    assert_equal ":html", body
+    get "/test.php", {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal ":xml", body
+    get "/test.php?format=json", { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal ":json", body
+    get "/test.php.json?format=html", { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal ":json", body
   end
 
   should "generate routes for format with controller" do

metadata

@@ -2,7 +2,7 @@
 name: padrino-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.10
+        version: 0.9.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ files:
 - lib/padrino-core/images/404.png
 - lib/padrino-core/images/500.png
 - lib/padrino-core/loader.rb
-- lib/padrino-core/locale/cz.yml
+- lib/padrino-core/locale/cs.yml
 - lib/padrino-core/locale/da.yml
 - lib/padrino-core/locale/de.yml
 - lib/padrino-core/locale/en.yml
@@ -144,11 +144,13 @@ files:
 - test/test_core.rb
 - test/test_dependencies.rb
 - test/test_filters.rb
+- test/test_locale.rb
 - test/test_logger.rb
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
 - test/test_rendering.rb
+- test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb
 has_rdoc: true
@@ -200,10 +202,12 @@ test_files:
 - test/test_core.rb
 - test/test_dependencies.rb
 - test/test_filters.rb
+- test/test_locale.rb
 - test/test_logger.rb
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
 - test/test_rendering.rb
+- test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb