fakeredis 0.2.0 → 0.2.1

data/.travis.yml

@@ -1,9 +1,9 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - ruby-head
   - ree
-  - rbx
   - jruby
-  - rbx-head
-  - ruby-head
-  - rbx-2.0.0pre
+  - rbx
+  - rbx-2.0

data/lib/fakeredis/version.rb

@@ -1,3 +1,3 @@
 module FakeRedis
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/redis/connection/memory.rb

@@ -4,11 +4,65 @@ require 'redis/connection/command_helper'
 class Redis
   module Connection
     class Memory
+      # Represents a normal hash with some additional expiration information
+      # associated with each key
+      class ExpiringHash < Hash
+        attr_reader :expires
+        
+        def initialize(*)
+          super
+          @expires = {}
+        end
+        
+        def [](key)
+          delete(key) if expired?(key)
+          super
+        end
+
+        def []=(key, val)
+          expire(key)
+          super
+        end
+
+        def delete(key)
+          expire(key)
+          super
+        end
+
+        def expire(key)
+          expires.delete(key)
+        end
+
+        def expired?(key)
+          expires.include?(key) && expires[key] < Time.now
+        end
+
+        def key?(key)
+          delete(key) if expired?(key)
+          super
+        end
+
+        def values_at(*keys)
+          keys.each {|key| delete(key) if expired?(key)}
+          super
+        end
+
+        def keys
+          super.select do |key|
+            if expired?(key)
+              delete(key)
+              false
+            else
+              true
+            end
+          end
+        end
+      end
+      
       include Redis::Connection::CommandHelper
 
       def initialize
-        @data = {}
-        @expires = {}
+        @data = ExpiringHash.new
         @connected = false
         @replies = []
       end
@@ -62,7 +116,6 @@ class Redis
       # * mapped_mset
       # * mapped_msetnx
       # * move
-      # * multi
       # * subscribe
       # * psubscribe
       # * publish
@@ -85,8 +138,7 @@ class Redis
       # * zscore
       # * zunionstore
       def flushdb
-        @data = {}
-        @expires = {}
+        @data = ExpiringHash.new
       end
 
       def flushall
@@ -123,12 +175,10 @@ class Redis
       def bgreriteaof ; end
 
       def get(key)
-        #return if expired?(key)
         @data[key]
       end
 
       def getbit(key, offset)
-        #return if expired?(key)
         return unless @data[key]
         @data[key].unpack('B8')[0].split("")[offset]
       end
@@ -423,7 +473,6 @@ class Redis
         old_count = @data.keys.size
         keys.flatten.each do |key|
           @data.delete(key)
-          @expires.delete(key)
         end
         deleted_count = old_count - @data.keys.size
       end
@@ -435,9 +484,8 @@ class Redis
       def rename(key, new_key)
         return unless @data[key]
         @data[new_key] = @data[key]
-        @expires[new_key] = @expires[key]
+        @data.expires[new_key] = @data.expires[key] if @data.expires.include?(key)
         @data.delete(key)
-        @expires.delete(key)
       end
 
       def renamenx(key, new_key)
@@ -446,21 +494,25 @@ class Redis
 
       def expire(key, ttl)
         return unless @data[key]
-        @expires[key] = ttl
+        @data.expires[key] = Time.now + ttl
         true
       end
 
       def ttl(key)
-        @expires[key]
+        if @data.expires.include?(key) && (ttl = @data.expires[key].to_i - Time.now.to_i) > 0
+          ttl
+        else
+          -1
+        end
       end
 
       def expireat(key, timestamp)
-        @expires[key] = (Time.at(timestamp) - Time.now).to_i
+        @data.expires[key] = Time.at(timestamp)
         true
       end
 
       def persist(key)
-        @expires[key] = -1
+        @data.expires.delete(key)
       end
 
       def hset(key, field, value)
@@ -643,11 +695,6 @@ class Redis
         def fail_unless_set(key)
           fail "Not a set" unless is_a_set?(key)
         end
-
-        def expired?(key)
-          return false if @expires[key] == -1
-          return true if @expires[key] && @expires[key] < Time.now
-        end
     end
   end
 end

data/spec/keys_spec.rb

@@ -34,7 +34,52 @@ puts "checking existence"
       @client.set("key1", "1")
       @client.expireat("key1", Time.now.to_i + 2)
 
-      @client.ttl("key1").should == 1
+      @client.ttl("key1").should == 2
+    end
+
+    it 'should not have an expiration after re-set' do
+      @client.set("key1", "1")
+      @client.expireat("key1", Time.now.to_i + 2)
+      @client.set("key1", "1")
+
+      @client.ttl("key1").should == -1
+    end
+
+    it "should not have a ttl if expired" do
+      @client.set("key1", "1")
+      @client.expireat("key1", Time.now.to_i)
+
+      @client.ttl("key1").should == -1
+    end
+    
+    it "should not find a key if expired" do
+      @client.set("key1", "1")
+      @client.expireat("key1", Time.now.to_i)
+
+      @client.get("key1").should be_nil
+    end
+
+    it "should not find multiple keys if expired" do
+      @client.set("key1", "1")
+      @client.set("key2", "2")
+      @client.expireat("key1", Time.now.to_i)
+
+      @client.mget("key1", "key2").should == [nil, "2"]
+    end
+
+    it "should only find keys that aren't expired" do
+      @client.set("key1", "1")
+      @client.set("key2", "2")
+      @client.expireat("key1", Time.now.to_i)
+
+      @client.keys.should == ["key2"]
+    end
+
+    it "should not exist if expired" do
+      @client.set("key1", "1")
+      @client.expireat("key1", Time.now.to_i)
+
+      @client.exists("key1").should be_false
     end
 
     it "should find all keys matching the given pattern" do

metadata

@@ -1,65 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fakeredis
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Guillermo Iguaran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-31 00:00:00 -05:00
+date: 2011-08-18 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152100500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152100500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152098160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id002
-description: Fake (In-memory) driver for redis-rb. Useful for testing environment and machines without Redis.
-email: 
+  prerelease: false
+  version_requirements: *2152098160
+description: Fake (In-memory) driver for redis-rb. Useful for testing environment
+  and machines without Redis.
+email:
 - guilleiguaran@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -85,38 +67,29 @@ files:
 has_rdoc: true
 homepage: https://github.com/guilleiguaran/fakeredis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fakeredis
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fake (In-memory) driver for redis-rb.
-test_files: 
+test_files:
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
 - spec/hashes_spec.rb