padrino-core 0.5.0 → 0.6.1

data/test/test_reloader_complex.rb

@@ -9,6 +9,7 @@ class TestComplexReloader < Test::Unit::TestCase
       Padrino.mounted_apps.clear
       Padrino.mount("complex_1_demo").to("/complex_1_demo")
       Padrino.mount("complex_2_demo").to("/complex_2_demo")
+      assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.collect(&:uri_root)
       assert_equal ["complex_1_demo", "complex_2_demo"], Padrino.mounted_apps.collect(&:name)
       assert Complex1Demo.reload?
       assert Complex2Demo.reload?

data/test/test_reloader_simple.rb

@@ -21,10 +21,27 @@ class TestSimpleReloader < Test::Unit::TestCase
         assert_equal 404, status
       end
     end
-  end
 
+    should 'keep sinatra routes' do
+      mock_app do
+        get("/"){ "ok" }
+      end
+      get "/"
+      assert_equal 200, status
+      get "/__sinatra__/404.png"
+      assert_equal 200, status
+      assert_equal "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", response["Content-Type"]
+    end
+  end
+  
   context 'for simple reload functionality' do
-
+  
     should 'correctly instantiate SimpleDemo fixture' do
       Padrino.mounted_apps.clear
       Padrino.mount_core("simple_demo")
@@ -32,7 +49,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end
-
+  
     should 'correctly reload SimpleDemo fixture' do
       @app = SimpleDemo
       get "/"
@@ -44,7 +61,7 @@ class TestSimpleReloader < Test::Unit::TestCase
       sleep 1.2 # We need at least a cooldown of 1 sec.
       get "/"
       assert_equal new_phrase, body
-
+  
       # Now we need to prevent to commit a new changed file so we revert it
       File.open(SimpleDemo.app_file, "w") { |f| f.write(buffer) }
     end

data/test/test_routing.rb

@@ -0,0 +1,217 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRouting < Test::Unit::TestCase
+
+  should 'ignore trailing delimiters' do
+    mock_app do
+      get("/foo"){ "okey" }
+    end
+    get "/foo"
+    assert_equal "okey", body
+    get "/foo/"
+    assert_equal "okey", body
+  end
+
+  should 'match correcly similar paths' do
+    mock_app do
+      get("/my/:foo_id"){ params[:foo_id] }
+      get("/my/:bar_id/bar"){ params[:bar_id] }
+    end
+    get "/my/1"
+    assert_equal "1", body
+    get "/my/2/bar"
+    assert_equal "2", body
+  end
+
+  should 'generate basic urls'do
+    mock_app do
+      get(:foo){ url(:foo) }
+      get(:bar, :with => :id){ url(:bar, :id => 1) }
+      get("/old-bar/:id"){ params[:id] }
+      post(:mix, :map => "/mix-bar/:id"){ params[:id] }
+      get(:mix, :map => "/mix-bar/:id"){ params[:id] }
+    end
+    get "/foo"
+    assert_equal "/foo", body
+    get "/bar/2"
+    assert_equal "/bar/1", body
+    get "/old-bar/3"
+    assert_equal "3", body
+    post "/mix-bar/4"
+    assert_equal "4", body
+    get "/mix-bar/4"
+    assert_equal "4", body
+  end
+
+  should 'generate url with format' do
+    mock_app do
+      get(:a, :respond_to => :any){ url(:a, :format => :json) }
+      get(:b, :respond_to => :js){ url(:b, :format => :js) }
+      get(:c, :respond_to => [:js, :json]){ url(:c, :format => :json) }
+      get(:d, :respond_to => [:html, :js]){ url(:d, :format => :js, :foo => :bar) }
+    end
+    get "/a.js"
+    assert_equal "/a.json", body
+    get "/b.js"
+    assert_equal "/b.js", body
+    get "/b.ru"
+    assert_equal 404, status
+    get "/c.js"
+    assert_equal "/c.json", body
+    get "/c.json"
+    assert_equal "/c.json", body
+    get "/c.ru"
+    assert_equal 404, status
+    get "/d.json"
+    assert 404, status
+    get "/d"
+    assert_equal "/d.js?foo=bar", body
+    get "/d.js"
+    assert_equal "/d.js?foo=bar", body
+  end
+
+  should 'map routes' do
+    mock_app do
+      get(:bar){ "bar" }
+    end
+    get "/bar"
+    assert_equal "bar", body
+    assert_equal "/bar", @app.url(:bar)
+  end
+
+  should 'remove index from path' do
+    mock_app do
+      get(:index){ "index" }
+      get("/accounts/index"){ "accounts" }
+    end
+    get "/"
+    assert_equal "index", body
+    assert_equal "/", @app.url(:index)
+    get "/accounts"
+    assert_equal "accounts", body
+  end
+
+  should 'parse named params' do
+    mock_app do
+      get(:print, :with => :id){ "Im #{params[:id]}" }
+    end
+    get "/print/9"
+    assert_equal "Im 9", body
+    assert_equal "/print/9", @app.url(:print, :id => 9)
+  end
+
+  should 'respond to' do
+    mock_app do
+      get(:a, :respond_to => :js){ "js" }
+      get(:b, :respond_to => :any){ "any" }
+      get(:c, :respond_to => [:js, :json]){ "js,json" }
+      get(:d, :respond_to => [:html, :js]){ "html,js"}
+    end
+    get "/a"
+    assert_equal 404, status
+    get "/a.js"
+    assert_equal "js", body
+    get "/b"
+    assert_equal "any", body
+    get "/b.foo"
+    assert_equal "any", body
+    get "/c"
+    assert_equal 404, status
+    get "/c.fo"
+    assert_equal 404, status
+    get "/c.js"
+    assert_equal "js,json", body
+    get "/c.json"
+    assert_equal "js,json", body
+    get "/d"
+    assert_equal "html,js", body
+    get "/d.fo"
+    assert_equal 404, status
+    get "/d.js"
+    assert_equal "html,js", body
+  end
+
+  should 'respond_to and set content_type' do
+    mock_app do
+      get :a, :respond_to => :any do
+        case content_type
+          when :js    then "js"
+          when :json  then "json"
+          when :foo   then "foo"
+          when :html  then "html"
+        end
+      end
+    end
+    get "/a.js"
+    assert_equal "js", body
+    assert_equal 'application/javascript', response["Content-Type"]
+    get "/a.json"
+    assert_equal "json", body
+    assert_equal 'application/json', response["Content-Type"]
+    get "/a.foo"
+    assert_equal "foo", body
+    assert_equal 'application/octet-stream', response["Content-Type"]
+    get "/a"
+    assert_equal "html", body
+    assert_equal 'text/html', response["Content-Type"]
+  end
+
+  should 'use controllers' do
+    mock_app do
+      controller "/admin" do
+        get("/"){ "index" }
+        get("/show/:id"){ "show #{params[:id]}" }
+      end
+    end
+    get "/admin"
+    assert_equal "index", body
+    get "/admin/show/1"
+    assert_equal "show 1", body
+  end
+
+  should 'use named controllers' do
+    mock_app do
+      controller :admin do
+        get(:index){ "index" }
+        get(:show, :with => :id){ "show #{params[:id]}" }
+      end
+      controllers :foo, :bar do
+        get(:index){ "foo_bar_index" }
+      end
+    end
+    get "/admin"
+    assert_equal "index", body
+    get "/admin/show/1"
+    assert_equal "show 1", body
+    assert_equal "/admin", @app.url(:admin_index)
+    assert_equal "/admin/show/1", @app.url(:admin_show, :id => 1)
+    get "/foo/bar"
+    assert_equal "foo_bar_index", body
+  end
+
+  should 'reset routes' do
+    mock_app do
+      get("/"){ "foo" }
+      router.reset!
+    end
+    get "/"
+    assert_equal 404, status
+  end
+
+  should 'apply maps' do
+    mock_app do
+      controllers :admin do
+        get(:index, :map => "/"){ "index" }
+        get(:show, :with => :id, :map => "/show"){ "show #{params[:id]}" }
+        get(:edit, :map => "/edit/:id/product"){ "edit #{params[:id]}" }
+      end
+    end
+    get "/"
+    assert_equal "index", body
+    get "/show/1"
+    assert_equal "show 1", body
+    get "/edit/1/product"
+    assert_equal "edit 1", body
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: usher
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: thor
   type: :runtime
@@ -124,22 +134,25 @@ files:
 - lib/padrino-core.rb
 - lib/padrino-core/application.rb
 - lib/padrino-core/caller.rb
+- lib/padrino-core/cli.rb
+- lib/padrino-core/cli/adapter.rb
+- lib/padrino-core/cli/console.rb
+- lib/padrino-core/cli/rake.rb
+- lib/padrino-core/cli/test.rb
+- lib/padrino-core/images/404.png
+- lib/padrino-core/images/500.png
 - lib/padrino-core/loader.rb
 - lib/padrino-core/locale/en.yml
 - lib/padrino-core/logger.rb
 - lib/padrino-core/mounter.rb
 - lib/padrino-core/reloader.rb
+- lib/padrino-core/routing.rb
 - lib/padrino-core/server.rb
 - lib/padrino-core/stat.rb
 - lib/padrino-core/support_lite.rb
 - lib/padrino-core/support_lite/as_support.rb
 - lib/padrino-core/support_lite/extlib_support.rb
 - lib/padrino-core/tasks.rb
-- lib/padrino-core/tasks/adapter.rb
-- lib/padrino-core/tasks/console.rb
-- lib/padrino-core/tasks/helpers.rb
-- lib/padrino-core/tasks/rake_tasks.rb
-- lib/padrino-core/tasks/test.rb
 - lib/padrino-core/version.rb
 - padrino-core.gemspec
 - test/fixtures/apps/.components
@@ -153,6 +166,7 @@ files:
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
+- test/test_routing.rb
 - test/test_server.rb
 has_rdoc: true
 homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-core

data/lib/padrino-core/tasks/helpers.rb

@@ -1,20 +0,0 @@
-module Padrino
-  module Tasks
-    module Helpers
-
-      def chdir(dir)
-        return unless dir
-        begin
-          Dir.chdir(dir.to_s)
-        rescue Errno::ENOENT
-          puts "=> Specified Padrino root '#{dir}' " +
-               "does not appear to exist!"
-        rescue Errno::EACCES
-          puts "=> Specified Padrino root '#{dir}' " +
-               "cannot be accessed by the current user!"
-        end
-      end
-
-    end
-  end
-end

data/lib/padrino-core/tasks/rake_tasks.rb

@@ -1,19 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-Dir["lib/tasks/**/*.rake"].each { |ext| load(ext) }
-
-# TODO: require here padrino-gen rake db:migrate, padrino-routes rake routes etc...
-
-class Padrino::Tasks::RakeFile
-  cattr_accessor :boot_file
-end
-
-task :environment do
-  require Padrino::Tasks::RakeFile.boot_file
-  Padrino.mounted_apps.each do |app|
-    Padrino.require_dependency(app.app_file)
-    app.app_object.setup_application!
-  end
-end