Permalink
Browse files

moves reopening of core classes to add generic stuff from Action Pack…

… to AS/core_ext and adds tests

[#2798 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent 9eeb5fe commit b56169c26240db1b1cff3c6f65a34b7516a9fc15 @fxn fxn committed with jeremy Jun 13, 2009
View
53 actionpack/lib/action_controller/routing/routing_ext.rb
@@ -1,49 +1,4 @@
-class Object
- def to_param
- to_s
- end
-end
-
-class TrueClass
- def to_param
- self
- end
-end
-
-class FalseClass
- def to_param
- self
- end
-end
-
-class NilClass
- def to_param
- self
- end
-end
-
-class Regexp #:nodoc:
- def number_of_captures
- Regexp.new("|#{source}").match('').captures.length
- end
-
- def multiline?
- options & MULTILINE == MULTILINE
- end
-
- class << self
- def optionalize(pattern)
- case unoptionalize(pattern)
- when /\A(.|\(.*\))\Z/ then "#{pattern}?"
- else "(?:#{pattern})?"
- end
- end
-
- def unoptionalize(pattern)
- [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
- return $1 if regexp =~ pattern
- end
- return pattern
- end
- end
-end
+require 'active_support/core_ext/object/conversions'
+require 'active_support/core_ext/boolean/conversions'
+require 'active_support/core_ext/nil/conversions'
+require 'active_support/core_ext/regexp'
View
1 activesupport/lib/active_support/core_ext/boolean.rb
@@ -0,0 +1 @@
+require 'active_support/core_ext/boolean/conversions'
View
11 activesupport/lib/active_support/core_ext/boolean/conversions.rb
@@ -0,0 +1,11 @@
+class TrueClass
+ def to_param
+ self
+ end
+end
+
+class FalseClass
+ def to_param
+ self
+ end
+end
View
1 activesupport/lib/active_support/core_ext/nil.rb
@@ -0,0 +1 @@
+require 'active_support/core_ext/nil/conversions'
View
5 activesupport/lib/active_support/core_ext/nil/conversions.rb
@@ -0,0 +1,5 @@
+class NilClass
+ def to_param
+ self
+ end
+end
View
25 activesupport/lib/active_support/core_ext/regexp.rb
@@ -0,0 +1,25 @@
+class Regexp #:nodoc:
+ def number_of_captures
+ Regexp.new("|#{source}").match('').captures.length
+ end
+
+ def multiline?
+ options & MULTILINE == MULTILINE
+ end
+
+ class << self
+ def optionalize(pattern)
+ case unoptionalize(pattern)
+ when /\A(.|\(.*\))\Z/ then "#{pattern}?"
+ else "(?:#{pattern})?"
+ end
+ end
+
+ def unoptionalize(pattern)
+ [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
+ return $1 if regexp =~ pattern
+ end
+ return pattern
+ end
+ end
+end
View
9 activesupport/test/core_ext/boolean_ext_test.rb
@@ -0,0 +1,9 @@
+class BooleanExtAccessTests < Test::Unit::TestCase
+ def test_to_param_on_true
+ assert_equal true, true.to_param
+ end
+
+ def test_to_param_on_false
+ assert_equal false, false.to_param
+ end
+end
View
5 activesupport/test/core_ext/nil_ext_test.rb
@@ -0,0 +1,5 @@
+class NilExtAccessTests < Test::Unit::TestCase
+ def test_to_param
+ assert_nil nil.to_param
+ end
+end
View
6 activesupport/test/core_ext/object_ext_test.rb
@@ -5,4 +5,10 @@ def test_tap_yields_and_returns_self
foo = Object.new
assert_equal foo, foo.tap { |x| assert_equal foo, x; :bar }
end
+
+ def test_to_param
+ foo = Object.new
+ foo.class_eval("def to_s; 'foo'; end")
+ assert_equal 'foo', foo.to_param
+ end
end
View
26 activesupport/test/core_ext/regexp_ext_test.rb
@@ -0,0 +1,26 @@
+class RegexpExtAccessTests < Test::Unit::TestCase
+ def test_number_of_captures
+ assert_equal 0, //.number_of_captures
+ assert_equal 1, /.(.)./.number_of_captures
+ assert_equal 2, /.(.).(?:.).(.)/.number_of_captures
+ assert_equal 3, /.((.).(?:.).(.))/.number_of_captures
+ end
+
+ def test_multiline
+ assert //m.multiline?
+ assert ! //.multiline?
+ assert ! /(?m:)/.multiline?
+ end
+
+ def test_optionalize
+ assert "a?", Regexp.optionalize("a")
+ assert "(?:foo)?", Regexp.optionalize("foo")
+ assert "", Regexp.optionalize("")
+ end
+
+ def test_unoptionalize
+ assert "a", Regexp.unoptionalize("a?")
+ assert "foo", Regexp.unoptionalize("(?:foo)")
+ assert "", Regexp.unoptionalize("")
+ end
+end

1 comment on commit b56169c

@jviney

RegexpExtAccessTests#test_optionalize and #test_unoptionalize should be using assert_equals, not assert.

Please sign in to comment.