json-bloomfilter 0.1.4 → 0.1.5

data/README.md

@@ -35,7 +35,7 @@ and the `json-bloomfilter.min.js` will be copied to your local directory. If you
 ### Ruby
 
 ```ruby
-require "json/bloomfilter"
+require "json-bloomfilter"
 
 # use the factory to configure the filter
 filter =  JsonBloomFilter.build 10000, 0.01 # number of expected items, desired error rate
@@ -129,7 +129,8 @@ Additionally you can pass along:
 
 ## Release notes
 
-* **0.1.4** Changed .build function to take a list of items
+* **0.1.5** Changes namespacing
+* **0.1.4** Changes .build function to take a list of items
 * **0.1.3** Adds a check for non positive capacity values on build
 * **0.1.2** Adds Zlib dependency
 * **0.1.1** Fixes a JS integer overflow issue and makes Ruby 1.8.7 compatible

data/json-bloomfilter.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "json/bloomfilter/version"
+require "json-bloomfilter/version"
 
 Gem::Specification.new do |s|
   s.name        = "json-bloomfilter"

data/lib/json-bloomfilter.rb

@@ -0,0 +1,68 @@
+require "json-bloomfilter/bitarray"
+require "json"
+require "zlib"
+
+class JsonBloomfilter
+  DEFAULTS = { "size" => 100, "hashes" => 4, "seed" => Time.new.to_i, "bits" => nil }
+
+  def self.build capacity_or_items, error_rate
+    capacity, items = capacity_or_items.is_a?(Array) ? [capacity_or_items.length, capacity_or_items] : [capacity_or_items, nil]
+    raise ArgumentError.new("Capacity needs to be a positive integer") if capacity <= 0
+    JsonBloomfilter.new :size => size_for(capacity, error_rate), :hashes => hashes_for(capacity, error_rate), :items => items
+  end
+
+  def self.size_for capacity, error_rate
+    (capacity * Math.log(error_rate) / Math.log(1.0 / 2**Math.log(2))).ceil
+  end
+
+  def self.hashes_for capacity, error_rate
+    (Math.log(2) * size_for(capacity, error_rate) / capacity).round
+  end
+
+  def initialize options = {}
+    items = options.delete("items")
+    @options = merge_defaults_with options
+    @bits = BitArray.new(@options["size"], @options["bits"])
+    add(items) if items
+  end
+
+  def add keys
+    [keys].flatten.each do |key|
+      indexes_for(key).each { |index| @bits.add(index) }
+    end
+    nil
+  end
+
+  def test keys
+    [keys].flatten.each do |key|
+      indexes_for(key).each do |index|
+        return false if @bits.get(index) == 0
+      end
+    end
+    true
+  end
+
+  def clear
+    @bits = BitArray.new(@options["size"])
+  end
+
+  def to_hash
+    @options.merge({ "bits" => @bits.field })
+  end
+
+  def to_json
+    JSON.generate to_hash
+  end
+
+  private
+
+  def indexes_for key
+    Array.new(@options["hashes"]).each_with_index.map do |item, index|
+      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/version.rb

@@ -0,0 +1,3 @@
+class JsonBloomfilter
+  VERSION = "0.1.5" unless defined? JsonBloomfilter::VERSION
+end

data/lib/json/bloomfilter.rb

@@ -1,68 +1 @@
-require "json/bloomfilter/bitarray"
-require "json"
-require "zlib"
-
-class JsonBloomfilter
-  DEFAULTS = { "size" => 100, "hashes" => 4, "seed" => Time.new.to_i, "bits" => nil }
-
-  def self.build capacity_or_items, error_rate
-    capacity, items = capacity_or_items.is_a?(Array) ? [capacity_or_items.length, capacity_or_items] : [capacity_or_items, nil]
-    raise ArgumentError.new("Capacity needs to be a positive integer") if capacity <= 0
-    JsonBloomfilter.new :size => size_for(capacity, error_rate), :hashes => hashes_for(capacity, error_rate), items: items
-  end
-
-  def self.size_for capacity, error_rate
-    (capacity * Math.log(error_rate) / Math.log(1.0 / 2**Math.log(2))).ceil
-  end
-
-  def self.hashes_for capacity, error_rate
-    (Math.log(2) * size_for(capacity, error_rate) / capacity).round
-  end
-
-  def initialize options = {}
-    items = options.delete("items")
-    @options = merge_defaults_with options
-    @bits = BitArray.new(@options["size"], @options["bits"])
-    add(items) if items
-  end
-
-  def add keys
-    [keys].flatten.each do |key|
-      indexes_for(key).each { |index| @bits.add(index) }
-    end
-    nil
-  end
-
-  def test keys
-    [keys].flatten.each do |key|
-      indexes_for(key).each do |index|
-        return false if @bits.get(index) == 0
-      end
-    end
-    true
-  end
-
-  def clear
-    @bits = BitArray.new(@options["size"])
-  end
-
-  def to_hash
-    @options.merge({ "bits" => @bits.field })
-  end
-
-  def to_json
-    JSON.generate to_hash
-  end
-
-  private
-
-  def indexes_for key
-    Array.new(@options["hashes"]).each_with_index.map do |item, index|
-      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
+require "json-bloomfilter"

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require "json/bloomfilter"
-require "json/bloomfilter/bitarray"
+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.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -179,9 +179,10 @@ files:
 - coffee/zlib.coffee
 - js/json-bloomfilter.min.js
 - json-bloomfilter.gemspec
+- lib/json-bloomfilter.rb
+- lib/json-bloomfilter/bitarray.rb
+- lib/json-bloomfilter/version.rb
 - lib/json/bloomfilter.rb
-- lib/json/bloomfilter/bitarray.rb
-- lib/json/bloomfilter/version.rb
 - spec/javascripts/bitarray_spec.js
 - spec/javascripts/bloomfilter_spec.js
 - spec/javascripts/support/jasmine.yml
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 762970087584583546
+      hash: -423997557885043161
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/json/bloomfilter/version.rb

@@ -1,3 +0,0 @@
-class JsonBloomfilter
-  VERSION = "0.1.4" unless defined? JsonBloomfilter::VERSION
-end