more_core_extensions 1.2.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4e072368f5dec0db13f1df4e2ff8319494087d15
+  data.tar.gz: cf9f2bbb0c0a9ae9857a073479e44816ea622149
+SHA512:
+  metadata.gz: f2a860d28460607a3d28f51e140754171ee53e49c5546a25f5202f35f620e3d2bfb8609a3ffe6afbe826a0ccac48abe033d0e0f2a9a058d35450d67ce213d4c7
+  data.tar.gz: 4515f726acb409bff78d078e92f3ce56daf3d60d57f45858149782be684f5c33b213f132d71267171e03d577cc7c8fd21e66718d747a03d69077e558491e7ee5

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format progress
+--warnings
+--require spec_helper

data/README.md

@@ -2,11 +2,11 @@
 
 MoreCoreExtensions are a set of core extensions beyond those provided by ActiveSupport.
 
-[![Gem Version](https://badge.fury.io/rb/more_core_extensions.png)](http://badge.fury.io/rb/more_core_extensions)
-[![Build Status](https://travis-ci.org/ManageIQ/more_core_extensions.png?branch=master)](https://travis-ci.org/ManageIQ/more_core_extensions)
-[![Code Climate](https://codeclimate.com/github/ManageIQ/more_core_extensions.png)](https://codeclimate.com/github/ManageIQ/more_core_extensions)
-[![Coverage Status](https://coveralls.io/repos/ManageIQ/more_core_extensions/badge.png)](https://coveralls.io/r/ManageIQ/more_core_extensions)
-[![Dependency Status](https://gemnasium.com/ManageIQ/more_core_extensions.png)](https://gemnasium.com/ManageIQ/more_core_extensions)
+[![Gem Version](https://badge.fury.io/rb/more_core_extensions.svg)](http://badge.fury.io/rb/more_core_extensions)
+[![Build Status](https://travis-ci.org/ManageIQ/more_core_extensions.svg?branch=master)](https://travis-ci.org/ManageIQ/more_core_extensions)
+[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/more_core_extensions.svg)](https://codeclimate.com/github/ManageIQ/more_core_extensions)
+[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/more_core_extensions.svg)](https://coveralls.io/r/ManageIQ/more_core_extensions)
+[![Dependency Status](https://gemnasium.com/ManageIQ/more_core_extensions.svg)](https://gemnasium.com/ManageIQ/more_core_extensions)
 
 ## Extensions Provided
 

data/lib/more_core_extensions/core_ext/array/deletes.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 module MoreCoreExtensions
@@ -18,4 +19,4 @@ module MoreCoreExtensions
   end
 end
 
-Array.send(:include, MoreCoreExtensions::ArrayDeletes)
+Array.send(:include, MoreCoreExtensions::ArrayDeletes)

data/lib/more_core_extensions/core_ext/array/duplicates.rb

@@ -7,7 +7,7 @@ module MoreCoreExtensions
     #
     #   [1, 2, 3, 4, 2, 4].duplicates  #=> [2, 4]
     def duplicates
-      element_counts.reject { |k, v| v == 1 }.keys
+      element_counts.select { |_k, v| v > 1 }.keys
     end
   end
 end

data/lib/more_core_extensions/core_ext/array/element_counts.rb

@@ -1,10 +1,16 @@
 module MoreCoreExtensions
   module ArrayElementCounts
-    # Returns a Hash of each element to the count of those elements.
+    # Returns a Hash of each element to the count of those elements.  Optionally
+    #  pass a block to count by a different criteria.
     #
     #   [1, 2, 3, 1, 3, 1].counts  # => {1 => 3, 2 => 1, 3 => 2}
+    #   %w(a aa aaa a aaa a).counts { |i| i.length }  # => {1 => 3, 2 => 1, 3 => 2}
+    #
     def element_counts
-      each_with_object(Hash.new(0)) { |i, h| h[i] += 1 }
+      each_with_object(Hash.new(0)) do |i, h|
+        key = block_given? ? yield(i) : i
+        h[key] += 1
+      end
     end
   end
 end

data/lib/more_core_extensions/core_ext/array/inclusions.rb

@@ -7,6 +7,7 @@ module MoreCoreExtensions
     #   [1, 2, 3].include_any?(1, 4)  #=> true
     #   [1, 2, 3].include_any?(4, 5)  #=> false
     def include_any?(*items)
+      items = items.first if items.length == 1 && items.first.kind_of?(Array)
       !(self & items).empty?
     end
 
@@ -17,6 +18,7 @@ module MoreCoreExtensions
     #   [1, 2, 3].include_none?(1, 4)  #=> false
     #   [1, 2, 3].include_none?(4, 5)  #=> true
     def include_none?(*items)
+      items = items.first if items.length == 1 && items.first.kind_of?(Array)
       (self & items).empty?
     end
 
@@ -27,6 +29,7 @@ module MoreCoreExtensions
     #   [1, 2, 3].include_all?(1, 4)  #=> false
     #   [1, 2, 3].include_all?(4, 5)  #=> false
     def include_all?(*items)
+      items = items.first if items.length == 1 && items.first.kind_of?(Array)
       (items - self).empty?
     end
 

data/lib/more_core_extensions/core_ext/hash/deletes.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 module MoreCoreExtensions

data/lib/more_core_extensions/core_ext/object/namespace.rb

@@ -11,15 +11,7 @@ module MoreCoreExtensions
     #   Aaa::Bbb::Ccc::Eee.in_namespace?(Aaa::Bbb::Ccc::Ddd)  #=> false
     def in_namespace?(val)
       val_ns = val.to_s.split("::")
-      val_ns == namespace[0, val_ns.length]
-    end
-
-    #
-    # Returns an Array with the namespace to an Instance.
-    #
-    #   Aaa::Bbb::Ccc::Ddd.new.namespace  #=> ["Aaa", "Bbb", "Ccc", "Ddd"]
-    def namespace
-      self.class.namespace
+      val_ns == (kind_of?(Module) ? namespace : self.class.namespace)[0, val_ns.length]
     end
   end
 end

data/lib/more_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module MoreCoreExtensions
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/spec/core_ext/array/deletes_spec.rb

@@ -1,17 +1,15 @@
-require_relative "../../spec_helper"
-
 describe Array do
   it "#delete_nils" do
-    [].delete_nils.should == []
-    [1].delete_nils.should == [1]
-    [nil].delete_nils.should == []
-    [1, [], nil].delete_nils.should == [1, []]
+    expect([].delete_nils).to eq([])
+    expect([1].delete_nils).to eq([1])
+    expect([nil].delete_nils).to eq([])
+    expect([1, [], nil].delete_nils).to eq([1, []])
   end
 
   it "#delete_blanks" do
-    [].delete_blanks.should == []
-    [1].delete_blanks.should == [1]
-    [nil].delete_blanks.should == []
-    [1, [], nil].delete_blanks.should == [1]
+    expect([].delete_blanks).to eq([])
+    expect([1].delete_blanks).to eq([1])
+    expect([nil].delete_blanks).to eq([])
+    expect([1, [], nil].delete_blanks).to eq([1])
   end
-end
+end

data/spec/core_ext/array/duplicates_spec.rb

@@ -1,11 +1,9 @@
-require_relative "../../spec_helper"
-
 describe Array do
   it '#duplicates' do
-    [1, 2, 3, 4].duplicates.should be_empty
-    [1, 2, 3, 4, 2, 4].duplicates.should match_array [2, 4]
+    expect([1, 2, 3, 4].duplicates).to be_empty
+    expect([1, 2, 3, 4, 2, 4].duplicates).to match_array [2, 4]
 
-    ['1', '2', '3', '4'].duplicates.should be_empty
-    ['1', '2', '3', '4', '2', '4'].duplicates.should match_array ['2', '4']
+    expect(['1', '2', '3', '4'].duplicates).to be_empty
+    expect(['1', '2', '3', '4', '2', '4'].duplicates).to match_array ['2', '4']
   end
 end

data/spec/core_ext/array/element_counts_spec.rb

@@ -1,10 +1,16 @@
-require "spec_helper"
-
 describe Array do
-  it "#element_counts" do
-    [].element_counts.should == {}
-    [1].element_counts.should == {1 => 1}
-    [nil].element_counts.should == {nil => 1}
-    [1, 2, 3, 1, 3, 1].element_counts.should == {1 => 3, 2 => 1, 3 => 2}
+  describe "#element_counts" do
+    it "without a block" do
+      expect([].element_counts).to eq({})
+      expect([1].element_counts).to eq({1 => 1})
+      expect([nil].element_counts).to eq({nil => 1})
+      expect([1, 2, 3, 1, 3, 1].element_counts).to eq({1 => 3, 2 => 1, 3 => 2})
+    end
+
+    it "with a block" do
+      expect([].element_counts(&:size)).to eq({})
+      expect(%w(a).element_counts(&:size)).to eq({1 => 1})
+      expect(%w(a aa aaa a aaa a).element_counts(&:size)).to eq({1 => 3, 2 => 1, 3 => 2})
+    end
   end
 end

data/spec/core_ext/array/inclusions_spec.rb

@@ -1,41 +1,51 @@
-require_relative "../../spec_helper"
-
 describe Array do
   it '#include_any?' do
-    [1, 2, 3].include_any?(1, 2).should be_true
-    [1, 2, 3].include_any?(1, 4).should be_true
-    [1, 2, 3].include_any?(4, 5).should be_false
+    expect([1, 2, 3].include_any?(1, 2)).to be_truthy
+    expect([1, 2, 3].include_any?(1, 4)).to be_truthy
+    expect([1, 2, 3].include_any?(4, 5)).to be_falsey
+    expect([1, 2, 3].include_any?([1, 4])).to be_truthy
+    expect([1, 2, 3].include_any?([4, 5])).to be_falsey
 
-    ['1', '2', '3'].include_any?('1', '2').should be_true
-    ['1', '2', '3'].include_any?('1', '4').should be_true
-    ['1', '2', '3'].include_any?('4', '5').should be_false
+    expect(['1', '2', '3'].include_any?('1', '2')).to be_truthy
+    expect(['1', '2', '3'].include_any?('1', '4')).to be_truthy
+    expect(['1', '2', '3'].include_any?('4', '5')).to be_falsey
+    expect(['1', '2', '3'].include_any?(['1', '4'])).to be_truthy
+    expect(['1', '2', '3'].include_any?(['4', '5'])).to be_falsey
   end
 
   it '#include_none?' do
-    [1, 2, 3].include_none?(1, 2).should be_false
-    [1, 2, 3].include_none?(1, 4).should be_false
-    [1, 2, 3].include_none?(4, 5).should be_true
+    expect([1, 2, 3].include_none?(1, 2)).to be_falsey
+    expect([1, 2, 3].include_none?(1, 4)).to be_falsey
+    expect([1, 2, 3].include_none?(4, 5)).to be_truthy
+    expect([1, 2, 3].include_none?([1, 4])).to be_falsey
+    expect([1, 2, 3].include_none?([4, 5])).to be_truthy
 
-    ['1', '2', '3'].include_none?('1', '2').should be_false
-    ['1', '2', '3'].include_none?('1', '4').should be_false
-    ['1', '2', '3'].include_none?('4', '5').should be_true
+    expect(['1', '2', '3'].include_none?('1', '2')).to be_falsey
+    expect(['1', '2', '3'].include_none?('1', '4')).to be_falsey
+    expect(['1', '2', '3'].include_none?('4', '5')).to be_truthy
+    expect(['1', '2', '3'].include_none?(['1', '4'])).to be_falsey
+    expect(['1', '2', '3'].include_none?(['4', '5'])).to be_truthy
   end
 
   it '#include_all?' do
-    [1, 2, 3].include_all?(1, 2).should be_true
-    [1, 2, 3].include_all?(1, 4).should be_false
-    [1, 2, 3].include_all?(4, 5).should be_false
+    expect([1, 2, 3].include_all?(1, 2)).to be_truthy
+    expect([1, 2, 3].include_all?(1, 4)).to be_falsey
+    expect([1, 2, 3].include_all?(4, 5)).to be_falsey
+    expect([1, 2, 3].include_all?([1, 2])).to be_truthy
+    expect([1, 2, 3].include_all?([1, 4])).to be_falsey
 
-    ['1', '2', '3'].include_all?('1', '2').should be_true
-    ['1', '2', '3'].include_all?('1', '4').should be_false
-    ['1', '2', '3'].include_all?('4', '5').should be_false
+    expect(['1', '2', '3'].include_all?('1', '2')).to be_truthy
+    expect(['1', '2', '3'].include_all?('1', '4')).to be_falsey
+    expect(['1', '2', '3'].include_all?('4', '5')).to be_falsey
+    expect(['1', '2', '3'].include_all?(['1', '2'])).to be_truthy
+    expect(['1', '2', '3'].include_all?(['1', '4'])).to be_falsey
   end
 
   it "#includes_index?" do
-    [1, 2, 3].includes_index?(-4).should be_false
-    [1, 2, 3].includes_index?(-3).should be_true
-    [1, 2, 3].includes_index?(1).should be_true
-    [1, 2, 3].includes_index?(2).should be_true
-    [1, 2, 3].includes_index?(3).should be_false
+    expect([1, 2, 3].includes_index?(-4)).to be_falsey
+    expect([1, 2, 3].includes_index?(-3)).to be_truthy
+    expect([1, 2, 3].includes_index?(1)).to be_truthy
+    expect([1, 2, 3].includes_index?(2)).to be_truthy
+    expect([1, 2, 3].includes_index?(3)).to be_falsey
   end
 end

data/spec/core_ext/array/nested_spec.rb

@@ -1,5 +1,3 @@
-require_relative "../../spec_helper"
-
 shared_examples_for "core_ext/array/nested will not modify arguments" do |meth|
   it "will not modify arguments" do
     args = (meth == :store_path ? [1] : [])
@@ -7,44 +5,44 @@ shared_examples_for "core_ext/array/nested will not modify arguments" do |meth|
     key  = [3, 0, 1, 2]
     key2 = key.dup
     array.send(meth, key2, *args)
-    key2.should == key
+    expect(key2).to eq(key)
 
     key  = [4, 0, 1]
     key2 = key.dup
     array.send(meth, key2, *args)
-    key2.should == key
+    expect(key2).to eq(key)
   end
 end
 
 shared_examples_for "core_ext/array/nested" do
   context '#fetch_path' do
     it "with various values" do
-      array.fetch_path(0).should == 1
-      array.fetch_path(1).should == []
-      array.fetch_path(1, 0).should be_nil
-      array.fetch_path(1, 0, 1).should be_nil
-      array.fetch_path(2).should == [2]
-      array.fetch_path(2, 0).should == 2
-      array.fetch_path(-4, 0).should == 2
-      array.fetch_path(2, 0, 1).should be_nil
-      array.fetch_path(3, 0, 0, 0).should == 3
-      array.fetch_path(3, 0, 1, 999).should be_nil
-      array.fetch_path(3, 0, 1, 2, 3).should be_nil
-      array.fetch_path(4).should == [nil, nil, nil, nil]
-      array.fetch_path(4, 0).should be_nil
-      array.fetch_path(4, 0, 1).should be_nil
-      array.fetch_path(5).should == []
-      array.fetch_path(5, 0).should be_nil
-      array.fetch_path(5, 0, 1).should be_nil
+      expect(array.fetch_path(0)).to eq(1)
+      expect(array.fetch_path(1)).to eq([])
+      expect(array.fetch_path(1, 0)).to be_nil
+      expect(array.fetch_path(1, 0, 1)).to be_nil
+      expect(array.fetch_path(2)).to eq([2])
+      expect(array.fetch_path(2, 0)).to eq(2)
+      expect(array.fetch_path(-4, 0)).to eq(2)
+      expect(array.fetch_path(2, 0, 1)).to be_nil
+      expect(array.fetch_path(3, 0, 0, 0)).to eq(3)
+      expect(array.fetch_path(3, 0, 1, 999)).to be_nil
+      expect(array.fetch_path(3, 0, 1, 2, 3)).to be_nil
+      expect(array.fetch_path(4)).to eq([nil, nil, nil, nil])
+      expect(array.fetch_path(4, 0)).to be_nil
+      expect(array.fetch_path(4, 0, 1)).to be_nil
+      expect(array.fetch_path(5)).to eq([])
+      expect(array.fetch_path(5, 0)).to be_nil
+      expect(array.fetch_path(5, 0, 1)).to be_nil
     end
 
     it "with a nil value should raise ArgumentError" do
-      lambda { array.fetch_path(nil) }.should raise_error(ArgumentError)
-      lambda { array.fetch_path(3, nil, 0) }.should raise_error(ArgumentError)
+      expect { array.fetch_path(nil) }.to raise_error(ArgumentError)
+      expect { array.fetch_path(3, nil, 0) }.to raise_error(ArgumentError)
     end
 
     it "with invalid values" do
-      lambda { array.fetch_path }.should raise_error(ArgumentError)
+      expect { array.fetch_path }.to raise_error(ArgumentError)
     end
 
     include_examples "core_ext/array/nested will not modify arguments", :fetch_path
@@ -54,56 +52,56 @@ shared_examples_for "core_ext/array/nested" do
     it "on an empty array" do
       a = described_class.new
       a.store_path(0, 1)
-      a.should == [1]
+      expect(a).to eq([1])
 
       a = described_class.new
       a.store_path(1, 0, 2)
-      a.should == [nil, [2]]
+      expect(a).to eq([nil, [2]])
     end
 
     it "on an existing array" do
       array.store_path(1, 0, 2)
-      array[1].should == [2]
+      expect(array[1]).to eq([2])
       array.store_path(2, 0, 3)
-      array[2].should == [3]
+      expect(array[2]).to eq([3])
       array.store_path(-4, 0, 3)
-      array[2].should == [3]
+      expect(array[2]).to eq([3])
     end
 
     it "on an existing item that is not a array" do
       array.store_path(0, 2)
-      array[0].should == 2
+      expect(array[0]).to eq(2)
       array.store_path(0, 0, 3)
-      array[0].should == [3]
+      expect(array[0]).to eq([3])
     end
 
     it "with an array of args" do
       a = described_class.new
       a.store_path([3, 0, 1, 2], 3)
-      a.should == [nil, nil, nil, [[nil, [nil, nil, 3]]]]
+      expect(a).to eq([nil, nil, nil, [[nil, [nil, nil, 3]]]])
     end
 
     it "with a nil value" do
       a = described_class.new
       a.store_path(0, 1, nil)
-      a.should == [[nil, nil]]
+      expect(a).to eq([[nil, nil]])
     end
 
     it "with an Array value" do
       a = described_class.new
       a.store_path(0, 1, [2, 3])
-      a.should == [[nil, [2, 3]]]
+      expect(a).to eq([[nil, [2, 3]]])
     end
 
     it "with a Hash value" do
       a = described_class.new
       a.store_path(0, 1, {2 => 3})
-      a.should == [[nil, {2 => 3}]]
+      expect(a).to eq([[nil, {2 => 3}]])
     end
 
     it "with invalid values" do
-      lambda { described_class.new.store_path }.should raise_error(ArgumentError)
-      lambda { described_class.new.store_path(1) }.should raise_error(ArgumentError)
+      expect { described_class.new.store_path }.to raise_error(ArgumentError)
+      expect { described_class.new.store_path(1) }.to raise_error(ArgumentError)
     end
 
     include_examples "core_ext/array/nested will not modify arguments", :store_path
@@ -111,31 +109,31 @@ shared_examples_for "core_ext/array/nested" do
 
   context '#has_key_path?' do
     it "with various values" do
-      array.has_key_path?(0).should be_true
-      array.has_key_path?(1).should be_true
-      array.has_key_path?(1, 0).should be_false
-      array.has_key_path?(1, 0, 1).should be_false
-      array.has_key_path?(2).should be_true
-      array.has_key_path?(2, 0).should be_true
-      array.has_key_path?(2, 0, 1).should be_false
-      array.has_key_path?(3, 0, 1, 2).should be_false
-      array.has_key_path?(3, 0, 1, 999).should be_false
-      array.has_key_path?(3, 0, 1, 2, 3).should be_false
-      array.has_key_path?(4).should be_true
-      array.has_key_path?(4, 0).should be_true
-      array.has_key_path?(4, 0, 1).should be_false
-      array.has_key_path?(5).should be_true
-      array.has_key_path?(5, 0).should be_false
-      array.has_key_path?(5, 0, 1).should be_false
+      expect(array.has_key_path?(0)).to be_truthy
+      expect(array.has_key_path?(1)).to be_truthy
+      expect(array.has_key_path?(1, 0)).to be_falsey
+      expect(array.has_key_path?(1, 0, 1)).to be_falsey
+      expect(array.has_key_path?(2)).to be_truthy
+      expect(array.has_key_path?(2, 0)).to be_truthy
+      expect(array.has_key_path?(2, 0, 1)).to be_falsey
+      expect(array.has_key_path?(3, 0, 1, 2)).to be_falsey
+      expect(array.has_key_path?(3, 0, 1, 999)).to be_falsey
+      expect(array.has_key_path?(3, 0, 1, 2, 3)).to be_falsey
+      expect(array.has_key_path?(4)).to be_truthy
+      expect(array.has_key_path?(4, 0)).to be_truthy
+      expect(array.has_key_path?(4, 0, 1)).to be_falsey
+      expect(array.has_key_path?(5)).to be_truthy
+      expect(array.has_key_path?(5, 0)).to be_falsey
+      expect(array.has_key_path?(5, 0, 1)).to be_falsey
     end
 
     it "with a nil value" do
-      lambda { array.fetch_path(nil) }.should raise_error(ArgumentError)
-      lambda { array.fetch_path(3, nil, 0) }.should raise_error(ArgumentError)
+      expect { array.fetch_path(nil) }.to raise_error(ArgumentError)
+      expect { array.fetch_path(3, nil, 0) }.to raise_error(ArgumentError)
     end
 
     it "with invalid values" do
-      lambda { array.has_key_path? }.should raise_error(ArgumentError)
+      expect { array.has_key_path? }.to raise_error(ArgumentError)
     end
 
     include_examples "core_ext/array/nested will not modify arguments", :has_key_path?
@@ -144,28 +142,28 @@ shared_examples_for "core_ext/array/nested" do
   context "#delete_path" do
     it "on a nested array" do
       array.delete_path(3, 0, 0, 0)
-      array[3].should == [[[]]]
+      expect(array[3]).to eq([[[]]])
     end
 
     it "with an invalid path" do
       array.delete_path(3, 0, 5)
-      array[3].should == [[[3]]]
+      expect(array[3]).to eq([[[3]]])
     end
 
     include_examples "core_ext/array/nested will not modify arguments", :delete_path
   end
 
   it "#delete_blank_paths" do
-    array.delete_blank_paths.should == [1, [2], [[[3]]]]
+    expect(array.delete_blank_paths).to eq([1, [2], [[[3]]]])
   end
 
   context "#find_path" do
     it "with a real value" do
-      array.find_path(3).should == [3, 0, 0, 0]
+      expect(array.find_path(3)).to eq([3, 0, 0, 0])
     end
 
     it "with non-existent value" do
-      array.find_path(42).should == []
+      expect(array.find_path(42)).to eq([])
     end
   end
 end
@@ -177,9 +175,9 @@ describe Array do
       [2],
       [[[3]]],
       Array.new(4),
-      described_class.new { |i| i = described_class.new }
+      described_class.new
     ]
   end
 
   include_examples "core_ext/array/nested"
-end
+end

data/spec/core_ext/array/random_spec.rb

@@ -1,5 +1,3 @@
-require_relative "../../spec_helper"
-
 describe Array do
   around do |example|
     old_seed = srand(12072)
@@ -8,16 +6,16 @@ describe Array do
   end
 
   it '#random_index' do
-    20.times.collect { [].random_index }.uniq.sort.should          == [nil]
-    20.times.collect { %w{a}.random_index }.uniq.sort.should       == [0]
-    20.times.collect { %w{a b}.random_index }.uniq.sort.should     == [0, 1]
-    20.times.collect { %w{a b c d}.random_index }.uniq.sort.should == [0, 1, 2, 3]
+    expect(20.times.collect { [].random_index }.uniq.sort).to          eq([nil])
+    expect(20.times.collect { %w{a}.random_index }.uniq.sort).to       eq([0])
+    expect(20.times.collect { %w{a b}.random_index }.uniq.sort).to     eq([0, 1])
+    expect(20.times.collect { %w{a b c d}.random_index }.uniq.sort).to eq([0, 1, 2, 3])
   end
 
   it '#random_element' do
-    20.times.collect { [].random_element }.uniq.sort.should          == [nil]
-    20.times.collect { %w{a}.random_element }.uniq.sort.should       == %w{a}
-    20.times.collect { %w{a b}.random_element }.uniq.sort.should     == %w{a b}
-    20.times.collect { %w{a b c d}.random_element }.uniq.sort.should == %w{a b c d}
+    expect(20.times.collect { [].random_element }.uniq.sort).to          eq([nil])
+    expect(20.times.collect { %w{a}.random_element }.uniq.sort).to       eq(%w{a})
+    expect(20.times.collect { %w{a b}.random_element }.uniq.sort).to     eq(%w{a b})
+    expect(20.times.collect { %w{a b c d}.random_element }.uniq.sort).to eq(%w{a b c d})
   end
 end

data/spec/core_ext/array/stretch_spec.rb

@@ -1,5 +1,3 @@
-require_relative "../../spec_helper"
-
 describe Array do
   STRETCH_CASES = [
     # 2 parameter cases
@@ -28,8 +26,8 @@ describe Array do
       it "where #{msg}" do
         result = Array.stretch(*test_case)
         result.each_with_index do |r, i|
-          r.should_not equal(test_case[i])
-          r.should == expected[i]
+          expect(r).not_to equal(test_case[i])
+          expect(r).to eq(expected[i])
         end
       end
     end
@@ -40,8 +38,8 @@ describe Array do
       it "where #{msg}" do
         result = Array.stretch!(*test_case)
         result.each_with_index do |r, i|
-          r.should equal(test_case[i])
-          r.should == expected[i]
+          expect(r).to equal(test_case[i])
+          expect(r).to eq(expected[i])
         end
       end
     end
@@ -52,8 +50,8 @@ describe Array do
       it "where #{msg}" do
         receiver, params = test_case[0], test_case[1..-1]
         result = receiver.stretch(*params)
-        result.should_not equal(receiver)
-        result.should == expected[0]
+        expect(result).not_to equal(receiver)
+        expect(result).to eq(expected[0])
       end
     end
   end
@@ -63,8 +61,8 @@ describe Array do
       it "where #{msg}" do
         receiver, params = test_case[0].dup, test_case[1..-1]
         result = receiver.stretch!(*params)
-        result.should equal(receiver)
-        result.should == expected[0]
+        expect(result).to equal(receiver)
+        expect(result).to eq(expected[0])
       end
     end
   end
@@ -89,7 +87,7 @@ describe Array do
   context '#zip_stretched' do
     ZIP_STRETCHED_CASES.each_slice(4) do |msg, receiver, params, expected|
       it "where #{msg}" do
-        receiver.zip_stretched(*params).should == expected
+        expect(receiver.zip_stretched(*params)).to eq(expected)
       end
     end
   end