mock_redis 0.9.0 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.10.0
+* Add support for :nx, :xx, :ex, :px options for SET command
+
 ### 0.9.0
 * Added futures support
 

data/lib/mock_redis/string_methods.rb

@@ -135,13 +135,39 @@ class MockRedis
       msetnx(*hash.to_a.flatten)
     end
 
-    def set(key, value)
+    def set(key, value, options = {})
+      return_true = false
+      options = options.dup
+      if options.delete(:nx)
+        if exists(key)
+          return false
+        else
+          return_true = true
+        end
+      end
+      if options.delete(:xx)
+        if exists(key)
+          return_true = true
+        else
+          return false
+        end
+      end
       data[key] = value.to_s
-      'OK'
+
+      # take latter
+      expire_option = options.to_a.last
+      if expire_option
+        type, duration = expire_option
+        if duration == 0
+          raise Redis::CommandError, 'ERR invalid expire time in SETEX'
+        end
+        expire(key, type.to_sym == :ex ? duration : duration / 1000.0)
+      end
+      return_true ? true : 'OK'
     end
 
-    def []=(key, value)
-      set(key, value)
+    def []=(key, value, options = {})
+      set(key, value, options)
     end
 
     def setbit(key, offset, value)

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/mock_redis.gemspec

@@ -1,24 +1,28 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "mock_redis/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'mock_redis/version'
 
 Gem::Specification.new do |s|
-  s.name        = "mock_redis"
+  s.name        = 'mock_redis'
   s.version     = MockRedis::VERSION
+  s.license     = 'MIT'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Causes Engineering', 'Samuel Merritt']
   s.email       = ['eng@causes.com']
-  s.homepage    = "https://github.com/causes/mock_redis"
-  s.summary     = %q{Redis mock that just lives in memory; useful for testing.}
+  s.homepage    = 'https://github.com/causes/mock_redis'
+  s.summary     = 'Redis mock that just lives in memory; useful for testing.'
 
-  s.description = %q{Instantiate one with `redis = MockRedis.new` and treat it like you would a normal Redis object. It supports all the usual Redis operations.}
+  s.description = <<-EOS.strip.gsub(/\s+/, ' ')
+   Instantiate one with `redis = MockRedis.new` and treat it like you would a
+   normal Redis object. It supports all the usual Redis operations.
+  EOS
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_development_dependency "rake", "~> 0.9.2"
-  s.add_development_dependency "redis", "~> 3.0.0"
-  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'redis', '~> 3.0.0'
+  s.add_development_dependency 'rspec', '~> 2.6.0'
 end

data/spec/commands/set_spec.rb

@@ -4,4 +4,60 @@ describe '#set(key, value)' do
   it "responds with 'OK'" do
     @redises.set('mock-redis-test', 1).should == 'OK'
   end
+
+  context 'options' do
+    it 'raises an error for EX seconds = 0' do
+      expect do
+        @redises.set('mock-redis-test', 1, ex: 0)
+      end.to raise_error(Redis::CommandError, 'ERR invalid expire time in SETEX')
+    end
+
+    it 'raises an error for PX milliseconds = 0' do
+      expect do
+        @redises.set('mock-redis-test', 1, px: 0)
+      end.to raise_error(Redis::CommandError, 'ERR invalid expire time in SETEX')
+    end
+
+    it 'accepts NX' do
+      key = 'mock-redis-test'
+      @redises.del(key)
+      @redises.set(key, 1, nx: true).should be_true
+      @redises.set(key, 1, nx: true).should be_false
+    end
+
+    it 'accepts XX' do
+      key = 'mock-redis-test'
+      @redises.del(key)
+      @redises.set(key, 1, xx: true).should be_false
+      @redises.set(key, 1).should == 'OK'
+      @redises.set(key, 1, xx: true).should be_true
+    end
+
+    context '[mock only]' do
+      before(:all) do
+        @mock = @redises.mock
+      end
+
+      before do
+        @now = Time.now
+        Time.stub!(:now).and_return(@now)
+      end
+
+      it 'accepts EX seconds' do
+        key = 'mock-redis-test'
+        @mock.set(key, 1, ex: 1).should == 'OK'
+        @mock.get(key).should_not be_nil
+        Time.stub!(:now).and_return(@now + 2)
+        @mock.get(key).should be_nil
+      end
+
+      it 'accepts PX milliseconds' do
+        key = 'mock-redis-test'
+        @mock.set(key, 1, px: 1000).should == 'OK'
+        @mock.get(key).should_not be_nil
+        Time.stub!(:now).and_return(@now + 2)
+        @mock.get(key).should be_nil
+      end
+    end
+  end
 end

metadata

@@ -1,82 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mock_redis
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+version: !ruby/object:Gem::Version
+  version: 0.10.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Causes Engineering
 - Samuel Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-08 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-description: Instantiate one with `redis = MockRedis.new` and treat it like you would a normal Redis object. It supports all the usual Redis operations.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+description: Instantiate one with `redis = MockRedis.new` and treat it like you would
+  a normal Redis object. It supports all the usual Redis operations.
+email:
 - eng@causes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .mailmap
 - .rspec
@@ -239,41 +230,32 @@ files:
 - spec/support/shared_examples/only_operates_on_zsets.rb
 - spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
-has_rdoc: true
 homepage: https://github.com/causes/mock_redis
-licenses: []
-
+licenses:
+- MIT
 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: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Redis mock that just lives in memory; useful for testing.
-test_files: 
+test_files:
 - spec/client_spec.rb
 - spec/cloning_spec.rb
 - spec/commands/append_spec.rb