padrino-core 0.11.3 → 0.11.4

data/lib/padrino-core/reloader.rb

@@ -143,8 +143,8 @@ module Padrino
           Padrino::Utils.unsilence_output
           new_constants = ObjectSpace.new_classes(klasses)
           if loaded
-            process_loaded_file(:file      => file, 
-                                :constants => new_constants, 
+            process_loaded_file(:file      => file,
+                                :constants => new_constants,
                                 :files     => files)
           else
             logger.devel "Failed to load #{file}; removing partially defined constants"
@@ -154,7 +154,7 @@ module Padrino
       end
 
       ##
-      # Returns true if the file is defined in our padrino root
+      # Returns true if the file is defined in our padrino root.
       #
       def figure_path(file)
         return file if Pathname.new(file).absolute?
@@ -183,13 +183,12 @@ module Padrino
       private
 
       ###
-      # Clear instance variables that keep track of 
-      # loaded features/files/mtimes
+      # Clear instance variables that keep track of # loaded features/files/mtimes.
       #
       def clear_modification_times
         MTIMES.clear
       end
-      
+
       def clear_loaded_classes
         LOADED_CLASSES.each do |file, klasses|
           klasses.each { |klass| remove_constant(klass) }
@@ -205,21 +204,21 @@ module Padrino
       end
 
       ###
-      # Macro for mtime query
+      # Macro for mtime query.
       #
       def modification_time(file)
         MTIMES[file]
       end
 
       ###
-      # Macro for mtime update
+      # Macro for mtime update.
       #
       def update_modification_time(file)
         MTIMES[file] = File.mtime(file)
       end
 
       ###
-      # Tracks loaded file features/classes/constants
+      # Tracks loaded file features/classes/constants:
       #
       def process_loaded_file(*args)
         options       = args.extract_options!
@@ -236,14 +235,14 @@ module Padrino
       end
 
       ###
-      # Unloads all constants in new_constants
+      # Unloads all constants in new_constants.
       #
       def unload_constants(new_constants)
         new_constants.each { |klass| remove_constant(klass) }
       end
 
       ###
-      # Safe load dependencies of a file
+      # Safe load dependencies of a file.
       #
       def reload_deps_of_file(file)
         if features = LOADED_FILES.delete(file)
@@ -252,23 +251,23 @@ module Padrino
       end
 
       ##
-      # Check if file was changed or if force a reload
+      # Check if file was changed or if force a reload.
       #
       def should_reload?(file)
         MTIMES[file] && File.mtime(file) > MTIMES[file]
       end
 
       ##
-      # Removes all classes declared in the specified file
+      # Removes all classes declared in the specified file.
       #
       def remove_loaded_file_classes(file)
         if klasses = LOADED_CLASSES.delete(file)
           klasses.each { |klass| remove_constant(klass) }
-        end 
+        end
       end
 
       ##
-      # Remove all loaded fatures with our file
+      # Remove all loaded fatures with our file.
       #
       def remove_loaded_file_features(file)
         if features = LOADED_FILES[file]
@@ -277,8 +276,8 @@ module Padrino
       end
 
       ##
-      # Return the mounted_apps providing the app location
-      # Can be an array because in one app.rb we can define multiple Padrino::Appplications
+      # Return the mounted_apps providing the app location.
+      # Can be an array because in one app.rb we can define multiple Padrino::Application.
       #
       def mounted_apps_of(file)
         file = figure_path(file)
@@ -286,7 +285,7 @@ module Padrino
       end
 
       ##
-      # Returns true if file is in our Padrino.root
+      # Returns true if file is in our Padrino.root.
       #
       def in_root?(file)
         # This is better but slow:
@@ -307,7 +306,7 @@ module Padrino
       end
 
       ##
-      # Creates an array of paths for use in #rotation
+      # Creates an array of paths for use in #rotation.
       #
       def files_for_rotation
         files  = Padrino.load_paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten
@@ -317,8 +316,9 @@ module Padrino
     end # self
 
     ##
-    # This class acts as a Rack middleware to be added to the application stack. This middleware performs a
-    # check and reload for source files at the start of each request, but also respects a specified cool down time
+    # This class acts as a Rack middleware to be added to the application stack.
+    # This middleware performs a check and reload for source files at the start
+    # of each request, but also respects a specified cool down time
     # during which no further action will be taken.
     #
     class Rack
@@ -337,5 +337,5 @@ module Padrino
         @app.call(env)
       end
     end
-  end # Reloader
-end # Padrino
+  end
+end

data/lib/padrino-core/router.rb

@@ -1,6 +1,6 @@
 module Padrino
   ##
-  # This class is an extended version of Rack::URLMap
+  # This class is an extended version of Rack::URLMap.
   #
   # Padrino::Router like Rack::URLMap dispatches in such a way that the
   # longest paths are tried first, since they are most specific.
@@ -9,7 +9,7 @@ module Padrino
   #
   # * Map a path to the specified App
   # * Ignore server names (this solve issues with vhost and domain aliases)
-  # * Use hosts instead of server name for mappings (this help us with our vhost and doman aliases)
+  # * Use hosts instead of server name for mappings (this help us with our vhost and domain aliases)
   #
   # @example
   #
@@ -26,8 +26,6 @@ module Padrino
   #
   # @api semipublic
   class Router
-
-    # Constructs a new route mapper instance
     def initialize(*mapping, &block)
       @mapping = []
       mapping.each { |m| map(m) }
@@ -68,14 +66,14 @@ module Padrino
     end
 
     # The call handler setup to route a request given the mappings specified.
-    # @api private
     def call(env)
-      rPath = env["PATH_INFO"].to_s
+      path_info = env["PATH_INFO"].to_s
       script_name = env['SCRIPT_NAME']
-      hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT')
+      http_host = env['HTTP_HOST']
+
       @mapping.each do |host, path, match, app|
-        next unless host.nil? || hHost =~ host
-        next unless rPath =~ match && rest = $1
+        next unless host.nil? || http_host =~ host
+        next unless path_info =~ match && rest = $1
         next unless rest.empty? || rest[0] == ?/
 
         rest = "/" if rest.empty?
@@ -85,14 +83,13 @@ module Padrino
             'SCRIPT_NAME' => (script_name + path),
             'PATH_INFO'   => rest))
       end
-      [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{rPath}"]]
+      [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path_info}"]]
     end
 
     private
 
-    # Sorts the mapped routes in consistent order
     def sort!
       @mapping = @mapping.sort_by { |h, p, m, a| -p.size }
     end
-  end # Router
-end # Padrino
+  end
+end

data/lib/padrino-core/server.rb

@@ -1,7 +1,7 @@
 module Padrino
   ##
   # Runs the Padrino apps as a self-hosted server using:
-  # thin, mongrel, or webrick in that order.
+  # thin, mongrel, or WEBrick in that order.
   #
   # @example
   #   Padrino.run! # with these defaults => host: "127.0.0.1", port: "3000", adapter: the first found
@@ -23,7 +23,7 @@ module Padrino
     def self.start(app, opts={})
       options = {}.merge(opts) # We use a standard hash instead of Thor::CoreExt::HashWithIndifferentAccess
       options.symbolize_keys!
-      options[:Host] = options.delete(:host) || '127.0.0.1' 
+      options[:Host] = options.delete(:host) || '127.0.0.1'
       options[:Port] = options.delete(:port) || 3000
       options[:AccessLog] = []
       if options[:daemonize]
@@ -53,27 +53,25 @@ module Padrino
     end
     alias :wrapped_app :app
 
-    # The options specified to the server.
     def options
       @options
     end
 
     private
-
-      # Detects the supported handler to use.
-      #
-      # @example
-      #   detect_rack_handler => <ThinHandler>
-      #
-      def self.detect_rack_handler
-        Handlers.each do |handler|
-          begin
-            return handler if Rack::Handler.get(handler.to_s.downcase)
-          rescue LoadError
-          rescue NameError
-          end
+    # Detects the supported handler to use.
+    #
+    # @example
+    #   detect_rack_handler => <ThinHandler>
+    #
+    def self.detect_rack_handler
+      Handlers.each do |handler|
+        begin
+          return handler if Rack::Handler.get(handler.to_s.downcase)
+        rescue LoadError
+        rescue NameError
         end
-        fail "Server handler (#{Handlers.join(', ')}) not found."
       end
-  end # Server
-end # Padrino
+      fail "Server handler (#{Handlers.join(', ')}) not found."
+    end
+  end
+end

data/lib/padrino-core/tasks.rb

@@ -1,7 +1,7 @@
 module Padrino
   ##
   # This module it's used for bootstrap with padrino rake
-  # thirdy party tasks, in your gem/plugin/extension you
+  # third party tasks, in your gem/plugin/extension you
   # need only do this:
   #
   # @example
@@ -17,5 +17,5 @@ module Padrino
     def self.files
       @files ||= []
     end
-  end # Tasks
-end # Padrino
+  end
+end

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.11.3' unless defined?(Padrino::VERSION)
+  VERSION = '0.11.4' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/padrino-core.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   # s.post_install_message << " as shown here:\e[0m https://gist.github.com/1d36a35794dbbd664ea4"
   # s.post_install_message << "\n\e[32m" + ("*" * 20) + "\n\e[0m"
 
-  s.add_dependency("tilt", "~> 1.3.7")
+  s.add_dependency("tilt", "~> 1.4.1")
   if ENV["SINATRA_EDGE"]
     s.add_dependency("sinatra")
   else

data/test/test_application.rb

@@ -80,22 +80,22 @@ describe "Application" do
     end
 
     # compare to: test_routing: allow global provides
-    should "set content_type to :html if none can be determined" do
+    should "set content_type to nil if none can be determined" do
       mock_app do
         provides :xml
 
-        get("/foo"){ "Foo in #{content_type}" }
-        get("/bar"){ "Foo in #{content_type}" }
+        get("/foo"){ "Foo in #{content_type.inspect}" }
+        get("/bar"){ "Foo in #{content_type.inspect}" }
       end
 
       get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-      assert_equal 'Foo in xml', body
+      assert_equal 'Foo in :xml', body
       get '/foo'
-      assert_equal 'Foo in xml', body
+      assert_equal 'Foo in :xml', body
 
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-      assert_equal "Foo in html", body
-    end # content_type to :html
+      assert_equal "Foo in nil", body
+    end
 
     context "errors" do
       should "haven't mapped errors on development" do

data/test/test_rendering.rb

@@ -60,14 +60,14 @@ describe "Rendering" do
     end
 
     should 'not use layout' do
-      with_layout :application, "this is a <%= yield %>" do
+      with_layout :application, "this is an <%= yield %>" do
         with_view :index, "index" do
           mock_app do
             get("/with/layout"){ render :index }
             get("/without/layout"){ render :index, :layout => false }
           end
           get "/with/layout"
-          assert_equal "this is a index", body
+          assert_equal "this is an index", body
           get "/without/layout"
           assert_equal "index", body
         end
@@ -528,5 +528,18 @@ describe "Rendering" do
       assert ok?
       assert_equal '<p><div>foo</div></p>', body.strip
     end
+
+    should "render correct erb when use sinatra as middleware" do
+      class Bar < Sinatra::Base
+        get "/" do
+          render :erb, "<&'>"
+        end
+      end
+      mock_app do
+        use Bar
+      end
+      get "/"
+      assert_equal "<&'>", body
+    end
   end
 end

data/test/test_routing.rb

@@ -109,6 +109,16 @@ describe "Routing" do
     assert_equal 'success!', body    
   end
 
+  should 'parse routes that include encoded slash' do
+    mock_app do
+      get('/:drive_alias/:path', :path => /.*/){
+        "Show #{params[:drive_alias]} and #{params[:path]}"
+      }
+    end
+    get("/drive%2Ffoo/some/path")
+    assert_equal "Show drive/foo and some/path", body
+  end
+
   should 'encode params using UTF-8' do
     skip unless ''.respond_to?(:encoding) # for 1.8.7
 
@@ -151,6 +161,20 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  should "parse params when use regex for parts of a route" do
+    mock_app do
+      post :index, :with => [:foo, :bar], :bar => /.+/ do
+        "show #{params[:foo]}"
+      end
+
+      get :index, :map => '/mystuff/:a_id/boing/:boing_id' do
+        "show #{params[:a_id]} and #{params[:boing_id]}"
+      end
+    end
+    get "/mystuff/5/boing/2"
+    assert_equal "show 5 and 2", body
+  end
+
   should "not generate overlapping head urls" do
     app = mock_app do
       get("/main"){ "hello" }
@@ -1096,17 +1120,17 @@ describe "Routing" do
     mock_app do
       provides :xml
 
-      get("/foo"){ "Foo in #{content_type}" }
-      get("/bar"){ "Bar in #{content_type}" }
+      get("/foo"){ "Foo in #{content_type.inspect}" }
+      get("/bar"){ "Bar in #{content_type.inspect}" }
     end
 
     get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
     get '/foo'
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
 
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Bar in html', body
+    assert_equal 'Bar in nil', body
   end
 
   should "does not allow global provides in controller" do
@@ -1114,18 +1138,18 @@ describe "Routing" do
       controller :base do
         provides :xml
 
-        get(:foo, "/foo"){ "Foo in #{content_type}" }
-        get(:bar, "/bar"){ "Bar in #{content_type}" }
+        get(:foo, "/foo"){ "Foo in #{content_type.inspect}" }
+        get(:bar, "/bar"){ "Bar in #{content_type.inspect}" }
       end
     end
 
     get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
     get '/foo'
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
 
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Bar in html', body
+    assert_equal 'Bar in nil', body
   end
 
   should "map non named routes in controllers" do