activesupport 2.3.5 → 3.0.0.beta3

data/lib/active_support/testing/setup_and_teardown.rb

@@ -1,18 +1,26 @@
-require 'active_support/callbacks'
-
 module ActiveSupport
   module Testing
     module SetupAndTeardown
-      def self.included(base)
-        base.class_eval do
-          include ActiveSupport::Callbacks
-          define_callbacks :setup, :teardown
+      extend ActiveSupport::Concern
 
-          if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-            include ForMiniTest
-          else
-            include ForClassicTestUnit
-          end
+      included do
+        include ActiveSupport::Callbacks
+        define_callbacks :setup, :teardown
+
+        if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
+          include ForMiniTest
+        else
+          include ForClassicTestUnit
+        end
+      end
+
+      module ClassMethods
+        def setup(*args, &block)
+          set_callback(:setup, :before, *args, &block)
+        end
+
+        def teardown(*args, &block)
+          set_callback(:teardown, :after, *args, &block)
         end
       end
 
@@ -20,15 +28,16 @@ module ActiveSupport
         def run(runner)
           result = '.'
           begin
-            run_callbacks :setup
-            result = super
+            _run_setup_callbacks do
+              result = super
+            end
           rescue Exception => e
-            result = runner.puke(self.class, self.name, e)
+            result = runner.puke(self.class, method_name, e)
           ensure
             begin
-              run_callbacks :teardown, :enumerator => :reverse_each
+              _run_teardown_callbacks
             rescue Exception => e
-              result = runner.puke(self.class, self.name, e)
+              result = runner.puke(self.class, method_name, e)
             end
           end
           result
@@ -44,23 +53,17 @@ module ActiveSupport
         def run(result)
           return if @method_name.to_s == "default_test"
 
-          if using_mocha = respond_to?(:mocha_verify)
-            assertion_counter_klass = if defined?(Mocha::TestCaseAdapter::AssertionCounter)
-                                        Mocha::TestCaseAdapter::AssertionCounter
-                                      else
-                                        Mocha::Integration::TestUnit::AssertionCounter
-                                      end
-            assertion_counter = assertion_counter_klass.new(result)
-          end
-
+          mocha_counter = retrieve_mocha_counter(result)
           yield(Test::Unit::TestCase::STARTED, name)
           @_result = result
+
           begin
             begin
-              run_callbacks :setup
-              setup
-              __send__(@method_name)
-              mocha_verify(assertion_counter) if using_mocha
+              _run_setup_callbacks do
+                setup
+                __send__(@method_name)
+                mocha_verify(mocha_counter) if mocha_counter
+              end
             rescue Mocha::ExpectationError => e
               add_failure(e.message, e.backtrace)
             rescue Test::Unit::AssertionFailedError => e
@@ -71,7 +74,7 @@ module ActiveSupport
             ensure
               begin
                 teardown
-                run_callbacks :teardown, :enumerator => :reverse_each
+                _run_teardown_callbacks
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception => e
@@ -80,12 +83,26 @@ module ActiveSupport
               end
             end
           ensure
-            mocha_teardown if using_mocha
+            mocha_teardown if mocha_counter
           end
+
           result.add_run
           yield(Test::Unit::TestCase::FINISHED, name)
         end
+
+        protected
+
+        def retrieve_mocha_counter(result) #:nodoc:
+          if using_mocha = respond_to?(:mocha_verify)
+            if defined?(Mocha::TestCaseAdapter::AssertionCounter)
+              Mocha::TestCaseAdapter::AssertionCounter.new(result)
+            else
+              Mocha::Integration::TestUnit::AssertionCounter.new(result)
+            end
+          end
+        end
       end
+
     end
   end
 end

data/lib/active_support/time/autoload.rb

@@ -0,0 +1,5 @@
+module ActiveSupport
+  autoload :Duration, 'active_support/duration'
+  autoload :TimeWithZone, 'active_support/time_with_zone'
+  autoload :TimeZone, 'active_support/values/time_zone'
+end

data/lib/active_support/time.rb

@@ -0,0 +1,34 @@
+require 'active_support'
+
+module ActiveSupport
+  autoload :Duration, 'active_support/duration'
+  autoload :TimeWithZone, 'active_support/time_with_zone'
+  autoload :TimeZone, 'active_support/values/time_zone'
+
+  on_load_all do
+    [Duration, TimeWithZone, TimeZone]
+  end
+end
+
+require 'date'
+require 'time'
+
+require 'active_support/core_ext/time/publicize_conversion_methods'
+require 'active_support/core_ext/time/marshal'
+require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/time/zones'
+
+require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/freeze'
+require 'active_support/core_ext/date/calculations'
+require 'active_support/core_ext/date/conversions'
+
+require 'active_support/core_ext/date_time/acts_like'
+require 'active_support/core_ext/date_time/calculations'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/date_time/zones'
+
+require 'active_support/core_ext/integer/time'
+require 'active_support/core_ext/numeric/time'

data/lib/active_support/time_with_zone.rb

@@ -1,4 +1,5 @@
-require 'tzinfo'
+require "active_support/values/time_zone"
+require 'active_support/core_ext/object/acts_like'
 
 module ActiveSupport
   # A Time-like class that can represent a time in any time zone. Necessary because standard Ruby Time instances are
@@ -15,7 +16,7 @@ module ActiveSupport
   #   Time.zone.now                                   # => Sun, 18 May 2008 13:07:55 EDT -04:00
   #   Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone  # => Sat, 10 Feb 2007 15:30:45 EST -05:00
   #
-  # See TimeZone and ActiveSupport::CoreExtensions::Time::Zones for further documentation for these methods.
+  # See Time and TimeZone for further documentation of these methods.
   #
   # TimeWithZone instances implement the same API as Ruby Time instances, so that Time and TimeWithZone instances are interchangable. Examples:
   #
@@ -31,6 +32,10 @@ module ActiveSupport
   #   t.is_a?(Time)                         # => true
   #   t.is_a?(ActiveSupport::TimeWithZone)  # => true
   class TimeWithZone
+    def self.name
+      'Time' # Report class name as 'Time' to thwart type checking
+    end
+    
     include Comparable
     attr_reader :time_zone
 
@@ -87,7 +92,7 @@ module ActiveSupport
     alias_method :gmtoff, :utc_offset
 
     def formatted_offset(colon = true, alternate_utc_string = nil)
-      utc? && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+      utc? && alternate_utc_string || TimeZone.seconds_to_utc_offset(utc_offset, colon)
     end
 
     # Time uses +zone+ to display the time zone abbreviation, so we're duck-typing it.
@@ -108,9 +113,9 @@ module ActiveSupport
     end
     alias_method :iso8601, :xmlschema
 
-    # Coerces the date to a string for JSON encoding.
-    #
-    # ISO 8601 format is used if ActiveSupport::JSON::Encoding.use_standard_json_time_format is set.
+    # Coerces the date to a string for JSON encoding. The default format is ISO 8601. You can get
+    # %Y/%m/%d %H:%M:%S +offset style by setting ActiveSupport::JSON::Encoding.use_standard_json_time_format
+    # to false.
     #
     # ==== Examples
     #
@@ -149,8 +154,9 @@ module ActiveSupport
     # <tt>:db</tt> format outputs time in UTC; all others output time in local.
     # Uses TimeWithZone's +strftime+, so <tt>%Z</tt> and <tt>%z</tt> work correctly.
     def to_s(format = :default)
-      return utc.to_s(format) if format == :db
-      if formatter = ::Time::DATE_FORMATS[format]
+      if format == :db
+        utc.to_s(format)
+      elsif formatter = ::Time::DATE_FORMATS[format]
         formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
       else
         "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{formatted_offset(false, 'UTC')}" # mimicking Ruby 1.9 Time#to_s format
@@ -239,10 +245,10 @@ module ActiveSupport
     end
 
     %w(year mon month day mday wday yday hour min sec to_date).each do |method_name|
-      class_eval <<-EOV
-        def #{method_name}     # def year
-          time.#{method_name}  #   time.year
-        end                    # end
+      class_eval <<-EOV, __FILE__, __LINE__ + 1
+        def #{method_name}    # def month
+          time.#{method_name} #   time.month
+        end                   # end
       EOV
     end
 

data/lib/active_support/values/time_zone.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 # The TimeZone class serves as a wrapper around TZInfo::Timezone instances. It allows us to do the following:
 #
 # * Limit the set of zones provided by TZInfo to a meaningful subset of 142 zones.
@@ -53,13 +55,13 @@ module ActiveSupport
         "Newfoundland"                 => "America/St_Johns",
         "Brasilia"                     => "America/Sao_Paulo",
         "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
-        "Georgetown"                   => "America/Argentina/San_Juan",
+        "Georgetown"                   => "America/Guyana",
         "Greenland"                    => "America/Godthab",
         "Mid-Atlantic"                 => "Atlantic/South_Georgia",
         "Azores"                       => "Atlantic/Azores",
         "Cape Verde Is."               => "Atlantic/Cape_Verde",
         "Dublin"                       => "Europe/Dublin",
-        "Edinburgh"                    => "Europe/Dublin",
+        "Edinburgh"                    => "Europe/London",
         "Lisbon"                       => "Europe/Lisbon",
         "London"                       => "Europe/London",
         "Casablanca"                   => "Africa/Casablanca",
@@ -88,7 +90,7 @@ module ActiveSupport
         "Bucharest"                    => "Europe/Bucharest",
         "Cairo"                        => "Africa/Cairo",
         "Helsinki"                     => "Europe/Helsinki",
-        "Kyev"                         => "Europe/Kiev",
+        "Kyiv"                         => "Europe/Kiev",
         "Riga"                         => "Europe/Riga",
         "Sofia"                        => "Europe/Sofia",
         "Tallinn"                      => "Europe/Tallinn",
@@ -121,7 +123,7 @@ module ActiveSupport
         "Kolkata"                      => "Asia/Kolkata",
         "Mumbai"                       => "Asia/Kolkata",
         "New Delhi"                    => "Asia/Kolkata",
-        "Kathmandu"                    => "Asia/Katmandu",
+        "Kathmandu"                    => "Asia/Kathmandu",
         "Astana"                       => "Asia/Dhaka",
         "Dhaka"                        => "Asia/Dhaka",
         "Sri Jayawardenepura"          => "Asia/Colombo",
@@ -170,6 +172,21 @@ module ActiveSupport
       MAPPING.freeze
     end
 
+    UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
+    UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')
+
+    # Assumes self represents an offset from UTC in seconds (as returned from Time#utc_offset)
+    # and turns this into an +HH:MM formatted string. Example:
+    #
+    #   TimeZone.seconds_to_utc_offset(-21_600) # => "-06:00"
+    def self.seconds_to_utc_offset(seconds, colon = true)
+      format = colon ? UTC_OFFSET_WITH_COLON : UTC_OFFSET_WITHOUT_COLON
+      sign = (seconds < 0 ? '-' : '+')
+      hours = seconds.abs / 3600
+      minutes = (seconds.abs % 3600) / 60
+      format % [sign, hours, minutes]
+    end
+
     include Comparable
     attr_reader :name
 
@@ -177,20 +194,26 @@ module ActiveSupport
     # offset is the number of seconds that this time zone is offset from UTC
     # (GMT). Seconds were chosen as the offset unit because that is the unit that
     # Ruby uses to represent time zone offsets (see Time#utc_offset).
-    def initialize(name, utc_offset, tzinfo = nil)
+    def initialize(name, utc_offset = nil, tzinfo = nil)
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo
+      @current_period = nil
     end
 
     def utc_offset
-      @utc_offset ||= tzinfo.current_period.utc_offset
+      if @utc_offset
+        @utc_offset
+      else
+        @current_period ||= tzinfo.current_period
+        @current_period.utc_offset
+      end
     end
 
     # Returns the offset of this time zone as a formatted string, of the
     # format "+HH:MM".
     def formatted_offset(colon=true, alternate_utc_string = nil)
-      utc_offset == 0 && alternate_utc_string || utc_offset.to_utc_offset_s(colon)
+      utc_offset == 0 && alternate_utc_string || self.class.seconds_to_utc_offset(utc_offset, colon)
     end
 
     # Compare this time zone to the parameter. The two are comapred first on
@@ -286,75 +309,29 @@ module ActiveSupport
       tzinfo.period_for_local(time, dst)
     end
 
-    # TODO: Preload instead of lazy load for thread safety
     def tzinfo
-      require 'tzinfo' unless defined?(TZInfo)
-      @tzinfo ||= TZInfo::Timezone.get(MAPPING[name])
+      @tzinfo ||= TimeZone.find_tzinfo(name)
+    end
+
+    # TODO: Preload instead of lazy load for thread safety
+    def self.find_tzinfo(name)
+      require 'tzinfo' unless defined?(::TZInfo)
+      ::TZInfo::Timezone.get(MAPPING[name] || name)
+    rescue TZInfo::InvalidTimezoneIdentifier
+      nil
     end
 
     unless const_defined?(:ZONES)
       ZONES = []
       ZONES_MAP = {}
-      [[-39_600, "International Date Line West", "Midway Island", "Samoa" ],
-       [-36_000, "Hawaii" ],
-       [-32_400, "Alaska" ],
-       [-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
-       [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
-                 "Arizona" ],
-       [-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",
-                 "Mexico City", "Monterrey", "Central America" ],
-       [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",
-                 "Lima", "Quito" ],
-       [-16_200, "Caracas" ],
-       [-14_400, "Atlantic Time (Canada)", "La Paz", "Santiago" ],
-       [-12_600, "Newfoundland" ],
-       [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ],
-       [ -7_200, "Mid-Atlantic" ],
-       [ -3_600, "Azores", "Cape Verde Is." ],
-       [      0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca",
-                 "Monrovia", "UTC" ],
-       [  3_600, "Belgrade", "Bratislava", "Budapest", "Ljubljana", "Prague",
-                 "Sarajevo", "Skopje", "Warsaw", "Zagreb", "Brussels",
-                 "Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin",
-                 "Bern", "Rome", "Stockholm", "Vienna",
-                 "West Central Africa" ],
-       [  7_200, "Bucharest", "Cairo", "Helsinki", "Kyev", "Riga", "Sofia",
-                 "Tallinn", "Vilnius", "Athens", "Istanbul", "Minsk",
-                 "Jerusalem", "Harare", "Pretoria" ],
-       [ 10_800, "Moscow", "St. Petersburg", "Volgograd", "Kuwait", "Riyadh",
-                 "Nairobi", "Baghdad" ],
-       [ 12_600, "Tehran" ],
-       [ 14_400, "Abu Dhabi", "Muscat", "Baku", "Tbilisi", "Yerevan" ],
-       [ 16_200, "Kabul" ],
-       [ 18_000, "Ekaterinburg", "Islamabad", "Karachi", "Tashkent" ],
-       [ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi", "Sri Jayawardenepura" ],
-       [ 20_700, "Kathmandu" ],
-       [ 21_600, "Astana", "Dhaka", "Almaty",
-                 "Novosibirsk" ],
-       [ 23_400, "Rangoon" ],
-       [ 25_200, "Bangkok", "Hanoi", "Jakarta", "Krasnoyarsk" ],
-       [ 28_800, "Beijing", "Chongqing", "Hong Kong", "Urumqi",
-                 "Kuala Lumpur", "Singapore", "Taipei", "Perth", "Irkutsk",
-                 "Ulaan Bataar" ],
-       [ 32_400, "Seoul", "Osaka", "Sapporo", "Tokyo", "Yakutsk" ],
-       [ 34_200, "Darwin", "Adelaide" ],
-       [ 36_000, "Canberra", "Melbourne", "Sydney", "Brisbane", "Hobart",
-                 "Vladivostok", "Guam", "Port Moresby" ],
-       [ 39_600, "Magadan", "Solomon Is.", "New Caledonia" ],
-       [ 43_200, "Fiji", "Kamchatka", "Marshall Is.", "Auckland",
-                 "Wellington" ],
-       [ 46_800, "Nuku'alofa" ]].
-      each do |offset, *places|
-        places.each do |place|
-          place.freeze
-          zone = new(place, offset)
-          ZONES << zone
-          ZONES_MAP[place] = zone
-        end
+      MAPPING.each_key do |place|
+        place.freeze
+        zone = new(place)
+        ZONES << zone
+        ZONES_MAP[place] = zone
       end
       ZONES.sort!
       ZONES.freeze
-      ZONES_MAP.freeze
 
       US_ZONES = ZONES.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
       US_ZONES.freeze
@@ -385,7 +362,7 @@ module ActiveSupport
       def [](arg)
         case arg
           when String
-            ZONES_MAP[arg]
+            ZONES_MAP[arg] ||= lookup(arg)
           when Numeric, ActiveSupport::Duration
             arg *= 3600 if arg.abs <= 13
             all.find { |z| z.utc_offset == arg.to_i }
@@ -399,6 +376,12 @@ module ActiveSupport
       def us_zones
         US_ZONES
       end
+
+      private
+
+        def lookup(name)
+          (tzinfo = find_tzinfo(name)) && create(tzinfo.name.freeze)
+        end
     end
   end
 end

data/lib/active_support/version.rb

@@ -1,9 +1,10 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 5
+    MAJOR = 3
+    MINOR = 0
+    TINY  = 0
+    BUILD = "beta3"
 
-    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
@@ -43,10 +42,7 @@ class NilClass
 
   private
     def method_missing(method, *args, &block)
-      # Ruby 1.9.2: disallow explicit coercion via method_missing.
-      if method == :to_ary || method == :to_str
-        super
-      elsif klass = METHOD_CLASS_MAP[method]
+      if klass = METHOD_CLASS_MAP[method]
         raise_nil_warning_for klass, method, caller
       else
         super

data/lib/active_support/xml_mini/jdom.rb

@@ -3,6 +3,8 @@ raise "JRuby is required to use the JDOM backend for XmlMini" unless RUBY_PLATFO
 require 'jruby'
 include Java
 
+require 'active_support/core_ext/object/blank'
+
 import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
 import java.io.StringReader unless defined? StringReader
@@ -24,15 +26,19 @@ module ActiveSupport
     node_type_map = {}
     NODE_TYPE_NAMES.each { |type| node_type_map[Node.send(type)] = type }
 
-    # Parse an XML Document string into a simple hash using Java's jdom.
-    # string::
-    #   XML Document string to parse
-    def parse(string)
-      if string.blank?
+    # Parse an XML Document string or IO into a simple hash using Java's jdom.
+    # data::
+    #   XML Document string or IO to parse
+    def parse(data)
+      if data.respond_to?(:read)
+        data = data.read
+      end
+
+      if data.blank?
         {}
       else
         @dbf = DocumentBuilderFactory.new_instance
-        xml_string_reader = StringReader.new(string)
+        xml_string_reader = StringReader.new(data)
         xml_input_source = InputSource.new(xml_string_reader)
         doc = @dbf.new_document_builder.parse(xml_input_source)
         merge_element!({}, doc.document_element)
@@ -74,7 +80,7 @@ module ActiveSupport
     # Merge all the texts of an element into the hash
     #
     # hash::
-    #   Hash to add the converted emement to.
+    #   Hash to add the converted element to.
     # element::
     #   XML element whose texts are to me merged into the hash
     def merge_texts!(hash, element)