em-redislite 0.1.2 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,7 @@
+== 0.2.0 (2012-04-08)
+
+* Rewrite to include methods for most redis commands.
+
+== 0.1.2 (2011-06-21)
+
+* Added Client#error?

data/README.md

@@ -0,0 +1,61 @@
+# Redis Lite 
+
+Eventmachine based adapter that talks redis 2.0 protocol
+
+## Installation
+
+  gem install em-redislite
+
+## Dependencies
+
+* Ruby >= 1.9.1
+* eventmachine
+* em-synchrony (optional)
+
+## Unsupported commands
+
+* Pub/Sub
+* Scripting
+* Server
+
+## Example
+
+### Using callbacks
+
+```ruby
+  require 'em-redislite'
+
+  EM.run do
+    # defaults to { host: '127.0.0.1', port: 6379 }
+    client = EM::Redis.connect
+    client.errback {|error| $stderr.puts "Redis Error: #{error}"; EM.stop }
+
+    r = client.set "mykey", "myvalue"
+    r.callback {|value| p value }
+    r.errback  {|error| p error }
+
+    r = client.get "mykey"
+    r.callback {|value| p value }
+    r.errback  {|error| p error }
+  end
+```
+### Using em-synchrony
+
+```ruby
+  require 'em-redislite'
+  require 'em/redis-synchrony'
+
+  EM.run do
+    EM.synchrony do
+      client = EM::Redis.connect
+      client.errback {|error| $stderr.puts "Redis Error: #{error}"; EM.stop }
+      
+       p client.set "mykey", "myvalue"
+       p client.get "mykey"
+       EM.stop
+    end
+  end
+```
+
+## License
+[Creative Commons Attribution - CC BY](http://creativecommons.org/licenses/by/3.0)

data/lib/em/redis-synchrony.rb

@@ -0,0 +1,21 @@
+require 'em-synchrony'
+require 'em-redislite'
+
+module EM
+  module Redis
+    class Client < Connection
+      def command name, *args
+        EM::Synchrony.sync send_command(name, *args)
+      end
+
+      def send_command name, *args
+        defer = DefaultDeferrable.new
+        @pool << defer
+        send_data "*#{args.length + 1}\r\n" +
+                  "$#{name.length}\r\n#{name}\r\n" +
+                  args.map(&:to_s).inject('') {|a,v| a + "$#{v.bytesize}\r\n#{v}\r\n"}
+        defer
+      end
+    end
+  end
+end

data/lib/em/redis.rb

@@ -1,10 +1,13 @@
 require 'eventmachine'
+
 module EM
   module Redis
-    class Error < StandardError; end
 
+    VERSION  = '0.2.0'
     DEFAULTS = { host: '127.0.0.1', port: 6379 }
 
+    class Error < StandardError; end
+
     def self.connect options = {}
       options = DEFAULTS.merge(options)
       begin
@@ -56,7 +59,7 @@ module EM
         EM.reconnect @options[:host], @options[:port], self
       end
 
-      def unbind msg = 'lost connection'
+      def unbind msg = 'lost db connection'
         error = Error.new(msg)
         @pool.each {|r| r.fail(error) }
         @pool = []
@@ -101,6 +104,20 @@ module EM
 
         process_bytes(nil) if @want_bytes < 0
       end
+
+      COMMANDS = %w(
+        APPEND AUTH BLPOP BRPOP BRPOPLPUSH DECR DECRBY DEL DISCARD DUMP ECHO EXEC EXISTS EXPIRE EXPIREAT
+        GET GETBIT GETRANGE GETSET HDEL HEXISTS HGET HGETALL HINCRBY HINCRBYFLOAT HKEYS HLEN HMGET HMSET
+        HSET HSETNX HVALS INCR INCRBY INCRBYFLOAT KEYS LINDEX LINSERT LLEN LPOP LPUSH LPUSHX LRANGE LREM
+        LSET LTRIM MGET MIGRATE MOVE MSET MSETNX MULTI OBJECT PERSIST PEXPIRE PEXPIREAT PING PSETEX PTTL
+        QUIT RANDOMKEY RENAME RENAMENX RESTORE RPOP RPOPLPUSH RPUSH RPUSHX SADD SCARD SDIFF SDIFFSTORE
+        SELECT SET SETBIT SETEX SETNX SETRANGE SINTER SINTERSTORE SISMEMBER SMEMBERS SMOVE SORT SPOP
+        SRANDMEMBER SREM STRLEN SUNION SUNIONSTORE TTL TYPE UNWATCH WATCH ZADD ZCARD ZCOUNT ZINCRBY
+        ZINTERSTORE ZRANGE ZRANGEBYSCORE ZRANK ZREM ZREMRANGEBYRANK ZREMRANGEBYSCORE ZREVRANGE
+        ZREVRANGEBYSCORE ZREVRANK ZSCORE ZUNIONSTORE
+      ).freeze
+
+      COMMANDS.each {|name| send(:define_method, name.downcase) {|*args| command(name, *args) }}
     end # Client
   end # Redis
 end # EM

data/lib/em-redislite.rb

@@ -1,2 +1 @@
 require_relative 'em/redis'
-require_relative 'em/redis/sugar'

data/{tests → test}/helper.rb

@@ -1,5 +1,5 @@
-require 'minitest/spec'
-require_relative '../lib/em-redislite'
+require 'minitest/autorun'
+require 'em-redislite'
 
 class MiniTest::Unit::TestCase
   def em_run &block
@@ -11,5 +11,3 @@ class MiniTest::Unit::TestCase
     end
   end
 end
-
-MiniTest::Unit.autorun

data/{tests → test}/test_command_expire.rb

@@ -4,8 +4,8 @@ describe 'Command Expire' do
   it 'should support set with expiry' do
     @success = false
     em_run do |client|
-      r = client.set 'mykey', 'foobar', 1
-      r = client.get 'mykey'
+      r = client.setex 'mykey', 1, 'foobar'
+      r = client.get   'mykey'
       r.callback do |value|
         EM.stop unless value == 'foobar'
         EM.add_timer(2) do

metadata

@@ -1,84 +1,86 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-redislite
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bharanee Rathna
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A very simple EventMachine based adapter that talks Redis protocol
-email: deepfryed@gmail.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: EventMachine based Redis client
+email:
+- deepfryed@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- README.rdoc
-- em-redislite.gemspec
-- lib/em-redislite.rb
-- lib/em/redis/sugar.rb
+files:
+- test/test_connection.rb
+- test/test_commands.rb
+- test/helper.rb
+- test/test_command_expire.rb
 - lib/em/redis.rb
-- tests/helper.rb
-- tests/test_command_expire.rb
-- tests/test_commands.rb
-- tests/test_connection.rb
-has_rdoc: true
+- lib/em/redis-synchrony.rb
+- lib/em-redislite.rb
+- README.md
+- CHANGELOG
 homepage: http://github.com/deepfryed/em-redislite
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: A lightweight EM based Redis adapter
+summary: A lite version of EM::Redis
 test_files: []
-

data/README.rdoc

@@ -1,42 +0,0 @@
-= Redis Lite 
-
-Eventmachine based adapter that talks redis 2.0 protocol
-
-== Installation
-
-  gem install em-redislite
-
-=== Dependencies
-
-* Ruby >= 1.9.1
-* eventmachine
-
-== Usage
-
-  require 'em/redislite'
-
-  EM.run do
-    client  = EM::Redis.connect  # defaults to { host: '127.0.0.1', port: 6379 }
-    client.errback {|error| $stderr.puts "Redis Error: #{error}"; EM.stop }
-
-    r = client.command :get, "mykey"
-    r.callback {|value| p value }
-    r.errback  {|error| p error }
-
-    # syntactic sugar for string and boolean commands
-    r = client.get "mykey"
-    r = client.set "mykey", "some value", 1800  # ttl
-
-    # you should be running redis in a private network or have it firewalled but ...
-    r = client.command :auth, "my super dooper password"  # should work as well
-  end
-
-== Testing
-
-There are no tests at the moment coz I'm a lazy slob.
-
-== License
-
-GNU GPLv3, so its free and comes with no guarantees. If it brings down your website or burns down your house, I will
-not be held responsible. Use it at your own risk. You can read all about GNU here: http://www.gnu.org and
-GNU GPLv3 here: http://www.gnu.org/licenses/gpl.txt.

data/em-redislite.gemspec

@@ -1,16 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-	s.name          = %q{em-redislite}
-	s.version       = '0.1.2'
-	s.summary       = 'A lightweight EM based Redis adapter'
-	s.description   = 'A very simple EventMachine based adapter that talks Redis protocol'
-	s.authors       = [ 'Bharanee Rathna' ]
-	s.email         = %q{deepfryed@gmail.com}
-	s.homepage      = %q{http://github.com/deepfryed/em-redislite}
-	s.files         = %w(README.rdoc em-redislite.gemspec) + Dir.glob("{lib,tests}/**/*")
-	s.require_paths = %w(lib)
-	s.platform      = Gem::Platform::RUBY
-
-	s.add_dependency('eventmachine')
-end

data/lib/em/redis/sugar.rb

@@ -1,34 +0,0 @@
-class EM::Redis::Client
-  COMMANDS = {
-    string:  %w(get strlen getset setnx setex setbit getbit mset msetnx mget incr incrby decr decrby
-                append setrange getrange),
-    boolean: %w(exists del type keys randomkey rename renamenx dbsize expire persist ttl select move
-                flushdb flushall),
-  }.freeze
-
-  COMMANDS[:string].each  {|c| send(:define_method, c) {|*args| command(c, *args) }}
-  COMMANDS[:boolean].each {|c| send(:define_method, c) {|*args|
-    defer = EM::DefaultDeferrable.new
-    req   = command(c, *args)
-    req.callback {|r| defer.succeed(r == '1') }
-    req.errback  {|e| defer.fail(e) }
-    defer
-  }}
-
-  # set here is special since it combines :set and optional :expire
-  def set key, value, ttl = nil
-    if ttl
-      defer = EM::DefaultDeferrable.new
-      req   = command(:set, key, value)
-      req.callback do
-        req = command(:expire, key, ttl)
-        req.callback {|r| defer.succeed(r == '1') }
-        req.errback  {|e| defer.fail(e) }
-      end
-      req.errback {|e| defer.fail(e) }
-      defer
-    else
-      command(:set, key, value)
-    end
-  end
-end