ruby-redis 0.0.1 → 0.0.2

data/lib/redis/database.rb

@@ -1,12 +1,36 @@
-require File.expand_path '../redis', File.dirname(__FILE__)
+module Redis
+  class Database
+    
+    class Watcher
 
-class Redis
+      attr_reader :bound
 
-  def self.databases
-    @@databases ||= [Database.new]
-  end
-    
-  class Database
+      def initialize
+        @watched = []
+        @bound = true
+      end
+
+      def bind database, *keys
+        return unless @bound
+        keys.each do |key|
+          entry = [database, key]
+          next if @watched.include? entry
+          @watched << entry
+          (database.watchers[key] ||= []).push self
+        end
+      end
+
+      def unbind
+        return unless @bound
+        @watched.each do |database, key|
+          key_df_list = database.watchers[key]
+          next unless key_df_list
+          key_df_list.delete_if { |e| e == self }
+        end
+        @bound = false
+      end
+
+    end
     
     # Redis databases are volatile dictionaries.
     
@@ -21,7 +45,7 @@ class Redis
     
     def touch key
       (@watchers[key]||[]).each do |watcher|
-        watcher.succeed self, key
+        watcher.unbind
       end
     end
     

data/lib/redis/database.rbc

@@ -1,6 +1,6 @@
 !RBIX
-6235178746665710376
-x
+8948944263761558646
+18
 M
 1
 n
@@ -9,57 +9,32 @@ x
 10
 __script__
 i
-54
-5
-45
-0
-1
-7
-2
-64
-45
-0
-3
-65
-49
-4
-0
-49
-5
-1
-49
-6
-2
-47
-49
-7
-1
-15
+29
 99
 7
-8
+0
 1
 65
 49
-9
+1
 3
 13
 99
 12
 7
-10
+2
 12
 7
-11
+3
 12
 65
 12
 49
-12
+4
 4
 15
 49
-10
+2
 0
 15
 2
@@ -72,29 +47,11 @@ I
 0
 I
 0
+I
+0
 n
 p
-13
-x
-4
-File
-n
-s
-8
-../redis
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-11
-expand_path
-x
-7
-require
+5
 x
 5
 Redis
@@ -112,45 +69,34 @@ x
 5
 Redis
 i
-40
+29
 5
 66
 99
 7
 0
-7
 1
 65
-5
 49
-2
-4
-15
-99
-7
-3
 1
-65
-49
-4
 3
 13
 99
 12
 7
-5
+2
 12
 7
-6
+3
 12
 65
 12
 49
-2
+4
 4
 15
 49
-5
+2
 0
 11
 I
@@ -161,128 +107,11 @@ I
 0
 I
 0
-n
-p
-7
-x
-9
-databases
-M
-1
-n
-n
-x
-9
-databases
-i
-51
-65
-7
-0
-49
-1
-1
-9
-18
-65
-7
-0
-49
-2
-1
-13
-10
-50
-15
-65
-7
-0
-45
-3
-4
-13
-71
-5
-47
-9
-42
-47
-49
-6
-0
-13
-47
-49
-7
-0
-15
-8
-45
-49
-5
-0
-35
-1
-49
-8
-2
-11
-I
-4
-I
-0
-I
-0
 I
 0
 n
 p
-9
-x
-11
-@@databases
-x
-23
-class_variable_defined?
-x
-18
-class_variable_get
-x
-8
-Database
-n
-x
-3
-new
-x
-8
-allocate
-x
-10
-initialize
-x
-18
-class_variable_set
-p
-5
-I
--1
-I
 5
-I
-0
-I
-6
-I
-33
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
-p
-0
-x
-13
-attach_method
 x
 8
 Database
@@ -300,258 +129,969 @@ x
 8
 Database
 i
-240
+267
 5
 66
-5
+99
 7
 0
-7
 1
-47
+65
 49
-2
-2
-15
+1
+3
+13
 99
+12
 7
-3
+2
+12
 7
-4
+3
+12
 65
-67
-49
-5
-0
+12
 49
-6
+4
 4
 15
-99
+49
+2
+0
+15
+5
+7
+5
 7
+6
+47
+49
 7
+2
+15
+99
 7
 8
+7
+9
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-9
+12
 7
-10
+13
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-11
+14
 7
-12
+15
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-13
+16
 7
-14
+17
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
+18
+7
+19
+65
+67
+49
+10
+0
+49
+11
+4
 15
+99
 7
-16
+20
+7
+21
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-17
+22
 7
-18
+23
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-19
+24
 7
-20
+25
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-21
+26
 7
-22
+27
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-23
+28
 7
-24
+29
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-25
+30
 7
-26
+31
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-27
+32
 7
-28
+33
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-29
+34
 7
-30
+35
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-31
+36
 7
-32
+37
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 99
 7
-33
+38
 7
-34
+39
 65
 67
 49
-5
+10
 0
 49
-6
+11
 4
 15
 5
 48
-35
+40
 15
 99
 7
-36
+41
+7
+42
+65
+67
+49
+10
+0
+49
+11
+4
+11
+I
+6
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+43
+x
+7
+Watcher
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+7
+Watcher
+i
+52
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+99
+7
+2
+7
+3
+65
+67
+49
+4
+0
+49
+5
+4
+15
+99
+7
+6
+7
 7
-37
 65
 67
 49
+4
+0
+49
 5
+4
+15
+99
+7
+8
+7
+9
+65
+67
+49
+4
 0
 49
+5
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+10
+x
+5
+bound
+x
+11
+attr_reader
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+9
+35
+0
+38
+0
+15
+2
+38
+1
+11
+I
+1
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+2
+x
+8
+@watched
+x
 6
+@bound
+p
+7
+I
+-1
+I
+8
+I
+0
+I
+9
+I
+5
+I
+a
+I
+9
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+0
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+4
+bind
+M
+1
+n
+n
+x
+4
+bind
+i
+18
+39
+0
+9
+7
+1
+8
+9
+1
+11
+15
+20
+1
+56
+1
+50
+2
+0
+11
+I
+4
+I
+2
+I
+1
+I
+0
+I
+1
+I
+1
+p
+3
+x
+6
+@bound
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+4
+bind
+i
+74
+57
+19
+0
+15
+21
+1
+0
+20
+0
+35
+2
+19
+1
+15
+39
+0
+20
+1
+49
+1
+1
+9
+27
+1
+11
+8
+28
+1
+15
+39
+0
+20
+1
+49
+2
+1
+15
+21
+1
+0
+49
+3
+0
+20
+0
+14
+2
+49
+4
+1
+13
+10
+65
+15
+35
+0
+13
+18
+3
+49
+5
+2
+15
+8
+69
+18
+2
+16
+2
+5
+49
+6
+1
+11
+I
+7
+I
+2
+I
+1
+I
+0
+I
+1
+n
+p
+7
+x
+8
+@watched
+x
+8
+include?
+x
+2
+<<
+x
+8
+watchers
+x
+2
+[]
+x
+3
+[]=
+x
+4
+push
+p
+13
+I
+0
+I
+f
+I
+4
+I
+10
+I
+e
+I
+11
+I
+1c
+I
+0
+I
+1d
+I
+12
+I
+25
+I
+13
+I
+4a
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+2
+x
+3
+key
+x
+5
+entry
+x
+4
+each
+p
+9
+I
+-1
+I
+d
+I
+0
+I
+e
+I
+9
+I
+0
+I
+a
+I
+f
+I
+12
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+2
+x
+8
+database
+x
+4
+keys
+x
+6
+unbind
+M
+1
+n
+n
+x
+6
+unbind
+i
+22
+39
+0
+9
+7
+1
+8
+9
+1
+11
+15
+39
+1
+56
+2
+50
+3
+0
+15
+3
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+6
+@bound
+x
+8
+@watched
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+6
+unbind
+i
+41
+58
+37
+19
+0
+15
+37
+19
+1
+15
+15
+20
+0
+49
+0
+0
+20
+1
+49
+1
+1
+19
+2
+15
+20
+2
+9
+30
+1
+8
+32
+1
+11
+15
+20
+2
+56
+2
+50
+3
+0
+11
+I
+6
+I
+3
+I
+2
+I
+0
+I
+2
+n
+p
+4
+x
+8
+watchers
+x
+2
+[]
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+6
+unbind
+i
+10
+57
+19
+0
+15
+20
+0
+5
+83
+0
+11
+I
+4
+I
+1
+I
+1
+I
+0
+I
+1
+n
+p
+1
+x
+2
+==
+p
+3
+I
+0
+I
+1c
+I
+a
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+1
+x
+1
+e
+x
+9
+delete_if
+p
+11
+I
+0
+I
+19
+I
+a
+I
+1a
+I
+17
+I
+1b
+I
+20
+I
+0
+I
+21
+I
+1c
+I
+29
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+3
+x
+8
+database
+x
+3
+key
+x
+11
+key_df_list
+x
 4
+each
+p
 11
 I
-5
+-1
+I
+17
 I
 0
 I
+18
+I
+9
+I
 0
 I
+a
+I
+19
+I
+12
+I
+1e
+I
+16
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
 0
-n
 p
-38
+9
+I
+2
+I
+6
+I
+a
+I
+8
+I
+18
+I
+d
+I
+26
+I
+17
+I
+34
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
+p
+0
+x
+13
+attach_method
 x
 12
 blocked_pops
@@ -621,6 +1161,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 6
@@ -647,23 +1189,23 @@ p
 I
 -1
 I
-f
+27
 I
 0
 I
-10
+28
 I
 a
 I
-11
+29
 I
 14
 I
-12
+2a
 I
 1e
 I
-13
+2b
 I
 28
 x
@@ -715,6 +1257,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -738,47 +1282,45 @@ x
 5
 touch
 i
-14
+10
 57
 19
 0
 15
 20
 0
-5
-21
-1
-0
 49
 0
-2
+0
 11
 I
-5
+3
 I
 1
 I
 1
 I
+0
+I
 1
 n
 p
 1
 x
-7
-succeed
+6
+unbind
 p
 5
 I
 0
 I
-17
+2f
 I
 4
 I
-18
+30
 I
-e
+a
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
@@ -795,11 +1337,11 @@ p
 I
 -1
 I
-16
+2e
 I
 0
 I
-17
+2f
 I
 13
 x
@@ -877,6 +1419,8 @@ I
 I
 2
 I
+0
+I
 2
 n
 p
@@ -911,11 +1455,11 @@ p
 I
 -1
 I
-1c
+34
 I
 0
 I
-1d
+35
 I
 e
 I
@@ -923,15 +1467,15 @@ I
 I
 f
 I
-1e
+36
 I
 17
 I
-1f
+37
 I
 2d
 I
-20
+38
 I
 30
 x
@@ -1010,6 +1554,8 @@ I
 I
 2
 I
+0
+I
 2
 n
 p
@@ -1041,11 +1587,11 @@ p
 I
 -1
 I
-23
+3b
 I
 0
 I
-24
+3c
 I
 e
 I
@@ -1053,15 +1599,15 @@ I
 I
 f
 I
-25
+3d
 I
 17
 I
-26
+3e
 I
 2b
 I
-27
+3f
 I
 2e
 x
@@ -1136,6 +1682,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1167,19 +1715,19 @@ p
 I
 -1
 I
-2a
+42
 I
 0
 I
-2b
+43
 I
 8
 I
-2c
+44
 I
 12
 I
-2d
+45
 I
 1b
 I
@@ -1187,7 +1735,7 @@ I
 I
 1c
 I
-2e
+46
 I
 2a
 x
@@ -1256,6 +1804,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1277,15 +1827,15 @@ p
 I
 -1
 I
-31
+49
 I
 0
 I
-32
+4a
 I
 a
 I
-33
+4b
 I
 18
 I
@@ -1293,11 +1843,11 @@ I
 I
 19
 I
-34
+4c
 I
 21
 I
-35
+4d
 I
 24
 x
@@ -1350,6 +1900,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 5
@@ -1373,11 +1925,11 @@ p
 I
 -1
 I
-38
+50
 I
 0
 I
-39
+51
 I
 13
 x
@@ -1420,6 +1972,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1438,15 +1992,15 @@ p
 I
 -1
 I
-3c
+54
 I
 0
 I
-3d
+55
 I
 8
 I
-3e
+56
 I
 10
 x
@@ -1506,6 +2060,8 @@ I
 I
 2
 I
+0
+I
 2
 n
 p
@@ -1530,19 +2086,19 @@ p
 I
 -1
 I
-41
+59
 I
 0
 I
-42
+5a
 I
 8
 I
-43
+5b
 I
 10
 I
-44
+5c
 I
 1e
 x
@@ -1591,6 +2147,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1609,15 +2167,15 @@ p
 I
 -1
 I
-47
+5f
 I
 0
 I
-48
+60
 I
 8
 I
-49
+61
 I
 10
 x
@@ -1671,6 +2229,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1692,19 +2252,19 @@ p
 I
 -1
 I
-4c
+64
 I
 0
 I
-4d
+65
 I
 8
 I
-4e
+66
 I
 10
 I
-4f
+67
 I
 18
 x
@@ -1763,6 +2323,8 @@ I
 0
 I
 0
+I
+0
 p
 4
 x
@@ -1782,11 +2344,11 @@ p
 I
 -1
 I
-52
+6a
 I
 4
 I
-53
+6b
 I
 1a
 x
@@ -1826,6 +2388,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 2
@@ -1840,11 +2404,11 @@ p
 I
 -1
 I
-56
+6e
 I
 0
 I
-57
+6f
 I
 6
 x
@@ -1892,6 +2456,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 5
@@ -1931,6 +2497,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -1943,7 +2511,7 @@ p
 I
 0
 I
-5c
+74
 I
 c
 x
@@ -1968,19 +2536,19 @@ p
 I
 -1
 I
-5a
+72
 I
 0
 I
-5c
+74
 I
 8
 I
-5d
+75
 I
 e
 I
-5e
+76
 I
 14
 x
@@ -2014,6 +2582,8 @@ I
 0
 I
 0
+I
+0
 n
 p
 2
@@ -2028,11 +2598,11 @@ p
 I
 -1
 I
-61
+79
 I
 0
 I
-62
+7a
 I
 6
 x
@@ -2101,6 +2671,8 @@ I
 I
 1
 I
+0
+I
 1
 n
 p
@@ -2129,15 +2701,15 @@ p
 I
 -1
 I
-67
+7f
 I
 0
 I
-68
+80
 I
 a
 I
-69
+81
 I
 26
 I
@@ -2156,98 +2728,101 @@ x
 10
 expires_at
 p
-37
+39
 I
 2
 I
-d
+4
 I
-c
+1d
 I
-f
+25
 I
-1a
+27
 I
-16
+27
 I
-28
+35
 I
-1c
+2e
 I
-36
+43
 I
-23
+34
 I
-44
+51
 I
-2a
+3b
 I
-52
+5f
 I
-31
+42
 I
-60
+6d
 I
-38
+49
 I
-6e
+7b
 I
-3c
+50
 I
-7c
+89
 I
-41
+54
 I
-8a
+97
 I
-47
+59
 I
-98
+a5
 I
-4c
+5f
 I
-a6
+b3
 I
-52
+64
 I
-b4
+c1
 I
-56
+6a
 I
-c2
+cf
 I
-5a
+6e
 I
-d0
+dd
 I
-61
+72
 I
-de
+eb
 I
-65
+79
 I
-e2
+f9
 I
-67
+7d
+I
+fd
 I
-f0
+7f
+I
+10b
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
 p
 0
+x
+13
+attach_method
 p
-5
+3
 I
 2
 I
-5
-I
-d
-I
-9
+2
 I
-28
+1d
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb
@@ -2257,17 +2832,13 @@ x
 13
 attach_method
 p
-5
+3
 I
 0
 I
 1
 I
-19
-I
-3
-I
-36
+1d
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/database.rb