diff options
Diffstat (limited to 'activesupport')
5 files changed, 32 insertions, 28 deletions
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb index fac4639eed..6165e95443 100644 --- a/activesupport/lib/active_support/core_ext/load_error.rb +++ b/activesupport/lib/active_support/core_ext/load_error.rb @@ -8,7 +8,7 @@ class MissingSourceFile < LoadError #:nodoc: def is_missing?(path) path.gsub(/\.rb$/, '') == self.path.gsub(/\.rb$/, '') end - + def self.from_message(message) REGEXPS.each do |regexp, capture| match = regexp.match(message) @@ -16,12 +16,12 @@ class MissingSourceFile < LoadError #:nodoc: end nil end - + REGEXPS = [ [/^no such file to load -- (.+)$/i, 1], [/^Missing \w+ (file\s*)?([^\s]+.rb)$/i, 2], [/^Missing API definition file in (.+)$/i, 1] - ] + ] unless defined?(REGEXPS) end module ActiveSupport #:nodoc: diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb index 1e925145aa..48b5c92454 100644 --- a/activesupport/lib/active_support/ordered_options.rb +++ b/activesupport/lib/active_support/ordered_options.rb @@ -1,35 +1,37 @@ # OrderedHash is namespaced to prevent conflicts with other implementations -class ActiveSupport::OrderedHash < Array #:nodoc: - def []=(key, value) - if pair = find_pair(key) - pair.pop - pair << value - else - self << [key, value] +module ActiveSupport + class OrderedHash < Array #:nodoc: + def []=(key, value) + if pair = find_pair(key) + pair.pop + pair << value + else + self << [key, value] + end end - end - - def [](key) - pair = find_pair(key) - pair ? pair.last : nil - end - def keys - self.collect { |i| i.first } - end + def [](key) + pair = find_pair(key) + pair ? pair.last : nil + end - private - def find_pair(key) - self.each { |i| return i if i.first == key } - return false + def keys + self.collect { |i| i.first } end + + private + def find_pair(key) + self.each { |i| return i if i.first == key } + return false + end + end end class OrderedOptions < ActiveSupport::OrderedHash #:nodoc: def []=(key, value) super(key.to_sym, value) end - + def [](key) super(key.to_sym) end @@ -41,4 +43,4 @@ class OrderedOptions < ActiveSupport::OrderedHash #:nodoc: self[name] end end -end
\ No newline at end of file +end diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 3aa135c28f..c67af60926 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -169,7 +169,7 @@ class TimeZone # A regular expression that matches the names of all time zones in # the USA. - US_ZONES = /US|Arizona|Indiana|Hawaii|Alaska/ + US_ZONES = /US|Arizona|Indiana|Hawaii|Alaska/ unless defined?(US_ZONES) # A convenience method for returning a collection of TimeZone objects # for time zones in the USA. diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb index 60c3d1ba86..44e3b87241 100644 --- a/activesupport/test/core_ext/kernel_test.rb +++ b/activesupport/test/core_ext/kernel_test.rb @@ -34,6 +34,8 @@ class KernelTest < Test::Unit::TestCase old_stderr_position = STDERR.tell silence_stderr { STDERR.puts 'hello world' } assert_equal old_stderr_position, STDERR.tell + rescue Errno::ESPIPE + # Skip if we can't STDERR.tell end def test_silence_stderr_with_return_value diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb index 06dd44cd2d..bd51aa11c3 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -127,7 +127,7 @@ class MethodAliasingTest < Test::Unit::TestCase end def test_alias_method_chain - assert @instance.respond_to? :bar + assert @instance.respond_to?(:bar) feature_aliases = [:bar_with_baz, :bar_without_baz] feature_aliases.each do |method| @@ -152,7 +152,7 @@ class MethodAliasingTest < Test::Unit::TestCase FooClassWithBarMethod.send(:include, BarMethodAliaser) FooClassWithBarMethod.alias_method_chain :quux!, :baz assert @instance.respond_to?(:quux_with_baz) - + assert_equal 'quux_with_baz', @instance.quux! assert_equal 'quux', @instance.quux_without_baz end |