superfeedr-em-redis 0.2.7 → 0.3.0

data/lib/em-redis/redis_protocol.rb

@@ -18,37 +18,7 @@ module EventMachine
       ASTERISK = "*".freeze
       DELIM    = "\r\n".freeze
 
-      BULK_COMMANDS = {
-        "set"       => true,
-        "setnx"     => true,
-        "rpush"     => true,
-        "lpush"     => true,
-        "lset"      => true,
-        "lrem"      => true,
-        "sadd"      => true,
-        "srem"      => true,
-        "sismember" => true,
-        "echo"      => true,
-        "getset"    => true,
-        "smove"     => true,
-        "zadd"      => true,
-        "zincrby"   => true,
-        "zrem"      => true,
-        "zscore"    => true,
-        "hget"      => true,
-        "hdel"      => true,
-        "hexists"   => true
-      }
-
-      MULTI_BULK_COMMANDS = {
-        "mset"      => true,
-        "msetnx"    => true,
-        "hset"      => true,
-        # these aliases aren't in redis gem
-        "multi_get" => true
-      }
-
-      BOOLEAN_PROCESSOR = lambda{|r| %w(1 OK).include? r.to_s }
+      BOOLEAN_PROCESSOR = lambda{|r| r == 1 }
 
       REPLY_PROCESSOR = {
         "exists"    => BOOLEAN_PROCESSOR,
@@ -186,11 +156,11 @@ module EventMachine
       def sort(key, options={}, &blk)
         cmd = ["SORT"]
         cmd << key
-        cmd << "BY #{options[:by]}" if options[:by]
-        cmd << "GET #{[options[:get]].flatten * ' GET '}" if options[:get]
-        cmd << "#{options[:order]}" if options[:order]
-        cmd << "LIMIT #{options[:limit].join(' ')}" if options[:limit]
-        call_command(cmd, &blk)
+        cmd << ["BY", options[:by]] if options[:by]
+        cmd << [options[:get]].flatten.map { |key| ["GET", key] } if options[:get]
+        cmd << options[:order].split(/\s+/) if options[:order]
+        cmd << ["LIMIT", options[:limit]] if options[:limit]
+        call_command(cmd.flatten, &blk)
       end
 
       def incr(key, increment = nil, &blk)
@@ -296,26 +266,16 @@ module EventMachine
         argv = argv.dup
 
         argv[0] = argv[0].to_s.downcase
-        if MULTI_BULK_COMMANDS[argv[0]]
-          command = ""
-          command << "*#{argv.size}\r\n"
-          argv.each do |a|
-            a = a.to_s
-            command << "$#{get_size(a)}\r\n"
-            command << a
-            command << "\r\n"
-          end
-        else
-          command = ""
-          bulk = nil
-          argv[0] = ALIASES[argv[0]] if ALIASES[argv[0]]
-          raise "#{argv[0]} command is disabled" if DISABLED_COMMANDS[argv[0]]
-          if BULK_COMMANDS[argv[0]] and argv.length > 1
-            bulk = argv[-1].to_s
-            argv[-1] = get_size(bulk)
-          end
-          command << "#{argv.join(' ')}\r\n"
-          command << "#{bulk}\r\n" if bulk
+        argv[0] = ALIASES[argv[0]] if ALIASES[argv[0]]
+        raise "#{argv[0]} command is disabled" if DISABLED_COMMANDS[argv[0]]
+
+        command = ""
+        command << "*#{argv.size}\r\n"
+        argv.each do |a|
+          a = a.to_s
+          command << "$#{get_size(a)}\r\n"
+          command << a
+          command << "\r\n"
         end
 
         @logger.debug { "*** sending: #{command}" } if @logger
@@ -325,23 +285,6 @@ module EventMachine
         end
       end
 
-      def call_commands(argvs, &blk)
-        pending = 0
-        results = []
-        check = lambda {
-          blk.call(results) if pending < 1
-        }
-        argvs.each do |argv|
-          call_command(argv) { |result|
-            results << result
-            pending -= 1
-            check.call
-          }
-          pending += 1
-        end
-        check.call
-      end
-
       ##
       # errors
       #########################
@@ -390,6 +333,7 @@ module EventMachine
           err.code = code
           raise err, "Redis server returned error code: #{code}"
         end
+        @values = []
 
         # These commands should be first
         auth_and_select_db
@@ -405,6 +349,7 @@ module EventMachine
         @logger.debug { "Connected to #{@host}:#{@port}" } if @logger
 
         @redis_callbacks = []
+        @previous_multibulks = []
         @multibulk_n     = false
         @reconnecting    = false
         @connected       = true
@@ -464,6 +409,9 @@ module EventMachine
           if multibulk_count == -1 || multibulk_count == 0
             dispatch_response([])
           else
+            if @multibulk_n
+              @previous_multibulks << [@multibulk_n, @multibulk_values]
+            end
             @multibulk_n = multibulk_count
             @multibulk_values = []
           end
@@ -481,18 +429,22 @@ module EventMachine
 
           if @multibulk_n == 0
             value = @multibulk_values
-            @multibulk_n = false
+            @multibulk_n,@multibulk_values = @previous_multibulks.pop
+            if @multibulk_n
+              dispatch_response(value)
+              return
+            end
           else
             return
           end
         end
 
         callback = @redis_callbacks.shift
-        if callback.kind_of?(Array) && callback.length == 2
+        if callback.length == 2
           processor, blk = callback
           value = processor.call(value) if processor
           blk.call(value) if blk
-        elsif callback.kind_of?(Array) && callback.length == 3
+        else
           processor, pipeline_count, blk = callback
           value = processor.call(value) if processor
           @values << value
@@ -505,11 +457,6 @@ module EventMachine
         end
       end
 
-      def start_multibulk(multibulk_count)
-        @multibulk_n = multibulk_count
-        @multibulk_values = []
-      end
-
       def unbind
         @logger.debug { "Disconnected" }  if @logger
         if @connected || @reconnecting

data/lib/em-redis/version.rb

@@ -0,0 +1,3 @@
+module EMRedis
+  VERSION = '0.3.0' unless defined? ::EMRedis::VERSION
+end

data/lib/em-redis.rb

@@ -1,47 +1,2 @@
-
-module EMRedis
-
-  # :stopdoc:
-  VERSION = '0.2.7'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
-end  # module EMRedis
-
-EMRedis.require_all_libs_relative_to(__FILE__)
+require File.expand_path('../em-redis/version', __FILE__)
+require File.expand_path('../em-redis/redis_protocol', __FILE__)

metadata

@@ -1,23 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: superfeedr-em-redis
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jonathan Broad
 - Eugene Pimenov
-- Stephan Maka
+- Julien Genestoux
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +02:00
+date: 2011-02-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,91 +27,47 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
-        - 12
-        - 10
-        version: 0.12.10
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: bundler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
-        - 1
         - 0
-        version: 1.1.0
+        - rc
+        - 6
+        version: 1.0.rc.6
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: em-spec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 4
-        - 1
-        version: 3.4.1
-  type: :development
-  version_requirements: *id004
 description: An eventmachine-based implementation of the Redis protocol
-email: stephan@spaceboyz.net
+email: 
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- README.rdoc
-- Rakefile
-- dump.rdb
-- lib/em-redis.rb
 - lib/em-redis/redis_protocol.rb
-- spec/live_redis_protocol_spec.rb
-- spec/redis_commands_spec.rb
-- spec/redis_commands_spec.rb.orig
-- spec/redis_protocol_spec.rb
-- spec/test_helper.rb
+- lib/em-redis/version.rb
+- lib/em-redis.rb
+- History.txt
 has_rdoc: true
-homepage: http://github.com/astro/em-redis
+homepage: http://github.com/superfeedr/em-redis
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,7 +75,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -129,13 +83,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: superfeedr-em-redis
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/README.rdoc

@@ -1,85 +0,0 @@
-== EM-REDIS
-
-== DESCRIPTION:
-
-An EventMachine[http://rubyeventmachine.com/] based library for interacting with the very cool Redis[http://code.google.com/p/redis/] data store by Salvatore 'antirez' Sanfilippo.
-Modeled after eventmachine's implementation of the memcached protocol, and influenced by Ezra Zygmuntowicz's {redis-rb}[http://github.com/ezmobius/redis-rb/tree/master] library (distributed as part of Redis).
-
-This library is only useful when used as part of an application that relies on
-Event Machine's event loop.  It implements an EM-based client protocol, which
-leverages the non-blocking nature of the EM interface to achieve significant
-parallelization without threads.
-
-
-== FEATURES/PROBLEMS:
-
-Implements most Redis commands (see {the list of available commands here}[http://code.google.com/p/redis/wiki/CommandReference] with the notable
-exception of MONITOR.
-
-== SYNOPSIS:
-
-Like any Deferrable eventmachine-based protocol implementation, using EM-Redis involves making calls and passing blocks that serve as callbacks when the call returns.  
-
-  require 'em-redis'
-
-  EM.run do
-    redis = EM::Protocols::Redis.connect
-    redis.errback do |code|
-      puts "Error code: #{code}"
-    end
-    redis.set "a", "foo" do |response|
-      redis.get "a" do |response|
-        puts response
-      end
-    end
-    # We get pipelining for free
-    redis.set("b", "bar")
-    redis.get("a") do |response|
-      puts response # will be foo
-    end
-  end
-
-To run tests on a Redis server (currently compatible with 1.3)
-
-  rake
-
-Because the EM::Protocol::Memcached code used Bacon for testing, test code is
-currently in the form of bacon specs.
-
-== REQUIREMENTS:
-
-* Redis (download[http://code.google.com/p/redis/downloads/list])
-
-== INSTALL:
-
-  sudo gem install em-redis
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008, 2009
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-== CREDIT
-
-    by Jonathan Broad (http://www.relativepath.org)
-

data/Rakefile

@@ -1,41 +0,0 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-
-begin
-  require 'bones'
-rescue LoadError
-  abort '### Please install the "bones" gem ###'
-end
-
-ensure_in_path 'lib'
-require 'em-redis'
-
-task :default => ['redis:test']
-
-Bones {
-  name 'superfeedr-em-redis'
-  authors ['Jonathan Broad', 'Eugene Pimenov', 'Stephan Maka']
-  email 'stephan@spaceboyz.net'
-  url 'http://github.com/astro/em-redis'
-  summary 'An eventmachine-based implementation of the Redis protocol'
-  description summary
-  version EMRedis::VERSION
-
-  readme_file  'README.rdoc'
-  ignore_file  '.gitignore'
-
-  depend_on 'eventmachine', '>=0.12.10'
-
-  depend_on "bacon", :development => true
-  depend_on "em-spec", :development => true 
-}
-
-namespace :redis do
-  desc "Test em-redis against a live Redis"
-  task :test do
-    sh "bacon spec/live_redis_protocol_spec.rb spec/redis_commands_spec.rb spec/redis_protocol_spec.rb"
-  end
-end
-
-# EOF