tekeya 0.0.4 → 0.0.5

data/lib/tekeya/entity.rb

@@ -336,7 +336,7 @@ module Tekeya
       # Check if the cache is not empty
       if recent_activities_count > 0
         # Retrieve the aggregate keys from redis
-        acts_keys = ::Tekeya.redis.zrange(fkey, 0, -1)
+        acts_keys = ::Tekeya.redis.zrevrange(fkey, 0, -1)
         # Retrieve the aggregates
         acts_keys.each do |act_key|
           acts << ::Tekeya::Feed::Activity::Item.from_redis(act_key, self)

data/lib/tekeya/feed/activity.rb

@@ -61,7 +61,16 @@ module Tekeya
       def write_activity_in_redis
         akey = activity_key
         tscore = score
-        ::Resque.enqueue(::Tekeya::Feed::Activity::Resque::ActivityFanout, self.entity_id, self.entity_type, akey, tscore, self.attachments.map{ |att| att.to_json(root: false, only: [:attachable_id, :attachable_type]) })
+        attachments_json = self.attachments.map{ |att| att.to_json(root: false, only: [:attachable_id, :attachable_type]) }
+
+        # write the activity to the aggregate set and the owner's feed
+        ::Tekeya.redis.multi do
+          write_aggregate
+          ::Tekeya::Feed::Activity::Resque::ActivityFanout.write_to_feed(self.entity.profile_feed_key, tscore, akey)
+          ::Tekeya::Feed::Activity::Resque::ActivityFanout.write_to_feed(self.entity.feed_key, tscore, akey)
+        end
+
+        ::Resque.enqueue(::Tekeya::Feed::Activity::Resque::ActivityFanout, self.entity_id, self.entity_type, akey, tscore)
       end
 
       # @private
@@ -96,6 +105,17 @@ module Tekeya
         # floors the timestamp to the nearest 15 minute
         return Time.at((stamp.to_f / 15.minutes).floor * 15.minutes)
       end
+
+      # Writes the activity and its' attachments to the aggregate set
+      #
+      # @param [String] activity_key the key of the activity to be added
+      # @param [Array]  attachments an array of attachments associated with the activity
+      def write_aggregate
+        # save the aggregate set
+        self.attachments.map{ |att| att.to_json(root: false, only: [:attachable_id, :attachable_type]) }.each do |attachment|
+          ::Tekeya.redis.sadd(activity_key, attachment)
+        end
+      end
     end
   end
 end

data/lib/tekeya/feed/activity/resque.rb

@@ -9,7 +9,6 @@ module Tekeya
         end
 
         module ClassMethods
-          private
           # Writes the activity reference to the feed with the supplied key
           #
           # @param [String]  feed_key the key of the feed where the activity will be referenced
@@ -23,6 +22,7 @@ module Tekeya
             ::Tekeya.redis.incr(activity_counter_key)
           end
 
+          private
           # Trims the feed according to the MAXTIMESTAMP set and returns the removed keys (for garbage collection)
           #
           # @param [String] feed_key a string containing the key of the feed to be trimed

data/lib/tekeya/feed/activity/resque/activity_fanout.rb

@@ -9,22 +9,15 @@ module Tekeya
           @queue = :activity_queue
 
           # @private
-          def self.perform(entity_id, entity_type, activity_key, score, attachments)
+          def self.perform(entity_id, entity_type, activity_key, score)
             # get the entity class
             entity_type = entity_type.safe_constantize
             entity = entity_type.where(entity_type.entity_primary_key.to_sym => entity_id).first
             # we only need the feed keys of the trackers
             entity_trackers_feeds = entity.trackers.map(&:feed_key)
-            entity_trackers_feeds << entity.feed_key
             # keep track of the keys we delete in the trim operation for garbage collection
             removed_keys = []
 
-            # write the activity to the aggregate set and the owner's feed
-            ::Tekeya.redis.multi do
-              write_aggregate(activity_key, attachments)
-              write_to_feed(entity.profile_feed_key, score, activity_key)
-            end
-
             # trim the profile feed
             removed_keys += trim_feed(entity.profile_feed_key)
 
@@ -42,19 +35,6 @@ module Tekeya
             # cleanup the garbage
             collect_garbage removed_keys
           end
-
-          private
-
-          # Writes the activity and its' attachments to the aggregate set
-          #
-          # @param [String] activity_key the key of the activity to be added
-          # @param [Array]  attachments an array of attachments associated with the activity
-          def self.write_aggregate(activity_key, attachments)
-            # save the aggregate set
-            attachments.each do |attachment|
-              ::Tekeya.redis.sadd(activity_key, attachment)
-            end
-          end
         end
       end
     end

data/lib/tekeya/version.rb

@@ -1,3 +1,3 @@
 module Tekeya
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tekeya
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70286481928400 !ruby/object:Gem::Requirement
+  requirement: &70167657241820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70286481928400
+  version_requirements: *70167657241820
 - !ruby/object:Gem::Dependency
   name: rebat
-  requirement: &70286481921620 !ruby/object:Gem::Requirement
+  requirement: &70167657235060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70286481921620
+  version_requirements: *70167657235060
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70286481918560 !ruby/object:Gem::Requirement
+  requirement: &70167657232000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.23.0
   type: :runtime
   prerelease: false
-  version_requirements: *70286481918560
+  version_requirements: *70167657232000
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70286481911860 !ruby/object:Gem::Requirement
+  requirement: &70167657225340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70286481911860
+  version_requirements: *70167657225340
 description: a social engine for Rails applications based on Redis and RebatDB
 email:
 - omar.mekky@mashsolvents.com