redis 3.3.3 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c3925815d6e2759b4b515f0763642ae57008c0
-  data.tar.gz: eb7c95f1d00b9d2e1361fe1642a25bb51d9d42ab
+  metadata.gz: 729f56810aa501065e2fc203050363713c80ee37
+  data.tar.gz: e7e13fb75618f794a2c742d73d6c8a72699d5e92
 SHA512:
-  metadata.gz: f734dca16f3a504caeb402b26f0b20c43c89d18e279facc58d0257500e4f8eb2ead727dca33947fd526e845a18950bf299f8351135281f63fe93fc1c96643047
-  data.tar.gz: ee0ab1ef846235e499dc3a576ba8285c2e2e807d1c64612059e29d391418772d68cd0cc23474711015e29ec4c936d9f4305bb8a1c926dc5f53cd9d4ed0546896
+  metadata.gz: f87e76c751760b7f1feb7c859ea373c41ebf805c104c27e85177cb20a60d42b11c50db2d5a916fb7bfc78b82b13141770a851568aea922ccc1970f4e30ba1dea
+  data.tar.gz: ac4cb236c9c9897d73ead9421e161cf1c7aac2a3c1f77c088b5c52c324cddccda6ab749441093cbcc94ea812e70232f9f9ac1c160a96fd1fbd46d87586d1d7fb

data/CHANGELOG.md

@@ -1,16 +1,11 @@
-# 4.x (unreleased)
-
-## Planned breaking changes:
-* `Redis#client` will no longer expose the underlying `Redis::Client`;
-  it has not yet been determined how 4.0 will expose the underlying
-  functionality, but we will make every attempt to provide a final minor
-  release of 3.x that provides the new interfaces in order to facilitate
-  a smooth transition.
-
-* Ruby 1.8.7 (and the 1.8 modes of JRuby and Rubinius) will no longer be
-  supported; 1.8.x entered end-of-life in June of 2012 and stopped receiving
-  security updates in June of 2013; continuing to support it would prevent
-  the use of newer features of Ruby.
+# 3.3.5
+
+* Fixed Ruby 1.8 compatibility after backporting `Redis#connection`. See #719.
+
+# 3.3.4
+
+* `Redis#connection` returns a hash with connection information.
+  You shouldn't need to call `Redis#_client`, ever.
 
 # 3.3.3
 

data/lib/redis.rb

@@ -2700,6 +2700,16 @@ class Redis
     self.class.new(@options)
   end
 
+  def connection
+    {
+      :host     => @original_client.host,
+      :port     => @original_client.port,
+      :db       => @original_client.db,
+      :id       => @original_client.id,
+      :location => @original_client.location
+    }
+  end
+
   def method_missing(command, *args)
     synchronize do |client|
       client.call([command] + args)

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.3.3"
+  VERSION = "3.3.5"
 end

data/test/connection_test.rb

@@ -0,0 +1,57 @@
+require_relative "helper"
+
+class TestConnection < Test::Unit::TestCase
+
+  include Helper::Client
+
+  def test_provides_a_meaningful_inspect
+    assert_equal "#<Redis client v#{Redis::VERSION} for redis://127.0.0.1:#{PORT}/15>", r.inspect
+  end
+
+  def test_connection_information
+    assert_equal "127.0.0.1",                 r.connection.fetch(:host)
+    assert_equal 6381,                        r.connection.fetch(:port)
+    assert_equal 15,                          r.connection.fetch(:db)
+    assert_equal "127.0.0.1:6381",            r.connection.fetch(:location)
+    assert_equal "redis://127.0.0.1:6381/15", r.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_host_and_port_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0, :scheme => "foo"))
+    assert_equal "redis://host:1234/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_default_id_with_path_and_explicit_scheme
+    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0, :scheme => "foo"))
+    assert_equal "redis:///tmp/redis.sock/0", redis.connection.fetch(:id)
+  end
+
+  def test_override_id
+    redis = Redis.new(OPTIONS.merge(:id => "test"))
+    assert_equal "test", redis.connection.fetch(:id)
+  end
+
+  def test_id_inside_multi
+    redis         = Redis.new(OPTIONS)
+    id            = nil
+    connection_id = nil
+
+    redis.multi do
+      id            = redis.id
+      connection_id = redis.connection.fetch(:id)
+    end
+
+    assert_equal "redis://127.0.0.1:6381/15", id
+    assert_equal "redis://127.0.0.1:6381/15", connection_id
+  end
+end

data/test/internals_test.rb

@@ -44,10 +44,6 @@ class TestInternals < Test::Unit::TestCase
     end
   end
 
-  def test_provides_a_meaningful_inspect
-    assert_equal "#<Redis client v#{Redis::VERSION} for redis://127.0.0.1:#{PORT}/15>", r.inspect
-  end
-
   def test_redis_current
     assert_equal "127.0.0.1", Redis.current.client.host
     assert_equal 6379, Redis.current.client.port
@@ -79,48 +75,12 @@ class TestInternals < Test::Unit::TestCase
     assert !fresh_client.connected?
   end
 
-  def test_default_id_with_host_and_port
-    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0))
-    assert_equal "redis://host:1234/0", redis.client.id
-  end
-
-  def test_default_id_with_host_and_port_and_explicit_scheme
-    redis = Redis.new(OPTIONS.merge(:host => "host", :port => "1234", :db => 0, :scheme => "foo"))
-    assert_equal "redis://host:1234/0", redis.client.id
-  end
-
-  def test_default_id_with_path
-    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0))
-    assert_equal "redis:///tmp/redis.sock/0", redis.client.id
-  end
-
-  def test_default_id_with_path_and_explicit_scheme
-    redis = Redis.new(OPTIONS.merge(:path => "/tmp/redis.sock", :db => 0, :scheme => "foo"))
-    assert_equal "redis:///tmp/redis.sock/0", redis.client.id
-  end
-
-  def test_override_id
-    redis = Redis.new(OPTIONS.merge(:id => "test"))
-    assert_equal redis.client.id, "test"
-  end
-
   def test_timeout
     assert_nothing_raised do
       Redis.new(OPTIONS.merge(:timeout => 0))
     end
   end
 
-  def test_id_inside_multi
-    redis = Redis.new(OPTIONS)
-    id = nil
-
-    redis.multi do
-      id = redis.id
-    end
-
-    assert_equal id, "redis://127.0.0.1:6381/15"
-  end
-
   driver(:ruby) do
     def test_tcp_keepalive
       keepalive = {:time => 20, :intvl => 10, :probes => 5}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.5
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,20 +16,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
 - !ruby/object:Gem::Dependency
@@ -56,10 +56,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .travis/Gemfile
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".travis/Gemfile"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -109,6 +109,7 @@ files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb
@@ -184,17 +185,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for Redis
@@ -211,6 +212,7 @@ test_files:
 - test/commands_on_strings_test.rb
 - test/commands_on_value_types_test.rb
 - test/connection_handling_test.rb
+- test/connection_test.rb
 - test/db/.gitkeep
 - test/distributed_blocking_commands_test.rb
 - test/distributed_commands_on_hashes_test.rb