em-hiredis 0.1.1 → 0.2.0

data/spec/redis_commands_spec.rb

@@ -611,7 +611,7 @@ describe EventMachine::Hiredis, "commands" do
   it "provides info (INFO)" do
     connect do |redis|
       redis.info do |r|
-        [:last_save_time, :redis_version, :total_connections_received, :connected_clients, :total_commands_processed, :connected_slaves, :uptime_in_seconds, :used_memory, :uptime_in_days, :changes_since_last_save].each do |x|
+        [:redis_version, :total_connections_received, :connected_clients, :total_commands_processed, :connected_slaves, :uptime_in_seconds, :used_memory, :uptime_in_days].each do |x|
           r.keys.include?(x).should == true
         end
         done
@@ -619,6 +619,17 @@ describe EventMachine::Hiredis, "commands" do
     end
   end
 
+  it "provides commandstats (INFO COMMANDSTATS)" do
+    connect do |redis|
+      redis.info_commandstats do |r|
+        r[:get][:calls].should be_a_kind_of(Integer)
+        r[:get][:usec].should be_a_kind_of(Integer)
+        r[:get][:usec_per_call].should be_a_kind_of(Float)
+        done
+      end
+    end
+  end
+
   it "flushes the database (FLUSHDB)" do
     connect do |redis|
       redis.set('key1', 'keyone')
@@ -632,7 +643,7 @@ describe EventMachine::Hiredis, "commands" do
   it "SELECTs database" do
     connect do |redis|
       redis.set("foo", "bar") do |set_response|
-        redis.select("9") do |select_response|
+        redis.select("10") do |select_response|
           redis.get("foo") do |get_response|
             get_response.should == nil; done
           end
@@ -810,8 +821,9 @@ describe EventMachine::Hiredis, "with nested multi-bulk response" do
       redis.multi
       redis.smembers "user:one:interests"
       redis.smembers "user:two:interests"
-      redis.exec do |user_interests|
-        user_interests.should == [["second-interest", "first-interest"], ['third-interest']]
+      redis.exec do |interests_one, interests_two|
+        interests_one.sort.should == ["first-interest", "second-interest"]
+        interests_two.should == ['third-interest']
       end
       redis.mget("user:one:id", "user:two:id") do |user_ids|
         user_ids.should == ['id-one', 'id-two']
@@ -824,11 +836,20 @@ end
 describe EventMachine::Hiredis, "monitor" do
   it "returns monitored commands" do
     connect do |redis|
-      redis.monitor do |reply|
-        reply.should == "OK"
-      end
+      # 1. Create 2nd connection to send traffic to monitor
+      redis2 = EventMachine::Hiredis.connect("redis://localhost:6379/")
+      redis2.callback {
+        # 2. Monitor after command has connected
+        redis.monitor do |reply|
+          reply.should == "OK"
+
+          # 3. Command which should show up in monitor output
+          redis2.get('foo')
+        end
+      }
+
       redis.on(:monitor) do |line|
-        line.should =~ /monitor/
+        line.should =~ /foo/
         done
       end
     end

data/spec/spec_helper.rb

@@ -12,3 +12,6 @@ RSpec.configure do |config|
   config.include EventMachine::SpecHelper
   config.include RedisMock::Helper
 end
+
+# This speeds the tests up a bit
+EM::Hiredis.reconnect_timeout = 0.01

data/spec/support/connection_helper.rb

@@ -1,8 +1,10 @@
 module ConnectionHelper
-  def connect(url = nil, &blk)
-    em do
+  # Use db 9 for tests to avoid flushing the main db
+  # It would be nice if there was a standard db number for testing...
+  def connect(timeout = 1, url = "redis://localhost:6379/9", &blk)
+    em(timeout) do
       redis = EventMachine::Hiredis.connect(url)
-      redis.flushall
+      redis.flushdb
       blk.call(redis)
     end
   end

data/spec/url_param_spec.rb

@@ -7,7 +7,7 @@ describe EventMachine::Hiredis, "URL parsing" do
 
     redis.host.should == "127.0.0.1"
     redis.port.should == 6379
-    redis.db.should == "0"
+    redis.db.should == 0
     redis.password.should == nil
   end
 
@@ -16,7 +16,7 @@ describe EventMachine::Hiredis, "URL parsing" do
 
     redis.host.should == "foo.com"
     redis.port.should == 999
-    redis.db.should == "2"
+    redis.db.should == 2
     redis.password.should == "secr3t"
   end
 
@@ -35,7 +35,7 @@ describe EventMachine::Hiredis, "URL parsing" do
 
     redis.host.should == "foo.com"
     redis.port.should == 999
-    redis.db.should == "2"
+    redis.db.should == 2
     redis.password.should == "secr3t"
 
     ENV.delete("REDIS_URL")

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: em-hiredis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70172074018560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172074018560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: em-spec
-  requirement: &70172074030920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.5
   type: :development
   prerelease: false
-  version_requirements: *70172074030920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172074026440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70172074026440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172074025080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172074025080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Eventmachine redis client using hiredis native parser
 email:
 - me@mloughran.com
@@ -64,18 +75,29 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
 - em-hiredis.gemspec
+- examples/getting_started.rb
+- examples/pubsub_basics.rb
+- examples/pubsub_more.rb
+- examples/pubsub_raw.rb
 - lib/em-hiredis.rb
+- lib/em-hiredis/base_client.rb
 - lib/em-hiredis/client.rb
 - lib/em-hiredis/connection.rb
 - lib/em-hiredis/event_emitter.rb
+- lib/em-hiredis/lock.rb
+- lib/em-hiredis/persistent_lock.rb
+- lib/em-hiredis/pubsub_client.rb
 - lib/em-hiredis/version.rb
+- spec/base_client_spec.rb
 - spec/connection_spec.rb
 - spec/live_redis_protocol_spec.rb
+- spec/pubsub_spec.rb
 - spec/redis_commands_spec.rb
 - spec/spec_helper.rb
 - spec/support/connection_helper.rb
@@ -83,31 +105,32 @@ files:
 - spec/url_param_spec.rb
 homepage: http://github.com/mloughran/em-hiredis
 licenses: []
+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: em-hiredis
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Eventmachine redis client
 test_files:
+- spec/base_client_spec.rb
 - spec/connection_spec.rb
 - spec/live_redis_protocol_spec.rb
+- spec/pubsub_spec.rb
 - spec/redis_commands_spec.rb
 - spec/spec_helper.rb
 - spec/support/connection_helper.rb