bloom-filter 0.2.0 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ec61bc4b1ff47f3c4733eef85b25f09809746139
+  data.tar.gz: 4144685fea073d1e34bb34f3525fea79b4808761
+SHA512:
+  metadata.gz: d455b2f9007301813a0f4eaebdae2c0cc4f3924c333b19f3ce5bd643614ffda0e9adfba6830a42b0c88d027b3c65fd83e2df4b7c6fb139f4defb6fcef8c7e28b
+  data.tar.gz: 9d2e692903025019a3f46a0a1baeba08bf6cdcbf6d8717ede3fc9470f677052e187c6b137bc67f961e01144f82eef0df6a6bc11be3370dea4c64279fc5a72540

data/CHANGELOG

@@ -1,3 +1,15 @@
+=== 0.2.1 (2013-01-21)
+
+* Clean up compiler warnings.
+
+=== 0.2.0 (2012-04-27)
+
+* Added BloomFilter#bits
+
+=== 0.1.1 (2012-01-26)
+
+* Store table size in dumps.
+
 === 0.1.0 (2012-01-25)
 
 * Initial version.

data/LICENSE

@@ -0,0 +1,23 @@
+MIT
+
+Copyright (c) 2015 Bharanee Rathna
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -22,6 +22,7 @@ BloomFilter is a ruby library that implements an in-memory [Bloom Filter](http:/
     #insert
     #include?
     #bits
+    #binary
 
 ```
 
@@ -45,17 +46,22 @@ BloomFilter is a ruby library that implements an in-memory [Bloom Filter](http:/
   filter.dump "/tmp/random.bloom"
   filter = BloomFilter.load "/tmp/random.bloom"
 
-  bits = filter.bits #=> "10010100100111..."
+  bits   = filter.bits   #=> "10010100100111..."
+  binary = filter.binary #=> "\x83Ö\xAC\xEA\u00..."
+
+  filter2 = BloomFilter.new bits: 100_000_0, hashes: 4
+  filter2.binary = binary
+  filter2.include? "foo" #=> true
 ```
 
 ## See Also
 
 [https://github.com/igrigorik/bloomfilter-rb](https://github.com/igrigorik/bloomfilter-rb)
 
-## License
-
-[Creative Commons Attribution - CC BY](http://creativecommons.org/licenses/by/3.0)
-
 ## Home Page
 
 [https://github.com/deepfryed/bloom-filter](https://github.com/deepfryed/bloom-filter)
+
+## License
+
+MIT

data/ext/bloom_filter.c

@@ -79,6 +79,7 @@ VALUE bloom_initialize(int argc, VALUE *argv, VALUE self) {
         rb_raise(rb_eNoMemError, "unable to allocate memory for BloomFilter");
 
     DATA_PTR(self) = filter;
+    return self;
 }
 
 
@@ -95,12 +96,13 @@ VALUE bloom_include(VALUE klass, VALUE string) {
 
 VALUE bloom_dump(VALUE klass, VALUE file) {
     int fd;
+    void *buffer;
     uint64_t nbits;
     FileHeader header;
     BloomFilter *filter = bloom_handle(klass);
 
-    nbits = (filter->table_size + 7) / 8;
-    void *buffer = malloc(nbits);
+    nbits  = (filter->table_size + 7) / 8;
+    buffer = malloc(nbits);
 
     if (!buffer)
         rb_raise(rb_eNoMemError, "out of memory dumping BloomFilter");
@@ -139,12 +141,14 @@ VALUE bloom_dump(VALUE klass, VALUE file) {
 VALUE bloom_bits(VALUE klass) {
     BloomFilter *filter = bloom_handle(klass);
 
-    int i = 0;
-    int nbits = filter->table_size;
-    char buffer[nbits];
-
+    VALUE bitmap;
+    char *buffer;
     unsigned char b;
-    int bit;
+    int i = 0, bit, nbits = filter->table_size;
+
+    buffer = (char *)malloc(nbits);
+    if (!buffer)
+        rb_raise(rb_eNoMemError, "out of memory dumping BloomFilter");
 
     for (i = 0; i < nbits; i++) {
         b = filter->table[i / 8];
@@ -156,7 +160,35 @@ VALUE bloom_bits(VALUE klass) {
 	        buffer[i] = '1';
     }
 
-    return rb_str_new(buffer, nbits);
+    bitmap = rb_str_new(buffer, nbits);
+    free(buffer);
+    return bitmap;
+}
+
+VALUE bloom_binary(VALUE klass) {
+    BloomFilter *filter = bloom_handle(klass);
+
+    VALUE bitmap;
+    unsigned char *buffer;
+
+    int nbytes = (filter->table_size + 7) / 8;
+    buffer = (unsigned char *)malloc(nbytes);
+
+    if (!buffer)
+        rb_raise(rb_eNoMemError, "out of memory dumping BloomFilter");
+
+    bloom_filter_read(filter, buffer);
+
+    bitmap = rb_str_new((const char *)buffer, nbytes);
+    free(buffer);
+    return bitmap;
+}
+
+VALUE bloom_binary_set(VALUE klass, VALUE buffer) {
+    BloomFilter *filter = bloom_handle(klass);
+    unsigned char* ptr = (unsigned char *) RSTRING_PTR(buffer);
+    bloom_filter_load(filter, ptr);
+    return Qtrue;
 }
 
 VALUE bloom_load(VALUE klass, VALUE file) {
@@ -199,12 +231,14 @@ VALUE bloom_load(VALUE klass, VALUE file) {
     return instance;
 }
 
-Init_bloom_filter() {
+void Init_bloom_filter() {
     VALUE cBloom = rb_define_class("BloomFilter", rb_cObject);
 
     rb_define_method(cBloom, "initialize", RUBY_METHOD_FUNC(bloom_initialize),  -1);
     rb_define_method(cBloom, "dump",       RUBY_METHOD_FUNC(bloom_dump),         1);
     rb_define_method(cBloom, "bits",       RUBY_METHOD_FUNC(bloom_bits),         0);
+    rb_define_method(cBloom, "binary",     RUBY_METHOD_FUNC(bloom_binary),       0);
+    rb_define_method(cBloom, "binary=",    RUBY_METHOD_FUNC(bloom_binary_set),   1);
     rb_define_method(cBloom, "insert",     RUBY_METHOD_FUNC(bloom_insert),       1);
     rb_define_method(cBloom, "include?",   RUBY_METHOD_FUNC(bloom_include),      1);
 

data/ext/version.h

@@ -1 +1 @@
-#define RUBY_BLOOM_FILTER_VERSION "0.2.0"
+#define RUBY_BLOOM_FILTER_VERSION "0.2.2"

data/test/test_io.rb

@@ -12,4 +12,13 @@ describe 'BloomFilter load & dump' do
     assert filter.include?("foo")
     assert !filter.include?("bar")
   end
+
+  it 'should accept assigning the bits directly' do
+    assert filter = BloomFilter.new(bits: 80)
+    assert filter.insert("foo")
+    assert filter2 = BloomFilter.new(bits: 80)
+    assert filter2.binary = filter.binary
+    assert filter2.include?("foo")
+    assert !filter2.include?("bar")
+  end
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: bloom-filter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Bharanee Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: A fast Bloom Filter library for Ruby for unices.
@@ -51,41 +46,42 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- CHANGELOG
+- LICENSE
+- README.md
 - ext/bloom-filter.c
-- ext/hash-string.c
-- ext/bloom_filter.c
 - ext/bloom-filter.h
+- ext/bloom_filter.c
+- ext/extconf.rb
+- ext/hash-string.c
 - ext/hash-string.h
 - ext/version.h
-- ext/extconf.rb
+- lib/bloom-filter.rb
 - test/helper.rb
-- test/test_io.rb
 - test/test_basic.rb
-- README.md
-- CHANGELOG
-- lib/bloom-filter.rb
+- test/test_io.rb
 homepage: http://github.com/deepfryed/bloom-filter
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast Bloom Filter library for Ruby.
 test_files: []