From b56169c26240db1b1cff3c6f65a34b7516a9fc15 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 13 Jun 2009 12:46:09 +0200 Subject: 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 --- .../lib/active_support/core_ext/boolean.rb | 1 + .../active_support/core_ext/boolean/conversions.rb | 11 +++++++++ activesupport/lib/active_support/core_ext/nil.rb | 1 + .../lib/active_support/core_ext/nil/conversions.rb | 5 +++++ .../lib/active_support/core_ext/regexp.rb | 25 +++++++++++++++++++++ activesupport/test/core_ext/boolean_ext_test.rb | 9 ++++++++ activesupport/test/core_ext/nil_ext_test.rb | 5 +++++ activesupport/test/core_ext/object_ext_test.rb | 6 +++++ activesupport/test/core_ext/regexp_ext_test.rb | 26 ++++++++++++++++++++++ 9 files changed, 89 insertions(+) create mode 100644 activesupport/lib/active_support/core_ext/boolean.rb create mode 100644 activesupport/lib/active_support/core_ext/boolean/conversions.rb create mode 100644 activesupport/lib/active_support/core_ext/nil.rb create mode 100644 activesupport/lib/active_support/core_ext/nil/conversions.rb create mode 100644 activesupport/lib/active_support/core_ext/regexp.rb create mode 100644 activesupport/test/core_ext/boolean_ext_test.rb create mode 100644 activesupport/test/core_ext/nil_ext_test.rb create mode 100644 activesupport/test/core_ext/regexp_ext_test.rb (limited to 'activesupport') diff --git a/activesupport/lib/active_support/core_ext/boolean.rb b/activesupport/lib/active_support/core_ext/boolean.rb new file mode 100644 index 0000000000..be834288f2 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/boolean.rb @@ -0,0 +1 @@ +require 'active_support/core_ext/boolean/conversions' \ No newline at end of file diff --git a/activesupport/lib/active_support/core_ext/boolean/conversions.rb b/activesupport/lib/active_support/core_ext/boolean/conversions.rb new file mode 100644 index 0000000000..534ebb7118 --- /dev/null +++ b/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 diff --git a/activesupport/lib/active_support/core_ext/nil.rb b/activesupport/lib/active_support/core_ext/nil.rb new file mode 100644 index 0000000000..e9f63c4802 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/nil.rb @@ -0,0 +1 @@ +require 'active_support/core_ext/nil/conversions' \ No newline at end of file diff --git a/activesupport/lib/active_support/core_ext/nil/conversions.rb b/activesupport/lib/active_support/core_ext/nil/conversions.rb new file mode 100644 index 0000000000..6ceb500a2a --- /dev/null +++ b/activesupport/lib/active_support/core_ext/nil/conversions.rb @@ -0,0 +1,5 @@ +class NilClass + def to_param + self + end +end diff --git a/activesupport/lib/active_support/core_ext/regexp.rb b/activesupport/lib/active_support/core_ext/regexp.rb new file mode 100644 index 0000000000..1a04c70d87 --- /dev/null +++ b/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 diff --git a/activesupport/test/core_ext/boolean_ext_test.rb b/activesupport/test/core_ext/boolean_ext_test.rb new file mode 100644 index 0000000000..751f703745 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/activesupport/test/core_ext/nil_ext_test.rb b/activesupport/test/core_ext/nil_ext_test.rb new file mode 100644 index 0000000000..945d3af239 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/activesupport/test/core_ext/object_ext_test.rb b/activesupport/test/core_ext/object_ext_test.rb index a413d331c4..72e3bffa4c 100644 --- a/activesupport/test/core_ext/object_ext_test.rb +++ b/activesupport/test/core_ext/object_ext_test.rb @@ -5,4 +5,10 @@ class ObjectExtTest < Test::Unit::TestCase 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 diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb new file mode 100644 index 0000000000..f71099856d --- /dev/null +++ b/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 \ No newline at end of file -- cgit v1.2.3