aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support.rb2
-rw-r--r--activesupport/lib/active_support/string_inquirer.rb11
-rw-r--r--activesupport/lib/active_support/string_questioneer.rb9
-rw-r--r--activesupport/test/string_inquirer_test.rb15
-rw-r--r--activesupport/test/string_questioneer_test.rb15
6 files changed, 28 insertions, 26 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 894b43928f..c7739fd7e0 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -4,7 +4,7 @@
* Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveSupport [Josh Peek]
-* Added StringQuestioneer for doing things like StringQuestioneer.new("production").production? # => true and StringQuestioneer.new("production").development? # => false [DHH]
+* Added StringInquirer for doing things like StringInquirer.new("production").production? # => true and StringInquirer.new("production").development? # => false [DHH]
* Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 2b418a1bb7..1a8603e892 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -43,7 +43,7 @@ require 'active_support/ordered_hash'
require 'active_support/ordered_options'
require 'active_support/option_merger'
-require 'active_support/string_questioneer'
+require 'active_support/string_inquirer'
require 'active_support/values/time_zone'
require 'active_support/duration'
diff --git a/activesupport/lib/active_support/string_inquirer.rb b/activesupport/lib/active_support/string_inquirer.rb
new file mode 100644
index 0000000000..65545748df
--- /dev/null
+++ b/activesupport/lib/active_support/string_inquirer.rb
@@ -0,0 +1,11 @@
+module ActiveSupport
+ class StringInquirer < String
+ def method_missing(method_name, *arguments)
+ if method_name.to_s.ends_with?("?")
+ self == method_name.to_s[0..-2]
+ else
+ super
+ end
+ end
+ end
+end
diff --git a/activesupport/lib/active_support/string_questioneer.rb b/activesupport/lib/active_support/string_questioneer.rb
deleted file mode 100644
index 7732f8b401..0000000000
--- a/activesupport/lib/active_support/string_questioneer.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class StringQuestioneer < String
- def method_missing(method_name, *arguments)
- if method_name.to_s.ends_with?("?")
- self == method_name.to_s[0..-2]
- else
- super
- end
- end
-end \ No newline at end of file
diff --git a/activesupport/test/string_inquirer_test.rb b/activesupport/test/string_inquirer_test.rb
new file mode 100644
index 0000000000..dda7850e6b
--- /dev/null
+++ b/activesupport/test/string_inquirer_test.rb
@@ -0,0 +1,15 @@
+require 'abstract_unit'
+
+class StringInquirerTest < Test::Unit::TestCase
+ def test_match
+ assert ActiveSupport::StringInquirer.new("production").production?
+ end
+
+ def test_miss
+ assert !ActiveSupport::StringInquirer.new("production").development?
+ end
+
+ def test_missing_question_mark
+ assert_raises(NoMethodError) { ActiveSupport::StringInquirer.new("production").production }
+ end
+end
diff --git a/activesupport/test/string_questioneer_test.rb b/activesupport/test/string_questioneer_test.rb
deleted file mode 100644
index ff9d2c17f9..0000000000
--- a/activesupport/test/string_questioneer_test.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'abstract_unit'
-
-class StringQuestioneerTest < Test::Unit::TestCase
- def test_match
- assert StringQuestioneer.new("production").production?
- end
-
- def test_miss
- assert !StringQuestioneer.new("production").development?
- end
-
- def test_missing_question_mark
- assert_raises(NoMethodError) { StringQuestioneer.new("production").production }
- end
-end \ No newline at end of file