hiredis 0.2.0 → 0.3.0

data/vendor/hiredis/sds.h

@@ -44,11 +44,12 @@ struct sdshdr {
 
 sds sdsnewlen(const void *init, size_t initlen);
 sds sdsnew(const char *init);
-sds sdsempty();
+sds sdsempty(void);
 size_t sdslen(const sds s);
 sds sdsdup(const sds s);
 void sdsfree(sds s);
 size_t sdsavail(sds s);
+sds sdsgrowzero(sds s, size_t len);
 sds sdscatlen(sds s, const void *t, size_t len);
 sds sdscat(sds s, const char *t);
 sds sdscpylen(sds s, char *t, size_t len);

data/vendor/hiredis/test.c

@@ -32,7 +32,7 @@ static void __connect(redisContext **target) {
     }
 }
 
-static void test_format_commands() {
+static void test_format_commands(void) {
     char *cmd;
     int len;
 
@@ -116,7 +116,7 @@ static void test_format_commands() {
     free(cmd);
 }
 
-static void test_blocking_connection() {
+static void test_blocking_connection(void) {
     redisContext *c;
     redisReply *reply;
     int major, minor;
@@ -261,7 +261,7 @@ static void test_blocking_connection() {
     __connect(&c);
 }
 
-static void test_reply_reader() {
+static void test_reply_reader(void) {
     void *reader;
     void *reply;
     char *err;
@@ -318,9 +318,18 @@ static void test_reply_reader() {
     ret = redisReplyReaderGetReply(reader,&reply);
     test_cond(ret == REDIS_OK && reply == (void*)REDIS_REPLY_STATUS);
     redisReplyReaderFree(reader);
+
+    test("Properly reset state after protocol error: ");
+    reader = redisReplyReaderCreate();
+    redisReplyReaderSetReplyObjectFunctions(reader,NULL);
+    redisReplyReaderFeed(reader,(char*)"x",1);
+    ret = redisReplyReaderGetReply(reader,&reply);
+    assert(ret == REDIS_ERR);
+    ret = redisReplyReaderGetReply(reader,&reply);
+    test_cond(ret == REDIS_OK && reply == NULL)
 }
 
-static void test_throughput() {
+static void test_throughput(void) {
     int i;
     long long t1, t2;
     redisContext *c = blocking_context;
@@ -354,7 +363,7 @@ static void test_throughput() {
     printf("\t(1000x LRANGE with 500 elements: %.2fs)\n", (t2-t1)/1000000.0);
 }
 
-static void cleanup() {
+static void cleanup(void) {
     redisContext *c = blocking_context;
     redisReply *reply;
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hiredis
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pieter Noordhuis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,32 +32,17 @@ dependencies:
         - 7
         - 1
         version: 0.7.1
-  type: :runtime
+  type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redis
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
-        version: 2.1.1
-  type: :runtime
-  version_requirements: *id002
 description: Ruby extension that wraps Hiredis (blocking connection and reply parsing)
-email: pcnoordhuis@gmail.com
+email: 
+- pcnoordhuis@gmail.com
 executables: []
 
 extensions: 
 - ext/hiredis_ext/extconf.rb
-extra_rdoc_files: 
-- COPYING
+extra_rdoc_files: []
+
 files: 
 - COPYING
 - Rakefile
@@ -67,10 +52,11 @@ files:
 - ext/hiredis_ext/reader.c
 - ext/hiredis_ext/hiredis_ext.h
 - lib/hiredis/connection.rb
-- lib/hiredis/em/base.rb
-- lib/hiredis/em/connection.rb
-- lib/hiredis/em.rb
+- lib/hiredis/ext/connection.rb
+- lib/hiredis/ext/reader.rb
 - lib/hiredis/reader.rb
+- lib/hiredis/ruby/connection.rb
+- lib/hiredis/ruby/reader.rb
 - lib/hiredis/version.rb
 - lib/hiredis.rb
 - vendor/hiredis/async.c
@@ -118,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby extension that wraps Hiredis (blocking connection and reply parsing)

data/lib/hiredis/em.rb

@@ -1 +0,0 @@
-require 'hiredis/em/connection'

data/lib/hiredis/em/base.rb

@@ -1,36 +0,0 @@
-require 'hiredis/reader'
-
-module Hiredis
-
-  module EM
-
-    class Base < ::EM::Connection
-
-      CRLF = "\r\n".freeze
-
-      def initialize
-        super
-        @reader = Reader.new
-      end
-
-      def receive_data(data)
-        @reader.feed(data)
-        while reply = @reader.gets
-          receive_reply(reply)
-        end
-      end
-
-      def receive_reply(reply)
-      end
-
-      def send_command(*args)
-        args = args.flatten
-        send_data("*" + args.size.to_s + CRLF)
-        args.each do |arg|
-          arg = arg.to_s
-          send_data("$" + arg.size.to_s + CRLF + arg + CRLF)
-        end
-      end
-    end
-  end
-end

data/lib/hiredis/em/connection.rb

@@ -1,25 +0,0 @@
-require 'hiredis/em/base'
-
-module Hiredis
-
-  module EM
-
-    class Connection < Base
-
-      def initialize
-        super
-        @callbacks = []
-      end
-
-      def receive_reply(reply)
-        callback = @callbacks.shift
-        callback.call(reply) if callback
-      end
-
-      def method_missing(sym, *args, &callback)
-        send_command(sym, *args)
-        @callbacks.push callback
-      end
-    end
-  end
-end