From abefe32baaa5385e5cfc55d03ef294ab68bc001b Mon Sep 17 00:00:00 2001 From: Carlos Duclos Date: Sat, 1 Dec 2012 13:00:12 -0500 Subject: nodoc AS::Testing::Pending because is deprecated [ci skip] --- activesupport/lib/active_support/testing/pending.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb index 944806bb64..b04bbbbaea 100644 --- a/activesupport/lib/active_support/testing/pending.rb +++ b/activesupport/lib/active_support/testing/pending.rb @@ -2,8 +2,8 @@ require 'active_support/deprecation' module ActiveSupport module Testing - module Pending - unless defined?(Spec) + module Pending # :nodoc: + unless defined?(Spec) def pending(description = "", &block) ActiveSupport::Deprecation.warn("#pending is deprecated and will be removed in Rails 4.1, please use #skip instead.") skip(description.blank? ? nil : description) -- cgit v1.2.3 From 90c887fa7d0c454b7533e208daefc342dea4d5f3 Mon Sep 17 00:00:00 2001 From: Florent Guilleux Date: Sat, 1 Dec 2012 13:20:39 -0500 Subject: Remove trailing whitespaces --- activesupport/lib/active_support/gzip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/gzip.rb b/activesupport/lib/active_support/gzip.rb index 6ef33ab683..cc9e151ac2 100644 --- a/activesupport/lib/active_support/gzip.rb +++ b/activesupport/lib/active_support/gzip.rb @@ -9,7 +9,7 @@ module ActiveSupport # # => "\x1F\x8B\b\x00o\x8D\xCDO\x00\x03K\xCE\xCF-(J-.V\xC8MU\x04\x00R>n\x83\f\x00\x00\x00" # # ActiveSupport::Gzip.decompress(gzip) - # # => "compress me!" + # # => "compress me!" module Gzip class Stream < StringIO def initialize(*) -- cgit v1.2.3 From 8dc4041a9b2fb0e8bc2bcb72ab93adb8722e62cd Mon Sep 17 00:00:00 2001 From: Florent Guilleux Date: Sat, 1 Dec 2012 13:22:49 -0500 Subject: Revert "Remove trailing whitespaces" This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3. --- activesupport/lib/active_support/gzip.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/gzip.rb b/activesupport/lib/active_support/gzip.rb index cc9e151ac2..6ef33ab683 100644 --- a/activesupport/lib/active_support/gzip.rb +++ b/activesupport/lib/active_support/gzip.rb @@ -9,7 +9,7 @@ module ActiveSupport # # => "\x1F\x8B\b\x00o\x8D\xCDO\x00\x03K\xCE\xCF-(J-.V\xC8MU\x04\x00R>n\x83\f\x00\x00\x00" # # ActiveSupport::Gzip.decompress(gzip) - # # => "compress me!" + # # => "compress me!" module Gzip class Stream < StringIO def initialize(*) -- cgit v1.2.3 From 96f7ec4537e8618855467e7226d11182bd8a1111 Mon Sep 17 00:00:00 2001 From: HPNeo Date: Sat, 1 Dec 2012 14:57:27 -0500 Subject: Add documentation for Hash.from_xml [ci skip] --- .../lib/active_support/core_ext/hash/conversions.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 85b0e10be2..e1ce9f371a 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -88,6 +88,19 @@ class Hash end class << self + # Returns a Hash containing a collection of pairs when the key is the node name and the value is + # its content + # + # xml = <<-XML + # + # + # 1 + # 2 + # + # XML + # + # hash = Hash.from_xml(xml) + # # => {"hash"=>{"foo"=>1, "bar"=>2}} def from_xml(xml) typecast_xml_value(unrename_keys(ActiveSupport::XmlMini.parse(xml))) end -- cgit v1.2.3 From 82ebe186e6037115c958cbb2c9ff34a3fb7d3eb0 Mon Sep 17 00:00:00 2001 From: Carlos Duclos Date: Sat, 1 Dec 2012 14:57:35 -0500 Subject: nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip] --- activesupport/lib/active_support/testing/constant_lookup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/testing/constant_lookup.rb b/activesupport/lib/active_support/testing/constant_lookup.rb index 73e87befb6..52bfeb7179 100644 --- a/activesupport/lib/active_support/testing/constant_lookup.rb +++ b/activesupport/lib/active_support/testing/constant_lookup.rb @@ -30,7 +30,7 @@ module ActiveSupport module ConstantLookup extend ::ActiveSupport::Concern - module ClassMethods + module ClassMethods # :nodoc: def determine_constant_from_test_name(test_name) names = test_name.split "::" while names.size > 0 do -- cgit v1.2.3