redness 0.0.5 → 0.1.0

data/.gitignore

@@ -1,2 +1,3 @@
+/Gemfile.lock
 *.gem
 tmp/*

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,8 +1,2 @@
 source :rubygems
-
-gem "rake"
-gem "json"
-gem "rspec"
-gem "redis", "~> 2.2.2"
-gem "activesupport"
-gem "timecop"
+gemspec

data/lib/redness/red.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 class Red
   class RedisUnavailable < StandardError; end
 
@@ -5,6 +7,10 @@ class Red
     $redis
   end
 
+  def self.client_version
+    @version ||= Redis::VERSION.scan(/\d+/).map { |s| s.to_i }
+  end
+
   def self.delete(key)
     redis.del(key)
   end
@@ -15,7 +21,7 @@ class Red
 
   def execute_with_uncertainty(fail_return = [])
     yield
-  rescue RedisUnavailable, Errno::ECONNREFUSED, Timeout, Timeout::Error, Errno::EAGAIN
+  rescue RedisUnavailable, Redis::CannotConnectError, Errno::ECONNREFUSED, Timeout, Timeout::Error, Errno::EAGAIN
     fail_return
   end
 

data/lib/redness/red_hash.rb

@@ -41,6 +41,10 @@ class RedHash
     end
   end
 
+  def get(key)
+    self[key]
+  end
+
   def set(options)
     redis.execute_with_uncertainty(false) do
       options.keys.each do |option|

data/lib/redness/red_list.rb

@@ -1,4 +1,6 @@
 class RedList
+  attr_reader :key
+
   def self.redis
     @redis ||= Red.new
   end
@@ -47,4 +49,19 @@ class RedList
     end
   end
 
+  def initialize(key)
+    @key = key
+  end
+
+  def add(value)
+    self.class.add(@key, value)
+  end
+
+  def remove(value)
+    self.class.remove(@key, value)
+  end
+
+  def value
+    self.class.get(@key)
+  end
 end

data/lib/redness/red_set.rb

@@ -1,4 +1,6 @@
 class RedSet
+  attr_reader :key
+
   def self.redis
     @redis ||= Red.new
   end
@@ -43,8 +45,14 @@ class RedSet
       results = redis.zrevrange(key, lower_bound, upper_bound, :with_scores => with_scores)
       if with_scores
         [].tap do |memo|
-          results.each_slice(2) do |slice|
-            memo << [slice[0].to_i, scoring.call(slice[1].to_i)]
+          if Red.client_version.first < 3
+            results.each_slice(2) do |slice|
+              memo << [slice[0].to_i, scoring.call(slice[1].to_i)]
+            end
+          else
+            results.each do |member, score|
+              memo << [member.to_i, scoring.call(score)]
+            end
           end
         end
       else
@@ -73,4 +81,20 @@ class RedSet
       redis.zscore(key, member)
     end
   end
+
+  def initialize(key)
+    @key = key
+  end
+
+  def add(value, options = {})
+    self.class.add(@key, value, options)
+  end
+
+  def value
+    self.class.get(@key)
+  end
+
+  def remove(value)
+    self.class.remove(@key, value)
+  end
 end

data/lib/{version.rb → redness/version.rb}

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

data/redness.gemspec

@@ -1,5 +1,5 @@
 $:.push File.expand_path("../lib", __FILE__)
-require "version"
+require "redness/version"
 
 Gem::Specification.new do |s|
   s.name = "redness"
@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/howaboutwe/redness"
   s.licenses = ["MIT"]
   s.files = `git ls-files`.split("\n")
-  s.add_dependency "json"
-  s.add_dependency "rspec"
-  s.add_dependency "redis", "~> 2.2.2"
-  s.add_dependency "activesupport"
-  s.add_dependency "timecop"
+  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "rspec"
+  s.add_runtime_dependency "redis", "~> 3.0.0"
+  s.add_runtime_dependency "activesupport"
+  s.add_development_dependency "timecop"
+  s.add_development_dependency "rake"
   s.require_paths = ["lib"]
 end

data/spec/redness/red_hash_spec.rb

@@ -75,6 +75,22 @@ describe RedHash do
     end
   end
 
+  describe "#get" do
+    before do
+      red_hash.set(
+        key: "foo",
+        another: "bar",
+        yet_another: "baz"
+      )
+    end
+
+    it "is aliased to []" do
+      red_hash.should_receive(:[]).with("key").and_return("foo")
+
+      red_hash.get("key").should == "foo"
+    end
+  end
+
   describe "#set" do
     it "accepts a hash, and sets all keys" do
       red_hash.set(

data/spec/redness/red_list_spec.rb

@@ -1,6 +1,51 @@
 require 'spec_integration_helper'
 
 describe RedList do
+  describe "#initialize" do
+    it "creates a new RedList instance with the provided key" do
+      list = RedList.new("somekey")
+
+      list.key.should == "somekey"
+    end
+  end
+
+  describe "#add" do
+    it "adds the element to the list" do
+      list = RedList.new("somekey")
+
+      list.add(1)
+
+      list.value.should == [1]
+    end
+  end
+
+  describe "#remove" do
+    it "removes the element from the list" do
+      list = RedList.new("somekey")
+
+      list.add(1)
+      list.add(2)
+
+      list.value.should == [2, 1]
+
+      list.remove(2)
+
+      list.value.should == [1]
+    end
+  end
+
+  describe "#value" do
+    it "returns the vlue of the list" do
+      list = RedList.new("somekey")
+
+      list.value.should == []
+
+      list.add(1)
+
+      list.value.should == [1]
+    end
+  end
+
   describe ".add" do
     it "adds a member to the list" do
       RedList.add("somekey", 2)

data/spec/redness/red_set_spec.rb

@@ -1,6 +1,49 @@
 require 'spec_integration_helper'
 
 describe RedSet do
+  describe "#initialize" do
+    it "creates a new RedSet instance and stores the key" do
+      set = RedSet.new("somekey")
+
+      set.key.should == "somekey"
+    end
+  end
+
+  describe "#add" do
+    it "adds the given value to the set" do
+      set = RedSet.new("somekey")
+
+      set.add(1)
+
+      set.value.should == [1]
+    end
+  end
+
+  describe "#value" do
+    it "returns the RedSet collection" do
+      set = RedSet.new("somekey")
+      set.value.should == []
+
+      set.add(1)
+
+      set.value.should == [1]
+    end
+  end
+
+  describe "#remove" do
+    it "removes the item from the set" do
+      set = RedSet.new("somekey")
+      set.add(1)
+      set.add(2)
+
+      set.value.should == [2, 1]
+
+      set.remove(2)
+
+      set.value.should == [1]
+    end
+  end
+
   describe ".add" do
     it "should add a member to the set" do
       RedSet.add("somekey", 2)
@@ -31,7 +74,7 @@ describe RedSet do
     it "sets the score when one is provided" do
       RedSet.add("somekey", 1, :score => lambda { 1000 })
 
-      RedSet.score("somekey", 1).should == "1000"
+      RedSet.score("somekey", 1).should == 1000
     end
   end
 
@@ -50,19 +93,33 @@ describe RedSet do
     it "returns the score of member within key" do
       RedSet.add("somekey", 1)
 
-      RedSet.score("somekey", 1).should == "0"
+      RedSet.score("somekey", 1).should == 0
     end
   end
 
   describe ".get" do
-    describe "pagination" do
-      it "should return results bounded by provided options" do
-        RedSet.add("somekey", 1)
-        RedSet.add("somekey", 2)
-
-        RedSet.get("somekey", :lower => 0, :upper => 0).should == [2]
-        RedSet.get("somekey", :lower => 1, :upper => 1).should == [1]
-      end
+    it "should return the elements in reverse-inserted order" do
+      RedSet.add('somekey', 1)
+      RedSet.add('somekey', 2)
+      RedSet.add('somekey', 3)
+
+      RedSet.get('somekey').should == [3, 2, 1]
+    end
+
+    it "should pair the elements with their scores if :with_scores is true" do
+      RedSet.add('somekey', 1)
+      RedSet.add('somekey', 2)
+      RedSet.add('somekey', 3)
+
+      RedSet.get('somekey', :with_scores => true).should == [[3, 2], [2, 1], [1, 0]]
+    end
+
+    it "should return results bounded by provided pagination options" do
+      RedSet.add("somekey", 1)
+      RedSet.add("somekey", 2)
+
+      RedSet.get("somekey", :lower => 0, :upper => 0).should == [2]
+      RedSet.get("somekey", :lower => 1, :upper => 1).should == [1]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redness
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,11 +14,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70095839355840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095839355840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70095839355420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,21 +42,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095839355420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70095839354920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095839354920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70095839354500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,18 +74,44 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095839354500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70095839354040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  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
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70095839354040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helpful Ruby classes for improved Redis data structures
 email: dev@howaboutwe.com
 executables: []
@@ -78,8 +119,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - RAKEFILE
 - README.md
@@ -96,7 +137,7 @@ files:
 - lib/redness/red_set_multi.rb
 - lib/redness/red_set_union.rb
 - lib/redness/timed_red_set.rb
-- lib/version.rb
+- lib/redness/version.rb
 - redness.gemspec
 - spec/redis_runner.rb
 - spec/redness/red_capped_list_spec.rb
@@ -130,8 +171,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Helpful Ruby classes for improved Redis data structures
 test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,32 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    json (1.6.6)
-    multi_json (1.3.2)
-    rake (0.9.2.2)
-    redis (2.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    timecop (0.3.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  json
-  rake
-  redis (~> 2.2.2)
-  rspec
-  timecop