activesupport 3.0.0.beta → 3.0.0.beta2

data/lib/active_support/values/time_zone.rb

@@ -198,10 +198,12 @@ module ActiveSupport
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo
+      @current_period = nil
     end
 
     def utc_offset
-      @utc_offset ||= tzinfo.current_period.utc_offset
+      @current_period ||= tzinfo.current_period
+      @current_period.utc_offset
     end
 
     # Returns the offset of this time zone as a formatted string, of the
@@ -305,8 +307,8 @@ module ActiveSupport
 
     # TODO: Preload instead of lazy load for thread safety
     def tzinfo
-      require 'tzinfo' unless defined?(TZInfo)
-      @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
+      require 'tzinfo' unless defined?(::TZInfo)
+      @tzinfo ||= ::TZInfo::Timezone.get(MAPPING[name])
     end
 
     unless const_defined?(:ZONES)
@@ -362,13 +364,14 @@ module ActiveSupport
                  "Wellington" ],
        [ 46_800, "Nuku'alofa" ]].
       each do |offset, *places|
-        places.sort.each do |place|
+        places.each do |place|
           place.freeze
           zone = new(place, offset)
           ZONES << zone
           ZONES_MAP[place] = zone
         end
       end
+      ZONES.sort!
       ZONES.freeze
       ZONES_MAP.freeze
 

data/lib/active_support/version.rb

@@ -2,8 +2,9 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = "0.beta"
+    TINY  = 0
+    BUILD = "beta2"
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end
 end

data/lib/active_support/whiny_nil.rb

@@ -11,7 +11,7 @@
 # classes in NilClass::WHINERS the error message suggests which could be the
 # actual intended class:
 #
-#   $ script/runner nil.destroy 
+#   $ rails runner nil.destroy
 #   ...
 #   You might have expected an instance of ActiveRecord::Base.
 #   ...
@@ -25,17 +25,16 @@
 # By default it is on in development and test modes, and it is off in production
 # mode.
 class NilClass
-  WHINERS = [::Array]
-  WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord
-
   METHOD_CLASS_MAP = Hash.new
 
-  WHINERS.each do |klass|
+  def self.add_whiner(klass)
     methods = klass.public_instance_methods - public_instance_methods
     class_name = klass.name
     methods.each { |method| METHOD_CLASS_MAP[method.to_sym] = class_name }
   end
 
+  add_whiner ::Array
+
   # Raises a RuntimeError when you attempt to call +id+ on +nil+.
   def id
     raise RuntimeError, "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id", caller

data/lib/active_support/xml_mini/libxmlsax.rb

@@ -1,4 +1,5 @@
 require 'libxml'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini LibXML implementation using a SAX-based parser
 module ActiveSupport

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini Nokogiri implementation using a SAX-based parser
 module ActiveSupport

data/lib/active_support/xml_mini/rexml.rb

@@ -27,7 +27,13 @@ module ActiveSupport
         data.ungetc(char)
         silence_warnings { require 'rexml/document' } unless defined?(REXML::Document)
         doc = REXML::Document.new(data)
-        merge_element!({}, doc.root)
+
+        if doc.root
+          merge_element!({}, doc.root)
+        else
+          raise REXML::ParseException,
+            "The document #{doc.to_s.inspect} does not have a valid root"
+        end
       end
     end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  version: 3.0.0.beta
+  prerelease: true
+  segments: 
+  - 3
+  - 0
+  - 0
+  - beta2
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,50 +15,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: i18n
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+        segments: 
+        - 0
+        - 3
+        - 6
+        version: 0.3.6
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 16
         version: 0.3.16
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: memcache-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 5
         version: 1.7.5
-    version: 
-description: Support and utility classes used by the Rails framework.
+  type: :runtime
+  version_requirements: *id004
+description: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.
 email: david@loudthinking.com
 executables: []
 
@@ -96,6 +118,7 @@ files:
 - lib/active_support/core_ext/class/attribute_accessors.rb
 - lib/active_support/core_ext/class/delegating_attributes.rb
 - lib/active_support/core_ext/class/inheritable_attributes.rb
+- lib/active_support/core_ext/class/subclasses.rb
 - lib/active_support/core_ext/class.rb
 - lib/active_support/core_ext/date/acts_like.rb
 - lib/active_support/core_ext/date/calculations.rb
@@ -108,6 +131,7 @@ files:
 - lib/active_support/core_ext/enumerable.rb
 - lib/active_support/core_ext/exception.rb
 - lib/active_support/core_ext/file/atomic.rb
+- lib/active_support/core_ext/file/path.rb
 - lib/active_support/core_ext/file.rb
 - lib/active_support/core_ext/float/rounding.rb
 - lib/active_support/core_ext/float.rb
@@ -125,7 +149,6 @@ files:
 - lib/active_support/core_ext/integer/time.rb
 - lib/active_support/core_ext/integer.rb
 - lib/active_support/core_ext/kernel/agnostics.rb
-- lib/active_support/core_ext/kernel/daemonizing.rb
 - lib/active_support/core_ext/kernel/debugger.rb
 - lib/active_support/core_ext/kernel/reporting.rb
 - lib/active_support/core_ext/kernel/requires.rb
@@ -133,14 +156,16 @@ files:
 - lib/active_support/core_ext/load_error.rb
 - lib/active_support/core_ext/logger.rb
 - lib/active_support/core_ext/module/aliasing.rb
+- lib/active_support/core_ext/module/anonymous.rb
 - lib/active_support/core_ext/module/attr_accessor_with_default.rb
 - lib/active_support/core_ext/module/attr_internal.rb
 - lib/active_support/core_ext/module/attribute_accessors.rb
 - lib/active_support/core_ext/module/delegation.rb
 - lib/active_support/core_ext/module/deprecation.rb
-- lib/active_support/core_ext/module/inclusion.rb
 - lib/active_support/core_ext/module/introspection.rb
-- lib/active_support/core_ext/module/loading.rb
+- lib/active_support/core_ext/module/method_names.rb
+- lib/active_support/core_ext/module/reachable.rb
+- lib/active_support/core_ext/module/remove_method.rb
 - lib/active_support/core_ext/module/synchronization.rb
 - lib/active_support/core_ext/module.rb
 - lib/active_support/core_ext/name_error.rb
@@ -151,10 +176,11 @@ files:
 - lib/active_support/core_ext/object/blank.rb
 - lib/active_support/core_ext/object/conversions.rb
 - lib/active_support/core_ext/object/duplicable.rb
+- lib/active_support/core_ext/object/extending.rb
 - lib/active_support/core_ext/object/instance_variables.rb
-- lib/active_support/core_ext/object/metaclass.rb
 - lib/active_support/core_ext/object/misc.rb
 - lib/active_support/core_ext/object/returning.rb
+- lib/active_support/core_ext/object/singleton_class.rb
 - lib/active_support/core_ext/object/to_param.rb
 - lib/active_support/core_ext/object/to_query.rb
 - lib/active_support/core_ext/object/try.rb
@@ -185,7 +211,7 @@ files:
 - lib/active_support/core_ext/time/acts_like.rb
 - lib/active_support/core_ext/time/calculations.rb
 - lib/active_support/core_ext/time/conversions.rb
-- lib/active_support/core_ext/time/marshal_with_utc_flag.rb
+- lib/active_support/core_ext/time/marshal.rb
 - lib/active_support/core_ext/time/publicize_conversion_methods.rb
 - lib/active_support/core_ext/time/zones.rb
 - lib/active_support/core_ext/uri.rb
@@ -207,11 +233,13 @@ files:
 - lib/active_support/inflector/transliterate.rb
 - lib/active_support/inflector.rb
 - lib/active_support/json/backends/jsongem.rb
+- lib/active_support/json/backends/yajl.rb
 - lib/active_support/json/backends/yaml.rb
 - lib/active_support/json/decoding.rb
 - lib/active_support/json/encoding.rb
 - lib/active_support/json/variable.rb
 - lib/active_support/json.rb
+- lib/active_support/lazy_load_hooks.rb
 - lib/active_support/locale/en.yml
 - lib/active_support/memoizable.rb
 - lib/active_support/message_encryptor.rb
@@ -269,20 +297,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Support and utility classes used by the Rails framework.
+summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.
 test_files: []
 

data/lib/active_support/core_ext/kernel/daemonizing.rb

@@ -1,7 +0,0 @@
-module Kernel
-  # Turns the current script into a daemon process that detaches from the console.
-  # It can be shut down with a TERM signal.
-  def daemonize
-    Process.daemon
-  end
-end

data/lib/active_support/core_ext/module/inclusion.rb

@@ -1,30 +0,0 @@
-class Module
-  # Returns the classes in the current ObjectSpace where this module has been
-  # mixed in according to Module#included_modules.
-  #
-  #   module M
-  #   end
-  #   
-  #   module N
-  #     include M
-  #   end
-  #   
-  #   class C
-  #     include M
-  #   end
-  #   
-  #   class D < C
-  #   end
-  #
-  #   p M.included_in_classes # => [C, D]
-  #
-  def included_in_classes
-    classes = []
-    ObjectSpace.each_object(Class) { |k| classes << k if k.included_modules.include?(self) }
-
-    classes.reverse.inject([]) do |unique_classes, klass| 
-      unique_classes << klass unless unique_classes.collect { |k| k.to_s }.include?(klass.to_s)
-      unique_classes
-    end
-  end
-end

data/lib/active_support/core_ext/module/loading.rb

@@ -1,25 +0,0 @@
-require 'active_support/core_ext/string/inflections'
-
-class Module
-  # Returns String#underscore applied to the module name minus trailing classes.
-  #
-  #   ActiveRecord.as_load_path               # => "active_record"
-  #   ActiveRecord::Associations.as_load_path # => "active_record/associations"
-  #   ActiveRecord::Base.as_load_path         # => "active_record" (Base is a class)
-  #
-  # The Kernel module gives an empty string by definition.
-  #
-  #   Kernel.as_load_path # => ""
-  #   Math.as_load_path   # => "math"
-  def as_load_path
-    if self == Object || self == Kernel
-      ''
-    elsif is_a? Class
-      parent == self ? '' : parent.as_load_path
-    else
-      name.split('::').collect do |word|
-        word.underscore
-      end * '/'
-    end
-  end
-end

data/lib/active_support/core_ext/object/metaclass.rb

@@ -1,13 +0,0 @@
-class Object
-  # Get object's meta (ghost, eigenclass, singleton) class
-  def metaclass
-    class << self
-      self
-    end
-  end
-
-  # If class_eval is called on an object, add those methods to its metaclass
-  def class_eval(*args, &block)
-    metaclass.class_eval(*args, &block)
-  end
-end

data/lib/active_support/core_ext/time/marshal_with_utc_flag.rb

@@ -1,22 +0,0 @@
-# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
-# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
-# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
-if RUBY_VERSION < '1.9'
-  class Time
-    class << self
-      alias_method :_original_load, :_load
-      def _load(marshaled_time)
-        time = _original_load(marshaled_time)
-        utc = time.instance_variable_get('@marshal_with_utc_coercion')
-        utc ? time.utc : time
-      end
-    end
-
-    alias_method :_original_dump, :_dump
-    def _dump(*args)
-      obj = frozen? ? dup : self
-      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
-      obj._original_dump(*args)
-    end
-  end
-end