Merge master

Author: dalibor

README.md

@@ -48,8 +48,9 @@ ba.total_set
 ```
 
 ## History
-- 2.0.0 in 2018 (Changed bits order to be compliant with Redis' setbit/getbit and fixed initialize with custom field)
-- 1.0.0 in 2017 (updated for modern Ruby, more efficient storage, and 10th birthday)
+- 2.0.0 in 2018 (Changed bits order to be compliant with Redis' setbit/getbit)
+- 1.1 in 2018 (fixed a significant bug)
+- 1.0 in 2017 (updated for modern Ruby, more efficient storage, and 10th birthday)
 - 0.0.1 in 2012 (original v5 released on GitHub)
 - v5 (added support for flags being on by default, instead of off)
 - v4 (fixed bug where setting 0 bits to 0 caused a set to 1)
@@ -61,6 +62,8 @@ ba.total_set
 
 Thanks to Michael Slade for encouraging me to update this library on its 10th birthday and for suggesting finally using String's getbyte and setbyte methods now that we're all on 1.9+ compatible implementations.
 
+Further thanks to @tdeo, @JoshuaSP, and @m1lt0n for pull requests.
+
 ## License
 
-MIT licensed. Copyright 2007-2017 Peter Cooper.
+MIT licensed. Copyright 2007-2018 Peter Cooper.

lib/bitarray-array.rb

@@ -3,7 +3,7 @@ class BitArray
   attr_reader :field
   include Enumerable
 
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
   ELEMENT_WIDTH = 32
 
   def initialize(size, field = nil)

lib/bitarray.rb

@@ -15,7 +15,7 @@ def []=(position, value)
     if value == 1
       @field.setbyte(position >> 3, @field.getbyte(position >> 3) | (1 << (7 - position % 8)))
     else
-      @field.setbyte(position >> 3, @field.getbyte(position >> 3) ^ (1 << (7 - position % 8)))
+      @field.setbyte(position >> 3, @field.getbyte(position >> 3) & ~(1 << (7 - position % 8)))
     end
   end
 

test/test_bitarray.rb

@@ -30,15 +30,19 @@ def test_random_setting_and_unsetting
 
   def test_multiple_setting
     1.upto(999) do |pos|
-      2.times { @public_ba[pos] = 1 }
-      assert_equal 1, @public_ba[pos]
+      2.times do
+        @public_ba[pos] = 1
+        assert_equal 1, @public_ba[pos]
+      end
     end
   end
 
   def test_multiple_unsetting
     1.upto(999) do |pos|
-      2.times { @public_ba[pos] = 0 }
-      assert_equal 0, @public_ba[pos]
+      2.times do
+        @public_ba[pos] = 0
+        assert_equal 0, @public_ba[pos]
+      end
     end
   end