backports 1.1.0 → 1.1.1

data/README.rdoc

@@ -46,7 +46,7 @@ Works with ruby 1.8 & 1.9
   * +first+
 * Array
   * +flatten+, <tt>flatten!</tt>
-  * +find_index+, +index+
+  * +find_index+, +find+
 * Fixnum
   * <tt>odd?</tt>, <tt>even?</tt>
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 0
+:patch: 1

data/lib/backports/array.rb

@@ -53,7 +53,6 @@ class Array
       each_with_index{|o,i| return i if yield o}
       return nil
     end
-    
     alias_method_chain :index, :block
     alias_method :find_index, :index
   end

data/lib/backports/enumerable.rb

@@ -11,10 +11,19 @@ module Enumerable
   end unless method_defined? :sum
 
   # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Enumerable.html]
-  def find_index(obj = nil)
-    return index(obj) unless block_given?
-    each_with_index do |element, i|
-      return i if yield(element)
+  def find_index(*args)
+    if args.size == 1
+      obj = args.first
+      each_with_index do |element, i|
+        return i if element == obj
+      end
+    elsif block_given?
+      each_with_index do |element, i|
+        return i if yield element
+      end
+      each_with_index{|o,i| return i if yield o}
+    else
+      raise ArgumentError, "Wrong number of arguments (#{args.size} for 1)"
     end
     nil
   end unless method_defined? :find_index

data/test/backports_test.rb

@@ -6,6 +6,10 @@ class BackportsTest < Test::Unit::TestCase
       assert_equal 3, %w{ant bat cat dog}.find_index {|item| item =~ /g/ }
       assert_equal nil, %w{ant bat cat dog}.find_index {|item| item =~ /h/ }
     end
+
+    should "work for enumerables too" do
+      assert_equal 69-42, (42..666).find_index(69)
+    end
   end
 
   context "take" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"