padrino-core 0.9.11 → 0.9.12

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

@@ -138,6 +138,8 @@ module Padrino
     #   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
     #
     def mount_core(*args)
+      # TODO Remove this in 0.9.13 or before 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)

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

@@ -361,9 +361,8 @@ module Padrino
         # Allow paths for the given request head or request format
         #
         def provides(*types)
-          mime_types = types.map { |t| mime_type(t) }
-
           condition do
+            mime_types        = types.map { |t| mime_type(t) }
             accepts           = request.accept.map { |a| a.split(";")[0].strip }
             matching_types    = (accepts & mime_types)
             request.path_info =~ /\.([^\.\/]+)$/
@@ -378,7 +377,7 @@ module Padrino
                              types.include?(accept_format)   ||
                              types.include?(url_format)      ||
                              accepts.any? { |a| a == "*/*" } ||
-                             (request.accept.empty? && types.include?(:html))
+                             ((!url_format) && request.accept.empty? && types.include?(:html))
 
             if matched_format
               @_content_type = url_format || accept_format || :html

data/lib/padrino-core/version.rb

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

data/test/fixtures/apps/simple.rb

@@ -24,7 +24,7 @@ end
 
 ## If you want use this as a standalone app uncomment:
 #
-# Padrino.mount_core("SimpleDemo")
+# Padrino.mount("SimpleDemo").to("/")
 # Padrino.run! unless Padrino.loaded? # If you enable reloader prevent to re-run the app
 #
 # Then run it from your console: ruby -I"lib" test/fixtures/apps/simple.rb

data/test/test_mounter.rb

@@ -34,14 +34,14 @@ class TestMounter < Test::Unit::TestCase
 
     should 'mount an app' do
       class ::AnApp < Padrino::Application; end
-      Padrino.mount_core("an_app")
+      Padrino.mount("an_app").to("/")
       assert_equal AnApp, Padrino.mounted_apps.first.app_obj
-      assert_equal ["core"], Padrino.mounted_apps.collect(&:name)
+      assert_equal ["an_app"], Padrino.mounted_apps.collect(&:name)
     end
 
     should 'mount a core' do
-      mounter = Padrino.mount_core("test", :app_file => __FILE__)
-      assert_equal "core", mounter.name
+      mounter = Padrino.mount("test", :app_file => __FILE__).to("/")
+      assert_equal "test", mounter.name
       assert_equal "Test", mounter.app_class
       assert_equal Test, mounter.app_obj
       assert_equal __FILE__, mounter.app_file
@@ -50,8 +50,8 @@ class TestMounter < Test::Unit::TestCase
     end
 
     should 'mount a core to url' do
-      mounter = Padrino.mount_core("test", :app_file => __FILE__).to('/me')
-      assert_equal "core", mounter.name
+      mounter = Padrino.mount("test", :app_file => __FILE__).to('/me')
+      assert_equal "test", mounter.name
       assert_equal "Test", mounter.app_class
       assert_equal Test, mounter.app_obj
       assert_equal __FILE__, mounter.app_file

data/test/test_reloader_simple.rb

@@ -46,8 +46,8 @@ class TestSimpleReloader < Test::Unit::TestCase
 
     should 'correctly instantiate SimpleDemo fixture' do
       Padrino.mounted_apps.clear
-      Padrino.mount_core("simple_demo")
-      assert_equal ["core"], Padrino.mounted_apps.collect(&:name)
+      Padrino.mount("simple_demo").to("/")
+      assert_equal ["simple_demo"], Padrino.mounted_apps.collect(&:name)
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end

data/test/test_rendering.rb

@@ -302,7 +302,8 @@ class TestRendering < Test::Unit::TestCase
       get "/foo.js"
       assert_equal "Im Italian Js", body
       I18n.locale = :en
-      assert_raise(RuntimeError) { get "/foo.pk" }
+      get "/foo.pk"
+      assert_equal 404, status
     end
 
     should 'resolve template content_type and locale with layout' do
@@ -343,7 +344,8 @@ class TestRendering < Test::Unit::TestCase
       I18n.locale = :en
       get "/bar.json"
       assert_equal "Im a json", body
-      assert_raise(RuntimeError) { get "/bar.pk" }
+      get "/bar.pk"
+      assert_equal 404, status
     end
 
     should 'renders erb with blocks' do

data/test/test_router.rb

@@ -105,8 +105,8 @@ class TestRouter < Test::Unit::TestCase
 
   should "works with padrino core applications" do
     Padrino.mounted_apps.clear
-    Padrino.mount_core("simple_demo").host("padrino.org")
-    assert_equal ["core"], Padrino.mounted_apps.collect(&:name)
+    Padrino.mount("simple_demo").host("padrino.org")
+    assert_equal ["simple_demo"], Padrino.mounted_apps.collect(&:name)
     assert_equal ["padrino.org"], Padrino.mounted_apps.collect(&:app_host)
 
     res = Rack::MockRequest.new(Padrino.application).get("/")

data/test/test_routing.rb

@@ -731,6 +731,38 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "bar2", body
   end
 
+  should "parse two routes with the same path but different http verbs" do
+    mock_app do
+      get(:index) { "This is the get index" }
+      post(:index) { "This is the post index" }
+    end
+    get "/"
+    assert_equal "This is the get index", body
+    post "/"
+    assert_equal "This is the post index", body
+  end
+
+  should "parse two routes with the same path but different http verbs and provides" do
+    mock_app do
+      get(:index, :provides => [:html, :json]) { "This is the get index.#{content_type}" }
+      post(:index, :provides => [:html, :json]) { "This is the post index.#{content_type}" }
+    end
+    get "/"
+    assert_equal "This is the get index.html", body
+    post "/"
+    assert_equal "This is the post index.html", body
+    get "/.json"
+    assert_equal "This is the get index.json", body
+    get "/.js"
+    assert_equal 404, status
+    assert_match "Sinatra doesn't know this ditty", body
+    post "/.json"
+    assert_equal "This is the post index.json", body
+    post "/.js"
+    assert_match "Sinatra doesn't know this ditty", body
+    assert_equal 404, status
+  end
+
   should "work with params and parent options" do
     mock_app do
       controller :test2, :parent => :parent1, :parent1_id => 1 do

data/test/test_server.rb

@@ -22,7 +22,7 @@ class ServerApp < Padrino::Application; end
 
 class ServerTest < Test::Unit::TestCase
   def setup
-    Padrino.mount_core("server_app")
+    Padrino.mount("server_app").to("/")
   end
 
   context 'for server functionality' do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,157 +18,167 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -07:00
+date: 2010-06-19 00:00:00 +02:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :runtime
+  name: sinatra
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: http_router
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 5
+        version: 0.2.5
   type: :runtime
+  name: http_router
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thor
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 13
         - 0
         version: 0.13.0
   type: :runtime
+  name: thor
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
         - 8
         version: 2.3.8
   type: :runtime
+  name: activesupport
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
         - 7
         version: 0.8.7
   type: :development
+  name: rake
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
+  name: mocha
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack-test
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
         - 0
         version: 0.5.0
   type: :development
+  name: rack-test
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: webrat
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 5
         - 1
         version: 0.5.1
   type: :development
+  name: webrat
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: haml
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 2
         - 2
         - 22
         version: 2.2.22
   type: :development
+  name: haml
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 10
         - 3
         version: 2.10.3
   type: :development
+  name: shoulda
   prerelease: false
   version_requirements: *id010
 description: The Padrino core gem required for use of this framework
@@ -250,6 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -258,6 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3