redis_assist 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e39bec5d60742e7f9a9fb9e9cd4ffe66007b178
-  data.tar.gz: 419f6dd81efed9dee7b8e3619ea5e55d710194fc
+  metadata.gz: feb40ab214f985e7c59f88cebb16ca40a75eb686
+  data.tar.gz: ec8328f304d326609fbc738db79fde27102fb7a5
 SHA512:
-  metadata.gz: 1da9e2a431b98676221cddd2590d752aedb424afabd368a96f6904a3ecb43f801b1922a30dda7b48681e16397c8682ad718342680ab25332cc99239bce0941c7
-  data.tar.gz: 354f84bff6fa88bff57d5018976b48f2f06ae7ff40e5a72811e1f3d864d0f401889a397cd27aab93e763be085bb7fde295343ef724c418066146a0df546d8409
+  metadata.gz: 515e9d3708aa53e8d819271d248c857679c906c4ac28b95aa997a1982b887c5e15aada064eeafcb788461e2b71f26e64d355634adf6c274a39d53e22d507b1ff
+  data.tar.gz: b0d545b698f646dab29ff5de7e8d633c784bf7cc7a93e8916dec85f15492fe0cac75d80b41b683b196b6ceb99c728e2b5c15722e4235d0157d8e4d50735eeaf6

data/lib/redis_assist/base.rb

@@ -8,12 +8,13 @@ module RedisAssist
     def self.inherited(base)
       base.before_create {|record| record.send(:created_at=, Time.now.to_f) if record.respond_to?(:created_at) }
       base.before_update {|record| record.send(:updated_at=, Time.now.to_f) if record.respond_to?(:updated_at) }
-      base.after_delete  {|record| record.send(:deleted_at=, Time.now.to_f) if record.respond_to?(:deleted_at) }
       base.after_create  {|record| record.send(:new_record=, false) }
     end
  
+
     class << self
 
+
       def attr_persist(name, opts={})
         persisted_attrs[name] = opts
 
@@ -26,10 +27,53 @@ module RedisAssist
         end
       end
 
+
+      # Get count of records
+      def count
+        redis.zcard(index_key_for(:id))
+      end
+
+
+      def first(amount=1)
+        offset  = amount - 1
+        members = redis.zrange(index_key_for(:id), 0, offset)
+        find(amount > 1 ? members : members.first)
+      end
+
+
+      def last(amount=1)
+        offset  = amount * -1
+        members = redis.zrange(index_key_for(:id), offset, -1)
+        find(amount > 1 ? members : members.first)
+      end
+ 
+
       def find(ids, opts={})
         ids.is_a?(Array) ? find_by_ids(ids, opts) : find_by_id(ids, opts)
       end
-  
+
+
+      # find articles in batches
+      def find_in_batches(params={})
+        start       = params[:start]      || 0
+        marker      = start
+        batch_size  = params[:batch_size] || 500
+        record_ids  = redis.zrange(index_key_for(:id), marker, marker + batch_size - 1)
+
+        while record_ids.length > 0
+          records_count   = record_ids.length
+          marker          += records_count
+          records         = find(record_ids)
+
+          yield records
+
+          break if records_count < batch_size
+
+          record_ids = redis.zrange(index_key_for(:id), marker, marker + batch_size - 1)
+        end
+      end
+
+
       # Deprecated finds
       def find_by_id(id, opts={})
         raw_attributes = load_attributes(id)
@@ -38,6 +82,7 @@ module RedisAssist
         (obj.deleted? && !opts[:deleted].eql?(true)) ? nil : obj
       end
   
+
       def find_by_ids(ids, opts={})
         attrs = load_attributes(*ids)
         raw_attributes = attrs
@@ -49,15 +94,18 @@ module RedisAssist
         end
       end
   
+
       def create(attrs={})
         roll = new(attrs)
         roll.save ? roll : false
       end
 
+
       def exists?(id)
         redis.exists(key_for(id, :attributes))      
       end
 
+
       # TODO: needs a refactor. Should this be an interface for skipping validations?
       # Should we optimize and skip the find? Support an array of ids?
       def update(id, params={})
@@ -92,6 +140,7 @@ module RedisAssist
         record.send(:invoke_callback, :after_update)
       end
 
+
       def transform(direction, attr, val)
         transformer = RedisAssist.transforms[persisted_attrs[attr][:as]]
 
@@ -102,41 +151,55 @@ module RedisAssist
         end
       end
 
+
       def fields
         persisted_attrs.select{|k,v| !(v[:as].eql?(:list) || v[:as].eql?(:hash)) }
       end
   
+
       def lists 
         persisted_attrs.select{|k,v| v[:as].eql?(:list) }
       end
   
+
       def hashes 
         persisted_attrs.select{|k,v| v[:as].eql?(:hash) }
       end
 
+
       # TODO: Attribute class
       def persisted_attrs
         @persisted_attrs ||= {}
       end
 
+
+      def index_key_for(index_name)
+        "#{key_prefix}:index:#{index_name}"
+      end
+
+
       def key_for(id, attribute)
         "#{key_prefix}:#{id}:#{attribute}"
       end
   
+
       def key_prefix(val=nil)
         return self.key_prefix = val if val
         return @key_prefix if @key_prefix
         return self.key_prefix = StringHelper.underscore(name)
       end
   
+    
       def key_prefix=(val)
         @key_prefix = val
       end
    
+      
       def redis
         RedisAssist::Config.redis_client
       end
   
+
       def load_attributes(*ids)
         future_attrs  = {}
         attrs         = {}
@@ -170,12 +233,15 @@ module RedisAssist
         future_attrs
       end
       
+
       def hash_to_redis(obj)
         obj.each_with_object([]) {|kv,args| args<<kv[0]<<kv[1] }
       end
 
+
       private
 
+
       def define_list(name)
         define_method(name) do
           read_list(name)
@@ -186,6 +252,7 @@ module RedisAssist
         end
       end
 
+
       def define_hash(name)
         define_method(name) do
           read_hash(name)
@@ -196,6 +263,7 @@ module RedisAssist
         end
       end
 
+
       def define_attribute(name)
         define_method(name) do 
           read_attribute(name)
@@ -207,9 +275,13 @@ module RedisAssist
       end
     end
   
+
     attr_accessor :attributes
-    attr_reader :id
-  
+
+    def id
+      @id.to_i
+    end
+    
     def initialize(attrs={})
       self.attributes = {}
       self.lists      = {}
@@ -303,9 +375,17 @@ module RedisAssist
       self.id = generate_id if new_record?
 
       redis.multi do
+        # Add to the index
+        insert_into_index(:id, id, id) if new_record? 
+
+        # Remove soft-deleted record from index
+        if deleted?
+          remove_from_index(:id, id)
+          insert_into_index(:deleted_at, deleted_at.to_i, id)
+        end
+
         # build the arguments to pass to redis hmset
         # and insure the attributes are explicitely declared
-
         unless attributes.is_a?(Redis::Future)
           attribute_args = hash_to_redis(attributes)
           redis.hmset(key_for(:attributes), *attribute_args)
@@ -354,10 +434,11 @@ module RedisAssist
         self.deleted_at = Time.now.to_f if respond_to?(:deleted_at)
         save
       else
-        redis.pipelined do |pipe|
-          pipe.del(key_for(:attributes))
+        redis.multi do
+          redis.zrem(self.class.primary_key_index_key, id)
+          redis.del(key_for(:attributes))
           lists.merge(hashes).each do |name|
-            pipe.del(key_for(name))
+            redis.del(key_for(name))
           end
         end
       end
@@ -365,7 +446,7 @@ module RedisAssist
       invoke_callback(:after_delete)
       self
     end
-  
+
     def new_record?
       !!new_record
     end
@@ -385,6 +466,14 @@ module RedisAssist
 
     private
   
+
+    def insert_into_index(name, score, member)
+      redis.zadd(self.class.index_key_for(name), score, member)
+    end
+
+    def remove_from_index(name, member)
+      redis.zrem(self.class.index_key_for(name), member)
+    end
   
     def generate_id
       redis.incr("#{self.class.key_prefix}:id_sequence")

data/lib/redis_assist/version.rb

@@ -1,3 +1,3 @@
 module RedisAssist
-  VERSION = '0.4.9' unless defined?(::RedisAssist::VERSION)
+  VERSION = '0.5.0' 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.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Tyler Love
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis