sorted_array_binary 0.0.1 → 0.0.2

data/README.md

@@ -30,13 +30,16 @@ array.push 'b', 'a' #=> ['a', 'b']
 # Use custom sorting block.
 array = SortedArrayBinary.new { |a, b| b <=> a }
 array.push 'a', 'b' #=> ['b', 'a']
+
+# Nils not allowed.
+array.push nil #=> ArgumentError is raised
 ```
 
 ## Performance
 
 When #push'ing 1000 random numbers into an array:
 ```
-sorted_array (0.0.5)		1.179088
-array-sorted (1.1.2)		0.076348
+sorted_array        (0.0.5)     1.179088
+array-sorted        (1.1.2)     0.076348
 sorted_array_binary (0.0.1)     0.015969
 ```

data/lib/sorted_array_binary.rb

@@ -134,7 +134,7 @@ class SortedArrayBinary < Array
   def replace other_ary
     self.class._check_for_nil *other_ary
     super
-    old_sort!
+    old_sort! &@sort_block
     self
   end
 

data/sorted_array_binary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'sorted_array_binary'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = '2014-01-29'
   s.summary     = 'Sorted array'
   s.description = 'Sorted array using binary search'

data/spec/sorted_array_binary_spec.rb

@@ -2,6 +2,11 @@ require 'rspec'
 require 'spec_helper'
 require 'sorted_array_binary'
 
+def new_array_with_block
+  SortedArrayBinary.new { |a, b| b <=> a }
+end
+
+# {{{1 SortedArrayBinary
 describe SortedArrayBinary do
   before :each do
     @ar = SortedArrayBinary.new
@@ -81,17 +86,24 @@ describe SortedArrayBinary do
   # {{{2 #collect!
   [:collect!, :map!].each { |method|
     context "##{method}" do
-      it 'after it, array is sorted' do
-	@ar.push 'a', 'b', 'c'
-	@ar.send(method) { |el|
-	  case el
-	  when 'a' then 9
-	  when 'b' then 3
-	  when 'c' then 1
+      [false, true].each { |sort_block_given|
+	it 'after it, array is sorted' do
+	  @ar = new_array_with_block if sort_block_given
+	  @ar.push 'a', 'b', 'c'
+	  @ar.send(method) { |el|
+	    case el
+	    when 'a' then 9
+	    when 'b' then 3
+	    when 'c' then 1
+	    end
+	  }
+	  if sort_block_given
+	    @ar.should == [9, 3, 1]
+	  else
+	    @ar.should == [1, 3, 9]
 	  end
-	}
-	@ar.should == [1, 3, 9]
-      end
+	end
+      }
 
       it 'raises exception if one of resulting elements is nil' do
 	@ar.push 'a'
@@ -102,19 +114,35 @@ describe SortedArrayBinary do
   }
 
   # {{{2 #concat
-  it '#concat adds another array and everything is sorted' do
-    @ar.push 'c'
-    @ar.concat ['a', 'b']
-    @ar.should == ['a', 'b', 'c']
+  context '#concat' do
+    [false, true].each { |sort_block_given|
+      it '#concat adds another array and everything is sorted' do
+	@ar = new_array_with_block if sort_block_given
+	@ar.push 'c'
+	@ar.concat ['a', 'b']
+	if sort_block_given
+	  @ar.should == ['c', 'b', 'a']
+	else
+	  @ar.should == ['a', 'b', 'c']
+	end
+      end
+    }
   end
 
   # {{{2 #flatten!
   context '#flatten!' do
-    it 'flattens array' do
-      @ar.push [1, 2], [4, 3]
-      @ar.flatten!
-      @ar.should == [1, 2, 3, 4]
-    end
+    [false, true].each { |sort_block_given|
+      it 'flattens array and the result is sorted' do
+	@ar = new_array_with_block if sort_block_given
+	@ar.push [1, 2], [4, 3]
+	@ar.flatten!
+	if sort_block_given
+	  @ar.should == [4, 3, 2, 1]
+	else
+	  @ar.should == [1, 2, 3, 4]
+	end
+      end
+    }
 
     it 'raises exception if resulting array contains nil' do
       @ar.push [nil, 1]
@@ -158,11 +186,18 @@ describe SortedArrayBinary do
 
   # {{{2 #replace
   context '#replace' do
-    it '#replace replaces array, the resulting array is sorted' do
-      @ar.push 'a'
-      @ar.replace ['c', 'b']
-      @ar.should == ['b', 'c']
-    end
+    [false, true].each { |sort_block_given|
+      it '#replace replaces array, the resulting array is sorted' do
+	@ar = new_array_with_block if sort_block_given
+	@ar.push 'a'
+	@ar.replace ['c', 'b']
+	if sort_block_given
+	  @ar.should == ['c', 'b']
+	else
+	  @ar.should == ['b', 'c']
+	end
+      end
+    }
 
     it "doesn't allow nils" do
       expect { @ar.replace [nil] }.to raise_error ArgumentError
@@ -320,6 +355,7 @@ describe SortedArrayBinary do
   # }}}2
 end
 
+# {{{1 ComparisonState
 describe SortedArrayBinary::ComparisonState do
   [nil, -2, 2].each { |state|
     it "allows only valid state in" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorted_array_binary
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: