padrino-core 0.9.19 → 0.9.20

data/lib/padrino-core.rb

@@ -40,7 +40,15 @@ module Padrino
       raise ApplicationLoadError, "At least one app must be mounted!" unless self.mounted_apps && self.mounted_apps.any?
       router = Padrino::Router.new
       self.mounted_apps.each { |app| app.map_onto(router) }
-      router
+
+      unless middleware.empty?
+        builder = Rack::Builder.new
+        middleware.each { |c,a,b| builder.use(c, *a, &b) }
+        builder.run(router)
+        builder.to_app
+      else
+        router
+      end
     end
 
     ##
@@ -75,5 +83,27 @@ module Padrino
       return :locked   if File.exist?(root('.bundle/environment.rb'))
       return :unlocked if File.exist?(root("Gemfile"))
     end
+
+    ##
+    # A Rack::Builder object that allows to add middlewares in front of all
+    # Padrino applications
+    #
+    def middleware
+      @middleware ||= []
+    end
+
+    ##
+    # Clears all previously configured middlewares
+    #
+    def clear_middleware!
+      @middleware = []
+    end
+
+    ##
+    # Convenience method for adding a Middleware to the whole padrino app.
+    #
+    def use(m, *args, &block)
+      middleware << [m, args, block]
+    end
   end # self
 end # Padrino

data/lib/padrino-core/application.rb

@@ -92,7 +92,7 @@ module Padrino
         self.default_routes!
         self.default_errors!
         if defined?(I18n)
-          I18n.load_path += self.locale_path
+          I18n.load_path << self.locale_path
           I18n.reload!
         end
         @_configured = true
@@ -150,6 +150,7 @@ module Padrino
         def default_routes!
           configure :development do
             get '/__sinatra__/:image.png' do
+              content_type :png
               filename = File.dirname(__FILE__) + "/images/#{params[:image]}.png"
               send_file filename
             end

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

@@ -132,7 +132,7 @@ module Padrino
         # => "/layouts/custom"
         #
         def resolved_layout
-          located_layout = resolve_template(settings.fetch_layout_path, :strict_format => true, :raise_exceptions => false)
+          located_layout = resolve_template(settings.fetch_layout_path, :raise_exceptions => false)
           located_layout ? located_layout[0] : false
         end
 

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

@@ -63,10 +63,15 @@ module Padrino
         end
 
         def route
-          match.matched? ? match.path.route : nil
+          if match.nil?
+            path = Rack::Utils.unescape(path_info)
+            path.empty? ? "/" : path
+          else
+            match.path.route
+          end
         end
-      end
-    end
+      end # Request
+    end # Sinatra
 
     class UnrecognizedException < RuntimeError #:nodoc:
     end
@@ -501,7 +506,9 @@ module Padrino
             request.path_info =~ /\.([^\.\/]+)$/
             url_format        = $1.to_sym if $1
 
-            if !url_format && matching_types.first
+            if params[:format]
+              accept_format = params[:format]
+            elsif !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
             end
@@ -585,29 +592,31 @@ module Padrino
         def route!(base=self.class, pass_block=nil)
           base.router.runner = self
           if base.router and match = base.router.recognize(@request)
-            if !match.matched?
-              route_eval do
-                match.headers.each {|k,v| response[k] = v}
-                status match.status
+            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)
+                pass_block = catch(:pass) do
+                  # If present set current controller layout
+                  parent_layout = base.instance_variable_get(:@layout)
+                  base.instance_variable_set(:@layout, matched_path.path.route.use_layout) if matched_path.path.route.use_layout
+                  # Provide access to the current controller to the request
+                  # Now we can eval route, but because we have "throw halt" we need to be
+                  # (en)sure to reset old layout and run controller after filters.
+                  begin
+                    @_response_buffer = catch(:halt) { route_eval(&matched_path.path.route.dest) }
+                    throw :halt, @_response_buffer
+                  ensure
+                    base.instance_variable_set(:@layout, parent_layout) if matched_path.path.route.use_layout
+                    matched_path.path.route.after_filters.each { |aft| throw :pass if instance_eval(&aft) == false } if matched_path.path.route.after_filters
+                  end
+                end
               end
             elsif match
-              @block_params = match.params
-              (@params ||= {}).merge!(match.params_as_hash)
-              pass_block = catch(:pass) do
-                # If present set current controller layout
-                parent_layout = base.instance_variable_get(:@layout)
-                base.instance_variable_set(:@layout, match.path.route.use_layout) if match.path.route.use_layout
-                # Provide access to the current controller to the request
-                request.match = match
-                # Now we can eval route, but because we have "throw halt" we need to be
-                # (en)sure to reset old layout and run controller after filters.
-                begin
-                  @_response_buffer = catch(:halt) { route_eval(&match.destination) }
-                  throw :halt, @_response_buffer
-                ensure
-                  base.instance_variable_set(:@layout, parent_layout) if match.path.route.use_layout
-                  match.path.route.after_filters.each { |aft| throw :pass if instance_eval(&aft) == false } if match.path.route.after_filters
-                end
+              route_eval do
+                match[1].each {|k,v| response[k] = v}
+                status match[0]
               end
             end
           end
@@ -624,4 +633,4 @@ module Padrino
         end
     end # InstanceMethods
   end # Routing
-end # Padrino
+end # Padrino

data/lib/padrino-core/caller.rb

@@ -1,22 +1,22 @@
 module Padrino
   PADRINO_IGNORE_CALLERS = [
-   %r{lib/padrino-.*$},                             # all padrino code
-   %r{/padrino-.*/(lib|bin)},                       # all padrino code
-   %r{/bin/padrino$},                               # all padrino code
-   %r{/sinatra(/(base|main|showexceptions))?\.rb$}, # all sinatra code
-   %r{lib/tilt.*\.rb$},                             # all tilt code
-   %r{lib/rack.*\.rb$},                             # all rack code
-   %r{lib/mongrel.*\.rb$},                          # all mongrel code
-   %r{lib/shotgun.*\.rb$},                          # all shotgun lib
-   %r{bin/shotgun$},                                # shotgun binary
-   %r{\(.*\)},                                      # generated code
-   %r{shoulda/context\.rb$},                        # shoulda hacks
-   %r{mocha/integration},                           # mocha hacks
-   %r{test/unit},                                   # test unit hacks
-   %r{rake_test_loader\.rb},                        # rake hacks
-   %r{custom_require\.rb$},                         # rubygems require hacks
-   %r{active_support},                              # active_support require hacks
-   %r{/thor},                                       # thor require hacks
+    %r{lib/padrino-.*$},                             # all padrino code
+    %r{/padrino-.*/(lib|bin)},                       # all padrino code
+    %r{/bin/padrino$},                               # all padrino code
+    %r{/sinatra(/(base|main|showexceptions))?\.rb$}, # all sinatra code
+    %r{lib/tilt.*\.rb$},                             # all tilt code
+    %r{lib/rack.*\.rb$},                             # all rack code
+    %r{lib/mongrel.*\.rb$},                          # all mongrel code
+    %r{lib/shotgun.*\.rb$},                          # all shotgun lib
+    %r{bin/shotgun$},                                # shotgun binary
+    %r{\(.*\)},                                      # generated code
+    %r{shoulda/context\.rb$},                        # shoulda hacks
+    %r{mocha/integration},                           # mocha hacks
+    %r{test/unit},                                   # test unit hacks
+    %r{rake_test_loader\.rb},                        # rake hacks
+    %r{custom_require\.rb$},                         # rubygems require hacks
+    %r{active_support},                              # active_support require hacks
+    %r{/thor}                                        # thor require hacks
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##

data/lib/padrino-core/loader.rb

@@ -170,4 +170,4 @@ module Padrino
       $:.uniq!
     end
   end # self
-end # Padrino
+end # Padrino

data/lib/padrino-core/{application/mounter.rb → mounter.rb}

@@ -97,9 +97,25 @@ module Padrino
     def ==(other)
       other.is_a?(Mounter) && self.app_class == other.app_class && self.uri_root == other.uri_root
     end
-    
+
+    ##
+    # Returns the class object for the app if defined, nil otherwise
+    #
+    def app_constant
+      klass = Object
+      for piece in app_class.split("::")
+        piece = piece.to_sym
+        if klass.const_defined?(piece)
+          klass = klass.const_get(piece)
+        else
+          return
+        end
+      end
+      klass
+    end
+
     protected
-    
+
     ##
     # Locates and requires the file to load the app constant
     #
@@ -122,14 +138,7 @@ module Padrino
       candidates << Padrino.root("app", "app.rb")
       candidates.find { |candidate| File.exist?(candidate) }
     end
-    
-    ##
-    # Returns the class object for the app if defined, nil otherwise
-    #
-    def app_constant
-      app_class.constantize if Object.const_defined?(app_class)
-    end
-    
+
     ###
     # Raises an exception unless app_file is located properly
     #
@@ -137,7 +146,7 @@ module Padrino
       message = "Unable to locate source file for app '#{name}', try with :app_file => '/path/app.rb'"
       raise MounterException, message unless @app_file
     end
-    
+
     ###
     # Raises an exception unless app_obj is defined properly
     #
@@ -171,23 +180,6 @@ module Padrino
       Padrino.mounted_apps.push(mounter) unless Padrino.mounted_apps.include?(mounter)
     end
 
-    ##
-    # Mounts the core application onto Padrino project with given app settings (file, class, root)
-    #
-    # ==== Examples
-    #
-    #   Padrino.mount_core("Blog")
-    #   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
-    #
-    def mount_core(*args)
-      # TODO Remove this in 0.9.14 or pre 1.0
-      warn "DEPRECATION! #{Padrino.first_caller}: Padrino.mount_core has been deprecated.\nUse Padrino.mount('AppName').to('/') instead"
-      options = args.extract_options!
-      app_class = args.size > 0 ? args.first.to_s.camelize : nil
-      options.reverse_merge!(:app_class => app_class)
-      mount("core", options).to("/")
-    end
-
     ##
     # Mounts a new sub-application onto Padrino project
     #

data/lib/padrino-core/reloader.rb

@@ -74,6 +74,7 @@ module Padrino
         # Reload all files with changes detected.
         #
         def reload!
+          # Detect changed files
           rotation do |file, mtime|
             # Retrive the last modified time
             new_file = MTIMES[file].nil?
@@ -253,4 +254,4 @@ module Padrino
       end # self
     end # Stat
   end # Reloader
-end # Padrino
+end # Padrino

data/lib/padrino-core/router.rb

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

data/lib/padrino-core/server.rb

@@ -71,4 +71,4 @@ module Padrino
         raise LoadError, "Server handler (#{servers.join(',')}) not found."
       end
   end # Server
-end # Padrino
+end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -109,4 +109,4 @@ end unless defined?(FileSet)
 ##
 # Loads our locales configuration files
 #
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -18,8 +18,8 @@ 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.4.0")
+  s.add_dependency("http_router", "~> 0.5.0")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")
-end
+end

data/test/fixtures/apps/complex.rb

@@ -14,6 +14,7 @@ end
 class Complex2Demo < Padrino::Application
   set :reload, true
   get("/old"){ "Old Sinatra Way" }
+  get("/"){ "The magick number is: 12!" } # Change only the number!!!
 end
 
 Complex1Demo.controllers do
@@ -21,7 +22,6 @@ Complex1Demo.controllers do
 end
 
 Complex2Demo.controllers do
-  get("/"){ "The magick number is: 16!" } # Change only the number!!!
 end
 
 Padrino.load!

data/test/test_core.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class TestCore < Test::Unit::TestCase
+  def teardown
+    Padrino.clear_middleware!
+  end
+
   context 'for core functionality' do
 
     should 'check some global methods' do
@@ -36,5 +40,24 @@ class TestCore < Test::Unit::TestCase
       Padrino.mounted_apps.clear
       assert_raise(Padrino::ApplicationLoadError) { Padrino.application.new }
     end
+
+    should "add middlewares in front if specified" do
+      test = Class.new {
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          status, headers, body = @app.call(env)
+          headers["Middleware-Called"] = "yes"
+          return status, headers, body
+        end
+      }
+
+      Padrino.use(test)
+
+      res = Rack::MockRequest.new(Padrino.application).get("/")
+      assert_equal "yes", res["Middleware-Called"]
+    end
   end
 end

data/test/test_mounter.rb

@@ -38,6 +38,15 @@ class TestMounter < Test::Unit::TestCase
       assert_equal AnApp, Padrino.mounted_apps.first.app_obj
       assert_equal ["an_app"], Padrino.mounted_apps.collect(&:name)
     end
+    
+    should 'correctly mount an app in a namespace' do
+      module ::SomeNamespace
+        class AnApp < Padrino::Application; end
+      end
+      Padrino.mount("some_namespace/an_app").to("/")
+      assert_equal SomeNamespace::AnApp, Padrino.mounted_apps.first.app_obj
+      assert_equal ["some_namespace/an_app"], Padrino.mounted_apps.collect(&:name)
+    end
 
     should 'mount a primary app to root uri' do
       mounter = Padrino.mount("test", :app_file => __FILE__).to("/")
@@ -159,4 +168,4 @@ class TestMounter < Test::Unit::TestCase
       assert_equal File.read(__FILE__), res.body
     end
   end
-end
+end

data/test/test_reloader_simple.rb

@@ -32,13 +32,13 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 200, status
       get "/__sinatra__/404.png"
       assert_equal 200, status
-      assert_equal "image/png;charset=utf-8", response["Content-Type"]
+      assert_match /image\/png/, response["Content-Type"]
       @app.reset_routes!
       get "/"
       assert_equal 404, status
       get "/__sinatra__/404.png"
       assert_equal 200, status
-      assert_equal "image/png;charset=utf-8", response["Content-Type"]
+      assert_match /image\/png/, response["Content-Type"]
     end
   end
 
@@ -93,4 +93,4 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 0, @app.templates.size
     end
   end
-end
+end

data/test/test_routing.rb

@@ -1,5 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
+class FooError < RuntimeError; end
+
+
 class TestRouting < Test::Unit::TestCase
   should 'ignore trailing delimiters for basic route' do
     mock_app do
@@ -255,7 +258,7 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "bar", body
     assert_equal "/bar", @app.url(:bar)
   end
-  
+
   should 'remove index from path' do
     mock_app do
       get(:index){ "index" }
@@ -512,8 +515,8 @@ class TestRouting < Test::Unit::TestCase
   end
 
   should 'apply maps when given path is kind of hash' do
-    mock_app do 
-      controllers :admin do 
+    mock_app do
+      controllers :admin do
         get(:foobar, "/foo/bar"){ "foobar" }
       end
     end
@@ -564,9 +567,9 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "show 3 1 2", body
     assert_equal user_product_project_url, @app.url(:project, :show, :user_id => 1, :product_id => 2, :id => 3)
   end
-  
-  should "apply parent with shallowing to controller" do 
-    mock_app do 
+
+  should "apply parent with shallowing to controller" do
+    mock_app do
       controller :project do
         parent :user
         parent :shop, :optional => true
@@ -575,7 +578,7 @@ class TestRouting < Test::Unit::TestCase
         get(:show, :with => :id, :parent => :product) { "show #{params[:id]} #{params[:user_id]} #{params[:product_id]} #{params[:shop_id]}" }
       end
     end
-    
+
     assert_equal "/user/1/project", @app.url(:project, :index, :user_id => 1, :shop_id => nil)
     assert_equal "/user/1/shop/23/project", @app.url(:project, :index, :user_id => 1, :shop_id => 23)
 
@@ -609,15 +612,15 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "show 3 1 2 1", body
     assert_equal user_product_project_url, @app.url(:project, :show, :user_id => 1, :product_id => 2, :id => 3, :shop_id => 1)
   end
-  
-  should "respect map in parents with shallowing" do 
-    mock_app do 
+
+  should "respect map in parents with shallowing" do
+    mock_app do
       controller :project do
         parent :shop, :map => "/foo/bar"
         get(:index) { "index #{params[:shop_id]}" }
       end
     end
-    
+
     shop_project_url = "/foo/bar/1/project"
     get shop_project_url
     assert_equal "index 1", body
@@ -916,7 +919,7 @@ class TestRouting < Test::Unit::TestCase
 
   should 'be able to access params in a before filter' do
     username_from_before_filter = nil
-    
+
     mock_app do
       before do
         username_from_before_filter = params[:username]
@@ -1137,4 +1140,29 @@ class TestRouting < Test::Unit::TestCase
     post @app.url(:posts, :create, :format => :js, :bar => 'bar', :baz => 'baz', :id => 5)
     assert_equal "POST CREATE bar - baz - 5", body, "should properly post to create action"
   end
+
+  should "have overideable format" do
+    mock_app do
+      ::Rack::Mime::MIME_TYPES[".other"] = "text/html"
+      before do
+        params[:format] ||= :other
+      end
+      get("/format_test", :provides => [:html, :other]){ content_type.to_s }
+    end
+    get "/format_test"
+    assert_equal "other", body
+  end
+
+  should 'invokes handlers registered with ::error when raised' do
+    mock_app do
+      set :raise_errors, false
+      error(FooError) { 'Foo!' }
+      get '/' do
+        raise FooError
+      end
+    end
+    get '/'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -115,7 +115,6 @@ files:
 - Rakefile
 - padrino-core.gemspec
 - bin/padrino
-- lib/padrino-core/application/mounter.rb
 - lib/padrino-core/application/rendering.rb
 - lib/padrino-core/application/routing.rb
 - lib/padrino-core/application/showexceptions.rb
@@ -144,6 +143,7 @@ files:
 - lib/padrino-core/locale/tr.yml
 - lib/padrino-core/locale/uk.yml
 - lib/padrino-core/logger.rb
+- lib/padrino-core/mounter.rb
 - lib/padrino-core/reloader.rb
 - lib/padrino-core/router.rb
 - lib/padrino-core/server.rb