padrino-core 0.10.1 → 0.10.2

data/README.rdoc

@@ -291,4 +291,4 @@ For a complete overview of Padrino terminal commands, check out the
 
 == Copyright
 
-Copyright (c) 2011 Padrino. See LICENSE for details.
+Copyright (c) 2011 Padrino. See LICENSE for details.

data/lib/padrino-core.rb

@@ -9,7 +9,7 @@ PADRINO_ENV  = ENV["PADRINO_ENV"]  ||= ENV["RACK_ENV"] ||= "development"  unless
 PADRINO_ROOT = ENV["PADRINO_ROOT"] ||= File.dirname(Padrino.first_caller) unless defined?(PADRINO_ROOT)
 
 module Padrino
-  class ApplicationLoadError < RuntimeError #:nodoc:
+  class ApplicationLoadError < RuntimeError # @private
   end
 
   class << self
@@ -80,7 +80,7 @@ module Padrino
         $KCODE='u'
       else
         Encoding.default_external = Encoding::UTF_8
-        Encoding.default_internal = nil # Encoding::UTF_8
+        Encoding.default_internal = Encoding::UTF_8
       end
       nil
     end
@@ -116,4 +116,4 @@ module Padrino
       middleware << [m, args, block]
     end
   end # self
-end # Padrino
+end # Padrino

data/lib/padrino-core/application.rb

@@ -1,5 +1,5 @@
 module Padrino
-  class ApplicationSetupError < RuntimeError #:nodoc:
+  class ApplicationSetupError < RuntimeError # @private
   end
 
   ##
@@ -11,7 +11,7 @@ module Padrino
 
     class << self
 
-      def inherited(base) #:nodoc:
+      def inherited(base) # @private
         logger.devel "Setup #{base}"
         CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
         base.default_configuration!
@@ -54,11 +54,12 @@ module Padrino
         logger.devel "Reloading #{self}"
         @_dependencies = nil # Reset dependencies
         reset! # Reset sinatra app
-        reset_routes! # Remove all existing user-defined application routes
+        reset_router! # Reset all routes
         Padrino.require_dependencies(self.app_file, :force => true) # Reload the app file
-        require_dependencies # Reload dependencies
         register_initializers # Reload our middlewares
+        require_dependencies # Reload dependencies
         default_filters! # Reload filters
+        default_routes!  # Reload default routes
         default_errors!  # Reload our errors
         I18n.reload! if defined?(I18n) # Reload also our translations
       end
@@ -217,7 +218,7 @@ module Padrino
               response.status = 500
               content_type 'text/html'
               '<h1>Internal Server Error</h1>'
-            end
+            end unless errors.has_key?(::Exception)
           end
         end
 
@@ -256,4 +257,4 @@ module Padrino
       end
     end # render method
   end # Application
-end # Padrino
+end # Padrino

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

@@ -6,7 +6,7 @@ module Padrino
   # enhanced layout functionality, locale enabled rendering, among other features.
   #
   module Rendering
-    class TemplateNotFound < RuntimeError #:nodoc:
+    class TemplateNotFound < RuntimeError # @private
     end
 
     ##
@@ -90,8 +90,12 @@ module Padrino
     module InstanceMethods
       attr_reader :current_engine
 
-      def content_type(type=nil, params={}) #:nodoc:
-        type.nil? ? @_content_type : super(type, params)
+      def content_type(type=nil, params={}) # @private
+        unless type.nil?
+          super(type, params)
+          @_content_type = type
+        end
+        @_content_type
       end
 
       private
@@ -108,7 +112,7 @@ module Padrino
         #
         def render(engine, data=nil, options={}, locals={}, &block)
           # If engine is a hash then render data converted to json
-          return engine.to_json if engine.is_a?(Hash)
+          content_type(:json, :charset => 'utf-8') and return engine.to_json if engine.is_a?(Hash)
 
           # If engine is nil, ignore engine parameter and shift up all arguments
           # render nil, "index", { :layout => true }, { :localvar => "foo" }
@@ -121,7 +125,7 @@ module Padrino
 
           # If data is unassigned then this is a likely a template to be resolved
           # This means that no engine was explicitly defined
-          data, engine = *resolve_template(engine, options) if data.nil?
+          data, engine = *resolve_template(engine, options.dup) if data.nil?
 
           # Setup root
           root = settings.respond_to?(:root) ? settings.root : ""
@@ -182,7 +186,7 @@ module Padrino
         #
         def resolve_template(template_path, options={})
           # Fetch cached template for rendering options
-          template_path = "/#{template_path}" unless template_path.to_s[0] == ?/
+          template_path = template_path.to_s[0] == ?/ ? template_path.to_s : "/#{template_path}"
           rendering_options = [template_path, content_type, locale]
           cached_template = settings.fetch_template_file(rendering_options)
           return cached_template if cached_template
@@ -225,4 +229,4 @@ module Padrino
         end
     end # InstanceMethods
   end # Rendering
-end # Padrino
+end # Padrino

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

@@ -1,7 +1,7 @@
 require 'http_router' unless defined?(HttpRouter)
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 
-class Sinatra::Request #:nodoc:
+class Sinatra::Request # @private
   attr_accessor :route_obj
 
   def controller
@@ -9,7 +9,7 @@ class Sinatra::Request #:nodoc:
   end
 end
 
-class HttpRouter #:nodoc:
+class HttpRouter # @private
   def rewrite_partial_path_info(env, request); end
   def rewrite_path_info(env, request); end
 
@@ -53,7 +53,7 @@ class HttpRouter #:nodoc:
     end
   end
 
-  class Route #:nodoc:
+  class Route # @private
     attr_reader :before_filters, :after_filters
     attr_accessor :custom_conditions, :use_layout, :controller, :cache
 
@@ -123,9 +123,9 @@ module Padrino
   #
   module Routing
     CONTENT_TYPE_ALIASES = { :htm => :html } unless defined?(CONTENT_TYPE_ALIASES)
-    ROUTE_PRIORITY = {:high => 0, :normal => 1, :low => 2}
+    ROUTE_PRIORITY = {:high => 0, :normal => 1, :low => 2} unless defined?(ROUTE_PRIORITY)
 
-    class UnrecognizedException < RuntimeError #:nodoc:
+    class UnrecognizedException < RuntimeError # @private
     end
 
     ##
@@ -248,14 +248,14 @@ module Padrino
           options = args.extract_options!
 
           # Controller defaults
-          @_controller, original_controller = args, @_controller
-          @_parents,    original_parent     = options.delete(:parent), @_parents
-          @_provides,   original_provides   = options.delete(:provides), @_provides
+          @_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
+          @_cache,      original_cache      = options.delete(:cache),      @_cache
+          @_map,        original_map        = options.delete(:map),        @_map
           @_conditions, original_conditions = options.delete(:conditions), @_conditions
-          @_defaults,   original_defaults   = options, @_defaults
+          @_defaults,   original_defaults   = options,                     @_defaults
 
           # Application defaults
           @filters,     original_filters    = { :before => @filters[:before].dup, :after => @filters[:after].dup }, @filters
@@ -268,9 +268,9 @@ module Padrino
           @layout         = original_layout
 
           # Controller defaults
-          @_controller, @_parents, @_cache = original_controller, original_parent, original_cache
-          @_defaults, @_provides, @_map  = original_defaults, original_provides, original_map
-          @_conditions, @_use_format = original_conditions, original_use_format
+          @_controller, @_parents,  @_cache = original_controller, original_parent,   original_cache
+          @_defaults,   @_provides, @_map   = original_defaults,   original_provides, original_map
+          @_conditions, @_use_format        = original_conditions, original_use_format
         else
           include(*args) if extensions.any?
         end
@@ -353,9 +353,8 @@ module Padrino
       end
 
       def recognize_path(path)
-        if response = @router.recognize(Rack::MockRequest.env_for(path))
-          [response.path.route.named, response.params]
-        end
+        responses = @router.recognize(Rack::MockRequest.env_for(path))
+        [responses[0].path.route.named, responses[0].params]
       end
 
       ##
@@ -537,8 +536,8 @@ module Padrino
           map = options.delete(:map)
 
           if path.kind_of?(Symbol) # path i.e :index or :show
-            name = path                       # The route name
-            path = map ? map.dup : path.to_s  # The route path
+            name = path                                                # The route name
+            path = map ? map.dup : (path == :index ? '/' : path.to_s)  # The route path
           end
 
           if path.kind_of?(String) # path i.e "/index" or "/show"
@@ -586,11 +585,11 @@ module Padrino
 
             # Small reformats
             path.gsub!(%r{/\?$}, '(/)')                    # 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
+            path.squeeze!('/')
           end
 
           # Merge in option defaults
@@ -660,7 +659,6 @@ module Padrino
           @_use_format = true
           condition do
             mime_types        = types.map { |t| mime_type(t) }
-            request.path_info =~ /\.([^\.\/]+)$/
             url_format        = params[:format].to_sym if params[:format]
             accepts           = request.accept.map { |a| a.split(";")[0].strip }
 
@@ -770,7 +768,11 @@ module Padrino
       #   end
       #
       def content_type(type=nil, params={})
-        type.nil? ? @_content_type : super(type, params)
+        unless type.nil?
+          super(type, params)
+          @_content_type = type
+        end
+        @_content_type
       end
 
       private

data/lib/padrino-core/caller.rb

@@ -42,4 +42,4 @@ module Padrino
         reject { |file,line| PADRINO_IGNORE_CALLERS.any? { |pattern| file =~ pattern } }.
         map    { |file,line| file }
     end
-end # Padrino
+end # Padrino

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

@@ -21,4 +21,4 @@ module Padrino
       end # self
     end # Adapter
   end # Cli
-end # Padrino
+end # Padrino

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

@@ -109,8 +109,7 @@ module Padrino
             help(task.to_s)
             raise SystemExit
           end
-          ENV["PADRINO_ENV"] ||= options.environment.to_s
-          ENV["RACK_ENV"] = ENV["PADRINO_ENV"] # Also set this for middleware
+          ENV["PADRINO_ENV"] ||= 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/cli/rake.rb

@@ -21,4 +21,4 @@ end
 
 def shell
   @_shell ||= Thor::Base.shell.new
-end
+end

data/lib/padrino-core/command.rb

@@ -24,4 +24,4 @@ module Padrino
       ruby
     end
   end
-end # Padrino
+end # Padrino

data/lib/padrino-core/loader.rb

@@ -179,4 +179,4 @@ module Padrino
       $:.uniq!; load_paths.uniq!
     end
   end # self
-end # Padrino
+end # Padrino

data/lib/padrino-core/logger.rb

@@ -104,23 +104,14 @@ module Padrino
 
     # Embed in a String to clear all previous ANSI sequences.
     CLEAR      = "\e[0m"
-    # The start of an ANSI bold sequence.
     BOLD       = "\e[1m"
-    # Set the terminal's foreground ANSI color to black.
     BLACK      = "\e[30m"
-    # Set the terminal's foreground ANSI color to red.
     RED        = "\e[31m"
-    # Set the terminal's foreground ANSI color to green.
     GREEN      = "\e[32m"
-    # Set the terminal's foreground ANSI color to yellow.
     YELLOW     = "\e[33m"
-    # Set the terminal's foreground ANSI color to blue.
     BLUE       = "\e[34m"
-    # Set the terminal's foreground ANSI color to magenta.
     MAGENTA    = "\e[35m"
-    # Set the terminal's foreground ANSI color to cyan.
     CYAN       = "\e[36m"
-    # Set the terminal's foreground ANSI color to white.
     WHITE      = "\e[37m"
 
     # Colors for levels
@@ -245,7 +236,6 @@ module Padrino
     #
     Levels.each_pair do |name, number|
       class_eval <<-LEVELMETHODS, __FILE__, __LINE__
-
       # Appends a message to the log if the log level is at least as high as
       # the log level of the logger.
       #
@@ -347,7 +337,7 @@ module Padrino
   end # Logger
 end # Padrino
 
-module Kernel #:nodoc:
+module Kernel # @private
   ##
   # Define a logger available every where in our app
   #

data/lib/padrino-core/mounter.rb

@@ -9,7 +9,7 @@ module Padrino
   #   Mounter.new("blog_app", :app_file => "/path/to/blog/app.rb").to("/blog")
   #
   class Mounter
-    class MounterException < RuntimeError #:nodoc:
+    class MounterException < RuntimeError # @private
     end
 
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host
@@ -189,4 +189,4 @@ module Padrino
       Mounter.new(name, options)
     end
   end # Mounter
-end # Padrino
+end # Padrino

data/lib/padrino-core/reloader.rb

@@ -98,7 +98,7 @@ module Padrino
       # We lock dependencies sets to prevent reloading of protected constants
       #
       def lock!
-        klasses = ObjectSpace.classes.map { |klass| klass.to_s.split("::")[0] }.uniq
+        klasses = ObjectSpace.classes.map { |klass| klass.name.to_s.split("::")[0] }.uniq
         klasses = klasses | Padrino.mounted_apps.map { |app| app.app_class }
         Padrino::Reloader.exclude_constants.concat(klasses)
       end
@@ -244,4 +244,4 @@ module Padrino
       end
     end
   end # Reloader
-end # Padrino
+end # Padrino

data/lib/padrino-core/router.rb

@@ -76,4 +76,4 @@ module Padrino
       [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{rPath}"]]
     end
   end # Router
-end # Padrino
+end # Padrino

data/lib/padrino-core/server.rb

@@ -67,4 +67,4 @@ module Padrino
         fail "Server handler (#{Handlers.join(', ')}) not found."
       end
   end # Server
-end # Padrino
+end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -1,9 +1,7 @@
 ##
 # This file loads certain extensions required by Padrino from ActiveSupport.
 #
-require 'active_support/core_ext/kernel'                    # silence_warnings
 require 'active_support/core_ext/module/aliasing'           # alias_method_chain
-require 'active_support/core_ext/class/attribute_accessors' # cattr_reader
 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/slice'                # slice
@@ -20,6 +18,7 @@ require 'active_support/inflections'                        # load default infle
 # Issue: https://github.com/rails/rails/issues/1526
 #
 class String
+  ##
   # Returns the plural form of the word in the string.
   #
   #   "post".pluralize             # => "posts"
@@ -28,10 +27,12 @@ class String
   #   "words".pluralize            # => "words"
   #   "the blue mailman".pluralize # => "the blue mailmen"
   #   "CamelOctopus".pluralize     # => "CamelOctopi"
+  #
   def pluralize
     ActiveSupport::Inflector.pluralize(self)
   end
 
+  ##
   # Returns the singular form of the word in the string.
   #
   #   "posts".singularize            # => "post"
@@ -40,10 +41,12 @@ class String
   #   "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.
@@ -51,10 +54,12 @@ class String
   # Examples
   #   "Module".constantize # => Module
   #   "Class".constantize  # => Class
+  #
   def constantize
     ActiveSupport::Inflector.constantize(self)
   end
 
+  ##
   # By default, +camelize+ converts strings to UpperCamelCase. If the argument to camelize
   # is set to <tt>:lower</tt> then camelize produces lowerCamelCase.
   #
@@ -64,6 +69,7 @@ class String
   #   "active_record".camelize(:lower)        # => "activeRecord"
   #   "active_record/errors".camelize         # => "ActiveRecord::Errors"
   #   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
+  #
   def camelize(first_letter = :upper)
     case first_letter
       when :upper then ActiveSupport::Inflector.camelize(self, true)
@@ -72,16 +78,19 @@ class String
   end
   alias_method :camelcase, :camelize
 
+  ##
   # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
   #
   # +underscore+ will also change '::' to '/' to convert namespaces to paths.
   #
   #   "ActiveRecord".underscore         # => "active_record"
   #   "ActiveRecord::Errors".underscore # => active_record/errors
+  #
   def underscore
     ActiveSupport::Inflector.underscore(self)
   end
 
+  ##
   # Create a class name from a plural table name like Rails does for table names to models.
   # Note that this returns a string and not a class. (To convert to an actual class
   # follow +classify+ with +constantize+.)
@@ -92,6 +101,7 @@ class String
   # Singular names are not handled correctly.
   #
   #   "business".classify # => "Busines"
+  #
   def classify
     ActiveSupport::Inflector.classify(self)
   end
@@ -102,7 +112,10 @@ module ObjectSpace
     # Returns all the classes in the object space.
     def classes
       ObjectSpace.each_object(Module).select do |klass|
-        Class.class_eval { klass } rescue false
+        # Why this? Ruby when you remove a constant don't clean it from
+        # rb_tables, this mean that here we can found classes that was
+        # removed.
+        klass.name rescue false
       end
     end
   end
@@ -111,21 +124,26 @@ end
 ##
 # FileSet helper method for iterating and interacting with files inside a directory
 #
-class FileSet
+module FileSet
+  extend self
+  ##
   # Iterates over every file in the glob pattern and yields to a block
   # Returns the list of files matching the glob pattern
   # FileSet.glob('padrino-core/application/*.rb', __FILE__) { |file| load file }
-  def self.glob(glob_pattern, file_path=nil, &block)
+  #
+  def glob(glob_pattern, file_path=nil, &block)
     glob_pattern = File.join(File.dirname(file_path), glob_pattern) if file_path
     file_list = Dir.glob(glob_pattern).sort
     file_list.each { |file| block.call(file) }
     file_list
   end
 
+  ##
   # Requires each file matched in the glob pattern into the application
   # FileSet.glob_require('padrino-core/application/*.rb', __FILE__)
-  def self.glob_require(glob_pattern, file_path=nil)
-    self.glob(glob_pattern, file_path) { |f| require f }
+  #
+  def glob_require(glob_pattern, file_path=nil)
+    glob(glob_pattern, file_path) { |f| require f }
   end
 end
 
@@ -144,4 +162,4 @@ I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n
 ##
 # Used to know if this file has already been required
 #
-module SupportLite; end
+module SupportLite; end

data/lib/padrino-core/tasks.rb

@@ -20,4 +20,4 @@ module Padrino
       @files ||= []
     end
   end # Tasks
-end # Padrino
+end # Padrino

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.10.1' unless defined?(Padrino::VERSION)
+  VERSION = '0.10.2' 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.9.4")
+  s.add_dependency("http_router", "~> 0.10.2")
   s.add_dependency("thor", "~> 0.14.3")
-  s.add_dependency("activesupport", "~> 3.0.0")
-end
+  s.add_dependency("activesupport", "~> 3.1.0")
+end

data/test/fixtures/apps/complex.rb

@@ -14,6 +14,11 @@ end
 class Complex2Demo < Padrino::Application
   set :reload, true
   get("/old"){ "Old Sinatra Way" }
+
+  controllers :var do
+    get(:destroy){ params.inspect }
+  end
+
   get("/"){ "The magick number is: 12!" } # Change only the number!!!
 end
 
@@ -24,4 +29,4 @@ end
 Complex2Demo.controllers do
 end
 
-Padrino.load!
+Padrino.load!

data/test/fixtures/apps/simple.rb

@@ -14,7 +14,7 @@ end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 72!' # Change only the number!!!
+    'The magick number is: 724274705032786548110472817755585178605481536388041566742570203174924198689!' # Change only the number!!!
   end
 
   get "/rand" do
@@ -30,4 +30,4 @@ end
 # Then run it from your console: ruby -I"lib" test/fixtures/apps/simple.rb
 #
 
-Padrino.load!
+Padrino.load!

data/test/fixtures/dependencies/a.rb

@@ -6,4 +6,4 @@
 # But here we need some of b.rb
 A_result = [B, C]
 
-A = "A"
+A = "A"

data/test/fixtures/dependencies/b.rb

@@ -1,4 +1,4 @@
 # But here we need some of c.rb and a.rb
 B_result = C
 
-B = "B"
+B = "B"

data/test/fixtures/dependencies/c.rb

@@ -1 +1 @@
-C = "C"
+C = "C"

data/test/fixtures/dependencies/d.rb

@@ -1,4 +1,4 @@
 D  = 0 unless defined?(D)
 D += 1
 
-raise "SomeThing"
+raise "SomeThing"

data/test/helper.rb

@@ -1,13 +1,13 @@
 ENV['PADRINO_ENV'] = 'test'
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
 
 require File.expand_path('../../../load_paths', __FILE__)
 require 'padrino-core'
+require 'json'
 require 'test/unit'
 require 'rack/test'
 require 'rack'
 require 'shoulda'
-require 'phocus'
 
 # Rubies < 1.9 don't handle hashes in the properly order so to prevent
 # this issue for now we remove extra values from mimetypes.
@@ -98,4 +98,4 @@ class Test::Unit::TestCase
   end
   alias :with_view   :with_template
   alias :with_layout :with_template
-end
+end

data/test/test_application.rb

@@ -78,6 +78,30 @@ class TestApplication < Test::Unit::TestCase
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
       assert_equal "Foo in html", body
     end # content_type to :html
-  end # application functionality
 
-end
+    context "errors" do
+      should "haven't mapped errors on development" do
+        mock_app { get('/'){ 'HI' } }
+        get "/"
+        assert @app.errors.empty?
+      end
+
+      should "have mapped errors on production" do
+        mock_app { set :environment, :production; get('/'){ 'HI' } }
+        get "/"
+        assert_equal 1, @app.errors.size
+      end
+
+      should "overide errors" do
+        mock_app do
+          set :environment, :production
+          get('/'){ raise }
+          error(::Exception){ 'custom error' }
+        end
+        get "/"
+        assert_equal 1, @app.errors.size
+        assert_equal 'custom error', body
+      end
+    end
+  end # application functionality
+end

data/test/test_core.rb

@@ -33,7 +33,7 @@ class TestCore < Test::Unit::TestCase
         assert_equal 'UTF8', $KCODE
       else
         assert_equal Encoding.default_external, Encoding::UTF_8
-        assert_equal Encoding.default_internal, nil # Encoding::UTF_8
+        assert_equal Encoding.default_internal, Encoding::UTF_8
       end
     end
 
@@ -76,4 +76,4 @@ class TestCore < Test::Unit::TestCase
       assert_equal "yes", res["Middleware-Called"]
     end
   end
-end
+end

data/test/test_logger.rb

@@ -88,4 +88,4 @@ class TestPadrinoLogger < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_mounter.rb

@@ -173,4 +173,4 @@ class TestMounter < Test::Unit::TestCase
       assert_equal File.read(__FILE__), res.body
     end
   end
-end
+end

data/test/test_reloader_complex.rb

@@ -36,9 +36,13 @@ class TestComplexReloader < Test::Unit::TestCase
       get "/complex_2_demo/old"
       assert_equal 200, status
 
+      get "/complex_2_demo/var/destroy"
+      assert_equal '{}', body
+
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(Complex1Demo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
+      new_buffer.gsub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
       begin
         File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
         sleep 1.2 # We need at least a cooldown of 1 sec.
@@ -57,10 +61,13 @@ class TestComplexReloader < Test::Unit::TestCase
 
         get "/complex_2_demo/old"
         assert_equal 200, status
+
+        get "/complex_2_demo/var/destroy/variable"
+        assert_equal '{:id=>"variable"}', body
       ensure
         # Now we need to prevent to commit a new changed file so we revert it
         File.open(Complex1Demo.app_file, "w") { |f| f.write(buffer) }
       end
     end
   end
-end
+end

data/test/test_reloader_simple.rb

@@ -94,4 +94,4 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 0, @app.templates.size
     end
   end
-end
+end

data/test/test_rendering.rb

@@ -434,4 +434,4 @@ class TestRendering < Test::Unit::TestCase
       assert_equal 'THIS. IS. SPARTA!', body
     end
   end
-end
+end

data/test/test_restful_routing.rb

@@ -30,4 +30,4 @@ class TestRouting < Test::Unit::TestCase
     delete "/parents/1/hi"
     assert_equal "/parents/1/hi delete", body
   end
-end
+end

data/test/test_router.rb

@@ -143,4 +143,4 @@ class TestRouter < Test::Unit::TestCase
     res = Rack::MockRequest.new(Padrino.application).get("/foo/", "HTTP_HOST" => "bar.padrino.org")
     assert res.ok?
   end
-end
+end

data/test/test_routing.rb

@@ -37,6 +37,9 @@ class TestRouting < Test::Unit::TestCase
       get %r{/([0-9]+)/} do |num|
        "Your lucky number: #{num} #{params[:captures].first}"
       end
+      get /\/page\/([0-9]+)|\// do |num|
+        "My lucky number: #{num} #{params[:captures].first}"
+      end
     end
     get "/foo"
     assert_equal "str", body
@@ -46,6 +49,8 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "regexp", body
     get "/1234/"
     assert_equal "Your lucky number: 1234 1234", body
+    get "/page/99"
+    assert_equal "My lucky number: 99 99", body
   end
 
   should "parse routes with question marks" do
@@ -239,6 +244,24 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'json', body
   end
 
+  should "set content_type to :json if render => :json" do
+    mock_app do
+      get("/foo"){ render :foo => :bar }
+    end
+
+    get '/foo'
+    assert_equal 'application/json;charset=utf-8', content_type
+  end
+
+  should 'set and get content_type' do
+    mock_app do
+      get("/foo"){ content_type(:json); content_type.to_s }
+    end
+    get "/foo"
+    assert_equal 'application/json', content_type
+    assert_equal 'json', body
+  end
+
   should "send the appropriate number of params" do
     mock_app do
       get('/id/:user_id', :provides => [:json]) { |user_id| user_id}
@@ -432,7 +455,7 @@ class TestRouting < Test::Unit::TestCase
     get "/"
     assert_equal "index", body
     assert_equal "/", @app.url(:index)
-    get "/accounts"
+    get "/accounts/index"
     assert_equal "accounts", body
   end
 
@@ -626,6 +649,20 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "foo_bar_index", body
   end
 
+  should "support a reindex action and remove index inside controller" do
+    mock_app do
+      controller :posts do
+        get(:index){ "index" }
+        get(:reindex){ "reindex" }
+      end
+    end
+    get "/posts"
+    assert_equal "index", body
+    get "/posts/reindex"
+    assert_equal "/posts/reindex", @app.url(:posts, :reindex)
+    assert_equal "reindex", body
+  end
+
   should 'use uri_root' do
     mock_app do
       get(:foo){ "foo" }
@@ -888,7 +925,7 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 406, status
   end
 
-  should "works allow global provides" do
+  should "does not allow global provides" do
     mock_app do
       provides :xml
 
@@ -905,6 +942,39 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'Bar in html', body
   end
 
+  should "does not allow global provides in controller" do
+    mock_app do
+      controller :base do
+        provides :xml
+
+        get(:foo, "/foo"){ "Foo in #{content_type}" }
+        get(:bar, "/bar"){ "Bar in #{content_type}" }
+      end
+    end
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal 'Foo in xml', body
+    get '/foo'
+    assert_equal 'Foo in xml', body
+
+    get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal 'Bar in html', body
+  end
+
+  should "map non named routes in controllers" do
+    mock_app do
+      controller :base do
+        get("/foo") { "ok" }
+        get("/bar") { "ok" }
+      end
+    end
+
+    get "/base/foo"
+    assert ok?
+    get "/base/bar"
+    assert ok?
+  end
+
   should "set content_type to :html for both empty Accept as well as Accept text/html" do
     mock_app do
       provides :html
@@ -1445,6 +1515,29 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'okay', body
   end
 
+  should 'return value from params' do
+    mock_app do
+      get("/foo/:bar"){ raise "'bar' should be a string" unless params[:bar].kind_of? String}
+    end
+    assert_nothing_raised do
+      get "/foo/50"
+    end
+  end
+
+  should 'have MethodOverride middleware with more options' do
+    mock_app do
+      put('/', :with => :id, :provides => [:json]) { params[:id] }
+    end
+    post '/hi', {'_method'=>'PUT'}
+    assert_equal 200, status
+    assert_equal 'hi', body
+    post '/hi.json', {'_method'=>'PUT'}
+    assert_equal 200, status
+    assert_equal 'hi', body
+    post '/hi.json'
+    assert_equal 405, status
+  end
+
   should 'parse nested params' do
     mock_app do
       get(:index) { "%s %s" % [params[:account][:name], params[:account][:surname]] }
@@ -1459,7 +1552,7 @@ class TestRouting < Test::Unit::TestCase
     mock_app { set :environment, :development }
     get "/"
     assert_equal 404, status
-    assert_match /Sinatra doesn&rsquo;t know this ditty./, body
+    assert_match %r{(Sinatra doesn&rsquo;t know this ditty.|<h1>Not Found</h1>)}, body
   end
 
   should 'render a custom NotFound page' do
@@ -1510,6 +1603,18 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "/paginate/10", body
   end
 
+  should 'accept :map and :parent' do
+    mock_app do
+      controller :posts do
+        get :show, :parent => :users, :map => "posts/:id" do
+          "#{params[:user_id]}-#{params[:id]}"
+        end
+      end
+    end
+    get '/users/123/posts/321'
+    assert_equal "123-321", body
+  end
+
   should 'change params in current_path' do
     mock_app do
       get :index, :map => "/paginate/:page" do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
-  version: 0.10.1
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +29,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id001
@@ -35,6 +45,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 2
+        - 6
         version: 1.2.6
   type: :runtime
   version_requirements: *id002
@@ -46,7 +61,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -57,6 +77,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 14
+        - 3
         version: 0.14.3
   type: :runtime
   version_requirements: *id004
@@ -68,7 +93,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id005
 description: The Padrino core gem required for use of this framework
@@ -171,12 +201,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []