padrino-core 0.9.10 → 0.9.11

data/lib/padrino-core/router.rb

@@ -13,9 +13,9 @@ module Padrino
   #
   # ==== Options
   #
-  #   :to:: The class of application that you want mount
-  #   :path:: Map the app to the given path
-  #   :host:: Map the app to the given host
+  # :to:: The class of application that you want mount
+  # :path:: Map the app to the given path
+  # :host:: Map the app to the given host
   #
   # ==== Examples
   #
@@ -66,6 +66,8 @@ module Padrino
         next unless rPath =~ match && rest = $1
         next unless rest.empty? || rest[0] == ?/
 
+        rest = "/" if rest.empty?
+
         return app.call(
           env.merge(
             'SCRIPT_NAME' => (script_name + path),

data/lib/padrino-core/server.rb

@@ -9,9 +9,9 @@ module Padrino
   #   Padrino.run! # with these defaults => host: "localhost", port: "3000", adapter: the first found
   #   Padrino.run!("localhost", "4000", "mongrel") # use => host: "localhost", port: "3000", adapter: "mongrel"
   #
-  def self.run!(*args)
-    Padrino.load! unless Padrino.loaded?
-    Server.build(*args)
+  def self.run!(options={})
+    Padrino.load!
+    Server.build(options)
   end
 
   ##
@@ -24,7 +24,11 @@ module Padrino
     Handlers = %w[thin mongrel webrick] unless const_defined?(:Handlers)
 
     private
-      def self.build(host="localhost", port=3000, adapter=nil)
+      def self.build(options={})
+        host    = options[:host] || "localhost"
+        port    = options[:port] || 3000
+        adapter = options[:adapter]
+
         handler_name = adapter ? adapter.to_s.capitalize : detect_handler.name.gsub(/.*::/, '')
 
         begin
@@ -34,6 +38,8 @@ module Padrino
           exit
         end
 
+        puts "=> Padrino/#{Padrino.version} has taken the stage #{Padrino.env} on #{port}"
+
         handler.run Padrino.application, :Host => host, :Port => port do |server|
           trap(:INT) do
             # Use thins' hard #stop! if available, otherwise just #stop

data/lib/padrino-core/support_lite.rb

@@ -3,89 +3,105 @@
 #
 # Why use ActiveSupport and not our own library or extlib?
 #
-# 1) Writing custom method extensions needed (i.e string inflections) is not a good use of time.
-# 2) Loading custom method extensions or separate gem would conflict when AR or MM has been loaded.
-# 3) Datamapper is planning to move to ActiveSupport and away from extlib.
+# 1) Rewriting custom method extensions needed (i.e string inflectors) is not a good use of time.
+# 2) Loading custom method extensions or separate gems would conflict with AS when AR or MM has been loaded.
+# 3) Datamapper 1.0 supports ActiveSupport 3.0 and no longer requires extlib.
 #
-# Extensions required for Padrino:
-#
-#   * Class#cattr_accessor
-#   * Module#alias_method_chain
-#   * String#inflectors (classify, underscore, camelize, pluralize, etc)
-#   * Array#extract_options!
-#   * Object#blank?
-#   * Object#present?
-#   * Hash#slice, Hash#slice!
-#   * Hash#to_params
-#   * Hash#symbolize_keys, Hash.symbolize_keys!
-#   * Hash#reverse_merge, Hash#reverse_merge!
-#   * Symbol#to_proc
-#   * SupportLite::OrderedHash
-#
-
-require 'i18n'
-require 'rbconfig'
-require 'active_support/version'
-require 'active_support/core_ext/kernel'
-require 'active_support/core_ext/module'
-require 'active_support/deprecation'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/hash'
-require 'active_support/inflector'
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/module'
-require 'active_support/ordered_hash'
 
-# AS 3.0 has been removed it because is now available in Ruby 1.8.7 and 1.9.
-require 'active_support/core_ext/symbol' if ActiveSupport::VERSION::MAJOR < 3
+require 'active_support/core_ext/string/conversions' unless String.method_defined?(:to_date)
+require 'active_support/core_ext/kernel'             unless Kernel.method_defined?(:silence_warnings)
+require 'active_support/core_ext/module'             unless Module.method_defined?(:alias_method_chain)
+require 'active_support/core_ext/class/attribute_accessors' unless Class.method_defined?(:cattr_reader)
+require 'active_support/core_ext/hash/keys'          unless Hash.method_defined?(:symbolize_keys!)
+require 'active_support/core_ext/hash/deep_merge'    unless Hash.method_defined?(:deep_merge)
+require 'active_support/core_ext/hash/reverse_merge' unless Hash.method_defined?(:reverse_merge)
+require 'active_support/core_ext/hash/slice'         unless Hash.method_defined?(:slice)
+require 'active_support/core_ext/object/blank'       unless Object.method_defined?(:present?)
+require 'active_support/core_ext/array'              unless Array.method_defined?(:from)
+require 'active_support/ordered_hash'                unless defined?(ActiveSupport::OrderedHash)
+require 'active_support/inflector'                   unless String.method_defined?(:humanize)
+require 'active_support/core_ext/float/rounding'     unless Float.method_defined?(:round)
+require 'active_support/option_merger'               unless defined?(ActiveSupport::OptionMerger)
 
-##
-# Define our own OrderedHash based on AS::OrderedHash
-#
-unless defined?(SupportLite::OrderedHash)
-  module SupportLite
-    OrderedHash = ::ActiveSupport::OrderedHash
-  end
+begin
+  require 'active_support/core_ext/symbol'
+rescue LoadError
+  # AS 3.0 has been removed it because is now available in Ruby > 1.8.7 but we want keep Ruby 1.8.6 support.
+  class Symbol
+    # Turns the symbol into a simple proc, which is especially useful for enumerations like: people.map(&:name)
+    def to_proc
+      Proc.new { |*args| args.shift.__send__(self, *args) }
+    end
+  end unless :to_proc.respond_to?(:to_proc)
 end
 
-##
-# Alias allowing for use of either method to get query parameters
-#
-unless Hash.method_defined?(:to_params)
+# On ActiveSupport < 3.0.0 this is called misc
+begin
+  require 'active_support/core_ext/object/with_options'
+rescue LoadError
+  require 'active_support/core_ext/object/misc'
+end unless Object.method_defined?(:with_options)
+
+if defined?(ActiveSupport::CoreExtensions::Hash) && !Hash.method_defined?(:slice)
+  # This mean that we are using AS 2.3.x
   class Hash
-    alias :to_params :to_query
+    include ActiveSupport::CoreExtensions::Hash::Keys
+    include ActiveSupport::CoreExtensions::Hash::DeepMerge
+    include ActiveSupport::CoreExtensions::Hash::ReverseMerge
+    include ActiveSupport::CoreExtensions::Hash::Slice
   end
 end
 
 ##
-# Loads our locales configuration files
+# Used to know if this file was required
 #
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]
+module SupportLite; end unless defined?(SupportLite)
 
-module Padrino
-  ##
-  # This method return the correct location of padrino bin or
-  # exec it using Kernel#system with the given args
-  #
-  def self.bin(*args)
-    @_padrino_bin ||= [self.ruby_command, File.expand_path("../../../bin/padrino", __FILE__)]
-    args.empty? ? @_padrino_bin : system(args.unshift(@_padrino_bin).join(" "))
+module ObjectSpace
+  class << self
+    # Returns all the classes in the object space.
+    def classes
+      klasses = []
+      ObjectSpace.each_object(Class) {|o| klasses << o}
+      klasses
+    end
   end
+end unless ObjectSpace.respond_to?(:classes)
 
-  ##
-  # Return the path to the ruby interpreter taking into account multiple
-  # installations and windows extensions.
-  #
-  def self.ruby_command
-    @ruby_command ||= begin
-      ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-      ruby << Config::CONFIG['EXEEXT']
-
-      # escape string in case path to ruby executable contain spaces.
-      ruby.sub!(/.*\s.*/m, '"\&"')
-      ruby
+class Object
+  def full_const_get(name)
+    list = name.split("::")
+    list.shift if list.first.blank?
+    obj = self
+    list.each do |x|
+      # This is required because const_get tries to look for constants in the
+      # ancestor chain, but we only want constants that are HERE
+      obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
     end
+    obj
+  end
+end unless Object.method_defined?(:full_const_get)
+
+# FileSet helper method for iterating and interacting with files inside a directory
+class FileSet
+  # Iterates over every file in the glob pattern and yields to a block
+  # Returns the list of files matching the glob pattern
+  # FileSet.glob_require('padrino-core/application/*.rb', __FILE__) { |file| load file }
+  def self.glob(glob_pattern, file_path=nil, &block)
+    glob_pattern = File.join(File.dirname(file_path), glob_pattern) if file_path
+    file_list = Dir.glob(glob_pattern).sort
+    file_list.each { |file| block.call(file) }
+    file_list
   end
-end
+  
+  # Requires each file matched in the glob pattern into the application
+  # FileSet.glob_require('padrino-core/application/*.rb', __FILE__)
+  def self.glob_require(glob_pattern, file_path=nil)
+    self.glob(glob_pattern, file_path) { |f| require f }
+  end
+end unless defined?(FileSet)
+
+##
+# Loads our locales configuration files
+#
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"] if defined?(I18n)

data/lib/padrino-core/version.rb

@@ -1,10 +1,11 @@
 ##
-# Manages Padrino version from the VERSION file managed by Jeweler
+# Manages current Padrino version for use in gem generation.
+#
 # We put this in a separate file so you can get padrino version
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.10' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.11' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -1,126 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/padrino-core/version.rb", __FILE__)
+require 'rubygems'
+require 'bundler'
 
 Gem::Specification.new do |s|
-  s.name = %q{padrino-core}
-  s.version = "0.9.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = "padrino-core"
+  s.rubyforge_project = "padrino-core"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-04-22}
-  s.default_executable = %q{padrino}
-  s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
+  s.summary = %q{The required Padrino core gem}
+  s.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-core"
+  s.description = %q{The Padrino core gem required for use of this framework}
+  s.default_executable = %q{padrino}
   s.executables = ["padrino"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "bin/padrino",
-     "lib/padrino-core.rb",
-     "lib/padrino-core/application.rb",
-     "lib/padrino-core/application/mounter.rb",
-     "lib/padrino-core/application/rendering.rb",
-     "lib/padrino-core/application/routing.rb",
-     "lib/padrino-core/application/showexceptions.rb",
-     "lib/padrino-core/caller.rb",
-     "lib/padrino-core/cli/adapter.rb",
-     "lib/padrino-core/cli/base.rb",
-     "lib/padrino-core/cli/console.rb",
-     "lib/padrino-core/cli/rake.rb",
-     "lib/padrino-core/images/404.png",
-     "lib/padrino-core/images/500.png",
-     "lib/padrino-core/loader.rb",
-     "lib/padrino-core/locale/da.yml",
-     "lib/padrino-core/locale/de.yml",
-     "lib/padrino-core/locale/en.yml",
-     "lib/padrino-core/locale/fr.yml",
-     "lib/padrino-core/locale/it.yml",
-     "lib/padrino-core/locale/pt_br.yml",
-     "lib/padrino-core/locale/ru.yml",
-     "lib/padrino-core/logger.rb",
-     "lib/padrino-core/reloader.rb",
-     "lib/padrino-core/router.rb",
-     "lib/padrino-core/server.rb",
-     "lib/padrino-core/support_lite.rb",
-     "lib/padrino-core/tasks.rb",
-     "lib/padrino-core/version.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",
-     "test/fixtures/dependencies/b.rb",
-     "test/fixtures/dependencies/c.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"
-  ]
-  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-core}
+  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_paths = ["lib"]
-  s.rubyforge_project = %q{padrino-core}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{The required Padrino core gem}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<usher>, [">= 0.6.2"])
-      s.add_runtime_dependency(%q<thor>, [">= 0.13.0"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0.9.7"])
-      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.22"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_dependency(%q<i18n>, [">= 0.3.2"])
-      s.add_dependency(%q<usher>, [">= 0.6.2"])
-      s.add_dependency(%q<thor>, [">= 0.13.0"])
-      s.add_dependency(%q<bundler>, [">= 0.9.7"])
-      s.add_dependency(%q<activesupport>, ["= 2.3.5"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_dependency(%q<haml>, [">= 2.2.22"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-    s.add_dependency(%q<i18n>, [">= 0.3.2"])
-    s.add_dependency(%q<usher>, [">= 0.6.2"])
-    s.add_dependency(%q<thor>, [">= 0.13.0"])
-    s.add_dependency(%q<bundler>, [">= 0.9.7"])
-    s.add_dependency(%q<activesupport>, ["= 2.3.5"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    s.add_dependency(%q<haml>, [">= 2.2.22"])
-  end
-end
-
+  s.require_path = 'lib'
+  s.add_bundler_dependencies :core, :development
+end

data/test/fixtures/apps/complex.rb

@@ -17,11 +17,11 @@ class Complex2Demo < Padrino::Application
 end
 
 Complex1Demo.controllers do
-  get("(/)"){ "Given random #{LibDemo.give_me_a_random}" }
+  get("/"){ "Given random #{LibDemo.give_me_a_random}" }
 end
 
 Complex2Demo.controllers do
-  get("(/)"){ "The magick number is: 33!" } # Change only the number!!!
+  get("/"){ "The magick number is: 62!" } # Change only the number!!!
 end
 
 Padrino.load!

data/test/fixtures/apps/simple.rb

@@ -2,16 +2,23 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 # Remove this comment if you want do some like this: ruby PADRINO_ENV=test app.rb
 #
 # require 'rubygems'
-# require 'lib/padrino-core'
+# require 'padrino-core'
 #
 
 class SimpleDemo < Padrino::Application
   set :reload, true
+  before { true }
+  after  { true }
+  error(404) { "404" }
 end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 77!' # Change only the number!!!
+    'The magick number is: 39!' # Change only the number!!!
+  end
+
+  get "/rand" do
+    rand(99).to_s
   end
 end
 
@@ -20,5 +27,7 @@ end
 # Padrino.mount_core("SimpleDemo")
 # 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
+#
 
 Padrino.load!

data/test/helper.rb

@@ -1,7 +1,7 @@
 ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
-require 'rubygems'
+require File.expand_path('../../../load_paths', __FILE__)
 require 'padrino-core'
 require 'test/unit'
 require 'rack/test'