diff options
| author | Denis Odorcic <denis.odorcic@gmail.com> | 2010-11-09 23:49:52 -0500 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-10 16:43:26 -0200 |
| commit | b961c6c158d31e3648a3239ee6846ab98d027162 (patch) | |
| tree | aaee19883633e4f4f386f238882b789a70df4d36 | |
| parent | 41366cdec6003011e19971c1bcfb82949ff93a6e (diff) | |
| download | rails-b961c6c158d31e3648a3239ee6846ab98d027162.tar.gz rails-b961c6c158d31e3648a3239ee6846ab98d027162.tar.bz2 rails-b961c6c158d31e3648a3239ee6846ab98d027162.zip | |
Remove useless cgi
[#5943 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| -rw-r--r-- | activesupport/lib/active_support/core_ext/cgi.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb | 19 | ||||
| -rw-r--r-- | activesupport/test/core_ext/cgi_ext_test.rb | 15 | ||||
| -rw-r--r-- | railties/lib/rails/info.rb | 1 |
4 files changed, 0 insertions, 36 deletions
diff --git a/activesupport/lib/active_support/core_ext/cgi.rb b/activesupport/lib/active_support/core_ext/cgi.rb deleted file mode 100644 index 7279a3d4da..0000000000 --- a/activesupport/lib/active_support/core_ext/cgi.rb +++ /dev/null @@ -1 +0,0 @@ -require 'active_support/core_ext/cgi/escape_skipping_slashes' diff --git a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb b/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb deleted file mode 100644 index d3c3575748..0000000000 --- a/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'cgi' - -class CGI #:nodoc: - if RUBY_VERSION >= '1.9' - def self.escape_skipping_slashes(str) - str = str.join('/') if str.respond_to? :join - str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do - "%#{$1.unpack('H2' * $1.bytesize).join('%').upcase}" - end.tr(' ', '+') - end - else - def self.escape_skipping_slashes(str) - str = str.join('/') if str.respond_to? :join - str.gsub(/([^ \/a-zA-Z0-9_.-])/n) do - "%#{$1.unpack('H2').first.upcase}" - end.tr(' ', '+') - end - end -end diff --git a/activesupport/test/core_ext/cgi_ext_test.rb b/activesupport/test/core_ext/cgi_ext_test.rb deleted file mode 100644 index c80362e382..0000000000 --- a/activesupport/test/core_ext/cgi_ext_test.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'abstract_unit' -require 'active_support/core_ext/cgi' - -class EscapeSkippingSlashesTest < Test::Unit::TestCase - def test_array - assert_equal 'hello/world', CGI.escape_skipping_slashes(%w(hello world)) - assert_equal 'hello+world/how/are/you', CGI.escape_skipping_slashes(['hello world', 'how', 'are', 'you']) - end - - def test_typical - assert_equal 'hi', CGI.escape_skipping_slashes('hi') - assert_equal 'hi/world', CGI.escape_skipping_slashes('hi/world') - assert_equal 'hi/world+you+funky+thing', CGI.escape_skipping_slashes('hi/world you funky thing') - end -end diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb index 6cbd1f21c0..d05e031f56 100644 --- a/railties/lib/rails/info.rb +++ b/railties/lib/rails/info.rb @@ -1,5 +1,4 @@ require "cgi" -require "active_support/core_ext/cgi" module Rails module Info |