activesupport 3.0.20 → 3.1.0

data/lib/active_support/ordered_options.rb

@@ -1,7 +1,26 @@
 require 'active_support/ordered_hash'
 
+# Usually key value pairs are handled something like this:
+#
+#   h = {}
+#   h[:boy] = 'John'
+#   h[:girl] = 'Mary'
+#   h[:boy]  # => 'John'
+#   h[:girl] # => 'Mary'
+#
+# Using <tt>OrderedOptions</tt>, the above code could be reduced to:
+#
+#   h = ActiveSupport::OrderedOptions.new
+#   h.boy = 'John'
+#   h.girl = 'Mary'
+#   h.boy  # => 'John'
+#   h.girl # => 'Mary'
+#
 module ActiveSupport #:nodoc:
   class OrderedOptions < OrderedHash
+    alias_method :_get, :[] # preserve the original #[] method
+    protected :_get # make it protected
+
     def []=(key, value)
       super(key.to_sym, value)
     end
@@ -12,16 +31,31 @@ module ActiveSupport #:nodoc:
 
     def method_missing(name, *args)
       if name.to_s =~ /(.*)=$/
-        self[$1.to_sym] = args.first
+        self[$1] = args.first
       else
         self[name]
       end
     end
+
+    def respond_to?(name)
+      true
+    end
   end
 
   class InheritableOptions < OrderedOptions
-    def initialize(parent)
-      super() { |h,k| parent[k] }
+    def initialize(parent = nil)
+      if parent.kind_of?(OrderedOptions)
+        # use the faster _get when dealing with OrderedOptions
+        super() { |h,k| parent._get(k) }
+      elsif parent
+        super() { |h,k| parent[k] }
+      else
+        super()
+      end
+    end
+
+    def inheritable_copy
+      self.class.new(self)
     end
   end
 end

data/lib/active_support/railtie.rb

@@ -46,7 +46,7 @@ module ActiveSupport
     # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     initializer "active_support.initialize_time_zone" do |app|
       require 'active_support/core_ext/time/zones'
-      zone_default = Time.__send__(:get_zone, app.config.time_zone)
+      zone_default = Time.find_zone!(app.config.time_zone)
 
       unless zone_default
         raise \

data/lib/active_support/rescuable.rb

@@ -47,6 +47,7 @@ module ActiveSupport
       #         exception.record.new_record? ? ...
       #       end
       #   end
+      #
       def rescue_from(*klasses, &block)
         options = klasses.extract_options!
 

data/lib/active_support/secure_random.rb

@@ -1,199 +1,6 @@
-begin
-  require 'securerandom'
-rescue LoadError
-end
+require 'active_support/deprecation'
 
 module ActiveSupport
-  if defined?(::SecureRandom)
-    # Use Ruby's SecureRandom library if available.
-    SecureRandom = ::SecureRandom # :nodoc:
-  else
-    # = Secure random number generator interface.
-    #
-    # This library is an interface for secure random number generator which is
-    # suitable for generating session key in HTTP cookies, etc.
-    #
-    # It supports following secure random number generators.
-    #
-    # * openssl
-    # * /dev/urandom
-    # * Win32
-    #
-    # *Note*: This module is based on the SecureRandom library from Ruby 1.9,
-    # revision 18786, August 23 2008. It's 100% interface-compatible with Ruby 1.9's
-    # SecureRandom library.
-    #
-    # == Example
-    #
-    #  # random hexadecimal string.
-    #  p SecureRandom.hex(10) # => "52750b30ffbc7de3b362"
-    #  p SecureRandom.hex(10) # => "92b15d6c8dc4beb5f559"
-    #  p SecureRandom.hex(11) # => "6aca1b5c58e4863e6b81b8"
-    #  p SecureRandom.hex(12) # => "94b2fff3e7fd9b9c391a2306"
-    #  p SecureRandom.hex(13) # => "39b290146bea6ce975c37cfc23"
-    #  ...
-    #
-    #  # random base64 string.
-    #  p SecureRandom.base64(10) # => "EcmTPZwWRAozdA=="
-    #  p SecureRandom.base64(10) # => "9b0nsevdwNuM/w=="
-    #  p SecureRandom.base64(10) # => "KO1nIU+p9DKxGg=="
-    #  p SecureRandom.base64(11) # => "l7XEiFja+8EKEtY="
-    #  p SecureRandom.base64(12) # => "7kJSM/MzBJI+75j8"
-    #  p SecureRandom.base64(13) # => "vKLJ0tXBHqQOuIcSIg=="
-    #  ...
-    #
-    #  # random binary string.
-    #  p SecureRandom.random_bytes(10) # => "\016\t{\370g\310pbr\301"
-    #  p SecureRandom.random_bytes(10) # => "\323U\030TO\234\357\020\a\337"
-    #  ...
-    module SecureRandom
-      # SecureRandom.random_bytes generates a random binary string.
-      #
-      # The argument n specifies the length of the result string.
-      #
-      # If n is not specified, 16 is assumed.
-      # It may be larger in future.
-      #
-      # If secure random number generator is not available,
-      # NotImplementedError is raised.
-      def self.random_bytes(n=nil)
-        n ||= 16
-
-        unless defined? OpenSSL
-          begin
-            require 'openssl'
-          rescue LoadError
-          end
-        end
-
-        if defined? OpenSSL::Random
-          return OpenSSL::Random.random_bytes(n)
-        end
-
-        if !defined?(@has_urandom) || @has_urandom
-          flags = File::RDONLY
-          flags |= File::NONBLOCK if defined? File::NONBLOCK
-          flags |= File::NOCTTY if defined? File::NOCTTY
-          flags |= File::NOFOLLOW if defined? File::NOFOLLOW
-          begin
-            File.open("/dev/urandom", flags) {|f|
-              unless f.stat.chardev?
-                raise Errno::ENOENT
-              end
-              @has_urandom = true
-              ret = f.readpartial(n)
-              if ret.length != n
-                raise NotImplementedError, "Unexpected partial read from random device"
-              end
-              return ret
-            }
-          rescue Errno::ENOENT
-            @has_urandom = false
-          end
-        end
-
-        if !defined?(@has_win32)
-          begin
-            require 'Win32API'
-
-            crypt_acquire_context = Win32API.new("advapi32", "CryptAcquireContext", 'PPPII', 'L')
-            @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'LIP', 'L')
-
-            hProvStr = " " * 4
-            prov_rsa_full = 1
-            crypt_verifycontext = 0xF0000000
-
-            if crypt_acquire_context.call(hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0
-              raise SystemCallError, "CryptAcquireContext failed: #{lastWin32ErrorMessage}"
-            end
-            @hProv, = hProvStr.unpack('L')
-
-            @has_win32 = true
-          rescue LoadError
-            @has_win32 = false
-          end
-        end
-        if @has_win32
-          bytes = " " * n
-          if @crypt_gen_random.call(@hProv, bytes.size, bytes) == 0
-            raise SystemCallError, "CryptGenRandom failed: #{lastWin32ErrorMessage}"
-          end
-          return bytes
-        end
-
-        raise NotImplementedError, "No random device"
-      end
-
-      # SecureRandom.hex generates a random hex string.
-      #
-      # The argument n specifies the length of the random length.
-      # The length of the result string is twice of n.
-      #
-      # If n is not specified, 16 is assumed.
-      # It may be larger in future.
-      #
-      # If secure random number generator is not available,
-      # NotImplementedError is raised.
-      def self.hex(n=nil)
-        random_bytes(n).unpack("H*")[0]
-      end
-
-      # SecureRandom.base64 generates a random base64 string.
-      #
-      # The argument n specifies the length of the random length.
-      # The length of the result string is about 4/3 of n.
-      #
-      # If n is not specified, 16 is assumed.
-      # It may be larger in future.
-      #
-      # If secure random number generator is not available,
-      # NotImplementedError is raised.
-      def self.base64(n=nil)
-        [random_bytes(n)].pack("m*").delete("\n")
-      end
-
-      # SecureRandom.random_number generates a random number.
-      #
-      # If an positive integer is given as n,
-      # SecureRandom.random_number returns an integer:
-      # 0 <= SecureRandom.random_number(n) < n.
-      #
-      # If 0 is given or an argument is not given,
-      # SecureRandom.random_number returns an float:
-      # 0.0 <= SecureRandom.random_number() < 1.0.
-      def self.random_number(n=0)
-        if 0 < n
-          hex = n.to_s(16)
-          hex = '0' + hex if (hex.length & 1) == 1
-          bin = [hex].pack("H*")
-          mask = bin[0]
-          mask |= mask >> 1
-          mask |= mask >> 2
-          mask |= mask >> 4
-          begin
-            rnd = SecureRandom.random_bytes(bin.length)
-            rnd[0] = rnd[0] & mask
-          end until rnd < bin
-          rnd.unpack("H*")[0].hex
-        else
-          # assumption: Float::MANT_DIG <= 64
-          i64 = SecureRandom.random_bytes(8).unpack("Q")[0]
-          Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
-        end
-      end
-
-      # Following code is based on David Garamond's GUID library for Ruby.
-      def self.lastWin32ErrorMessage # :nodoc:
-        get_last_error = Win32API.new("kernel32", "GetLastError", '', 'L')
-        format_message = Win32API.new("kernel32", "FormatMessageA", 'LPLLPLPPPPPPPP', 'L')
-        format_message_ignore_inserts = 0x00000200
-        format_message_from_system    = 0x00001000
-
-        code = get_last_error.call
-        msg = "\0" * 1024
-        len = format_message.call(format_message_ignore_inserts + format_message_from_system, 0, code, 0, msg, 1024, nil, nil, nil, nil, nil, nil, nil, nil)
-        msg[0, len].tr("\r", '').chomp
-      end
-    end
-  end
+  # Use Ruby's SecureRandom library.
+  SecureRandom = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActiveSupport::SecureRandom', ::SecureRandom) # :nodoc:
 end

data/lib/active_support/test_case.rb

@@ -5,16 +5,9 @@ require 'active_support/testing/deprecation'
 require 'active_support/testing/declarative'
 require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
+require 'active_support/testing/mochaing'
 require 'active_support/core_ext/kernel/reporting'
 
-begin
-  silence_warnings { require 'mocha/setup' }
-rescue LoadError
-  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
-  Object.const_set :Mocha, Module.new
-  Mocha.const_set :ExpectationError, Class.new(StandardError)
-end
-
 module ActiveSupport
   class TestCase < ::Test::Unit::TestCase
     if defined? MiniTest
@@ -24,8 +17,7 @@ module ActiveSupport
     else
       Assertion = Test::Unit::AssertionFailedError
 
-      require 'active_support/testing/default'
-      include ActiveSupport::Testing::Default
+      undef :default_test
     end
 
     $tags = {}

data/lib/active_support/testing/assertions.rb

@@ -29,22 +29,35 @@ module ActiveSupport
       #     post :create, :article => {...}
       #   end
       #
+      # A lambda or a list of lambdas can be passed in and evaluated:
+      #
+      #   assert_difference lambda { Article.count }, 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
+      #   assert_difference [->{ Article.count }, ->{ Post.count }], 2 do
+      #     post :create, :article => {...}
+      #   end
+      #
       # A error message can be specified.
       #
       #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
       #     post :delete, :id => ...
       #   end
       def assert_difference(expression, difference = 1, message = nil, &block)
-        b = block.send(:binding)
-        exps = Array.wrap(expression)
-        before = exps.map { |e| eval(e, b) }
+        expressions = Array.wrap expression
+
+        exps = expressions.map { |e|
+          e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
+        }
+        before = exps.map { |e| e.call }
 
         yield
 
-        exps.each_with_index do |e, i|
-          error = "#{e.inspect} didn't change by #{difference}"
-          error = "#{message}.\n#{error}" if message
-          assert_equal(before[i] + difference, eval(e, b), error)
+        expressions.zip(exps).each_with_index do |(code, e), i|
+          error  = "#{code.inspect} didn't change by #{difference}"
+          error  = "#{message}.\n#{error}" if message
+          assert_equal(before[i] + difference, e.call, error)
         end
       end
 

data/lib/active_support/testing/mochaing.rb

@@ -0,0 +1,7 @@
+begin
+  silence_warnings { require 'mocha' }
+rescue LoadError
+  # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+  Object.const_set :Mocha, Module.new
+  Mocha.const_set :ExpectationError, Class.new(StandardError)
+end

data/lib/active_support/testing/pending.rb

@@ -1,5 +1,5 @@
 # Some code from jeremymcanally's "pending"
-# http://github.com/jeremymcanally/pending/tree/master
+# https://github.com/jeremymcanally/pending/tree/master
 
 module ActiveSupport
   module Testing
@@ -11,32 +11,36 @@ module ActiveSupport
         @@at_exit = false
 
         def pending(description = "", &block)
-          if description.is_a?(Symbol)
-            is_pending = $tags[description]
-            return block.call unless is_pending
-          end
+          if defined?(::MiniTest)
+            skip(description.blank? ? nil : description)
+          else
+            if description.is_a?(Symbol)
+              is_pending = $tags[description]
+              return block.call unless is_pending
+            end
 
-          if block_given?
-            failed = false
+            if block_given?
+              failed = false
 
-            begin
-              block.call
-            rescue Exception
-              failed = true
-            end
+              begin
+                block.call
+              rescue Exception
+                failed = true
+              end
 
-            flunk("<#{description}> did not fail.") unless failed
-          end
+              flunk("<#{description}> did not fail.") unless failed
+            end
 
-          caller[0] =~ (/(.*):(.*):in `(.*)'/)
-          @@pending_cases << "#{$3} at #{$1}, line #{$2}"
-          print "P"
+            caller[0] =~ (/(.*):(.*):in `(.*)'/)
+            @@pending_cases << "#{$3} at #{$1}, line #{$2}"
+            print "P"
 
-          @@at_exit ||= begin
-            at_exit do
-              puts "\nPending Cases:"
-              @@pending_cases.each do |test_case|
-                puts test_case
+            @@at_exit ||= begin
+              at_exit do
+                puts "\nPending Cases:"
+                @@pending_cases.each do |test_case|
+                  puts test_case
+                end
               end
             end
           end
@@ -45,4 +49,4 @@ module ActiveSupport
 
     end
   end
-end
+end

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

@@ -0,0 +1,115 @@
+require 'jruby/profiler'
+require 'java'
+java_import java.lang.management.ManagementFactory
+
+module ActiveSupport
+  module Testing
+    module Performance
+      DEFAULTS.merge!(
+        if ARGV.include?('--benchmark')
+          {:metrics => [:wall_time, :user_time, :memory, :gc_runs, :gc_time]}
+        else
+          { :metrics => [:wall_time],
+            :formats => [:flat, :graph] }
+        end).freeze
+
+      protected
+        def run_gc
+          ManagementFactory.memory_mx_bean.gc
+        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) }
+            end
+          end
+        end
+
+        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|
+            fname = output_filename(klass)
+            FileUtils.mkdir_p(File.dirname(fname))
+            file = File.open(fname, 'wb') do |file|
+              klass.new(@data).printProfile(file)
+            end
+          end
+        end
+
+        protected
+          def output_filename(printer_class)
+            suffix =
+              case printer_class.name.demodulize
+                when 'FlatProfilePrinter';  'flat.txt'
+                when 'GraphProfilePrinter'; 'graph.txt'
+                else printer_class.name.sub(/ProfilePrinter$/, '').underscore
+              end
+
+            "#{super()}_#{suffix}"
+          end
+      end
+
+      module Metrics
+        class Base
+          def profile
+            yield
+          end
+
+          protected
+            def with_gc_stats
+              ManagementFactory.memory_mx_bean.gc
+              yield
+            end
+        end
+
+        class WallTime < Time
+          def measure
+            super
+          end
+        end
+
+        class CpuTime < Time
+          def measure
+            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
+          end
+        end
+
+        class Memory < DigitalInformationUnit
+          def measure
+            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 }
+          end
+        end
+
+        class GcTime < Time
+          def measure
+            ManagementFactory.garbage_collector_mx_beans.inject(0) { |total_time, current_gc| total_time += current_gc.collection_time } / 1000.0 # seconds
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+require 'rubinius/agent'
+
+module ActiveSupport
+  module Testing
+    module Performance
+      DEFAULTS.merge!(
+        if ARGV.include?('--benchmark')
+          {:metrics => [:wall_time, :memory, :objects, :gc_runs, :gc_time]}
+        else
+          { :metrics => [:wall_time],
+            :formats => [:flat, :graph] }
+        end).freeze
+
+      protected
+        def run_gc
+          GC.run(true)
+        end
+
+      class Performer; end
+
+      class Profiler < Performer
+        def initialize(*args)
+          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"
+            FileUtils.mkdir_p(File.dirname(fname))
+            File.open(fname, 'wb') do |file|
+              yield(file)
+            end
+          end
+      end
+
+      module Metrics
+        class Base
+          attr_reader :loopback
+
+          def profile
+            yield
+          end
+
+          protected
+            def with_gc_stats
+              @loopback = Rubinius::Agent.loopback
+              GC.run(true)
+              yield
+            end
+        end
+
+        class WallTime < Time
+          def measure
+            super
+          end
+        end
+
+        class Memory < DigitalInformationUnit
+          def measure
+            loopback.get("system.memory.counter.bytes").last
+          end
+        end
+
+        class Objects < Amount
+          def measure
+            loopback.get("system.memory.counter.objects").last
+          end
+        end
+
+        class GcRuns < Amount
+          def measure
+            loopback.get("system.gc.full.count").last + loopback.get("system.gc.young.count").last
+          end
+        end
+
+        class GcTime < Time
+          def measure
+            (loopback.get("system.gc.full.wallclock").last + loopback.get("system.gc.young.wallclock").last) / 1000.0
+          end
+        end
+      end
+    end
+  end
+end