Ticket #7501: select_with_regex.patch

lib/active_support/core_ext/array.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/array/conversions'
-require File.dirname(__FILE__) + '/array/grouping'
+require File.dirname(__FILE__) + '/array/selections'
-
-class Array #:nodoc:
-  include ActiveSupport::CoreExtensions::Array::Conversions
-  include ActiveSupport::CoreExtensions::Array::Grouping
+  include ActiveSupport::CoreExtensions::Array::Selections
-end

lib/active_support/core_ext/array/selections.rb

@@ +1 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module Array #:nodoc:
+      module Selections
+        
+        def select_with_regex(regex=nil, &block)
+          if regex.is_a? Regexp
+            block = Proc.new  {|word| word =~ regex}
+          end
+          self.send :select_without_regex, &block
+        end
+        
+        def self.included(base)
+          base.alias_method_chain :select, :regex
+        end
+      end
+    end
+  end
+end

test/core_ext/array_ext_test.rb

@@ -180 +180 @@
-    assert_equal 0, xml.rindex(/<\?xml /)
-  end
-end
+
+class ArrayExtSelectRegexTests < Test::Unit::TestCase
+  def test_select_with_regex_no_alias
+    assert_equal [], %w().select_with_regex(/foo/)
+    assert_equal(%w(foo too_foo_bar), %w(foo bar too_foo_bar fbar).select_with_regex(/foo/))
+  end
+
+  def test_select_by_regex
+    assert_equal [], %w().select(/foo/)
+    assert_equal(%w(foo too_foo_bar), %w(foo bar too_foo_bar fbar).select(/foo/))
+  end
+
+  def test_normal_select
+    assert_equal [], %w().select {|word| word =~ /foo/}
+    assert_equal(%w(foo too_foo_bar), %w(foo bar too_foo_bar fbar).select {|word| word =~ /foo/})
+  end
+
+  def test_normal_select_without_regex
+    assert_equal [], %w().send(:select_without_regex, &proc {|word| word =~ /foo/})
+    assert_equal %w(foo too_foo_bar), %w(foo bar too_foo_bar fbar).send(:select_without_regex, &proc {|word| word =~ /foo/})
+  end
+end