parity_timeline 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ff062fb5f48769808d2edb009304c53afaeaa8
-  data.tar.gz: 781075a55bf33f1aaafdb863289e67aae7ad8c39
+  metadata.gz: e85146f69c8fde0197e60c17e05915a0af4412cc
+  data.tar.gz: 7a677ed0ec60db4aa3ecdfccdf0278e07abace4d
 SHA512:
-  metadata.gz: fa7367b09d7c6b4281f809bbb4351fc73317d9a304d2d3d40c5e3666aa4f80fae19dd252a22e31fcf4f70a0491705237fa17de3e62a2a8afcb9005404a2e2c27
-  data.tar.gz: 3f49d6d5c12ef03a531b5133337dd81d7e8522c792b949f2d8a8642871c9eb08988d0f0a83b1702af57070538b2950697d3aae7a513b1dbadb3739b0145679d4
+  metadata.gz: 59a011912f306bbd1dc89be69bf41c9c2180a0b1fbfe1292196cd454bf34236997a7574e58e7d94332682706ebd257ae2dba23bb03fa27cc87f8cd5de5e08b1b
+  data.tar.gz: 305562d0439a61010de6217c2693bb84239e9c5988a181b30026d262d68a3527a8eb1f635af1a03574e246652acf00c3f34d02064186c100fd630f770a9ca2bc

data/lib/timeline/controller_helper.rb

@@ -9,12 +9,14 @@ module Timeline
       def track_timeline_activity(name, options={})
         @name = name
         @start_value = 0
-        @limit_records = options.delete(:limit_records) || -1
+        @limit_records = (options[:limit_records] && options[:limit_records] > 30) ? options[:limit_records] : 30
+        @limit_days = (options[:limit_days] && options[:limit_days] > 30) ? options[:limit_days] : 30
         @actor = options.delete :actor
         @actor ||= :creator
         @object = options.delete :object
         @target = options.delete :target
         @followers = options.delete :followers
+        @friends = options.delete :friends
         @mentionable = options.delete :mentionable
        
         @fields_for = {}
@@ -46,6 +48,7 @@ module Timeline
         add_activity_by_user(activity_item[:actor][:id], activity_item)
         add_mentions(activity_item)
         add_activity_to_followers(activity_item) if @followers.any?
+        add_activity_to_friends(activity_item) if @friends.any?
       end
 
       def add_activity_by_user(user_id, activity_item)
@@ -56,10 +59,18 @@ module Timeline
         redis_add "user:id:#{user_id}:activity", activity_item
       end
 
+      def add_activity_to_users_friends(user_id, activity_item)
+        redis_add "user:id:#{user_id}:activity:friends", activity_item
+      end
+
       def add_activity_to_followers(activity_item)
         @followers.each { |follower| add_activity_to_user(follower.id, activity_item) }
       end
 
+      def add_activity_to_friends(activity_item)
+        @friends.each { |friend| add_activity_to_users_friends(friend, activity_item) }
+      end
+
       def add_mentions(activity_item)
         return unless @mentionable and @object.send(@mentionable)
         @object.send(@mentionable).scan(/@\w+/).each do |mention|
@@ -95,7 +106,33 @@ module Timeline
 
       def redis_add(list, activity_item)
         Timeline.redis.lpush list, Timeline.encode(activity_item)
-        Timeline.redis.ltrim list , @start_value , @limit_records
+        trim_activities list
+      end
+
+      def trim_activities(list)
+        return if (Timeline.redis.llen list) < @limit_records
+        last_record = get_record(list, -1)
+        return if (last_record && last_record["created_at"]) > Time.now - @limit_days.days
+        trim_old_activities(list)
+      end
+
+      def get_record(list, index)
+        last_record = Timeline.redis.lindex list, index
+        last_record = Timeline.decode(last_record) if last_record
+      end
+
+      def trim_old_activities(list)
+        Timeline.redis.ltrim list , 0 , get_trim_index(list, (Timeline.redis.llen list) - 1)
+      end
+
+      def get_trim_index(list, index)
+        return @limit_records if index < @limit_records
+        record = get_record(list, index)
+        if record && (record["created_at"] < Time.now - @limit_days.days)
+          return get_trim_index(list, index - 5)
+        else
+          return index
+        end
       end
 
       def set_object(object)

data/lib/timeline/notification_helper.rb

@@ -21,9 +21,8 @@ module Timeline
 
       def add_activity_to_subscribed_user(followers, activity_item)
         followers.each do |follower|
-          follower_id ? follower.respond_to?(:id) ? follower.id : follower
-          add_to_redis "user:id:#{follower_id}:notification", activity_item
-          trim_notification "user:id:#{follower_id}:notification"
+          add_to_redis "user:id:#{follower.id}:notification", activity_item
+          trim_notification "user:id:#{follower.id}:notification"
         end
       end
 

data/lib/timeline/untitled.txt

@@ -1,4 +1,8 @@
 1.upto(User.last.id).each do |u|
    list = "user:id:#{u}:notification"
-   Timeline.redis.ltrim list, 0, 15
+   Timeline.redis.ltrim list, 0, 30
+   list = "user:id:#{u}:posts"
+   Timeline.redis.ltrim list, 0, 30
+   list = "user:id:#{u}:activity"
+   Timeline.redis.ltrim list, 0, 30
 end

data/lib/timeline/version.rb

@@ -1,3 +1,3 @@
 module Timeline
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: parity_timeline
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Felix Clack
 - Shiva Kumar
-- Jimish Jpbanputra
+- Jimish Jobanputra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport