padrino-core 0.7.9 → 0.8.0

data/Rakefile

@@ -18,7 +18,8 @@ begin
     gem.add_runtime_dependency     "usher",         ">= 0.6.2"
     gem.add_runtime_dependency     "thor",          ">= 0.13.0"
     gem.add_runtime_dependency     "bundler",       ">= 0.9.3"
-    gem.add_development_dependency "shoulda",       ">= 0"
+    gem.add_runtime_dependency     "activesupport", ">= 2.3.5"
+    gem.add_development_dependency "shoulda",       ">= 2.10.3"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"
@@ -39,14 +40,15 @@ end
 
 begin
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
+  Rcov::RcovTask.new do |rcov|
+    rcov.libs << 'test'
+    rcov.pattern = 'test/**/test_*.rb'
+    rcov.verbose = true
+    rcov.rcov_opts << ['--exclude /Gems/1.8/gems/,padrino-admin,padrino-cache,padrino-gen,padrino-helpers,padrino-mailer']
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install relevance-rcov"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.8.0

data/lib/padrino-core.rb

@@ -1,5 +1,6 @@
 require 'usher'
 require 'sinatra/base'
+
 Dir[File.dirname(__FILE__) + '/padrino-core/*.rb'].each {|file| require file }
 
 # Defines our PADRINO_ENV
@@ -14,6 +15,7 @@ module Padrino
     # Helper method for file references.
     #
     # ==== Examples
+    # 
     #   # Referencing a file in config called settings.yml
     #   Padrino.root("config", "settings.yml")
     #   # returns PADRINO_ROOT + "/config/setting.yml"

data/lib/padrino-core/cli/console.rb

@@ -15,7 +15,7 @@ end
 
 # Load apps
 Padrino.mounted_apps.each do |app|
-  puts "=> Loading Application #{app.name}"
+  puts "=> Loading Application #{app.app_object}"
   Padrino.require_dependency(app.app_file)
   app.app_object.setup_application!
 end

data/lib/padrino-core/logger.rb

@@ -249,7 +249,7 @@ module Padrino
             env["REMOTE_USER"] || "-",
             env["REQUEST_METHOD"],
             env["PATH_INFO"],
-            env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+            env["QUERY_STRING"].empty? ? "" : "?" + env["QUERY_STRING"],
             env["HTTP_VERSION"],
             status.to_s[0..3],
             length,

data/lib/padrino-core/support_lite.rb

@@ -1,6 +1,13 @@
 ##
-# This file determines if extlib or activesupport are already loaded, and then ensures
-# the required objects and methods exist for Padrino to use.
+# This file load some usefull extensions from Active Support.
+# 
+# Why ActiveSupport and not ours or extlib?
+# 
+# We don't love so much rewite code and we don't use extlib because:
+# 
+#   1) ActiveRecord need ActiveSupport
+#   2) MongoMapper need ActiveSuport
+#   3) DataMapper it's planning to migrate to ActiveSupport (see: http://wiki.github.com/datamapper/dm-core/roadmap)
 # 
 # Required for Padrino to run:
 # 
@@ -16,28 +23,39 @@
 #   * Hash#reverse_merge, Hash#reverse_merge!
 #   * SupportLite::OrderedHash
 # 
+
 require 'i18n'
+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'
 
 ##
-# Load our locales
+# Define our Ordered Hash
 # 
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]
-
-module Padrino
-  ##
-  # Return the current support used.
-  # Can be one of: :extlib, :active_support
-  # 
-  def self.support
-    @_padrino_support
+unless defined?(SupportLite::OrderedHash)
+  module SupportLite
+    OrderedHash = ::ActiveSupport::OrderedHash
   end
+end
 
-end # Padrino
+##
+# We new alwasy :to_params in a Hash
+# 
+unless Hash.method_defined?(:to_params)
+  class Hash 
+    alias :to_params :to_query
+  end
+end
 
-if defined?(Extlib) # load if already using extlib
-  Padrino.instance_variable_set(:@_padrino_support, :extlib)
-  require File.dirname(__FILE__) + '/support_lite/extlib_support'
-else # load active support by default
-  Padrino.instance_variable_set(:@_padrino_support, :active_support)
-  require File.dirname(__FILE__) + '/support_lite/as_support'
-end
+##
+# Load our locales
+# 
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.7.9"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-14}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{padrinorb@gmail.com}
@@ -44,8 +44,6 @@ Gem::Specification.new do |s|
      "lib/padrino-core/reloader.rb",
      "lib/padrino-core/server.rb",
      "lib/padrino-core/support_lite.rb",
-     "lib/padrino-core/support_lite/as_support.rb",
-     "lib/padrino-core/support_lite/extlib_support.rb",
      "lib/padrino-core/tasks.rb",
      "lib/padrino-core/version.rb",
      "padrino-core.gemspec",
@@ -84,7 +82,8 @@ Gem::Specification.new do |s|
       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.3"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      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"])
@@ -94,7 +93,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.13.0"])
       s.add_dependency(%q<bundler>, [">= 0.9.3"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      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"])
@@ -105,7 +105,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.13.0"])
     s.add_dependency(%q<bundler>, [">= 0.9.3"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    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"])

data/test/test_core.rb

@@ -12,11 +12,14 @@ class TestCore < Test::Unit::TestCase
       assert_respond_to Padrino, :load!
       assert_respond_to Padrino, :reload!
       assert_respond_to Padrino, :version
+      assert_respond_to Padrino, :bundle
     end
 
     should 'validate global helpers' do
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
+      assert_equal nil, Padrino.bundle
+      assert_not_nil Padrino.version
     end
 
     should 'set correct utf-8 encoding' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-02-14 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.5
+    version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   type: :development
@@ -73,7 +83,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.10.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -140,8 +150,6 @@ files:
 - lib/padrino-core/reloader.rb
 - lib/padrino-core/server.rb
 - lib/padrino-core/support_lite.rb
-- lib/padrino-core/support_lite/as_support.rb
-- lib/padrino-core/support_lite/extlib_support.rb
 - lib/padrino-core/tasks.rb
 - lib/padrino-core/version.rb
 - padrino-core.gemspec

data/lib/padrino-core/support_lite/as_support.rb

@@ -1,38 +0,0 @@
-# This requires necessary pieces of ActiveSupport for the dependencies required by Padrino
-
-## ActiveSupport#Version
-require 'active_support/version'
-## ActiveSupport#Deprecation
-unless defined?(ActiveSupport::Deprecation)
-  require 'active_support/core_ext/kernel' unless Kernel.method_defined?(:silence_warnings)
-  require 'active_support/core_ext/module' unless Module.method_defined?(:mattr_accessor)
-  require 'active_support/deprecation'
-end
-## Class#cattr_accessor
-require 'active_support/core_ext/class/attribute_accessors' unless Class.method_defined?(:cattr_accessor)
-## Hash#symbolize_keys, Hash#reverse_merge, Hash#reverse_merge!, Hash#extract_options!, Hash#slice!
-require 'active_support/core_ext/hash' unless Hash.method_defined?(:reverse_merge)
-## Hash#to_params
-require 'active_support/core_ext/object' unless Object.method_defined?(:to_query)
-class Hash; alias :to_params :to_query; end unless Hash.method_defined?(:to_params)
-## Object#with_options
-require 'active_support/option_merger'
-## String#inflectors
-require 'active_support/inflector' unless String.method_defined?(:constantize)
-## Object#blank?, Object#present?
-require 'active_support/core_ext/object' unless Object.method_defined?(:blank?)
-require 'active_support/core_ext/blank' unless Object.method_defined?(:blank?)
-## Array#extract_options!
-require 'active_support/core_ext/array' unless Array.method_defined?(:extract_options!)
-## Module#alias_method_chain
-require 'active_support/core_ext/module' unless Module.method_defined?(:alias_method_chain)
-## SupportLite#OrderedHash
-require 'active_support/ordered_hash' unless defined?(ActiveSupport::OrderedHash)
-## Float#round
-require 'active_support/core_ext/float/rounding'
-
-unless defined?(SupportLite::OrderedHash)
-  module SupportLite
-    OrderedHash = ::ActiveSupport::OrderedHash
-  end
-end

data/lib/padrino-core/support_lite/extlib_support.rb

@@ -1,207 +0,0 @@
-# This helps extlib to act like ActiveSupport for use with Padrino
-
-## Class#cattr_accessor
-unless Class.method_defined?(:cattr_accessor)
-  require 'extlib/class'
-end
-
-## SupportLite::OrderedHash
-unless defined?(SupportLite::OrderedHash)
-  require 'extlib/dictionary'
-  module SupportLite
-    OrderedHash = ::Dictionary
-  end
-end
-
-## Hash#symbolize_keys
-unless Hash.method_defined?(:symbolize_keys)
-  require 'extlib/hash'
-  require 'extlib/mash'
-  class Hash
-    def symbolize_keys
-      Mash.new(self).symbolize_keys
-    end
-
-    def symbolize_keys!
-      self.replace(symbolize_keys.to_hash)
-    end
-  end
-end
-
-## Hash#slice, Hash#slice!
-unless Hash.method_defined?(:slice)
-  require 'extlib/hash'
-  class Hash
-    # Slice a hash to include only the given keys. This is useful for
-    # limiting an options hash to valid keys before passing to a method:
-    #
-    #   def search(criteria = {})
-    #     assert_valid_keys(:mass, :velocity, :time)
-    #   end
-    #
-    #   search(options.slice(:mass, :velocity, :time))
-    #
-    # If you have an array of keys you want to limit to, you should splat them:
-    #
-    #   valid_keys = [:mass, :velocity, :time]
-    #   search(options.slice(*valid_keys))
-    def slice(*keys)
-      keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
-      hash = self.class.new
-      keys.each { |k| hash[k] = self[k] if has_key?(k) }
-      hash
-    end
-
-    # Replaces the hash with only the given keys.
-    # Returns a hash contained the removed key/value pairs
-    #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d =>4}
-    def slice!(*keys)
-      keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
-      omit = slice(*self.keys - keys)
-      hash = slice(*keys)
-      replace(hash)
-      omit
-    end
-  end
-end
-
-## Hash#to_params
-unless Hash.method_defined?(:to_params)
-  require 'extlib/hash'
-end
-
-## Hash#reverse_merge, Hash#reverse_merge!
-unless Hash.method_defined?(:reverse_merge)
-  class Hash
-    def reverse_merge(other_hash)
-      other_hash.merge(self)
-    end
-
-    def reverse_merge!(other_hash)
-      replace(reverse_merge(other_hash))
-    end
-
-    def deep_merge(other_hash)
-      target = dup
-      other_hash.each_pair do |k,v|
-        tv = target[k]
-        target[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-      end
-      target
-    end
-  end
-end
-
-## Array#extract_options!
-unless Array.method_defined?(:extract_options!)
-  class Array
-    def extract_options!
-      last.is_a?(::Hash) ? pop : {}
-    end
-  end
-end
-
-## String#inflectors
-unless String.method_defined?(:constantize)
-  require 'extlib/inflection'
-  class String
-    def classify;    Extlib::Inflection.classify(self);    end
-    def underscore;  Extlib::Inflection.underscore(self);  end
-    def constantize; Extlib::Inflection.constantize(self); end
-    def camelize;    Extlib::Inflection.camelize(self);    end
-    def humanize;    Extlib::Inflection.humanize(self);    end
-    alias :titleize :humanize
-  end
-end
-
-## Object#blank?
-unless Object.method_defined?(:blank?)
-  require 'extlib/blank'
-end
-
-## Object#present?
-unless Object.method_defined?(:present?)
-  class Object
-    def present?
-      !blank?
-    end
-  end
-end
-
-## Object#with_options
-unless Object.method_defined?(:with_options)
-  class SupportLite::OptionMerger #:nodoc:
-    instance_methods.each do |method|
-      undef_method(method) if method !~ /^(__|instance_eval|class|object_id)/
-    end
-
-    def initialize(context, options)
-      @context, @options = context, options
-    end
-
-    private
-      def method_missing(method, *arguments, &block)
-        if arguments.last.is_a?(Proc)
-          proc = arguments.pop
-          arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) }
-        else
-          arguments << (arguments.last.respond_to?(:to_hash) ? @options.deep_merge(arguments.pop) : @options.dup)
-        end
-
-        @context.__send__(method, *arguments, &block)
-      end
-  end
-
-  class Object
-    def with_options(options)
-      yield SupportLite::OptionMerger.new(self, options)
-    end
-  end
-end
-
-## Module#alias_method_chain
-unless Module.method_defined?(:alias_method_chain)
-  def alias_method_chain(target, feature)
-    # Strip out punctuation on predicates or bang methods since
-    # e.g. target?_without_feature is not a valid method name.
-    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
-    yield(aliased_target, punctuation) if block_given?
-
-    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
-
-    alias_method without_method, target
-    alias_method target, with_method
-
-    case
-      when public_method_defined?(without_method)
-        public target
-      when protected_method_defined?(without_method)
-        protected target
-      when private_method_defined?(without_method)
-        private target
-    end
-  end
-end
-
-## Float#round
-unless Float.method_defined?(:round)
-  class Float
-    alias precisionless_round round
-    private :precisionless_round
-
-    # Rounds the float with the specified precision.
-    #
-    #   x = 1.337
-    #   x.round    # => 1
-    #   x.round(1) # => 1.3
-    #   x.round(2) # => 1.34
-    def round(precision = nil)
-      if precision
-        magnitude = 10.0 ** precision
-        (self * magnitude).round / magnitude
-      else
-        precisionless_round
-      end
-    end
-  end
-end