padrino-core 0.9.21 → 0.9.22

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Padrino
+Copyright (c) 2011 Padrino
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -291,4 +291,4 @@ For a complete overview of Padrino terminal commands, check out the
 
 == Copyright
 
-Copyright (c) 2010 Padrino. See LICENSE for details.
+Copyright (c) 2011 Padrino. See LICENSE for details.

data/lib/padrino-core/application.rb

@@ -6,7 +6,7 @@ module Padrino
   # Subclasses of this become independent Padrino applications (stemming from Sinatra::Application)
   # These subclassed applications can be easily mounted into other Padrino applications as well.
   #
-  class Application < Sinatra::Application
+  class Application < Sinatra::Base
     register Padrino::Routing   # Support for advanced routing, controllers, url_for
     register Padrino::Rendering # Support for enhanced rendering with template detection
 
@@ -131,6 +131,7 @@ module Padrino
           set :raise_errors, true if development?
           set :reload, true if development?
           set :logging, false
+          set :padrino_logging, true
           set :sessions, false
           set :public, Proc.new { Padrino.root('public', self.uri_root) }
           # Padrino specific
@@ -196,7 +197,7 @@ module Padrino
         # Requires the Padrino middleware
         #
         def register_initializers
-          use Padrino::Logger::Rack    if Padrino.logger && Padrino.logger.level == 0
+          use Padrino::Logger::Rack    if Padrino.logger && (Padrino.logger.level == 0 && padrino_logging?)
           use Padrino::Reloader::Rack  if reload?
           use Rack::Flash              if flash? && sessions?
         end
@@ -234,4 +235,4 @@ module Padrino
         }.map! { |line| line.gsub(/^\.\//, '') }
       end
   end # Application
-end # Padrino
+end # Padrino

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

@@ -502,10 +502,17 @@ module Padrino
           @_use_format = true
           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 =~ /\.([^\.\/]+)$/
             url_format        = $1.to_sym if $1
+            accepts           = request.accept.map { |a| a.split(";")[0].strip }
+            
+            # per rfc2616-sec14:
+            # Assume */* if no ACCEPT header is given.
+            if accepts.empty? || accepts.any? { |a| a == "*/*" }
+              matching_types  = mime_types.slice(0,1)
+            else
+              matching_types  = (accepts & mime_types)
+            end
 
             if params[:format]
               accept_format = params[:format]
@@ -517,9 +524,15 @@ module Padrino
             matched_format = types.include?(:any)            ||
                              types.include?(accept_format)   ||
                              types.include?(url_format)      ||
-                             accepts.any? { |a| a == "*/*" } ||
                              ((!url_format) && request.accept.empty? && types.include?(:html))
 
+            # per rfc2616-sec14:
+            # answer with 406 if accept is given but types to not match any
+            # provided type
+            if !url_format && !accepts.empty? && !matched_format
+              halt 406
+            end
+            
             if matched_format
               @_content_type = url_format || accept_format || :html
               content_type(@_content_type, :charset => 'utf-8')

data/lib/padrino-core/locale/ja.yml

@@ -0,0 +1,30 @@
+ja:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y/%m/%d"
+      short: "%m/%d"
+      long: "%Y年%m月%d日"
+
+    day_names: [日曜日, 月曜日, 火曜日, 水曜日, 木曜日, 金曜日, 土曜日]
+    abbr_day_names: [日, 月, 火, 水, 木, 金, 土]
+    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    abbr_month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
+    order: [ :year, :month, :day ]
+
+  time:
+    formats:
+      default: "%Y/%m/%d %H:%M:%S"
+      short: "%m/%d %H:%M"
+      long: "%Y年%m月%d日 %H時%M分%S秒"
+    am: "午前"
+    pm: "午後"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " と "
+      last_word_connector: ", と "

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-core.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
-  s.add_dependency("sinatra", ">= 1.1.0")
+  s.add_dependency("sinatra", "~> 1.1.0")
   s.add_dependency("http_router", "~> 0.5.4")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")
-end
+end

data/test/test_application.rb

@@ -20,6 +20,7 @@ class TestApplication < Test::Unit::TestCase
       assert_equal Padrino.root("views"), PadrinoTestApp.views
       assert PadrinoTestApp.raise_errors
       assert !PadrinoTestApp.logging
+      assert PadrinoTestApp.padrino_logging
       assert !PadrinoTestApp.sessions
     end
 
@@ -45,10 +46,10 @@ class TestApplication < Test::Unit::TestCase
       get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
       assert_equal 'Foo in xml', body
       get '/foo'
-      assert not_found?
+      assert_equal 'Foo in xml', body
 
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
       assert_equal "Foo in html", body
     end
   end
-end
+end

data/test/test_routing.rb

@@ -170,13 +170,31 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 404, status
   end
 
-  should "not allow Accept-Headers it does not provide" do
+  should "return 406 on Accept-Headers it does not provide" do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }
     end
 
     get "/a", {}, {"HTTP_ACCEPT" => "application/yaml"}
-    assert_equal 404, status
+    assert_equal 406, status
+  end
+  
+  should "not set content_type to :html if Accept */* and html not in provides" do
+    mock_app do
+      get("/foo", :provides => [:json, :xml]) { content_type.to_s }
+    end
+    
+    get '/foo', {}, { 'HTTP_ACCEPT' => '*/*;q=0.5' }
+    assert_equal 'json', body
+  end
+  
+  should "return the first content type in provides if accept header is empty" do
+    mock_app do
+      get(:a, :provides => [:js]){ content_type.to_s }
+    end
+
+    get "/a", {}, {}
+    assert_equal "js", body
   end
 
   should "not default to HTML if HTML is not provided and no type is given" do
@@ -185,7 +203,7 @@ class TestRouting < Test::Unit::TestCase
     end
 
     get "/a", {}, {}
-    assert_equal 404, status
+    assert_equal "application/javascript;charset=utf-8", content_type
   end
 
   should "not match routes if url_format and http_accept is provided but not included" do
@@ -345,14 +363,16 @@ class TestRouting < Test::Unit::TestCase
       get(:d, :provides => [:html, :js]){ "html,js"}
     end
     get "/a"
-    assert_equal 404, status
+    assert_equal 200, status
+    assert_equal "js", body
     get "/a.js"
     assert_equal "js", body
     get "/b"
     assert_equal "any", body
     assert_raise(RuntimeError) { get "/b.foo" }
     get "/c"
-    assert_equal 404, status
+    assert_equal 200, status
+    assert_equal "js,json", body
     get "/c.js"
     assert_equal "js,json", body
     get "/c.json"
@@ -733,8 +753,8 @@ class TestRouting < Test::Unit::TestCase
     assert ok?
     assert_equal 'application/javascript;charset=utf-8', response.headers['Content-Type']
 
-    get '/foo', {}, { :accept => 'text/html' }
-    assert not_found?
+    get '/foo', {}, { "HTTP_ACCEPT" => 'text/html' }
+    assert_equal 406, status
   end
 
   should "works allow global provides" do
@@ -748,8 +768,8 @@ class TestRouting < Test::Unit::TestCase
     get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
     assert_equal 'Foo in xml', body
     get '/foo'
-    assert not_found?
-
+    assert_equal 'Foo in xml', body
+    
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
     assert_equal 'Bar in html', body
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 9
-  - 21
-  version: 0.9.21
+  - 22
+  version: 0.9.22
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -135,6 +135,7 @@ files:
 - lib/padrino-core/locale/es.yml
 - lib/padrino-core/locale/fr.yml
 - lib/padrino-core/locale/it.yml
+- lib/padrino-core/locale/ja.yml
 - lib/padrino-core/locale/nl.yml
 - lib/padrino-core/locale/no.yml
 - lib/padrino-core/locale/pl.yml
@@ -204,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem