json-bloomfilter 0.0.2 → 0.0.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json-bloomfilter (0.0.2)
+    json-bloomfilter (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -4,6 +4,8 @@ A bloomfilter implementation in both Ruby and Javascript that can be serialised
 
 ## Release notes
 
+* **0.0.3** Added Ruby tests
+* **0.0.2** First implementation of both Ruby and JS filters
 * **0.0.1** Skeleton
 
 ## License

data/Rakefile

@@ -54,7 +54,7 @@ namespace :js do
       coffee_script += File.read(filename) + "\n"
     end
 
-    js_file = "js/bloomfilter.js"
+    js_file = "js/json-bloomfilter.js"
     directory_name = File.dirname js_file
     FileUtils.mkdir_p(directory_name) unless File.exists? directory_name
     puts "\t\t->#{js_file}"
@@ -68,8 +68,8 @@ namespace :js do
     filename = args[:filename]
     compressor = YUI::JavaScriptCompressor.new
 
-    js_file = "js/bloomfilter.js"
-    min_file = "js/bloomfilter.min.js"
+    js_file = "js/json-bloomfilter.js"
+    min_file = "js/json-bloomfilter.min.js"
 
     puts "\t\t->#{min_file}"
     directory_name = File.dirname min_file

data/coffee/bitarray.coffee

@@ -1,46 +1,43 @@
-JsonBloomfilter.BitArray =
-    size: null
-    field: null
-
-    ELEMENT_WIDTH: 32
-
-    new: (size, field = null) ->
-      @size = size
-      arrayLength = Math.floor(((size - 1) / @ELEMENT_WIDTH) + 1)
-      @field = field || []
-      @field[i] = 0 for i in [0..arrayLength] unless field
-      this
-
-    add: (position) ->
-      @set(position, 1)
-
-    remove: (position) ->
-      @set(position, 0)
-
-    set: (position, value) ->
-      aPos = @arrayPosition(position)
-      bChange = @bitChange(position)
-      if value == 1
-        @field[aPos] |= bChange
-      else if @field[aPos] & bChange != 0
-        @field[aPos] ^= bChange
-      true
-
-    get: (position) ->
-      aPos = @arrayPosition(position)
-      bChange = @bitChange(position)
-      if (@field[aPos] & bChange) > 0
-        return 1
-      else
-        return 0
-
-    arrayPosition: (position) ->
-      Math.floor(position / @ELEMENT_WIDTH)
-
-    bitChange: (position) ->
-      Math.abs(1 << position % @ELEMENT_WIDTH)
-
-    toString: ->
-      output = ""
-      output += @get(i) for i in [0..@size-1]
-      output
+JsonBloomfilter.BitArray = (size, field = null) ->
+  @ELEMENT_WIDTH = 32
+  @size = size
+  @field = field || []
+
+  arrayLength = Math.floor(((size - 1) / @ELEMENT_WIDTH) + 1)
+  @field[i] = 0 for i in [0..arrayLength] unless field
+
+  this
+
+JsonBloomfilter.BitArray.prototype.add = (position) ->
+  @set(position, 1)
+
+JsonBloomfilter.BitArray.prototype.remove = (position) ->
+  @set(position, 0)
+
+JsonBloomfilter.BitArray.prototype.set = (position, value) ->
+  aPos = @arrayPosition(position)
+  bChange = @bitChange(position)
+  if value == 1
+    @field[aPos] |= bChange
+  else if @field[aPos] & bChange != 0
+    @field[aPos] ^= bChange
+  true
+
+JsonBloomfilter.BitArray.prototype.get = (position) ->
+  aPos = @arrayPosition(position)
+  bChange = @bitChange(position)
+  if (@field[aPos] & bChange) > 0
+    return 1
+  else
+    return 0
+
+JsonBloomfilter.BitArray.prototype.arrayPosition = (position) ->
+  Math.floor(position / @ELEMENT_WIDTH)
+
+JsonBloomfilter.BitArray.prototype.bitChange = (position) ->
+  Math.abs(1 << position % @ELEMENT_WIDTH)
+
+JsonBloomfilter.BitArray.prototype.toString = ->
+  output = ""
+  output += @get(i) for i in [0..@size-1]
+  output

data/coffee/bloomfilter.coffee

@@ -1,40 +1,38 @@
-JsonBloomfilter =
-  bits: null
-  options:
+JsonBloomfilter = (options = {}) ->
+  @options =
     size: 100,
     hashes: 4,
     seed: (new Date().getTime() / 1000),
     bits: null
 
-  new: (options = {}) ->
-    @options[key] = value for key, value of options
-    @bits = @BitArray.new(@options["size"], @options["bits"])
-    this
+  @options[key] = value for key, value of options
+  @bits = new JsonBloomfilter.BitArray(@options["size"], @options["bits"])
+  this
 
-  add: (key) ->
-    @bits.add(index) for index in @indexesFor(key)
-    return
+JsonBloomfilter.prototype.add = (key) ->
+  @bits.add(index) for index in @indexesFor(key)
+  return
 
-  test: (key) ->
-    for index in @indexesFor(key)
-      return false if @bits.get(index) == 0
-    true
+JsonBloomfilter.prototype.test = (key) ->
+  for index in @indexesFor(key)
+    return false if @bits.get(index) == 0
+  true
 
-  clear: ->
-    @bits = @BitArray.new(@options["size"], null)
-    return
+JsonBloomfilter.prototype.clear = ->
+  @bits = @BitArray.new(@options["size"], null)
+  return
 
-  toHash: ->
-    hash = {}
-    hash[key] = value for key, value of @options
-    hash["bits"] = @bits.field
-    hash
+JsonBloomfilter.prototype.toHash = ->
+  hash = {}
+  hash[key] = value for key, value of @options
+  hash["bits"] = @bits.field
+  hash
 
-  toJson: ->
-    JSON.stringify @toHash()
+JsonBloomfilter.prototype.toJson = ->
+  JSON.stringify @toHash()
 
-  indexesFor: (key) ->
-    indexes = []
-    for index in [0..@options["hashes"]-1]
-      indexes.push (@Zlib.crc32("#{key}:#{index+@options["seed"]}") % @options["size"])
-    indexes
+JsonBloomfilter.prototype.indexesFor = (key) ->
+  indexes = []
+  for index in [0..@options["hashes"]-1]
+    indexes.push (JsonBloomfilter.Zlib.crc32("#{key}:#{index+@options["seed"]}") % @options["size"])
+  indexes

data/coffee/zlib.coffee

@@ -28,4 +28,4 @@ JsonBloomfilter.Zlib =
     while i < string.length
       bytes.push string.charCodeAt(i)
       ++i
-    bytes
+    bytes

data/js/json-bloomfilter.min.js

@@ -0,0 +1 @@
+var JsonBloomfilter;JsonBloomfilter=function(options){var key,value;if(options==null){options={}}this.options={size:100,hashes:4,seed:new Date().getTime()/1000,bits:null};for(key in options){value=options[key];this.options[key]=value}this.bits=new JsonBloomfilter.BitArray(this.options.size,this.options.bits);return this};JsonBloomfilter.prototype.add=function(key){var index,_i,_len,_ref;_ref=this.indexesFor(key);for(_i=0,_len=_ref.length;_i<_len;_i++){index=_ref[_i];this.bits.add(index)}};JsonBloomfilter.prototype.test=function(key){var index,_i,_len,_ref;_ref=this.indexesFor(key);for(_i=0,_len=_ref.length;_i<_len;_i++){index=_ref[_i];if(this.bits.get(index)===0){return false}}return true};JsonBloomfilter.prototype.clear=function(){this.bits=this.BitArray["new"](this.options.size,null)};JsonBloomfilter.prototype.toHash=function(){var hash,key,value,_ref;hash={};_ref=this.options;for(key in _ref){value=_ref[key];hash[key]=value}hash.bits=this.bits.field;return hash};JsonBloomfilter.prototype.toJson=function(){return JSON.stringify(this.toHash())};JsonBloomfilter.prototype.indexesFor=function(key){var index,indexes,_i,_ref;indexes=[];for(index=_i=0,_ref=this.options.hashes-1;0<=_ref?_i<=_ref:_i>=_ref;index=0<=_ref?++_i:--_i){indexes.push(JsonBloomfilter.Zlib.crc32(""+key+":"+(index+this.options.seed))%this.options.size)}return indexes};JsonBloomfilter.BitArray=function(size,field){var arrayLength,i,_i;if(field==null){field=null}this.ELEMENT_WIDTH=32;this.size=size;this.field=field||[];arrayLength=Math.floor(((size-1)/this.ELEMENT_WIDTH)+1);if(!field){for(i=_i=0;0<=arrayLength?_i<=arrayLength:_i>=arrayLength;i=0<=arrayLength?++_i:--_i){this.field[i]=0}}return this};JsonBloomfilter.BitArray.prototype.add=function(position){return this.set(position,1)};JsonBloomfilter.BitArray.prototype.remove=function(position){return this.set(position,0)};JsonBloomfilter.BitArray.prototype.set=function(position,value){var aPos,bChange;aPos=this.arrayPosition(position);bChange=this.bitChange(position);if(value===1){this.field[aPos]|=bChange}else{if(this.field[aPos]&bChange!==0){this.field[aPos]^=bChange}}return true};JsonBloomfilter.BitArray.prototype.get=function(position){var aPos,bChange;aPos=this.arrayPosition(position);bChange=this.bitChange(position);if((this.field[aPos]&bChange)>0){return 1}else{return 0}};JsonBloomfilter.BitArray.prototype.arrayPosition=function(position){return Math.floor(position/this.ELEMENT_WIDTH)};JsonBloomfilter.BitArray.prototype.bitChange=function(position){return Math.abs(1<<position%this.ELEMENT_WIDTH)};JsonBloomfilter.BitArray.prototype.toString=function(){var i,output,_i,_ref;output="";for(i=_i=0,_ref=this.size-1;0<=_ref?_i<=_ref:_i>=_ref;i=0<=_ref?++_i:--_i){output+=this.get(i)}return output};JsonBloomfilter.Zlib={CRC32_TABLE:new Array(0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918000,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117),crc32:function(string){var bytes,crc,i,iTop,n;bytes=this.bytesFor(string);crc=0;n=0;crc=crc^(-1);i=0;iTop=bytes.length;while(i<iTop){n=(crc^bytes[i])&255;crc=(crc>>>8)^this.CRC32_TABLE[n];i++}crc=crc^(-1);if(crc<0){crc+=4294967296}return crc},bytesFor:function(string){var bytes,i;bytes=[];i=0;while(i<string.length){bytes.push(string.charCodeAt(i));++i}return bytes}};

data/lib/json/bloomfilter.rb

@@ -1,28 +1,28 @@
-require_relative "bitarray"
+require_relative "bloomfilter/bitarray"
 require "json"
 
 class JsonBloomfilter
   DEFAULTS = { "size" => 100, "hashes" => 4, "seed" => Time.new.to_i, "bits" => nil }
 
   def initialize options = {}
-    @options = DEFAULTS.merge options
+    @options = merge_defaults_with options
     @bits = BitArray.new(@options["size"], @options["bits"])
   end
 
   def add key
-    indexes_for(key).each { |index| @bits[index] = 1 }
+    indexes_for(key).each { |index| @bits.add(index) }
     nil
   end
 
   def test key
     indexes_for(key).each do |index|
-      return false if @bits[index] == 0
+      return false if @bits.get(index) == 0
     end
     true
   end
 
   def clear
-    @bits = BitArray.new(@options["size"], 0)
+    @bits = BitArray.new(@options["size"])
   end
 
   def to_hash
@@ -40,4 +40,8 @@ class JsonBloomfilter
       Zlib.crc32("#{key}:#{index+@options["seed"]}") % @options["size"]
     end
   end
+
+  def merge_defaults_with options
+    DEFAULTS.merge Hash[options.map {|k, v| ["#{k}", v] }]
+  end
 end

data/lib/json/bloomfilter/bitarray.rb

@@ -0,0 +1,51 @@
+# Adapted from
+# https://github.com/peterc/bitarray
+
+class JsonBloomfilter
+  class BitArray
+    attr_reader :size
+    attr_reader :field
+    include Enumerable
+
+    ELEMENT_WIDTH = 32
+
+    def initialize(size, field = nil)
+      @size = size
+      @field = field || Array.new(((size - 1) / ELEMENT_WIDTH) + 1, 0)
+    end
+
+    def add position
+      self[position] = 1
+    end
+
+    def remove position
+      self[position] = 0
+    end
+
+    # Set a bit (1/0)
+    def []=(position, value)
+      raise ArgumentError.new("Position out of bound (#{position} for max #{@size})") if position >= @size
+      if value == 1
+        @field[position / ELEMENT_WIDTH] |= 1 << (position % ELEMENT_WIDTH)
+      elsif (@field[position / ELEMENT_WIDTH]) & (1 << (position % ELEMENT_WIDTH)) != 0
+        @field[position / ELEMENT_WIDTH] ^= 1 << (position % ELEMENT_WIDTH)
+      end
+    end
+
+    # Read a bit (1/0)
+    def get position
+      raise ArgumentError.new("Position out of bound (#{position} for max #{@size})") if position >= @size
+      @field[position / ELEMENT_WIDTH] & 1 << (position % ELEMENT_WIDTH) > 0 ? 1 : 0
+    end
+
+    # Iterate over each bit
+    def each(&block)
+      @size.times { |position| yield self.get(position) }
+    end
+
+    # Returns the field as a string like "0101010100111100," etc.
+    def to_s
+      inject("") { |a, b| a + b.to_s }
+    end
+  end
+end

data/lib/json/bloomfilter/version.rb

@@ -1,3 +1,3 @@
 class JsonBloomfilter
-  VERSION = "0.0.2" unless defined? Trifle::VERSION
+  VERSION = "0.0.3" unless defined? Trifle::VERSION
 end

data/spec/json/bloomfilter/bitarray_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+describe JsonBloomfilter::BitArray do
+
+  describe "#initialize" do
+    it "should require a size" do
+      expect(->{JsonBloomfilter::BitArray.new}).to raise_error(ArgumentError)
+      expect(->{JsonBloomfilter::BitArray.new(100)}).not_to raise_error(ArgumentError)
+    end
+    it "should take an optional bit field" do
+      field = [0,0,0,2]
+      ba = JsonBloomfilter::BitArray.new(100, field)
+      expect(ba.field).to be == field
+    end
+  end
+
+  describe "add" do
+    it "should set the bit to 1" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      ba.add(9)
+      expect(ba.to_s).to be == "0000000001"
+    end
+
+    it "should throw an error on out of bound" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      expect(->{ba.add(10)}).to raise_error
+    end
+  end
+
+  describe "remove" do
+    it "should set the bit to 0" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      ba.add(9)
+      ba.remove(9)
+      expect(ba.to_s).to be == "0000000000"
+    end
+
+    it "should throw an error on out of bound" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      expect(->{ba.remove(10)}).to raise_error
+    end
+  end
+
+  describe "get" do
+    it "should return the bit set" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      ba.add(9)
+      expect(ba.get(9)).to be == 1
+      expect(ba.get(8)).to be == 0
+    end
+
+    it "should throw an error on out of bound" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      expect(->{ba.get(10)}).to raise_error
+    end
+  end
+
+  describe "#to_s" do
+    it "should output the bit string" do
+      ba = JsonBloomfilter::BitArray.new(10)
+      ba.add(3)
+      ba.add(9)
+      expect(ba.to_s).to be == "0001000001"
+    end
+  end
+end

data/spec/json/bloomfilter_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+
+describe JsonBloomfilter do
+
+  describe "#initialize" do
+    it "should take the appropriate options" do
+      seed = Time.now.to_i - 24*60*60
+      bf = JsonBloomfilter.new size: 200, hashes: 10, seed: seed
+      expect(bf.to_hash["size"]).to be == 200
+      expect(bf.to_hash["hashes"]).to be == 10
+      expect(bf.to_hash["seed"]).to be == seed
+    end
+
+    it "should be initializable with a field serialized by another bloom filter" do
+      bf1 = JsonBloomfilter.new
+      bf1.add "foo"
+      bf2 = JsonBloomfilter.new bf1.to_hash
+      expect(bf2.test "foo").to be_true
+    end
+  end
+
+  context "with an instance" do
+    before :each do
+      @bf = JsonBloomfilter.new
+      @bf.add("foobar")
+    end
+
+    describe "#add, #test" do
+      it "should add a key" do
+        expect(@bf.test "foo").to be_false
+        @bf.add "foo"
+        expect(@bf.test "foo").to be_true
+      end
+
+      it "should not change anything if added twice" do
+        expect(@bf.test "foobar").to be_true
+        bits = @bf.to_hash["bits"]
+        @bf.add "foobar"
+        expect(@bf.test "foobar").to be_true
+        expect(@bf.to_hash["bits"]).to be == bits
+      end
+    end
+
+    describe "#clear" do
+      it "should clear the bit array" do
+        expect(@bf.to_hash["bits"]).not_to be == [0,0,0,0]
+        @bf.clear
+        expect(@bf.to_hash["bits"]).to be == [0,0,0,0]
+      end
+    end
+
+    describe "#to_hash" do
+      it "should return the serialisable hash" do
+        hash = @bf.to_hash
+        expect(hash).to be_a(Hash)
+
+        expect(hash).to have_key("seed")
+        expect(hash["seed"]).to be_a(Integer)
+
+        expect(hash).to have_key("hashes")
+        expect(hash["hashes"]).to be_a(Integer)
+
+        expect(hash).to have_key("size")
+        expect(hash["size"]).to be_a(Integer)
+
+        expect(hash).to have_key("bits")
+        expect(hash["bits"]).to be_a(Array)
+      end
+    end
+
+    describe "#to_json" do
+      it "should return the hash serialised" do
+        expect(@bf.to_json).to be == JSON.generate(@bf.to_hash)
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,2 @@
 require "json/bloomfilter"
+require "json/bloomfilter/bitarray"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-bloomfilter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -116,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -125,14 +126,15 @@ files:
 - coffee/bitarray.coffee
 - coffee/bloomfilter.coffee
 - coffee/zlib.coffee
-- js/bloomfilter.min.js
+- js/json-bloomfilter.min.js
 - json-bloomfilter.gemspec
-- lib/json/bitarray.rb
 - lib/json/bloomfilter.rb
+- lib/json/bloomfilter/bitarray.rb
 - lib/json/bloomfilter/version.rb
 - pkg/json-bloomfilter-0.0.1.gem
 - pkg/json-bloomfilter-0.0.2.gem
-- spec/json-bloomfilter_spec.rb
+- spec/json/bloomfilter/bitarray_spec.rb
+- spec/json/bloomfilter_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cbetta/json-bloomfilter
 licenses:
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1888125834509649748
+      hash: 2570443821793762265
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -163,5 +165,6 @@ signing_key:
 specification_version: 3
 summary: A bloomfilter implementation in both Ruby and Javascript.
 test_files:
-- spec/json-bloomfilter_spec.rb
+- spec/json/bloomfilter/bitarray_spec.rb
+- spec/json/bloomfilter_spec.rb
 - spec/spec_helper.rb

data/js/bloomfilter.min.js

@@ -1 +0,0 @@
-var JsonBloomfilter;JsonBloomfilter={bits:null,options:{size:100,hashes:4,seed:new Date().getTime()/1000,bits:null},"new":function(options){var key,value;if(options==null){options={}}for(key in options){value=options[key];this.options[key]=value}this.bits=this.BitArray["new"](this.options.size,this.options.bits);return this},add:function(key){var index,_i,_len,_ref;_ref=this.indexesFor(key);for(_i=0,_len=_ref.length;_i<_len;_i++){index=_ref[_i];this.bits.add(index)}},test:function(key){var index,_i,_len,_ref;_ref=this.indexesFor(key);for(_i=0,_len=_ref.length;_i<_len;_i++){index=_ref[_i];if(this.bits.get(index)===0){return false}}return true},clear:function(){this.bits=this.BitArray["new"](this.options.size,null)},toHash:function(){var hash,key,value,_ref;hash={};_ref=this.options;for(key in _ref){value=_ref[key];hash[key]=value}hash.bits=this.bits.field;return hash},toJson:function(){return JSON.stringify(this.toHash())},indexesFor:function(key){var index,indexes,_i,_ref;indexes=[];for(index=_i=0,_ref=this.options.hashes-1;0<=_ref?_i<=_ref:_i>=_ref;index=0<=_ref?++_i:--_i){indexes.push(this.Zlib.crc32(""+key+":"+(index+this.options.seed))%this.options.size)}return indexes}};JsonBloomfilter.BitArray={size:null,field:null,ELEMENT_WIDTH:32,"new":function(size,field){var arrayLength,i,_i;if(field==null){field=null}this.size=size;arrayLength=Math.floor(((size-1)/this.ELEMENT_WIDTH)+1);this.field=field||[];if(!field){for(i=_i=0;0<=arrayLength?_i<=arrayLength:_i>=arrayLength;i=0<=arrayLength?++_i:--_i){this.field[i]=0}}return this},add:function(position){return this.set(position,1)},remove:function(position){return this.set(position,0)},set:function(position,value){var aPos,bChange;aPos=this.arrayPosition(position);bChange=this.bitChange(position);if(value===1){this.field[aPos]|=bChange}else{if(this.field[aPos]&bChange!==0){this.field[aPos]^=bChange}}return true},get:function(position){var aPos,bChange;aPos=this.arrayPosition(position);bChange=this.bitChange(position);if((this.field[aPos]&bChange)>0){return 1}else{return 0}},arrayPosition:function(position){return Math.floor(position/this.ELEMENT_WIDTH)},bitChange:function(position){return Math.abs(1<<position%this.ELEMENT_WIDTH)},toString:function(){var i,output,_i,_ref;output="";for(i=_i=0,_ref=this.size-1;0<=_ref?_i<=_ref:_i>=_ref;i=0<=_ref?++_i:--_i){output+=this.get(i)}return output}};JsonBloomfilter.Zlib={CRC32_TABLE:new Array(0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918000,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117),crc32:function(string){var bytes,crc,i,iTop,n;bytes=this.bytesFor(string);crc=0;n=0;crc=crc^(-1);i=0;iTop=bytes.length;while(i<iTop){n=(crc^bytes[i])&255;crc=(crc>>>8)^this.CRC32_TABLE[n];i++}crc=crc^(-1);if(crc<0){crc+=4294967296}return crc},bytesFor:function(string){var bytes,i;bytes=[];i=0;while(i<string.length){bytes.push(string.charCodeAt(i));++i}return bytes}};

data/lib/json/bitarray.rb

@@ -1,45 +0,0 @@
-# Adapted from
-# https://github.com/peterc/bitarray
-
-class BitArray
-  attr_reader :size
-  attr_reader :field
-  include Enumerable
-
-  ELEMENT_WIDTH = 32
-
-  def initialize(size, field = nil)
-    @size = size
-    @field = field || Array.new(((size - 1) / ELEMENT_WIDTH) + 1, 0)
-  end
-
-  # Set a bit (1/0)
-  def []=(position, value)
-    if value == 1
-      @field[position / ELEMENT_WIDTH] |= 1 << (position % ELEMENT_WIDTH)
-    elsif (@field[position / ELEMENT_WIDTH]) & (1 << (position % ELEMENT_WIDTH)) != 0
-      @field[position / ELEMENT_WIDTH] ^= 1 << (position % ELEMENT_WIDTH)
-    end
-  end
-
-  # Read a bit (1/0)
-  def [](position)
-    @field[position / ELEMENT_WIDTH] & 1 << (position % ELEMENT_WIDTH) > 0 ? 1 : 0
-  end
-
-  # Iterate over each bit
-  def each(&block)
-    @size.times { |position| yield self[position] }
-  end
-
-  # Returns the field as a string like "0101010100111100," etc.
-  def to_s
-    inject("") { |a, b| a + b.to_s }
-  end
-
-  # Returns the total number of bits that are set
-  # (The technique used here is about 6 times faster than using each or inject direct on the bitfield)
-  def total_set
-    @field.inject(0) { |a, byte| a += byte & 1 and byte >>= 1 until byte == 0; a }
-  end
-end

data/spec/json-bloomfilter_spec.rb

@@ -1,9 +0,0 @@
-require "spec_helper"
-
-describe JsonBloomfilter do
-
-  it "should pass" do
-    bf = JsonBloomfilter.new
-  end
-
-end