padrino-core 0.11.2 → 0.11.3

data/lib/padrino-core.rb

@@ -169,7 +169,7 @@ module Padrino
 
     ##
     # Registers a gem with padrino. This relieves the caller from setting up
-    # loadpaths by himself and enables Padrino to look up apps in gem folder.
+    # loadpaths by itself and enables Padrino to look up apps in gem folder.
     #
     # The name given has to be the proper gem name as given in the gemspec.
     #

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

@@ -1,10 +1,12 @@
 begin
   require 'haml'
   require 'haml/helpers/xss_mods'
+  require 'haml/helpers/action_view_extensions'
 
   module Haml
     module Helpers
       include XssMods
+      include ActionViewExtensions
     end
 
     module Util

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

@@ -98,6 +98,30 @@ class HttpRouter
         []
       end
     end
+
+    def to(dest = nil, &dest_block)
+      @dest = dest || dest_block || raise("you didn't specify a destination")
+
+      @router.current_order ||= 0
+      @order = @router.current_order
+      @router.current_order += 1
+
+      if @dest.respond_to?(:url_mount=)
+        urlmount = UrlMount.new(@path_for_generation, @default_values || {}) # TODO url mount should accept nil here.
+        urlmount.url_mount = @router.url_mount if @router.url_mount
+        @dest.url_mount = urlmount
+      end
+      self
+    end
+
+    attr_accessor :order
+
+  end
+
+  attr_accessor :current_order
+
+  def sort!
+    @routes.sort!{ |a, b| a.order <=> b.order }
   end
 
   #Monkey patching the Request class. Using Rack::Utils.unescape rather than
@@ -394,7 +418,7 @@ module Padrino
       #
       # @example if filters based on a symbol or regexp
       #   before :index, /main/ do; ... end
-      #   # => match oly path that are  +/+ or contains +main+
+      #   # => match only path that are  +/+ or contains +main+
       #
       # @example filtering everything except an occurency
       #   before :except => :index do; ...; end
@@ -466,6 +490,7 @@ module Padrino
         else
           deferred_routes.each { |_, routes| routes.each { |(route, dest)| route.to(dest) } }
           @deferred_routes = nil
+          router.sort!
           router
         end
       end
@@ -909,6 +934,17 @@ module Padrino
       end
       alias :url_for :url
 
+      ##
+      # Returns absolute url. Calls Sinatra::Helpers#uri to generate protocol version, hostname and port.
+      #
+      # @example
+      #   absolute_url(:show, :id => 1)  # => http://example.com/show?id=1
+      #   absolute_url(:show, 24)        # => https://example.com/admin/show/24
+      #
+      def absolute_url( *args )
+        uri url(*args), true, false
+      end
+
       ##
       # Returns the recognized path for a route.
       #

data/lib/padrino-core/logger.rb

@@ -58,7 +58,7 @@ module Padrino
       :info  =>  3,
       :debug =>  0,
       :devel => -1,
-    } unless const_defined?(:Levels)
+    } unless defined?(Levels)
 
     module Extensions
       ##
@@ -207,13 +207,8 @@ module Padrino
 
     include Extensions
 
-    attr_accessor :level
-    attr_accessor :auto_flush
-    attr_reader   :buffer
-    attr_reader   :log
-    attr_reader   :init_args
-    attr_accessor :log_static
-    attr_reader   :colorize_logging
+    attr_accessor :auto_flush, :level, :log_static
+    attr_reader   :buffer, :colorize_logging, :init_args, :log
 
     ##
     # Configuration for a given environment, possible options are:
@@ -403,7 +398,7 @@ module Padrino
         env['rack.logger'] = Padrino.logger
         began_at = Time.now
         status, header, body = @app.call(env)
-        log(env, status, header, began_at)
+        log(env, status, header, began_at) if logger.debug?
         [status, header, body]
       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.2' unless defined?(Padrino::VERSION)
+  VERSION = '0.11.3' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/padrino-core.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |s|
   end
   s.add_dependency("http_router", "~> 0.11.0")
   s.add_dependency("thor", "~> 0.17.0")
-  s.add_dependency("activesupport", ">= 3.1.0")
+  s.add_dependency("activesupport", ">= 3.1", "< 4.0")
   s.add_dependency("rack-protection", ">= 1.5.0")
 end

data/test/test_logger.rb

@@ -98,6 +98,35 @@ describe "PadrinoLogger" do
         Padrino.logger.instance_eval{ @log_static = false }
       end
     end
+
+    context "health-check requests logging" do
+      def access_to_mock_app
+        mock_app do
+          enable :logging
+          get("/"){ "Foo" }
+        end
+        get "/"
+      end
+
+      should 'output under debug level' do
+        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:debug] }
+        access_to_mock_app
+        assert_match /\e\[36m  DEBUG\e\[0m/, Padrino.logger.log.string
+
+        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:devel] }
+        access_to_mock_app
+        assert_match /\e\[36m  DEBUG\e\[0m/, Padrino.logger.log.string
+      end
+      should 'not output over debug level' do
+        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:info] }
+        access_to_mock_app
+        assert_equal '', Padrino.logger.log.string
+
+        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:error] }
+        access_to_mock_app
+        assert_equal '', Padrino.logger.log.string
+      end
+    end
   end
 end
 

data/test/test_rendering_extensions.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "Rendering Extensions" do
+  context 'for haml' do
+    should 'render haml_tag correctly' do
+      mock_app do
+        get('/') { render :haml, '-haml_tag :div'}
+      end
+
+      get '/'
+      assert_match '<div></div>', last_response.body
+    end
+  end
+end

data/test/test_routing.rb

@@ -226,6 +226,28 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  should 'generate absolute urls' do
+    mock_app do
+      get(:hash, :with => :id){ absolute_url(:hash, :id => 1) }
+    end
+    get "/hash/2"
+    assert_equal "http://example.org/hash/1", body
+    get "https://example.org/hash/2"
+    assert_equal "https://example.org/hash/1", body
+  end
+
+  should 'generate proper absolute urls for mounted apps' do
+    class Test < Padrino::Application
+      get :foo do
+        absolute_url(:foo, :id => 1)
+      end
+    end
+    Padrino.mount("Test").to("/test")
+    @app = Padrino.application
+    get('/test/foo')
+    assert_equal 'http://example.org/test/foo?id=1', body
+  end
+
   should 'allow regex url with format' do
     mock_app do
       get(/.*/, :provides => :any) { "regexp" }
@@ -792,7 +814,6 @@ describe "Routing" do
 
 
   should 'respect priorities' do
-    skip
     route_order = []
     mock_app do
       get(:index, :priority => :normal) { route_order << :normal; pass }
@@ -804,6 +825,19 @@ describe "Routing" do
     assert_equal "hello", body
   end
 
+  should 'catch all after controllers' do
+    mock_app do
+      get(:index, :with => :slug, :priority => :low) { "catch all" }
+      controllers :contact do
+        get(:index) { "contact"}
+      end
+    end
+    get "/contact"
+    assert_equal "contact", body
+    get "/foo"
+    assert_equal "catch all", body
+  end
+
   should 'allow optionals' do
     mock_app do
       get(:show, :map => "/stories/:type(/:category)") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -85,7 +85,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -93,7 +96,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +211,7 @@ files:
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
 - test/test_rendering.rb
+- test/test_rendering_extensions.rb
 - test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb
@@ -222,9 +229,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3143622035712023707
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,6 +272,7 @@ test_files:
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
 - test/test_rendering.rb
+- test/test_rendering_extensions.rb
 - test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb