redness 0.2.0 → 0.2.1

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/lib/redness/timed_red_set.rb

@@ -8,13 +8,23 @@ class TimedRedSet < RedSet
     precise_start = Precisionable.int_from_float(start)
 
     redis.execute_with_uncertainty([]) do
+      raw = redis.zrevrangebyscore(key, "+inf", precise_start, with_scores: options[:with_scores])
+
       if options[:upper] and options[:lower]
         lower = options[:lower].to_i
         upper = options[:upper].to_i
 
-        redis.zrevrangebyscore(key, "+inf", precise_start)[lower..upper].map(&:to_i)
+        raw = raw[lower..upper]
+      end
+
+      if options[:with_scores]
+        result = {}
+        raw.each do |member, score|
+          result[member.to_i] = Time.at(Precisionable.float_from_int(score))
+        end
+        result
       else
-        redis.zrevrangebyscore(key, "+inf", precise_start).map(&:to_i)
+        raw.map(&:to_i)
       end
     end
   end

data/lib/redness/version.rb

@@ -1,4 +1,4 @@
 module Redness
-  VERSION="0.2.0"
+  VERSION="0.2.1"
   MAJOR, MINOR, TINY = VERSION.split(".")
 end

data/spec/redness/timed_red_set_spec.rb

@@ -54,6 +54,24 @@ describe TimedRedSet do
       TimedRedSet.since("somekey", 1.day.ago, :lower => 0, :upper => 1).should == [3,2]
       TimedRedSet.since("somekey", 1.day.ago, :lower => 1, :upper => 2).should == [2,1]
     end
+
+    it "returns an array of elements with timestamps if the with_scores option is true" do
+      Timecop.freeze(Time.at(1.5)) { TimedRedSet.add('somekey', 10) }
+      Timecop.freeze(Time.at(2.5)) { TimedRedSet.add('somekey', 20) }
+      Timecop.freeze(Time.at(3.5)) { TimedRedSet.add('somekey', 30) }
+
+      TimedRedSet.since('somekey', 2, :with_scores => true).should ==
+        {20 => Time.at(2.5), 30 => Time.at(3.5)}
+    end
+
+    it "supports using the :upper/:lower and :with_scores attributes together" do
+      Timecop.freeze(Time.at(1.5)) { TimedRedSet.add('somekey', 10) }
+      Timecop.freeze(Time.at(2.5)) { TimedRedSet.add('somekey', 20) }
+      Timecop.freeze(Time.at(3.5)) { TimedRedSet.add('somekey', 30) }
+
+      TimedRedSet.since('somekey', 2, :lower => 1, :upper => 1, :with_scores => true).should ==
+        {20 => Time.at(2.5)}
+    end
   end
 
   describe ".get_with_timestamps" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redness
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Helpful Ruby classes for improved Redis data structures