mock_redis 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+### 0.1.1
+* Fix handling of -inf, +inf, and exclusive endpoints (e.g. "(3") in
+  zrangebyscore, zrevrangebyscore, and zremrangebyscore. ("Fix" here
+  means "write", as it's something that was completely forgotten the
+  first time around.)
+
+### 0.1.0
+* Support `move(key, db)` to move keys between databases.
+
+### 0.0.2
+* Fix gem homepage.
+
+### 0.0.1
+Initial release.

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mock_redis/zset.rb

@@ -40,6 +40,36 @@ class MockRedis
       members.each {|m| yield score(m), m}
     end
 
+    def in_range(min, max)
+      in_from_the_left = case min
+                         when "-inf":
+                             lambda { true }
+                         when "+inf":
+                             lambda { false }
+                         when /\((.*)$/:
+                             val = $1.to_f
+                           lambda {|x| x.to_f > val }
+                         else
+                           lambda {|x| x.to_f >= min.to_f }
+                         end
+
+      in_from_the_right = case max
+                          when "-inf":
+                              lambda { false }
+                          when "+inf":
+                              lambda { true }
+                          when /\((.*)$/:
+                              val = $1.to_f
+                            lambda {|x| x.to_f < val }
+                          else
+                            lambda {|x| x.to_f <= max.to_f }
+                          end
+
+      sorted.find_all do |(score, member)|
+        in_from_the_left[score] && in_from_the_right[score]
+      end
+    end
+
     def intersection(other)
       if !block_given?
         intersection(other, &:+)

data/lib/mock_redis/zset_methods.rb

@@ -55,10 +55,8 @@ class MockRedis
 
     def zrangebyscore(key, min, max, options={})
       with_zset_at(key) do |zset|
-        in_range = zset.sorted.find_all do |(score, member)|
-          min <= score && score <= max
-        end
-        to_response(apply_limit(in_range, options[:limit]), options)
+        all_results = zset.in_range(min, max)
+        to_response(apply_limit(all_results, options[:limit]), options)
       end
     end
 
@@ -90,10 +88,11 @@ class MockRedis
 
     def zrevrangebyscore(key, max, min, options={})
       with_zset_at(key) do |zset|
-        in_range = zset.sorted.reverse.find_all do |(score, member)|
-          min <= score && score <= max
-        end
-        to_response(apply_limit(in_range, options[:limit]), options)
+        to_response(
+          apply_limit(
+            zset.in_range(min, max).reverse,
+            options[:limit]),
+          options)
       end
     end
 

data/spec/commands/zrangebyscore_spec.rb

@@ -38,5 +38,31 @@ describe "#zrangebyscore(key, start, stop [:with_scores => true] [:limit => [off
     end.should raise_error(RuntimeError)
   end
 
+  it "treats scores like floats, not strings" do
+    @redises.zadd(@key, "10", "Tyler")
+    @redises.zrangebyscore(@key, 1, 2).should == ['Washington', 'Adams']
+  end
+
+  it "treats -inf as negative infinity" do
+    @redises.zrangebyscore(@key, "-inf", 3).should ==
+      ["Washington", "Adams", "Jefferson"]
+  end
+
+  it "treats +inf as positive infinity" do
+    @redises.zrangebyscore(@key, 3, "+inf").should == ["Jefferson", "Madison"]
+  end
+
+  it "treats +inf as positive infinity" do
+    @redises.zrangebyscore(@key, 3, "+inf").should == ["Jefferson", "Madison"]
+  end
+
+  it "honors exclusive ranges on the left" do
+    @redises.zrangebyscore(@key, "(3", 4).should == ["Madison"]
+  end
+
+  it "honors exclusive ranges on the right" do
+    @redises.zrangebyscore(@key, "3", "(4").should == ["Jefferson"]
+  end
+
   it_should_behave_like "a zset-only command"
 end

data/spec/commands/zremrangebyscore_spec.rb

@@ -17,5 +17,12 @@ describe "#zremrangebyscore(key, min, max)" do
     @redises.zremrangebyscore(@key, 2, 3)
     @redises.zrange(@key, 0, -1).should == %w[Washington Madison]
   end
+
+  # As seen in http://redis.io/commands/zremrangebyscore
+  it "removes the elements for complex statements" do
+    @redises.zremrangebyscore(@key, '-inf', '(4')
+    @redises.zrange(@key, 0, -1).should == %w[Madison]
+  end
+
   it_should_behave_like "a zset-only command"
 end

data/spec/commands/zrevrangebyscore_spec.rb

@@ -23,6 +23,11 @@ describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
       should == %w[Madison 4 Jefferson 3]
   end
 
+  it "treats +inf as positive infinity" do
+    @redises.zrevrangebyscore(@key, "+inf", 3).
+      should == %w[Madison Jefferson]
+  end
+
   it "honors the :limit => [offset count] argument" do
     @redises.zrevrangebyscore(@key, 100, -100, :limit => [1, 2]).
       should == ["Jefferson", "Adams"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mock_redis
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Samuel Merritt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 -07:00
+date: 2011-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md