redis-namespace 1.5.0 → 1.5.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGI3Mjc4NGZmMjkyOTgyNzQ3MzMwNzAwZjkyZTk3MzE2ZjJlYTA0YQ==
+  data.tar.gz: !binary |-
+    ZGVlNjU3MDUxNDA3M2I0ZjVlYjQ5ZGJmYmYzOGNiOGJkMjI3NTUwZA==
+SHA512:
+  metadata.gz: !binary |-
+    NWU5MzVmOTNjMDUzOTcwYzUwYzhlZmU1NzAxZTY2M2MzMGY3MjlkYTVhNjNl
+    OGYyMmE1M2M1ZDY0MWZmZWIwNDA1NDk5M2VlYTcyZDliMTJmZDBhMGFiYTUx
+    MWMzMjJiYmFhMGE1YjlkMDM2ODY5NzFiNjM1YjQyNDBhMWQzZjc=
+  data.tar.gz: !binary |-
+    YjY1MGZkZmEzOWNhNmRhMTEzNjQ0MGNkYTQ4YWZmZjQ1YTAwNzA2MmJkZWJl
+    OTQ0MWQ3NWNiMzU1YjNkYzYzZGM4MTAyNGE3NTFkMTk0N2UzN2IyZThjY2Zk
+    NjJhODIyMGY1NzNmNThmN2E2MDUyOWJkNWU1OWZlZjA5MDdmM2I=

data/lib/redis/namespace.rb

@@ -182,6 +182,7 @@ class Redis
       "ttl"              => [ :first ],
       "type"             => [ :first ],
       "unsubscribe"      => [ :all ],
+      "unwatch"          => [ :all ],
       "watch"            => [ :all ],
       "zadd"             => [ :first ],
       "zcard"            => [ :first ],
@@ -215,7 +216,9 @@ class Redis
     def initialize(namespace, options = {})
       @namespace = namespace
       @redis = options[:redis] || Redis.current
-      @warning = options.fetch(:warning, true)
+      @warning = !!options.fetch(:warning) do
+                   !ENV['REDIS_NAMESPACE_QUIET']
+                 end
       @deprecations = !!options.fetch(:deprecations) do
                         ENV['REDIS_NAMESPACE_DEPRECATIONS']
                       end
@@ -225,6 +228,10 @@ class Redis
       @deprecations
     end
 
+    def warning?
+      @warning
+    end
+
     def client
       @redis.client
     end
@@ -285,9 +292,11 @@ class Redis
         # redis-namespace does not know how to handle this command.
         # Passing it to @redis as is, where redis-namespace shows
         # a warning message if @warning is set.
-        if @warning
+        if warning?
           call_site = caller.reject { |l| l.start_with?(__FILE__) }.first
-          warn("Passing '#{command}' command to redis as is (at #{call_site})")
+          warn("Passing '#{command}' command to redis as is; blind " +
+               "passthrough has been deprecated and will be removed in " +
+               "redis-namespace 2.0 (at #{call_site})")
         end
         @redis.send(command, *args, &block)
       else
@@ -401,13 +410,14 @@ class Redis
   private
 
     def namespaced_block(command, &block)
-      original = @redis
-      result = redis.send(command) do |r|
-        @redis = r
-        yield self
+      redis.send(command) do |r|
+        begin
+          original, @redis = @redis, r
+          yield self
+        ensure
+          @redis = original
+        end
       end
-      @redis = original
-      result
     end
 
     def add_namespace(key)

data/lib/redis/namespace/version.rb

@@ -2,6 +2,6 @@
 
 class Redis
   class Namespace
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

data/spec/deprecation_spec.rb

@@ -18,12 +18,18 @@ describe Redis::Namespace do
     subject { namespaced }
 
     its(:deprecations?) { should be false }
+    its(:warning?) { should be true }
 
     context('with REDIS_NAMESPACE_DEPRECATIONS') do
       around(:each) {|e| with_env('REDIS_NAMESPACE_DEPRECATIONS'=>'1', &e) }
       its(:deprecations?) { should be true }
     end
 
+    context('with REDIS_NAMESPACE_QUIET') do
+      around(:each) {|e| with_env('REDIS_NAMESPACE_QUIET'=>'1', &e) }
+      its(:warning?) { should be false }
+    end
+
     before(:each) do
       allow(redis).to receive(:unhandled) do |*args| 
         "unhandled(#{args.inspect})"
@@ -73,6 +79,17 @@ describe Redis::Namespace do
           expect(warning).to include %q(Passing 'unhandled' command to redis as is)
           expect(warning).to include __FILE__
         end
+
+        context('and warnings disabled') do
+          let(:options) { super().merge(:warning => false)}
+          it 'does not warn' do
+            capture_stderr(stderr = StringIO.new) do
+              namespaced.unhandled('bar')
+            end
+            warning = stderr.tap(&:rewind).read
+            expect(warning).to be_empty
+          end
+        end
       end
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-namespace
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.5.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,7 +26,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +36,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +43,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +50,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +57,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,39 +77,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
-- lib/redis/namespace/version.rb
-- lib/redis/namespace.rb
 - lib/redis-namespace.rb
+- lib/redis/namespace.rb
+- lib/redis/namespace/version.rb
 - spec/deprecation_spec.rb
 - spec/redis_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/resque/redis-namespace
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Namespaces Redis commands.
 test_files: []
 has_rdoc: false