relix 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjY4Y2ExMjRhYTk5MTJjYjUyYTUwZjE4NWUxZDlmOGEwNGU5YWJjYw==
+    NWRmYWJjZWYxNDM0MmU3OTEzOGE4MzFhODI4Y2RhOWU5ZWY3ZThjMA==
   data.tar.gz: !binary |-
-    ZjA5NGFhODZhODYyYzZjZjA3MmU1ODA5YTkyM2Q2YWM4ZGZkNjJlYw==
+    NzJjMDM1MDdmMzM0ZDgyODU1MmMwN2YxZTA0ODgyYzEzOWRiZDYxZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yzg0NzA4YjczZTI0YzJkZmE2NTJlNzA1NWNkNWJkZTEyNzIzYTU1MjYzYjgz
-    YWQyYjQ2NjA0MzJmZThjMzJjYTY3YmYyNjZhNGRjYzFhNzhlNmViYWU3ODFl
-    ZDAwY2Y2OTc4NzFlMzVmNDlhYTMwMDI5ZGI4ZTE3ZGMwZDEwYTI=
+    YTNmNGVjN2U2ZDc5OTQ1Mzk5ZmZkNjlhYjI3MTI3N2RlZjQwZDMyMTJjOTZk
+    NmEyNWExZmEyNWQ4Y2IyMWIzNWFjMThiMmY1MTgwOWQxMDEzYTk5MTE3MDlj
+    Mjg3Y2E4M2EwYmUwMDM4YTNkMmQ1N2JlNzYyNGY4ODE4M2I1YzU=
   data.tar.gz: !binary |-
-    ZDA1ZTZjMDMxMzliMDIyZjZmZjIxZjk3MTYxOTAzYTk1NjhjODJiYzFiOTAx
-    NmZlMDQ4Y2JlNGIzN2RiMTI2MDk3MDM2ODg0NjI0OTg1YmExN2E0NDlmN2Yy
-    NjQyN2RkYjEzNTQ2YzA2NmIxMjIxMWVkMzE5NjE4ZDg0Y2M3MTk=
+    Y2YwODAwZTRkNDI5MTZkMTlhZGVhYmRiOWNkMWUxMjQ1M2JmMzUwYjg5YzFh
+    ZWI5N2YyMjJjZTQ4MmM3ZGRjMjlhMWQzNjQ2Zjc0NWYyZmQyNzliZjVkOTFi
+    ZTk5MWJiZjAyNjE1ZjJiMTNkYzEyZjNjOWQ4YTQ4NTdmNzFjZDI=

data/HISTORY.md

@@ -1,3 +1,7 @@
+### 2.1.0
+
+* Make IndexSet lazy-retrieve the Redis client. (ntalbott)
+
 ### 2.0.0
 
 * Require Redis 2.6. (ntalbott)

data/lib/relix/core.rb

@@ -14,7 +14,7 @@ module Relix
 
   module ClassMethods
     def relix(&block)
-      @relix ||= IndexSet.new(self, Relix.redis)
+      @relix ||= IndexSet.new(self, Relix)
       if block_given?
         @relix.instance_eval(&block)
       else

data/lib/relix/index_set.rb

@@ -2,13 +2,17 @@ module Relix
   class IndexSet
     attr_accessor :redis
     attr_reader :klass
-    def initialize(klass, redis)
+    def initialize(klass, redis_source)
       @klass = klass
-      @redis = redis
+      @redis_source = redis_source
       @indexes = Hash.new
       @keyer = Keyer.default_for(@klass) unless parent
     end
 
+    def redis
+      @redis ||= @redis_source.redis
+    end
+
     def primary_key(accessor)
       @primary_key_index = add_index(:primary_key, accessor)
     end
@@ -57,38 +61,38 @@ module Relix
         yield(query)
         query.run
       else
-        primary_key_index.all(@redis)
+        primary_key_index.all(redis)
       end
     end
 
     def lookup_values(index)
-      self[index].values(@redis)
+      self[index].values(redis)
     end
 
     def index_ops(object, pk)
       current_values_name = current_values_name(pk)
-      @redis.watch current_values_name
-      current_values = @redis.hgetall(current_values_name)
+      redis.watch current_values_name
+      current_values = redis.hgetall(current_values_name)
 
       ops = full_index_list.collect do |name,index|
         value = index.read_normalized(object)
         old_value = current_values[name]
 
-        ((watch = index.watch(value, old_value)) && @redis.watch(*watch))
+        ((watch = index.watch(value, old_value)) && redis.watch(*watch))
 
         next if value == old_value
         current_values[name] = value unless index.attribute_immutable?
 
-        next unless index.filter(@redis, object, value)
+        next unless index.filter(redis, object, value)
 
-        query_value = index.query(@redis, value)
+        query_value = index.query(redis, value)
         proc do
-          index.index(@redis, pk, object, value, old_value, *query_value)
+          index.index(redis, pk, object, value, old_value, *query_value)
         end
       end.compact
 
       ops << proc do
-        @redis.hmset(current_values_name, *current_values.flatten)
+        redis.hmset(current_values_name, *current_values.flatten)
       end if current_values.any?
 
       ops
@@ -107,8 +111,8 @@ module Relix
 
       handle_concurrent_modifications(pk) do
         current_values_name = current_values_name(pk)
-        @redis.watch current_values_name
-        current_values = @redis.hgetall(current_values_name)
+        redis.watch current_values_name
+        current_values = redis.hgetall(current_values_name)
 
         full_index_list.map do |name, index|
           old_value = if index.attribute_immutable?
@@ -117,24 +121,24 @@ module Relix
             current_values[name]
           end
 
-          ((watch = index.watch(old_value)) && !watch.empty? && @redis.watch(*watch))
-          proc { index.deindex(@redis, pk, old_value) }
-        end.tap { |ops| ops << proc { @redis.del current_values_name } }
+          ((watch = index.watch(old_value)) && !watch.empty? && redis.watch(*watch))
+          proc { index.deindex(redis, pk, old_value) }
+        end.tap { |ops| ops << proc { redis.del current_values_name } }
       end
     end
 
     def deindex_by_primary_key!(pk)
       handle_concurrent_modifications(pk) do
         current_values_name = current_values_name(pk)
-        @redis.watch current_values_name
-        current_values = @redis.hgetall(current_values_name)
+        redis.watch current_values_name
+        current_values = redis.hgetall(current_values_name)
 
         full_index_list.map do |name, index|
           old_value = current_values[name]
 
-          ((watch = index.watch(old_value)) && !watch.empty? && @redis.watch(*watch))
-          proc { index.deindex(@redis, pk, old_value) }
-        end.tap { |ops| ops << proc { @redis.del current_values_name } }
+          ((watch = index.watch(old_value)) && !watch.empty? && redis.watch(*watch))
+          proc { index.deindex(redis, pk, old_value) }
+        end.tap { |ops| ops << proc { redis.del current_values_name } }
       end
     end
 
@@ -171,7 +175,7 @@ module Relix
       loop do
         ops = yield
 
-        results = @redis.multi do
+        results = redis.multi do
           ops.each do |op|
             op.call(primary_key)
           end

data/lib/relix/version.rb

@@ -1,5 +1,5 @@
 module Relix
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
   REDIS_VERSION = "2.6"
 
   class Version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relix
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Nathaniel Talbott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false