blendris 1.0 → 1.1

data/blendris.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blendris}
-  s.version = "1.0"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex McHale"]

data/lib/blendris/utils.rb

@@ -41,7 +41,12 @@ module Blendris
     # Take an array and turn it into a list of pairs.
     def pairify(*arr)
       arr = arr.flatten
-      (0 ... arr.length/2).map { |i| [ arr[2*i], arr[2*i + 1] ] }
+
+      if arr.length == 1 && arr.first.kind_of?(Hash)
+        arr.first.map { |k, v| [ k, v ] }
+      else
+        (0 ... arr.length/2).map { |i| [ arr[2*i], arr[2*i + 1] ] }
+      end
     end
 
   end

data/lib/blendris/zset.rb

@@ -24,6 +24,21 @@ module Blendris
       self
     end
 
+    def each_with_scores(min = "-inf", max = "+inf", mode = :score)
+      flat_pairs =
+        case mode
+        when :rank  then redis.zrange key, min, max, :with_scores => true
+        when :score then redis.zrangebyscore key, min, max, :with_scores => true
+        else             raise "unknown zset mode #{mode}"
+        end
+
+      pairify(flat_pairs).each do |value, score|
+        yield score.to_f, value
+      end
+
+      self
+    end
+
     def set(*pairs)
       tempkey = "#{key}:::TEMP:::#{rand}"
       redis.del tempkey

data/lib/blendris.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Blendris
-  VERSION = '1.0'
+  VERSION = '1.1'
 end
 
 require "redis"

data/spec/zset_spec.rb

@@ -13,4 +13,17 @@ describe "redis zsets" do
     z.to_a.should == %w( dog )
   end
 
+  it "should delete correctly" do
+    z = RedisSortedSet.new("set1")
+    z << [ [2, "timothy"], [1, "alexander"], [3, "mchale"], [0, "dog"], [7, "cat"] ]
+    z.delete_by_score 1, 3
+    z.to_a.should == %w( dog cat )
+  end
+
+  it "should accept hashes" do
+    z = RedisSortedSet.new("set1")
+    z << { 2 => "c", 0 => "a", 1 => "b" }
+    z.to_a.should == %w( a b c )
+  end
+
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blendris
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Alex McHale