redis_assist 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ca743b1a93bc0582651d353aa37b5b9fb4b1ce
-  data.tar.gz: c0a20e395c0c9ade86935a5299684ef64f0e47da
+  metadata.gz: 7df8d359a12b776a26ea86bf2b593825b5146994
+  data.tar.gz: 010c01a56bb842ca476a528b6b4ea254fa41e7ad
 SHA512:
-  metadata.gz: 59dcf841c9d547297ecc461de66e63f2a0e8d465abd9b6cc78593e7d3fef36d44aeb4f71deeb7e73b142ec2d4a43e9bba7c1e80d1cf1a6627080e4827b7dae92
-  data.tar.gz: fe0f0fc265f5ff06219c16b224e752709424b19efa7267193eb0c6bde005b69c6f3e14fbdd0e19c48be6182472acdaa4f37b8696308ec5d057c2877480e7d275
+  metadata.gz: 982ea611873442583290d984117e8015c7668b9e884d0f36a2ef915af9af4bedb6bf2abc0b90c52ce039d75e5e021286c388d8866f12c57ff6d8032db3ab2e12
+  data.tar.gz: d55d9df08d606043c4df664b42bfe4ff582cbbeea18e77746236859c1da57bc4dd42b5151cf24493a8616e15d4eafa0e19fc75c695936c08f55b8d5543b18d72

data/lib/redis_assist/base.rb

@@ -33,7 +33,7 @@ module RedisAssist
       # Deprecated finds
       def find_by_id(id, opts={})
         raw_attributes = load_attributes(id)
-        return nil unless raw_attributes[id]
+        return nil unless raw_attributes[id][:exists].value
         obj = new(id: id, raw_attributes: raw_attributes[id])
         (obj.deleted? && !opts[:deleted].eql?(true)) ? nil : obj
       end
@@ -42,8 +42,10 @@ module RedisAssist
         attrs = load_attributes(*ids)
         raw_attributes = attrs
         ids.each_with_object([]) do |id, instances| 
-          instance = new(id: id, raw_attributes: raw_attributes[id]) unless raw_attributes[id].nil?
-          instances << instance if instance && (!instance.deleted? || opts[:deleted].eql?(true))
+          if raw_attributes[id][:exists].value
+            instance = new(id: id, raw_attributes: raw_attributes[id])
+            instances << instance if instance && (!instance.deleted? || opts[:deleted].eql?(true))
+          end
         end
       end
   
@@ -152,24 +154,16 @@ module RedisAssist
   
             future_fields = pipe.hmget(key_for(id, :attributes), fields.keys)
 
-            futures[id] = { lists: future_lists, hashes: future_hashes, fields: future_fields } 
+            futures[id] = { 
+              lists:  future_lists, 
+              hashes: future_hashes, 
+              fields: future_fields, 
+              exists: pipe.exists(key_for(id, :attributes))
+            } 
           end
         end
 
-        # Remove the empty futures
-        future_attrs = ids.each_with_object({}) do |id, obj|
-           obj[id] = future_attrs[id] unless future_attrs[id][:fields].value.select{|v| !v.nil? }.empty?
-        end
-
-        # Map futures to attributes
-        future_attrs.each_with_object(attrs) do |kv, obj|
-          lists       = kv[1][:lists].each_with_object({}){|kv,obj| obj[kv[0]] = kv[1].value unless kv[1].value.nil? }
-          hashes      = kv[1][:hashes].each_with_object({}){|kv,obj| obj[kv[0]] = kv[1].value unless kv[1].value.nil?}
-          fields      = Hash[*self.fields.keys.zip(kv[1][:fields].value).flatten] 
-          obj[kv[0]]  = { lists: lists, hashes: hashes, fields: fields }
-        end
-
-        attrs
+        future_attrs
       end
       
       def hash_to_redis(obj)
@@ -181,8 +175,13 @@ module RedisAssist
       def define_list(name)
         define_method(name) do
           opts = self.class.persisted_attrs[name]
-          self.send("#{name}=", opts[:default]) if !lists[name] && opts[:default]
-          lists[name]
+
+          if !lists[name] && opts[:default]
+            opts[:default]
+          else
+            send("#{name}=", lists[name].value) if lists[name].is_a?(Redis::Future)
+            lists[name]
+          end
         end
   
         define_method("#{name}=") do |val|
@@ -194,8 +193,12 @@ module RedisAssist
       def define_hash(name)
         define_method(name) do
           opts = self.class.persisted_attrs[name]
-          self.send("#{name}=", opts[:default]) if !hashes[name] && opts[:default]
-          hashes[name]
+
+          if !hashes[name] && opts[:default]
+            opts[:default]
+          else
+            self.send("#{name}=", hashes[name].value)
+          end
         end
   
         define_method("#{name}=") do |val|
@@ -206,6 +209,11 @@ module RedisAssist
 
       def define_attribute(name)
         define_method(name) do 
+          if attributes.is_a?(Redis::Future)
+            value = attributes.value 
+            self.attributes = value ? Hash[*self.class.fields.keys.zip(value).flatten] : {}
+          end
+
           self.class.transform(:from, name, attributes[name])
         end
   
@@ -223,12 +231,14 @@ module RedisAssist
       self.lists      = {}
       self.hashes     = {}
   
+      if attrs[:id]
+      end
+
       if attrs[:id]
         self.id = attrs[:id]
         load_attributes(attrs[:raw_attributes])
+        return self if self.id 
       end
-
-      return self if id 
   
       self.new_record = true
   
@@ -259,18 +269,24 @@ module RedisAssist
       redis.multi do
         # build the arguments to pass to redis hmset
         # and insure the attributes are explicitely declared
-        attribute_args = hash_to_redis(attributes)
- 
-        redis.hmset(key_for(:attributes), *attribute_args)
+
+        unless attributes.is_a?(Redis::Future)
+          attribute_args = hash_to_redis(attributes)
+          redis.hmset(key_for(:attributes), *attribute_args)
+        end
   
         lists.each do |name, val|
-          redis.del(key_for(name))
-          redis.rpush(key_for(name), val) if val && !val.empty?
+          if val && !val.is_a?(Redis::Future) 
+            redis.del(key_for(name))
+            redis.rpush(key_for(name), val) unless val.empty?
+          end
         end
   
         hashes.each do |name, val|
-          hash_as_args = hash_to_redis(val)
-          redis.hmset(key_for(name), *hash_as_args)
+          unless val.is_a?(Redis::Future)
+            hash_as_args = hash_to_redis(val)
+            redis.hmset(key_for(name), *hash_as_args)
+          end
         end
       end
 
@@ -344,10 +360,9 @@ module RedisAssist
   
     def load_attributes(raw_attributes)
       return nil unless raw_attributes
-      load_response   = self.class.load_attributes(id)
-      self.lists      = load_response[id][:lists] 
-      self.hashes     = load_response[id][:hashes] 
-      self.attributes = load_response[id][:fields]
+      self.lists      = raw_attributes[:lists] 
+      self.hashes     = raw_attributes[:hashes] 
+      self.attributes = raw_attributes[:fields]
       self.new_record = false
     end
   

data/lib/redis_assist/version.rb

@@ -1,3 +1,3 @@
 module RedisAssist
-  VERSION = '0.4.1' unless defined?(::RedisAssist::VERSION)
+  VERSION = '0.4.2' unless defined?(::RedisAssist::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_assist
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tyler Love
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis