padrino-core 0.9.18 → 0.9.19

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

@@ -64,8 +64,8 @@ module Padrino
       app_obj.set :app_name, app_data.name
       app_obj.set :app_file, app_data.app_file unless ::File.exist?(app_obj.app_file)
       app_obj.set :root,     app_data.app_root unless app_data.app_root.blank?
-      app_obj.set :public,   Padrino.root('public', app_data.uri_root)
-      app_obj.set :static,   File.exist?(app_obj.public)
+      app_obj.set :public,   Padrino.root('public', app_data.uri_root) unless File.exists?(app_obj.public)
+      app_obj.set :static,   File.exist?(app_obj.public) if app_obj.nil?
       app_obj.setup_application! # We need to initialize here the app.
       router.map(:to => app_obj, :path => app_data.uri_root, :host => app_data.app_host)
     end

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

@@ -70,7 +70,7 @@ module Padrino
 
     class UnrecognizedException < RuntimeError #:nodoc:
     end
-    
+
     ##
     # Keeps information about parent scope.
     #
@@ -80,7 +80,7 @@ module Padrino
       attr_reader :options
 
       alias_method :optional?, :optional
-      
+
       def initialize(value, options={})
         super(value.to_s)
         @map      = options.delete(:map)
@@ -88,7 +88,7 @@ module Padrino
         @options  = options
       end
     end
-    
+
     ##
     # Main class that register this extension
     #
@@ -175,15 +175,13 @@ module Padrino
           @_defaults,   original_defaults   = options, @_defaults
 
           # Application defaults
-          @before_filters, original_before_filters = [],  @before_filters
-          @after_filters,  original_after_filters  = [],  @after_filters
-          @layout,         original_layout         = nil, @layout
+          @filters,     original_filters = { :before => [], :after => [] }, @filters
+          @layout,      original_layout         = nil, @layout
 
           instance_eval(&block)
 
           # Application defaults
-          @before_filters = original_before_filters
-          @after_filters  = original_after_filters
+          @filters        = original_filters
           @layout         = original_layout
 
           # Controller defaults
@@ -196,10 +194,10 @@ module Padrino
       alias :controllers :controller
 
       ##
-      # Provides many parents with shallowing.  
+      # Provides many parents with shallowing.
       #
       # ==== Examples
-      # 
+      #
       #   controllers :product do
       #     parent :shop, :optional => true, :map => "/my/stand"
       #     parent :category, :optional => true
@@ -212,7 +210,7 @@ module Padrino
       #       # url_for(:product, :show, :shop_id => 5, :id => 10) => "/my/stand/5/product/show/10"
       #       # url_for(:product, :show, :shop_id => 5, :category_id => 1, :id => 10) => "/my/stand/5/category/1/product/show/10"
       #     end
-      #   end   
+      #   end
       #
       def parent(name, options={})
         defaults = { :optional => false, :map => name.to_s }
@@ -327,7 +325,7 @@ module Padrino
           else
             raise
           end
-          
+
           # Do padrino parsing. We dup options so we can build HEAD request correctly
           route_options = options.dup
           route_options[:provides] = @_provides if @_provides
@@ -357,7 +355,7 @@ module Padrino
           route.host(options.delete(:host)) if options.key?(:host)
           route.condition(:user_agent => options.delete(:agent)) if options.key?(:agent)
           route.default_values = options.delete(:default_values)
-          options.delete_if do |option, args| 
+          options.delete_if do |option, args|
             if route.send(:significant_variable_names).include?(option)
               route.matching(option => Array(args).first)
               true
@@ -373,13 +371,13 @@ module Padrino
 
           # Add Application defaults
           if @_controller
-            route.before_filters = @before_filters
-            route.after_filters  = @after_filters
+            route.before_filters = @filters[:before]
+            route.after_filters  = @filters[:after]
             route.use_layout     = @layout
             route.controller     = Array(@_controller).first.to_s
           else
-            route.before_filters = @before_filters || []
-            route.after_filters  = @after_filters || []
+            route.before_filters = @filters[:before] || []
+            route.after_filters  = @filters[:after]  || []
           end
 
           route.to(block)

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

@@ -0,0 +1,31 @@
+"no":
+  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: "%d.%m.%Y"
+      short: "%e. %b %Y"
+      long: "%e. %B %Y"
+
+    day_names: [søndag, mandag, tirsdag, onsdag, torsdag, fredag, lørdag]
+    abbr_day_names: [sø, ma, ti, 'on', to, fr, lø]
+    month_names: [~, januar, februar, mars, april, mai, juni, juli, august, september, oktober, november, desember]
+    abbr_month_names: [~, jan, feb, mar, apr, maj, jun, jul, aug, sep, okt, nov, des]
+    order: [ :day, :month, :year ]
+
+  time:
+    formats:
+      default: "%e. %B %Y, %H:%M"
+      short: "%e. %b %Y, %H:%M"
+      long: "%A, %e. %B %Y, %H:%M"
+    am: ""
+    pm: ""
+
+# Used in array.to_sentence.
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " og "
+      last_word_connector: " og "
+

data/lib/padrino-core/server.rb

@@ -49,7 +49,11 @@ module Padrino
         end
       rescue RuntimeError => e
         if e.message =~ /no acceptor/
-          puts "=> Someone is already performing on port #{port}!"
+          if port < 1024 && RUBY_PLATFORM !~ /mswin|win|mingw/ && Process.uid != 0
+            puts "=> Only root may open a priviledged port #{port}!"
+          else
+            puts "=> Someone is already performing on port #{port}!"
+          end
         else
           raise e
         end
@@ -67,4 +71,4 @@ module Padrino
         raise LoadError, "Server handler (#{servers.join(',')}) not found."
       end
   end # Server
-end # Padrino
+end # Padrino

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -17,7 +17,7 @@ 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.0.0")
+  s.add_dependency("sinatra", ">= 1.1.0")
   s.add_dependency("http_router", "~> 0.4.0")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")

data/test/test_mounter.rb

@@ -146,5 +146,17 @@ class TestMounter < Test::Unit::TestCase
       get '/demo_2'
       assert_equal "Im Demo 2", body
     end
+
+    should "not clobber the public setting when mounting an app" do
+      class ::PublicApp < Padrino::Application
+        set :root, "/root"
+        set :public, File.expand_path(File.dirname(__FILE__))
+      end
+
+      Padrino.mount("public_app").to("/public")
+      res = Rack::MockRequest.new(Padrino.application).get("/public/test_mounter.rb")
+      assert res.ok?
+      assert_equal File.read(__FILE__), res.body
+    end
   end
-end
+end

data/test/test_reloader_simple.rb

@@ -32,13 +32,13 @@ class TestSimpleReloader < Test::Unit::TestCase
       assert_equal 200, status
       get "/__sinatra__/404.png"
       assert_equal 200, status
-      assert_equal "image/png", response["Content-Type"]
+      assert_equal "image/png;charset=utf-8", 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"]
+      assert_equal "image/png;charset=utf-8", response["Content-Type"]
     end
   end
 
@@ -74,9 +74,9 @@ class TestSimpleReloader < Test::Unit::TestCase
       get "/rand"
       assert ok?
       last_body = body
-      assert_equal 2, @app.before_filters.size # one is ours the other is default_filter for content type
+      assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
       assert_equal 1, @app.errors.size
-      assert_equal 1, @app.after_filters.size
+      assert_equal 1, @app.filters[:after].size
       assert_equal 2, @app.middleware.size # [Padrino::Logger::Rack, Padrino::Reloader::Rack]
       assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
       assert_equal 2, @app.extensions.size # [Padrino::Routing, Padrino::Rendering]
@@ -84,13 +84,13 @@ class TestSimpleReloader < Test::Unit::TestCase
       @app.reload!
       get "/rand"
       assert_not_equal last_body, body
-      assert_equal 2, @app.before_filters.size # one is ours the other is default_filter for content type
+      assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
       assert_equal 1, @app.errors.size
-      assert_equal 1, @app.after_filters.size
+      assert_equal 1, @app.filters[:after].size
       assert_equal 2, @app.middleware.size # only logger Padrino::Logger::Rack
       assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2
       assert_equal 2, @app.extensions.size # [Padrino::Routing, Padrino::Rendering]
       assert_equal 0, @app.templates.size
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
+        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - lib/padrino-core/locale/fr.yml
 - lib/padrino-core/locale/it.yml
 - lib/padrino-core/locale/nl.yml
+- lib/padrino-core/locale/no.yml
 - lib/padrino-core/locale/pl.yml
 - lib/padrino-core/locale/pt_br.yml
 - lib/padrino-core/locale/ru.yml