padrino-core 0.9.25 → 0.9.26

data/lib/padrino-core/application.rb

@@ -133,6 +133,7 @@ module Padrino
           set :padrino_logging, true
           set :method_override, true
           set :sessions, false
+          set :session_path, '/'
           set :public, Proc.new { Padrino.root('public', uri_root) }
           set :views, Proc.new { File.join(root,   "views") }
           set :images_path, Proc.new { File.join(public, "images") }
@@ -210,9 +211,14 @@ module Padrino
         end
 
       private
+
         def setup_sessions(builder)
-          return unless sessions
-          builder.use Rack::Session::Cookie, :secret => session_secret, :path => uri_root
+          return unless sessions?
+          options = {}
+          options[:secret] = session_secret if session_secret?
+          options[:path]   = session_path   if session_path?
+          options.merge!(sessions.to_hash)  if sessions.respond_to?(:to_hash)
+          builder.use Rack::Session::Cookie, options
         end
     end # self
 
@@ -225,4 +231,4 @@ module Padrino
         }.map! { |line| line.gsub(/^\.\//, '') }
       end
   end # Application
-end # Padrino
+end # Padrino

data/lib/padrino-core/loader.rb

@@ -98,17 +98,20 @@ module Padrino
       # Extract all files to load
       files = paths.map { |path| Dir[path] }.flatten.uniq.sort
 
-      while files.present?
-        # We need a size to make sure things are loading
-        size_at_start = files.size
+      # We need a size to make sure things are loading
+      size_at_start = files.size
 
+      while files.present?
         # List of errors and failed files
         errors, failed = [], []
 
-        # Now we try to require our dependencies
-        files.each do |file|
+        # Now we try to require our dependencies, we dup files
+        # so we don't perform delete on the original array during
+        # iteration, this prevent problems with rubinus
+        files.dup.each do |file|
           begin
             Reloader::Stat.safe_load(file)
+            files.delete(file)
           rescue LoadError => e
             errors << e
             failed << file
@@ -121,8 +124,8 @@ module Padrino
         end
 
         # Stop processing if nothing loads or if everything has loaded
-        raise errors.last if failed.size == size_at_start
-        break if failed.empty?
+        raise errors.last if files.size == size_at_start && files.present?
+        break if files.empty?
       end
     end
 

data/lib/padrino-core/logger.rb

@@ -215,6 +215,7 @@ module Padrino
       flush if @auto_flush
       message
     end
+    alias :write :<<
 
     ##
     # Generate the logging methods for Padrino.logger for each log level.
@@ -328,4 +329,4 @@ module Kernel #:nodoc:
   def logger
     Padrino.logger
   end
-end # Kernel
+end # Kernel

data/lib/padrino-core/mounter.rb

@@ -133,7 +133,7 @@ module Padrino
         candidates  = []
         candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
         candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
-        candidates << Padrino.mounted_root(name, "app.rb")
+        candidates << Padrino.mounted_root(name.downcase, "app.rb")
         candidates << Padrino.root("app", "app.rb")
         candidates.find { |candidate| File.exist?(candidate) }
       end

data/lib/padrino-core/version.rb

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

data/padrino-core.gemspec

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
@@ -8,18 +9,20 @@ Gem::Specification.new do |s|
   s.summary = "The required Padrino core gem"
   s.homepage = "http://www.padrinorb.com"
   s.description = "The Padrino core gem required for use of this framework"
-  s.default_executable = "padrino"
-  s.executables = ["padrino"]
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
+
   s.extra_rdoc_files = Dir["*.rdoc"]
-  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.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rdoc_options  = ["--charset=UTF-8"]
+
   s.add_dependency("tilt", "~> 1.3.0")
   s.add_dependency("sinatra", "~> 1.2.3")
-  s.add_dependency("http_router", "~> 0.7.4")
+  s.add_dependency("http_router", "~> 0.7.5")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")

data/test/fixtures/apps/.components

@@ -0,0 +1,6 @@
+--- 
+:test: bacon
+:mock: mocha
+:orm: datamapper
+:renderer: erb
+:script: jquery

data/test/fixtures/apps/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+log/**/*
+tmp/**/*
+vendor/gems/gems
+vendor/gems/specifications
+vendor/gems/doc
+vendor/gems/environment.rb

data/test/test_logger.rb

@@ -44,6 +44,16 @@ class TestPadrinoLogger < Test::Unit::TestCase
       assert_match(/Yep this can be logged/, @log.string)
     end
 
+    should 'respond to #write for Rack::CommonLogger' do
+      setup_logger(:log_level => :error)
+      @logger.error "Error message"
+      assert_match /Error message/, @log.string
+      @logger << "logged anyways"
+      assert_match /logged anyways/, @log.string
+      @logger.write "log via alias"
+      assert_match /log via alias/, @log.string
+    end
+
     should 'log an application' do
       mock_app { get("/"){ "Foo" } }
       get "/"
@@ -69,4 +79,4 @@ class TestPadrinoLogger < Test::Unit::TestCase
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 9
-  - 25
-  version: 0.9.25
+  - 26
+  version: 0.9.26
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +02:00
-default_executable: padrino
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -61,12 +60,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 7
-        - 4
-        version: 0.7.4
+        - 5
+        version: 0.7.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -129,12 +128,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- padrino-core.gemspec
 - bin/padrino
+- lib/padrino-core.rb
+- lib/padrino-core/application.rb
 - lib/padrino-core/application/rendering.rb
 - lib/padrino-core/application/routing.rb
 - lib/padrino-core/application/showexceptions.rb
-- lib/padrino-core/application.rb
 - lib/padrino-core/caller.rb
 - lib/padrino-core/cli/adapter.rb
 - lib/padrino-core/cli/base.rb
@@ -169,7 +168,9 @@ files:
 - lib/padrino-core/support_lite.rb
 - lib/padrino-core/tasks.rb
 - lib/padrino-core/version.rb
-- lib/padrino-core.rb
+- padrino-core.gemspec
+- test/fixtures/apps/.components
+- test/fixtures/apps/.gitignore
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/simple.rb
 - test/fixtures/dependencies/a.rb
@@ -188,8 +189,6 @@ files:
 - test/test_router.rb
 - test/test_routing.rb
 - test/test_server.rb
-- test/tmp/cache/%2Ffoo
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -221,9 +220,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem
-test_files: []
-
+test_files: 
+- test/fixtures/apps/.components
+- test/fixtures/apps/.gitignore
+- test/fixtures/apps/complex.rb
+- test/fixtures/apps/simple.rb
+- test/fixtures/dependencies/a.rb
+- test/fixtures/dependencies/b.rb
+- test/fixtures/dependencies/c.rb
+- test/fixtures/dependencies/d.rb
+- test/helper.rb
+- test/test_application.rb
+- test/test_core.rb
+- test/test_dependencies.rb
+- test/test_logger.rb
+- test/test_mounter.rb
+- test/test_reloader_complex.rb
+- test/test_reloader_simple.rb
+- test/test_rendering.rb
+- test/test_router.rb
+- test/test_routing.rb
+- test/test_server.rb

data/test/tmp/cache/%2Ffoo

@@ -1,2 +0,0 @@
--1
-I"test page again:EF