activesupport 3.0.0.rc → 3.0.0.rc2

data/lib/active_support/testing/assertions.rb

@@ -63,19 +63,21 @@ module ActiveSupport
       def assert_no_difference(expression, message = nil, &block)
         assert_difference expression, 0, message, &block
       end
-      
+
       # Test if an expression is blank. Passes if object.blank? is true.
       #
       #   assert_blank [] # => true
-      def assert_blank(object)
-        assert object.blank?, "#{object.inspect} is not blank"
+      def assert_blank(object, message=nil)
+        message ||= "#{object.inspect} is not blank"
+        assert object.blank?, message
       end
-      
+
       # Test if an expression is not blank. Passes if object.present? is true.
       #
       #   assert_present {:data => 'x' } # => true
-      def assert_present(object)
-        assert object.present?, "#{object.inspect} is blank"
+      def assert_present(object, message=nil)
+        message ||= "#{object.inspect} is blank"
+        assert object.present?, message
       end
     end
   end

data/lib/active_support/testing/declarative.rb

@@ -1,10 +1,10 @@
 module ActiveSupport
   module Testing
     module Declarative
-      
+
       def self.extended(klass)
         klass.class_eval do
-          
+
           unless method_defined?(:describe)
             def self.describe(text)
               class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -14,9 +14,9 @@ module ActiveSupport
               RUBY_EVAL
             end
           end
-          
+
         end
-      end 
+      end
 
       unless defined?(Spec)
         # test "verify something" do

data/lib/active_support/testing/isolation.rb

@@ -34,7 +34,7 @@ module ActiveSupport
 
     module Isolation
       def self.forking_env?
-        !ENV["NO_FORK"] && ((Config::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
+        !ENV["NO_FORK"] && ((RbConfig::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
       end
 
       def self.included(base)

data/lib/active_support/testing/pending.rb

@@ -25,13 +25,13 @@ module ActiveSupport
               failed = true
             end
 
-            flunk("<#{description}> did not fail.") unless failed 
+            flunk("<#{description}> did not fail.") unless failed
           end
 
           caller[0] =~ (/(.*):(.*):in `(.*)'/)
           @@pending_cases << "#{$3} at #{$1}, line #{$2}"
           print "P"
-      
+
           @@at_exit ||= begin
             at_exit do
               puts "\nPending Cases:"
@@ -42,7 +42,7 @@ module ActiveSupport
           end
         end
       end
-      
+
     end
   end
 end

data/lib/active_support/testing/performance.rb

@@ -178,7 +178,7 @@ begin
             RubyProf.pause
             profile_options[:runs].to_i.times { run_test(@metric, :profile) }
             @data = RubyProf.stop
-            @total = @data.threads.values.sum(0) { |method_infos| method_infos.sort.last.total_time }
+            @total = @data.threads.values.sum(0) { |method_infos| method_infos.max.total_time }
           end
 
           def report
@@ -207,10 +207,14 @@ begin
             def output_filename(printer_class)
               suffix =
                 case printer_class.name.demodulize
-                  when 'FlatPrinter'; 'flat.txt'
-                  when 'GraphPrinter'; 'graph.txt'
-                  when 'GraphHtmlPrinter'; 'graph.html'
-                  when 'CallTreePrinter'; 'tree.txt'
+                  when 'FlatPrinter';                 'flat.txt'
+                  when 'FlatPrinterWithLineNumbers';  'flat_line_numbers.txt'
+                  when 'GraphPrinter';                'graph.txt'
+                  when 'GraphHtmlPrinter';            'graph.html'
+                  when 'GraphYamlPrinter';            'graph.yml'
+                  when 'CallTreePrinter';             'tree.txt'
+                  when 'CallStackPrinter';            'stack.html'
+                  when 'DotPrinter';                  'graph.dot'
                   else printer_class.name.sub(/Printer$/, '').underscore
                 end
 

data/lib/active_support/time_with_zone.rb

@@ -18,7 +18,7 @@ module ActiveSupport
   #
   # 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 interchangeable. 
+  # TimeWithZone instances implement the same API as Ruby Time instances, so that Time and TimeWithZone instances are interchangeable.
   # Examples:
   #
   #   t = Time.zone.now                     # => Sun, 18 May 2008 13:27:25 EDT -04:00
@@ -36,7 +36,7 @@ module ActiveSupport
     def self.name
       'Time' # Report class name as 'Time' to thwart type checking
     end
-    
+
     include Comparable
     attr_reader :time_zone
 

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "rc"
+    BUILD = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

data/lib/active_support/xml_mini/nokogiri.rb

@@ -1,4 +1,9 @@
-require 'nokogiri'
+begin
+  require 'nokogiri'
+rescue LoadError => e
+  $stderr.puts "You don't have nokogiri installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
 require 'active_support/core_ext/object/blank'
 
 # = XmlMini Nokogiri implementation

data/lib/active_support/xml_mini/nokogirisax.rb

@@ -1,4 +1,9 @@
-require 'nokogiri'
+begin
+  require 'nokogiri'
+rescue LoadError => e
+  $stderr.puts "You don't have nokogiri installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
 require 'active_support/core_ext/object/blank'
 
 # = XmlMini Nokogiri implementation using a SAX-based parser
@@ -80,4 +85,4 @@ module ActiveSupport
       end
     end
   end
-end
+end

data/lib/active_support/xml_mini/rexml.rb

@@ -19,7 +19,7 @@ module ActiveSupport
       if !data.respond_to?(:read)
         data = StringIO.new(data || '')
       end
-      
+
       char = data.getc
       if char.nil?
         {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 7712042
+  hash: 977940607
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  version: 3.0.0.rc
+  - rc2
+  version: 3.0.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -05:00
+date: 2010-08-23 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -126,6 +126,7 @@ files:
 - lib/active_support/core_ext/object/conversions.rb
 - lib/active_support/core_ext/object/duplicable.rb
 - lib/active_support/core_ext/object/instance_variables.rb
+- lib/active_support/core_ext/object/returning.rb
 - lib/active_support/core_ext/object/to_json.rb
 - lib/active_support/core_ext/object/to_param.rb
 - lib/active_support/core_ext/object/to_query.rb