redis-bloomfilter 0.0.1 → 0.0.2

data/README.md

@@ -85,7 +85,7 @@ The lua version is about ~3 times faster than the pure-Ruby version
 
 Lua code is taken from https://github.com/ErikDubbelboer/redis-lua-scaling-bloom-filter
 
-1.000.000 ~= 1.5Mb occuped on Redis
+1.000.000 ~= 1.5Mb occupied on Redis
 
 Contributing to redis-bloomfilter
 ----------------

data/lib/redis/bloomfilter.rb

@@ -1,7 +1,7 @@
 class Redis
   class Bloomfilter
 
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
 
     def self.version
       "redis-bloomfilter version #{VERSION}"
@@ -19,7 +19,7 @@ class Redis
         :key_name     => 'redis-bloomfilter',
         :hash_engine  => 'md5',
         :redis        => Redis.current,
-        :driver       => 'ruby'
+        :driver       => nil
       }.merge options
 
       raise ArgumentError, "options[:size] && options[:error_rate] cannot be nil" if options[:error_rate].nil? || options[:size].nil?
@@ -33,6 +33,17 @@ class Redis
 
       @redis = @options[:redis] || Redis.current
       @options[:hash_engine] = options[:hash_engine] if options[:hash_engine]
+
+      if @options[:driver].nil?
+        ver = @redis.info['redis_version']
+
+        if Gem::Version.new(ver) >= Gem::Version.new('2.6.0')
+          @options[:driver] = 'lua'
+        else
+          @options[:driver] = 'ruby'
+        end
+      end
+
       driver_class = Redis::BloomfilterDriver.const_get(driver_name)
       @driver = driver_class.new @options
       @driver.redis = @redis 

data/redis-bloomfilter.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency "redis", "~> 3.0.4"
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "flexmock"
 
 end

data/spec/redis_bloomfilter_spec.rb

@@ -32,6 +32,21 @@ describe Redis::Bloomfilter do
     expect { Redis::Bloomfilter.new :size => 123,:error_rate => 0.01, :driver => 'bibu' }.to raise_error(NameError)
   end
 
+  it 'should choose the right driver based on the Redis version' do
+    
+    redis_mock = flexmock("redis")
+    redis_mock.should_receive(:info).and_return({'redis_version' => '2.6.0'})
+    redis_mock.should_receive(:script).and_return([true, true])
+    redis_mock_2_5 = flexmock("redis_2_5")
+    redis_mock_2_5.should_receive(:info).and_return({'redis_version' => '2.5.0'})
+
+    bf = factory({:size => 1000, :error_rate => 0.01, :key_name => 'ossom', :redis => redis_mock}, nil)
+    bf.driver.should be_kind_of(Redis::BloomfilterDriver::Lua)
+
+    bf = factory({:size => 1000, :error_rate => 0.01, :key_name => 'ossom', :redis => redis_mock_2_5}, nil)
+    bf.driver.should be_kind_of(Redis::BloomfilterDriver::Ruby)
+  end
+
   it 'should create a Redis::Bloomfilter object' do
     bf = factory({:size => 1000, :error_rate => 0.01, :key_name => 'ossom'}, 'ruby')
     bf.should be
@@ -72,4 +87,13 @@ describe Redis::Bloomfilter do
     end
   end
 
+  it 'should be a scalable bloom filter' do
+    bf = factory({:size => 10, :error_rate => 0.01, :key_name => '__test_bf'},'lua')
+    bf.clear
+    e = test_error_rate(bf, 1000)
+    e.should be < bf.options[:error_rate]
+    bf.clear
+    
+  end
+
 end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.mock_with :flexmock
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -17,4 +18,5 @@ RSpec.configure do |config|
 end
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'redis-bloomfilter'
+require "redis-bloomfilter"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-bloomfilter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  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: ! "\n    Adds Redis::Bloomfilter class which can be used as ditributed
   bloom filter implementation on Redis.\n    A Bloom filter is a space-efficient probabilistic
   data structure that is used to test whether an element is a member of a set.\n  "