activesupport 3.1.0.rc1 → 3.1.0.rc2

data/CHANGELOG

@@ -1,5 +1,9 @@
 *Rails 3.1.0 (unreleased)*
 
+* ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. [Andrew White]
+
+* Deprecated ActiveSupport::SecureRandom in favour of SecureRandom from the standard library [Jon Leighton]
+
 * New reporting method Kernel#quietly. [fxn]
 
 * Add String#inquiry as a convenience method for turning a string into a StringInquirer object [DHH]

data/lib/active_support.rb

@@ -21,6 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+require 'securerandom'
+
 module ActiveSupport
   class << self
     attr_accessor :load_all_hooks
@@ -30,7 +32,7 @@ module ActiveSupport
   self.load_all_hooks = []
 
   on_load_all do
-    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom]
+    [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte]
   end
 end
 

data/lib/active_support/cache/mem_cache_store.rb

@@ -31,7 +31,7 @@ module ActiveSupport
         DELETED     = "DELETED\r\n"
       end
 
-      ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/
+      ESCAPE_KEY_CHARS = /[\x00-\x20%\x7F-\xFF]/n
 
       def self.build_mem_cache(*addresses)
         addresses = addresses.flatten

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

@@ -59,7 +59,7 @@ module Kernel
       raise unless exception_classes.any? { |cls| e.kind_of?(cls) }
     end
   end
-  
+
   # Captures the given stream and returns it:
   #
   #   stream = capture(:stdout) { puts "Cool" }

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

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/module/deprecation'
 
 module Kernel
   # Require a library with fallback to RubyGems.  Warnings during library
@@ -23,4 +24,5 @@ module Kernel
       end
     end
   end
+  deprecate :require_library_or_gem
 end

data/lib/active_support/core_ext/string/output_safety.rb

@@ -74,6 +74,7 @@ end
 
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
+    UNSAFE_STRING_METHODS = ["capitalize", "chomp", "chop", "delete", "downcase", "gsub", "lstrip", "next", "reverse", "rstrip", "slice", "squeeze", "strip", "sub", "succ", "swapcase", "tr", "tr_s", "upcase"].freeze
     alias safe_concat concat
 
     def concat(value)
@@ -110,6 +111,18 @@ module ActiveSupport #:nodoc:
 
       to_str.to_yaml(*args)
     end
+
+    for unsafe_method in UNSAFE_STRING_METHODS
+      class_eval <<-EOT, __FILE__, __LINE__
+        def #{unsafe_method}(*args)
+          super.to_str
+        end
+
+        def #{unsafe_method}!(*args)
+          raise TypeError, "Cannot modify SafeBuffer in place"
+        end
+      EOT
+    end
   end
 end
 

data/lib/active_support/dependencies.rb

@@ -474,7 +474,7 @@ module ActiveSupport #:nodoc:
         raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
       end
 
-      raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
+      raise NameError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
 
       qualified_name = qualified_name_for from_mod, const_name
       path_suffix = qualified_name.underscore

data/lib/active_support/notifications/instrumenter.rb

@@ -29,7 +29,7 @@ module ActiveSupport
 
       private
         def unique_id
-          SecureRandom.hex(10)
+          ::SecureRandom.hex(10)
         end
     end
 

data/lib/active_support/secure_random.rb

@@ -1,6 +1,6 @@
-require 'securerandom'
+require 'active_support/deprecation'
 
 module ActiveSupport
   # Use Ruby's SecureRandom library.
-  SecureRandom = ::SecureRandom # :nodoc:
+  SecureRandom = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveSupport::SecureRandom', ::SecureRandom) # :nodoc:
 end

data/lib/active_support/testing/performance.rb

@@ -9,7 +9,7 @@ module ActiveSupport
   module Testing
     module Performance
       extend ActiveSupport::Concern
-      
+
       included do
         superclass_delegating_accessor :profile_options
         self.profile_options = {}
@@ -20,7 +20,7 @@ module ActiveSupport
           include ForClassicTestUnit
         end
       end
-      
+
       # each implementation should define metrics and freeze the defaults
       DEFAULTS =
         if ARGV.include?('--benchmark') # HAX for rake test
@@ -32,7 +32,7 @@ module ActiveSupport
             :output => 'tmp/performance',
             :benchmark => false }
         end
-      
+
       def full_profile_options
         DEFAULTS.merge(profile_options)
       end
@@ -40,7 +40,7 @@ module ActiveSupport
       def full_test_name
         "#{self.class.name}##{method_name}"
       end
-      
+
       module ForMiniTest
         def run(runner)
           @runner = runner
@@ -53,7 +53,7 @@ module ActiveSupport
               end
             end
           end
-          
+
           return
         end
 
@@ -122,7 +122,7 @@ module ActiveSupport
       protected
         # overridden by each implementation
         def run_gc; end
-      
+
         def run_warmup
           run_gc
 
@@ -132,7 +132,7 @@ module ActiveSupport
 
           run_gc
         end
-        
+
         def run_profile(metric)
           klass = full_profile_options[:benchmark] ? Benchmarker : Profiler
           performer = klass.new(self, metric)
@@ -163,7 +163,7 @@ module ActiveSupport
             "#{full_profile_options[:output]}/#{full_test_name}_#{@metric.name}"
           end
       end
-      
+
       # overridden by each implementation
       class Profiler < Performer
         def time_with_block
@@ -171,7 +171,7 @@ module ActiveSupport
           yield
           Time.now - before
         end
-        
+
         def run;    end
         def record; end
       end
@@ -181,10 +181,10 @@ module ActiveSupport
           super
           @supported = @metric.respond_to?('measure')
         end
-           
+
         def run
           return unless @supported
-          
+
           full_profile_options[:runs].to_i.times { run_test(@metric, :benchmark) }
           @total = @metric.total
         end
@@ -237,7 +237,7 @@ module ActiveSupport
             "#{super}.csv"
           end
       end
-      
+
       module Metrics
         def self.[](name)
           const_get(name.to_s.camelize)
@@ -247,7 +247,7 @@ module ActiveSupport
 
         class Base
           include ActionView::Helpers::NumberHelper
-          
+
           attr_reader :total
 
           def initialize
@@ -265,15 +265,15 @@ module ActiveSupport
               @total += (measure - before)
             end
           end
-          
+
           # overridden by each implementation
           def profile; end
-            
+
           protected
             # overridden by each implementation
             def with_gc_stats; end
         end
-        
+
         class Time < Base
           def measure
             ::Time.now.to_f
@@ -287,19 +287,19 @@ module ActiveSupport
             end
           end
         end
-        
+
         class Amount < Base
           def format(measurement)
             number_with_delimiter(measurement.floor)
           end
         end
-        
+
         class DigitalInformationUnit < Base
           def format(measurement)
             number_to_human_size(measurement, :precision => 2)
           end
         end
-        
+
         # each implementation provides its own metrics like ProcessTime, Memory or GcRuns
       end
     end

data/lib/active_support/testing/performance/jruby.rb

@@ -1,6 +1,6 @@
 require 'jruby/profiler'
-require 'java' 
-import java.lang.management.ManagementFactory
+require 'java'
+java_import java.lang.management.ManagementFactory
 
 module ActiveSupport
   module Testing
@@ -12,21 +12,21 @@ module ActiveSupport
           { :metrics => [:wall_time],
             :formats => [:flat, :graph] }
         end).freeze
-      
+
       protected
         def run_gc
           ManagementFactory.memory_mx_bean.gc
-        end   
+        end
 
       class Profiler < Performer
         def initialize(*args)
           super
           @supported = @metric.is_a?(Metrics::WallTime)
         end
-        
+
         def run
           return unless @supported
-          
+
           @total = time_with_block do
             @data = JRuby::Profiler.profile do
               full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
@@ -36,7 +36,7 @@ module ActiveSupport
 
         def record
           return unless @supported
-          
+
           klasses = full_profile_options[:formats].map { |f| JRuby::Profiler.const_get("#{f.to_s.camelize}ProfilePrinter") }.compact
 
           klasses.each do |klass|
@@ -61,7 +61,7 @@ module ActiveSupport
           end
       end
 
-      module Metrics        
+      module Metrics
         class Base
           def profile
             yield
@@ -85,7 +85,7 @@ module ActiveSupport
             ManagementFactory.thread_mx_bean.get_current_thread_cpu_time / 1000 / 1000 / 1000.0 # seconds
           end
         end
-        
+
         class UserTime < Time
           def measure
             ManagementFactory.thread_mx_bean.get_current_thread_user_time / 1000 / 1000 / 1000.0 # seconds
@@ -97,7 +97,7 @@ module ActiveSupport
             ManagementFactory.memory_mx_bean.non_heap_memory_usage.used + ManagementFactory.memory_mx_bean.heap_memory_usage.used
           end
         end
-        
+
         class GcRuns < Amount
           def measure
             ManagementFactory.garbage_collector_mx_beans.inject(0) { |total_runs, current_gc| total_runs += current_gc.collection_count }

data/lib/active_support/testing/performance/rubinius.rb

@@ -10,12 +10,12 @@ module ActiveSupport
           { :metrics => [:wall_time],
             :formats => [:flat, :graph] }
         end).freeze
-      
+
       protected
         def run_gc
           GC.run(true)
         end
-      
+
       class Performer; end
 
       class Profiler < Performer
@@ -23,35 +23,35 @@ module ActiveSupport
           super
           @supported = @metric.is_a?(Metrics::WallTime)
         end
-                
+
         def run
           return unless @supported
-          
+
           @profiler = Rubinius::Profiler::Instrumenter.new
-          
+
           @total = time_with_block do
             @profiler.profile(false) do
               full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
             end
           end
         end
-        
+
         def record
           return unless @supported
-          
+
           if(full_profile_options[:formats].include?(:flat))
             create_path_and_open_file(:flat) do |file|
               @profiler.show(file)
             end
           end
-          
+
           if(full_profile_options[:formats].include?(:graph))
             create_path_and_open_file(:graph) do |file|
               @profiler.show(file)
             end
           end
         end
-        
+
         protected
           def create_path_and_open_file(printer_name)
             fname = "#{output_filename}_#{printer_name}.txt"
@@ -62,10 +62,10 @@ module ActiveSupport
           end
       end
 
-      module Metrics        
+      module Metrics
         class Base
           attr_reader :loopback
-          
+
           def profile
             yield
           end

data/lib/active_support/testing/performance/ruby.rb

@@ -16,7 +16,7 @@ module ActiveSupport
             :metrics => [:process_time, :memory, :objects],
             :formats => [:flat, :graph_html, :call_tree, :call_stack] }
         end).freeze
-      
+
       protected
         def run_gc
           GC.start
@@ -77,7 +77,7 @@ module ActiveSupport
           def measure_mode
             self.class::Mode
           end
-          
+
           def profile
             RubyProf.resume
             yield
@@ -91,7 +91,7 @@ module ActiveSupport
               yield
             end
         end
-        
+
         class ProcessTime < Time
           Mode = RubyProf::PROCESS_TIME if RubyProf.const_defined?(:PROCESS_TIME)
 

data/lib/active_support/testing/performance/ruby/mri.rb

@@ -15,7 +15,7 @@ module ActiveSupport
               end
             end
         end
-            
+
         class Memory < DigitalInformationUnit
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_memory)
@@ -24,7 +24,7 @@ module ActiveSupport
             end
           end
         end
-          
+
         class Objects < Amount
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_allocations)
@@ -33,7 +33,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcRuns < Amount
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_gc_runs)
@@ -42,7 +42,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcTime < Time
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_gc_time)
@@ -55,5 +55,3 @@ module ActiveSupport
     end
   end
 end
-            
-            

data/lib/active_support/testing/performance/ruby/yarv.rb

@@ -15,7 +15,7 @@ module ActiveSupport
               end
             end
         end
-        
+
         class Memory < DigitalInformationUnit
           # Ruby 1.9 + GCdata patch
           if GC.respond_to?(:malloc_allocated_size)
@@ -24,7 +24,7 @@ module ActiveSupport
             end
           end
         end
-          
+
         class Objects < Amount
           # Ruby 1.9 + GCdata patch
           if GC.respond_to?(:malloc_allocations)
@@ -33,7 +33,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcRuns < Amount
           # Ruby 1.9
           if GC.respond_to?(:count)
@@ -42,7 +42,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcTime < Time
           # Ruby 1.9 with GC::Profiler
           if defined?(GC::Profiler) && GC::Profiler.respond_to?(:total_time)

data/lib/active_support/version.rb

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

data/lib/active_support/xml_mini/jdom.rb

@@ -5,12 +5,12 @@ 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
-import org.xml.sax.InputSource unless defined? InputSource
-import org.xml.sax.Attributes unless defined? Attributes
-import org.w3c.dom.Node unless defined? Node
+java_import javax.xml.parsers.DocumentBuilder unless defined? DocumentBuilder
+java_import javax.xml.parsers.DocumentBuilderFactory unless defined? DocumentBuilderFactory
+java_import java.io.StringReader unless defined? StringReader
+java_import org.xml.sax.InputSource unless defined? InputSource
+java_import org.xml.sax.Attributes unless defined? Attributes
+java_import org.w3c.dom.Node unless defined? Node
 
 # = XmlMini JRuby JDOM implementation
 module ActiveSupport
@@ -41,7 +41,7 @@ module ActiveSupport
         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)
+        merge_element!({CONTENT_KEY => ''}, doc.document_element)
       end
     end
 
@@ -54,9 +54,14 @@ module ActiveSupport
     # element::
     #   XML element to merge into hash
     def merge_element!(hash, element)
+      delete_empty(hash)
       merge!(hash, element.tag_name, collapse(element))
     end
 
+    def delete_empty(hash) 
+      hash.delete(CONTENT_KEY) if hash[CONTENT_KEY] == ''
+    end
+
     # Actually converts an XML document element into a data structure.
     #
     # element::
@@ -84,6 +89,7 @@ module ActiveSupport
     # element::
     #   XML element whose texts are to me merged into the hash
     def merge_texts!(hash, element)
+      delete_empty(hash)
       text_children = texts(element)
       if text_children.join.empty?
         hash
@@ -128,8 +134,9 @@ module ActiveSupport
       attribute_hash = {}
       attributes = element.attributes
       for i in 0...attributes.length
-         attribute_hash[attributes.item(i).name] =  attributes.item(i).value
-       end
+        attribute_hash[CONTENT_KEY] ||= ''
+        attribute_hash[attributes.item(i).name] =  attributes.item(i).value
+      end
       attribute_hash
     end
 

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
+  hash: 15424097
   prerelease: 6
-  version: 3.1.0.rc1
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -10,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -21,6 +27,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -246,7 +256,6 @@ files:
 - lib/active_support/xml_mini/rexml.rb
 - lib/active_support/xml_mini.rb
 - lib/active_support.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -260,17 +269,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.