padrino-core 0.11.4 → 0.12.0.rc1

data/lib/padrino-core.rb

@@ -14,7 +14,6 @@ require 'padrino-core/server'
 require 'padrino-core/tasks'
 require 'padrino-core/module'
 
-
 PADRINO_ENV  = ENV["PADRINO_ENV"]  ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
 PADRINO_ROOT = ENV["PADRINO_ROOT"] ||= File.dirname(Padrino.first_caller) unless defined?(PADRINO_ROOT)
 
@@ -22,6 +21,8 @@ module Padrino
   class ApplicationLoadError < RuntimeError # @private
   end
 
+  extend Loader
+
   class << self
     ##
     # Helper method for file references.
@@ -61,18 +62,10 @@ module Padrino
     #   No applications were mounted.
     #
     def application
-      raise ApplicationLoadError, "At least one app must be mounted!" unless Padrino.mounted_apps && Padrino.mounted_apps.any?
+      raise ApplicationLoadError, "At least one app must be mounted!" unless Padrino.mounted_apps.present?
       router = Padrino::Router.new
       Padrino.mounted_apps.each { |app| app.map_onto(router) }
-
-      if middleware.present?
-        builder = Rack::Builder.new
-        middleware.each { |c,a,b| builder.use(c, *a, &b) }
-        builder.run(router)
-        builder.to_app
-      else
-        router
-      end
+      middleware.present? ? add_middleware(router) : router
     end
 
     ##
@@ -90,21 +83,14 @@ module Padrino
     #
     def configure_apps(&block)
       return  unless block_given?
-      @@_global_configurations ||= []
-      @@_global_configurations << block
-      @_global_configuration = lambda do |app|
-        @@_global_configurations.each do |configuration|
-          app.class_eval(&configuration)
-        end
-      end
+      global_configurations << block
     end
 
     ##
-    # Returns project-wide configuration settings defined in
-    # {configure_apps} block.
+    # Stores global configuration blocks.
     #
-    def apps_configuration
-      @_global_configuration
+    def global_configurations
+      @_global_configurations ||= []
     end
 
     ##
@@ -119,15 +105,21 @@ module Padrino
     # @return [NilClass]
     #
     def set_encoding
-      if RUBY_VERSION < '1.9'
-        $KCODE='u'
-      else
-        Encoding.default_external = Encoding::UTF_8
-        Encoding.default_internal = Encoding::UTF_8
-      end
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
       nil
     end
 
+    ##
+    # Creates Rack stack with the router added to the middleware chain.
+    #
+    def add_middleware(router)
+      builder = Rack::Builder.new
+      middleware.each{ |mw,args,block| builder.use(mw, *args, &block) }
+      builder.run(router)
+      builder.to_app
+    end
+
     ##
     # A Rack::Builder object that allows to add middlewares in front of all
     # Padrino applications.
@@ -161,8 +153,8 @@ module Padrino
     # @yield []
     #   The given block will be passed to the initialized middleware.
     #
-    def use(m, *args, &block)
-      middleware << [m, args, block]
+    def use(mw, *args, &block)
+      middleware << [mw, args, block]
     end
 
     ##

data/padrino-core.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.license = "MIT"
 
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files         = `git ls-files`.split("\n")
@@ -38,6 +39,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", "< 4.0")
+  s.add_dependency("activesupport", ">= 3.1")
   s.add_dependency("rack-protection", ">= 1.5.0")
 end

data/test/fixtures/apps/helpers/system_helpers.rb

@@ -0,0 +1,8 @@
+require 'resolv'
+
+SystemDemo.helpers do
+  def resolv
+    Resolv.name
+  end
+end
+

data/test/fixtures/apps/kiq.rb

@@ -0,0 +1,3 @@
+class Kiq < ::Sinatra::Base
+  set :root, '/weird'
+end

data/test/fixtures/apps/lib/myklass/mysubklass.rb

@@ -0,0 +1,4 @@
+class MyKlass
+    class MySubKlass
+    end
+end

data/test/fixtures/apps/lib/myklass.rb

@@ -0,0 +1,2 @@
+class MyKlass < OpenStruct
+end

data/test/fixtures/apps/models/child.rb

@@ -0,0 +1,2 @@
+class Child < Parent
+end

data/test/fixtures/apps/models/parent.rb

@@ -0,0 +1,5 @@
+class Parent
+  def family
+    'Danes'
+  end
+end

data/test/fixtures/apps/render.rb

@@ -0,0 +1,13 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class RenderDemo < Padrino::Application
+  set :reload, true
+end
+
+RenderDemo.controllers :blog do
+  get '/' do
+    render 'post'
+  end
+end
+
+Padrino.load!

data/test/fixtures/apps/system.rb

@@ -0,0 +1,13 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class SystemDemo < Padrino::Application
+  set :reload, true
+end
+
+SystemDemo.controllers do
+  get '/' do
+    resolv
+  end
+end
+
+Padrino.load!

data/test/fixtures/apps/views/blog/post.erb

@@ -0,0 +1 @@
+okay

data/test/helper.rb

@@ -56,7 +56,7 @@ class MiniTest::Spec
     path  = "/views/#{name}"
     path += ".#{options.delete(:locale)}" if options[:locale].present?
     path += ".#{options[:format]}" if options[:format].present?
-    path += ".erb" unless options[:format].to_s =~ /haml|rss|atom/
+    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom/
     path += ".builder" if options[:format].to_s =~ /rss|atom/
     file  = File.dirname(__FILE__) + path
     File.open(file, 'w') { |io| io.write content }

data/test/mini_shoulda.rb

@@ -29,10 +29,10 @@ class ColoredIO
 
   def print(o)
     case o
-    when "." then @io.send(:print, o.green)
-    when "E" then @io.send(:print, o.red)
-    when "F" then @io.send(:print, o.yellow)
-    when "S" then @io.send(:print, o.magenta)
+    when "." then @io.send(:print, o.colorize(:green))
+    when "E" then @io.send(:print, o.colorize(:red))
+    when "F" then @io.send(:print, o.colorize(:yellow))
+    when "S" then @io.send(:print, o.colorize(:magenta))
     else @io.send(:print, o)
     end
   end

data/test/test_application.rb

@@ -25,19 +25,6 @@ describe "Application" do
       assert !Padrino.configure_apps
     end
 
-    should 'check haml options on production' do
-      assert defined?(Haml), 'Haml not defined'
-      assert_equal :test, PadrinoPristine.environment
-      assert !PadrinoPristine.haml[:ugly]
-      Padrino.stub :env, :production do
-        PadrinoPristine.send :default_configuration!
-        assert_equal :production, Padrino.env
-        assert_equal :production, PadrinoPristine.environment
-        assert PadrinoPristine.haml[:ugly]
-        PadrinoPristine.environment = :test
-      end
-    end
-
     should 'check padrino specific options' do
       assert !PadrinoPristine.instance_variable_get(:@_configured)
       PadrinoPristine.send(:setup_application!)
@@ -97,6 +84,11 @@ describe "Application" do
       assert_equal "Foo in nil", body
     end
 
+    should "resolve views and layouts paths" do
+      assert_equal Padrino.root('views')+'/users/index', PadrinoPristine.view_path('users/index')
+      assert_equal Padrino.root('views')+'/layouts/app', PadrinoPristine.layout_path(:app)
+    end
+
     context "errors" do
       should "haven't mapped errors on development" do
         mock_app { get('/'){ 'HI' } }

data/test/test_core.rb

@@ -27,12 +27,8 @@ describe "Core" do
 
     should 'set correct utf-8 encoding' do
       Padrino.set_encoding
-      if RUBY_VERSION <'1.9'
-        assert_equal 'UTF8', $KCODE
-      else
-        assert_equal Encoding.default_external, Encoding::UTF_8
-        assert_equal Encoding.default_internal, Encoding::UTF_8
-      end
+      assert_equal Encoding.default_external, Encoding::UTF_8
+      assert_equal Encoding.default_internal, Encoding::UTF_8
     end
 
     should 'have load paths' do

data/test/test_csrf_protection.rb

@@ -76,5 +76,71 @@ describe "Application" do
         assert_equal 403, status
       end
     end
+
+    context "with :except option that is using Proc" do
+      before do
+        mock_app do
+          enable :sessions
+          set :protect_from_csrf, :except => proc{|env| ["/", "/foo"].any?{|path| path == env['PATH_INFO'] }}
+          post("/") { "Hello" }
+          post("/foo") { "Hello, foo" }
+          post("/bar") { "Hello, bar" }
+        end
+      end
+
+      should "allow ignoring CSRF protection on specific routes" do
+        post "/"
+        assert_equal 200, status
+        post "/foo"
+        assert_equal 200, status
+        post "/bar"
+        assert_equal 403, status
+      end
+    end
+
+    context "with :except option that is using String and Regexp" do
+      before do
+        mock_app do
+          enable :sessions
+          set :protect_from_csrf, :except => ["/a", %r{^/a.c$}]
+          post("/a") { "a" }
+          post("/abc") { "abc" }
+          post("/foo") { "foo" }
+        end
+      end
+
+      should "allow ignoring CSRF protection on specific routes" do
+        post "/a"
+        assert_equal 200, status
+        post "/abc"
+        assert_equal 200, status
+        post "/foo"
+        assert_equal 403, status
+      end
+    end
+
+    context "with middleware" do
+      before do
+        class Middleware < Sinatra::Base
+          post("/middleware") { "Hello, middleware" }
+          post("/dummy") { "Hello, dummy" }
+        end
+        mock_app do
+          enable :sessions
+          set :protect_from_csrf, :except => proc{|env| ["/", "/middleware"].any?{|path| path == env['PATH_INFO'] }}
+          use Middleware
+          post("/") { "Hello" }
+        end
+      end
+
+      should "allow ignoring CSRF protection on specific routes of middleware" do
+        post "/"
+        assert_equal 200, status
+        post "/middleware"
+        assert_equal 200, status
+        post "/dummy"
+        assert_equal 403, status
+      end
+    end
   end
-end
+end

data/test/test_dependencies.rb

@@ -2,6 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Dependencies" do
   context 'when we require a dependency that have another dependency' do
+    setup do
+      @log_level = Padrino::Logger::Config[:test]
+      @io = StringIO.new
+      Padrino::Logger::Config[:test] = { :log_level => :error, :stream => @io }
+      Padrino::Logger.setup!
+    end
+
+    teardown do
+      Padrino::Logger::Config[:test] = @log_level
+      Padrino::Logger.setup!
+    end
 
     should 'raise an error without reloading it twice' do
       capture_io do
@@ -15,6 +26,7 @@ describe "Dependencies" do
         end
       end
       assert_equal 1, D
+      assert_match /RuntimeError: SomeThing/, @io.string
     end
 
     should 'resolve dependency problems' do
@@ -27,6 +39,7 @@ describe "Dependencies" do
       end
       assert_equal ["B", "C"], A_result
       assert_equal "C", B_result
+      assert_equal "", @io.string
     end
 
     should 'remove partially loaded constants' do
@@ -37,8 +50,8 @@ describe "Dependencies" do
           Padrino.root("fixtures/dependencies/circular/g.rb")
         )
       end
-
       assert_equal ["name"], F.fields
+      assert_equal "", @io.string
     end
   end
 end

data/test/test_mounter.rb

@@ -24,7 +24,14 @@ describe "Mounter" do
       assert_equal "TestApp", mounter.app_class
       assert_equal "/path/to/test.rb", mounter.app_file
       assert_equal "/test_app", mounter.uri_root
-      assert_equal File.dirname(mounter.app_file), mounter.app_root
+      assert_equal Padrino.root, mounter.app_root
+    end
+
+    should 'use app.root if available' do
+      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/kiq')
+      mounter = Padrino::Mounter.new("kiq", :app_class => "Kiq")
+      mounter.to("/test_app")
+      assert_equal '/weird', mounter.app_root
     end
 
     should 'check locate_app_file with __FILE__' do
@@ -53,6 +60,17 @@ describe "Mounter" do
       assert_equal ["some_namespace/an_app"], Padrino.mounted_apps.map(&:name)
     end
 
+    should 'correctly set a name of a namespaced app' do
+      module ::SomeNamespace2
+        class AnApp < Padrino::Application
+          get(:index) { settings.app_name }
+        end
+      end
+      Padrino.mount("SomeNamespace2::AnApp").to("/")
+      res = Rack::MockRequest.new(Padrino.application).get("/")
+      assert_equal "some_namespace2/an_app", res.body
+    end
+
     should 'mount a primary app to root uri' do
       mounter = Padrino.mount("test_app", :app_file => __FILE__).to("/")
       assert_equal "test_app", mounter.name
@@ -130,30 +148,56 @@ describe "Mounter" do
           put(:update) { "users update" }
           delete(:destroy) { "users delete" }
         end
+        controllers :foo_bar do
+          get(:index) { "foo bar index" }
+          get(:new) { "foo bar new" }
+          post(:create) { "foo bar create" }
+          put(:update) { "foo bar update" }
+          delete(:destroy) { "foo bar delete" }
+        end
       end
 
       Padrino.mount("one_app").to("/")
       Padrino.mount("two_app").to("/two_app")
 
       assert_equal 15, Padrino.mounted_apps[0].routes.size
-      assert_equal 7, Padrino.mounted_apps[1].routes.size
+      assert_equal 14, Padrino.mounted_apps[1].routes.size
       assert_equal 6, Padrino.mounted_apps[0].named_routes.size
-      assert_equal 5, Padrino.mounted_apps[1].named_routes.size
+      assert_equal 10, Padrino.mounted_apps[1].named_routes.size
 
       first_route = Padrino.mounted_apps[0].named_routes[3]
-      assert_equal "posts_show", first_route.identifier.to_s
+      assert_equal "posts show", first_route.identifier.to_s
       assert_equal "(:posts, :show)", first_route.name
       assert_equal "GET", first_route.verb
       assert_equal "/posts/show/:id(.:format)", first_route.path
       another_route = Padrino.mounted_apps[1].named_routes[2]
-      assert_equal "users_create", another_route.identifier.to_s
+      assert_equal "users create", another_route.identifier.to_s
       assert_equal "(:users, :create)", another_route.name
       assert_equal "POST", another_route.verb
       assert_equal "/two_app/users/create", another_route.path
       regexp_route = Padrino.mounted_apps[0].named_routes[5]
-      assert_equal "posts_regexp", regexp_route.identifier.to_s
+      assert_equal "posts regexp", regexp_route.identifier.to_s
       assert_equal "(:posts, :regexp)", regexp_route.name
       assert_equal "/\\/foo|\\/baz/", regexp_route.path
+      foo_bar_route = Padrino.mounted_apps[1].named_routes[5]
+      assert_equal "(:foo_bar, :index)", foo_bar_route.name
+    end
+    
+    should "configure cascade apps" do
+      class ::App1 < Padrino::Application
+        get(:index) { halt 404, 'index1' }
+      end
+      class ::App2 < Padrino::Application
+        get(:index) { halt 404, 'index2' }
+      end
+      class ::App3 < Padrino::Application
+        get(:index) { halt 404, 'index3' }
+      end
+      Padrino.mount('app1', :cascade => true).to('/foo')
+      Padrino.mount('app2').to('/foo')
+      Padrino.mount('app3').to('/foo')
+      res = Rack::MockRequest.new(Padrino.application).get("/foo")
+      assert_equal 'index2', res.body
     end
 
     should 'correctly instantiate a new padrino application' do

data/test/test_reloader_complex.rb

@@ -47,7 +47,7 @@ describe "ComplexReloader" do
       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.
+        sleep 1.1 # We need at least a cooldown of 1 sec.
         get "/complex_2_demo"
         assert_equal new_phrase, body
 
@@ -65,7 +65,7 @@ describe "ComplexReloader" do
         assert_equal 200, status
 
         get "/complex_2_demo/var/destroy/variable"
-        assert_equal '{:id=>"variable"}', body
+        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) }

data/test/test_reloader_simple.rb

@@ -61,7 +61,7 @@ describe "SimpleReloader" do
       buffer     = File.read(SimpleDemo.app_file)
       new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
       File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
-      sleep 2 # We need at least a cooldown of 1 sec.
+      sleep 1.1 # We need at least a cooldown of 1 sec.
       get "/"
       assert_equal new_phrase, body
 

data/test/test_reloader_system.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system')
+
+describe "SystemReloader" do
+  context 'for wierd and difficult reload events' do
+    should 'reload system features if they were required only in helper' do
+      @app = SystemDemo
+      @app.reload!
+      get '/'
+      assert_equal 'Resolv', body
+    end
+
+    should 'reload children on parent change' do
+      @app = SystemDemo
+      assert_equal Child.new.family, 'Danes'
+      parent_file = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/models/parent.rb')
+      new_class = <<-DOC
+        class Parent
+          def family
+            'Dancy'
+          end
+          def shmamily
+            'Shmancy'
+          end
+        end
+      DOC
+      begin
+        backup = File.read(parent_file)
+        Padrino::Reloader.reload!
+        assert_equal 'Danes', Parent.new.family
+        assert_equal 'Danes', Child.new.family
+        File.open(parent_file, "w") { |f| f.write(new_class) }
+        Padrino::Reloader.reload!
+        assert_equal 'Dancy', Parent.new.family
+        assert_equal 'Shmancy', Parent.new.shmamily
+        assert_equal 'Dancy', Child.new.family
+        assert_equal 'Shmancy', Child.new.shmamily
+      ensure
+        File.open(parent_file, "w") { |f| f.write(backup) }
+      end
+    end
+    
+    should 'tamper with LOAD_PATH' do
+      SystemDemo.load_paths.each do |lib_dir|
+        assert_includes $LOAD_PATH, lib_dir
+      end
+      Padrino.send(:load_paths_was).each do |lib_dir|
+        assert_includes $LOAD_PATH, lib_dir
+      end
+    end
+  end
+end

data/test/test_rendering.rb

@@ -209,6 +209,43 @@ describe "Rendering" do
     assert_equal "haml", body.chomp
   end
 
+  should 'allow to render template with layout option that using other template engine.' do
+    create_layout :"layouts/foo", "application layout for <%= yield %>", :format => :erb
+    create_view :slim, "| slim", :format => :slim
+    create_view :haml, "haml", :format => :haml
+    create_view :erb, "erb", :format => :erb
+    mock_app do
+      get("/slim") { render("slim.slim", :layout => "foo.erb") }
+      get("/haml") { render("haml.haml", :layout => "foo.erb") }
+      get("/erb") { render("erb.erb", :layout => "foo.erb") }
+    end
+    get "/slim"
+    assert_equal "application layout for slim", body.chomp
+    get "/haml"
+    assert_equal "application layout for haml", body.chomp
+    get "/erb"
+    assert_equal "application layout for erb", body.chomp
+  end
+
+  should 'allow to use extension with layout method.' do
+    create_layout :"layouts/bar", "application layout for <%= yield %>", :format => :erb
+    create_view :slim, "| slim", :format => :slim
+    create_view :haml, "haml", :format => :haml
+    create_view :erb, "erb", :format => :erb
+    mock_app do
+      layout "bar.erb"
+      get("/slim") { render("slim.slim") }
+      get("/haml") { render("haml.haml") }
+      get("/erb") { render("erb.erb") }
+    end
+    get "/slim"
+    assert_equal "application layout for slim", body.chomp
+    get "/haml"
+    assert_equal "application layout for haml", body.chomp
+    get "/erb"
+    assert_equal "application layout for erb", body.chomp
+  end
+
   context 'for application render functionality' do
 
     should "work properly with logging and missing layout" do
@@ -385,11 +422,15 @@ describe "Rendering" do
       mock_app do
         get("/foo", :provides => [:html, :js]) { render :foo }
       end
+
+      I18n.enforce_available_locales = false
       I18n.locale = :none
       get "/foo.js"
       assert_equal "Im Js", body
       get "/foo"
       assert_equal "Im Erb", body
+      I18n.enforce_available_locales = true
+
       I18n.locale = :en
       get "/foo"
       assert_equal "Im English Erb", body
@@ -405,6 +446,7 @@ describe "Rendering" do
       I18n.locale = :en
       get "/foo.pk"
       assert_equal 404, status
+
     end
 
     should 'resolve template content_type and locale with layout' do
@@ -425,11 +467,15 @@ describe "Rendering" do
         layout :foo
         get("/bar", :provides => [:html, :js, :json]) { render :bar }
       end
+
+      I18n.enforce_available_locales = false
       I18n.locale = :none
       get "/bar.js"
       assert_equal "Hello Im Js in a Js layout", body
       get "/bar"
       assert_equal "Hello Im Erb in a Erb layout", body
+      I18n.enforce_available_locales = true
+
       I18n.locale = :en
       get "/bar"
       assert_equal "Hello Im English Erb in a Erb-En layout", body
@@ -447,6 +493,14 @@ describe "Rendering" do
       assert_equal "Im a json", body
       get "/bar.pk"
       assert_equal 404, status
+
+    end
+
+    should 'resolve template location relative to controller name' do
+      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/render')
+      @app = RenderDemo
+      get '/blog'
+      assert_equal 'okay', body
     end
 
     should 'renders erb with blocks' do