bis 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61336b18bc5e7fd8daa89f0cee4a5d47b5c66859
-  data.tar.gz: 22444418a3a00b1a78caf0d370f429643e0b09e8
+  metadata.gz: 77a393ad380bbdc924d6c8421d4afc0a6573e4de
+  data.tar.gz: 56cc67115897fb0e197639e4e9176142596e0ac5
 SHA512:
-  metadata.gz: 26a5973b6e2376bad37eb55462442123eec989701cf0ce69bf63301938c1d5062747eb9898b96b01a167c564d971f2623e29ba189d591c314d2ad5a4835d322c
-  data.tar.gz: a5d6122cc1cde1e84952266449693a7e3c386db2f4a79b4c92746d634f3f6810a1308f36c09b09ab81f150ec9c286a8f4845e328a41096f09ae17ede598fd680
+  metadata.gz: fd7bcd70ca222cb942773cc7eb9efbb9cc10c0a75681993a6593bd2c1231fbc25d8894c0be4d03d2055fa83805bc24b71c47101f1fb20142cd0ba3843326aa18
+  data.tar.gz: 7ec004c8dac647d18bd7131dd27c9fafab0c41a8910b12dedec51439db1960da4791932f76786a5c293a491407c4b3552b2a2dae2df8ca85b1d6aeb68e1fc9bd

data/README.md

@@ -7,7 +7,7 @@
                 (https://codeclimate.com/github/fuadsaud/bis)
 
 
-A pure ruby bitset implementation.
+A pure ruby immutable bitset implementation.
 
 ## Installation
 
@@ -16,14 +16,13 @@ A pure ruby bitset implementation.
 ## Usage
 
 ```ruby
-bis = Bis.new(8) #=> <<00000000>> 0
-
-bis.set(3) #=> <<00001000>> 8
-bis.set(3).set(2) #=> <<00001010>> 10
-bis2 = bis.set(3).set(2).clear(3) #=> <<00000010>> 2
-
-bis3 = bis2 << 4 #=> <<00100000>> 32
-bis3 + 1 #=> <<0010000001>> 65
+bis = Bis.new(8)  #=> <<00000000>> 0
+bis.set(3)        #=> <<00001000>> 8
+bis.set(3).set(2) #=> <<00001100>> 12
+bis2 = bis.set(3).set(2).clear(3) #=> <<00000100>> 4
+bis3 = bis2 << 4  #=> <<01000000>> 64
+bis3 + 1          #=> <<1000001>> 65
+bis3.concat(10)   #=> <<010000001010>> 1034
 ```
 
 ## Contributing

data/lib/bis.rb

@@ -2,21 +2,28 @@ require 'bis/conversion'
 require 'bis/version'
 
 class Bis
+  include Comparable
   include Enumerable
 
   def self.from_enum(enum)
-    Bis.new(enum.size, value: enum.join.to_i(2))
+    from_string(enum.join)
+  end
+
+  def self.from_string(string)
+    Bis.new(string.size, value: string.to_i(2))
   end
 
   attr_reader :size
   alias_method :length, :size
-  alias_method :bitlength, :size # Ruby 2.1 Integer interoperability
+
+  # Future versions of Ruby may have Fixnum#bitlength
+  alias_method :bitlength, :size
 
   def initialize(size, value: 0)
     fail ArgumentError, 'size must be >= 0' if size < 0
 
     @size = size.to_i
-    @store = value & ((1 << size) - 1)
+    @store = (value & ((1 << size) - 1)).to_i
   end
 
   def set(index)
@@ -34,14 +41,14 @@ class Bis
   end
 
   # Not sure if it's a good idead to implement this.
-  def []=(index, value)
-    with_valid_bit value do |bit|
-      case bit
-      when 1 then set index
-      when 0 then clear index
-      end
-    end
-  end
+  # def []=(index, value)
+  #   with_valid_bit value do |bit|
+  #     case bit
+  #     when 1 then set index
+  #     when 0 then clear index
+  #     end
+  #   end
+  # end
 
   def concat(other)
     size_and_value_for(other) do |other_size, other_value|
@@ -86,8 +93,15 @@ class Bis
   def each_byte
     return enum_for :each_byte unless block_given?
 
-    (size / 8).times.reverse_each do |offset|
-      yield Bis.new(8, value: (to_i >> offset * 8) & ((1 << 8) - 1))
+    full_bitset = if size % 8 != 0
+                    concat((1 << (8 - (size % 8))) - 1)
+                  else
+                    self
+                  end
+
+
+    (full_bitset.size / 8).times.reverse_each do |offset|
+      yield Bis.new(8, value: (full_bitset >> offset * 8) & ((1 << 8) - 1))
     end
   end
 
@@ -107,14 +121,6 @@ class Bis
     to_a.join
   end
 
-  def ==(other)
-    other == to_i
-  end
-
-  def ===(other)
-    to_i === other
-  end
-
   def <=>(other)
     to_i <=> Bis(other).to_i
   end
@@ -172,13 +178,13 @@ class Bis
 
   def bitlenght_for(bitset_or_integer)
     case bitset_or_integer
+    when Bis     then  bitset_or_integer.size
     when 0..1    then 1
     when 2       then 2
     when Integer then  Math.log2(bitset_or_integer).ceil
-    when Bis     then  bitset_or_integer.size
-    else fail ArgumentError, 'cannot resolve a bitlength'
-                             "#{ bitset_or_integer }. Must be either Integer"
-                             'or Bis'
+    else fail ArgumentError, 'cannot resolve a bitlength' +
+      "#{ bitset_or_integer }. Must be either Integer" +
+      'or Bis'
     end
   end
 end

data/lib/bis/version.rb

@@ -1,3 +1,3 @@
 class Bis
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/bis_spec.rb

@@ -423,21 +423,23 @@ describe Bis do
 
     context 'bitset has less than 8 bits' do
       let(:size) { 4 }
-      let(:value) { 0 }
+      let(:value) { 10 }
 
-      it "doesn't yield" do
-        expect { |b| subject.(b) }.to_not yield_control
+      it "yields many 1's as needed to fill a byte" do
+        expect { |b| subject.(b) }.to yield_with_args(0b10101111)
       end
     end
 
-    context 'bitset has at least pne byte' do
+    context 'bitset has at least one byte' do
       let(:size) { 16 }
-      let(:first_byte) { 38 }
-      let(:second_byte) { 213 }
+      let(:first_byte) { 0b00100110 }
+      let(:second_byte) { 0b11010101 }
       let(:value) { (first_byte << 8) | second_byte }
 
       it 'yields all the bytes' do
-        expect { |b| subject.(b) }.to yield_successive_args 38, 213
+        p Bis.new(size, value: value).each_byte.to_a
+        expect { |b| subject.(b) }.to yield_successive_args first_byte,
+                                                            second_byte
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bis
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Fuad Saud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake