tekeya 0.0.7 → 0.0.9

data/Gemfile

@@ -19,6 +19,7 @@ group :test do
   gem 'fabrication'       , '~> 2.3.0'
   gem 'faker'             , '~> 1.1.2'
   gem 'simplecov'         , '~> 0.7.0'
+  gem 'timecop'           , '~> 0.5.9.1'
 end
 
 platforms :jruby do

data/db/migrate/00_create_activities.rb

@@ -4,8 +4,10 @@ class CreateActivities < ActiveRecord::Migration
       t.string  :activity_type, null: false
       t.integer :entity_id, null: false
       t.string  :entity_type, null: false
+      t.integer :author_id, null: false
+      t.string  :author_type, null: false
       
       t.timestamps
     end
   end
-end
+end

data/lib/tekeya/entity.rb

@@ -36,7 +36,7 @@ module Tekeya
               attachments << ::Tekeya::Attachment.new(attachable: attachable)
             end
 
-            create(activity_type: meth, attachments: attachments, group_with_recent: options[:group].nil? ? true : options[:group])
+            create(activity_type: meth, attachments: attachments, group_with_recent: options[:group].nil? ? true : options[:group], author: options[:author])
           else
             super
           end
@@ -312,13 +312,19 @@ module Tekeya
         acts_keys = ::Tekeya.redis.zrevrange(pkey, 0, -1)
         # Retrieve the aggregates
         acts_keys.each do |act_key|
-          acts << ::Tekeya::Feed::Activity::Item.from_redis(act_key, self)
+          # Make `from_redis` only hit the db if author != entity
+          key_components = act_key.split(':')
+          actor = if key_components[4] == self.class.to_s && key_components[5] == self.entity_primary_key
+            self
+          end
+
+          acts << ::Tekeya::Feed::Activity::Item.from_redis(act_key, actor)
         end
       else
         # Retrieve the activities from the DB
         db_recent_activities = self.activities.recent
         db_recent_activities.each do |activity|
-          acts << ::Tekeya::Feed::Activity::Item.from_db(activity, self)
+          acts << ::Tekeya::Feed::Activity::Item.from_db(activity, activity.author)
         end
       end
 

data/lib/tekeya/entity/group.rb

@@ -19,4 +19,4 @@ module Tekeya
       end
     end
   end
-end
+end

data/lib/tekeya/feed/activity.rb

@@ -5,17 +5,23 @@ module Tekeya
 
       included do
         belongs_to    :entity, polymorphic: true, autosave: true
+        belongs_to    :author, polymorphic: true, autosave: true
         has_many      :attachments, as: :attache, class_name: 'Tekeya::Attachment'
 
+        before_create do |act|
+          act.author ||= act.entity
+        end
         before_create :group_activities
+
         after_create  :write_activity_in_redis
         after_destroy :delete_activity_from_redis
 
         accepts_nested_attributes_for :attachments
 
-        validates_presence_of :attachments
+        validates_presence_of :attachments, :activity_type
 
         attr_writer :group_with_recent
+        attr_accessible :attachments, :activity_type, :author, :entity, :group_with_recent
       end
 
       # Check if this activity is cached in redis
@@ -40,7 +46,14 @@ module Tekeya
             return current_time_from_proper_timezone.to_i
           end
         else
-          return Time.now.to_i
+          if from_time.present?
+            stamp = from_time.to_i
+
+            # floors the timestamp to the nearest 15 minute
+            return (stamp.to_f / 15.minutes).floor * 15.minutes
+          else
+            return Time.now.to_i
+          end
         end
       end
 
@@ -48,7 +61,16 @@ module Tekeya
       #
       # @return [String] the activity key
       def activity_key
-        "activity:#{self.id}:#{self.entity_type}:#{self.entity.send(self.entity.entity_primary_key)}:#{self.activity_type}:#{score}"
+        k = []
+        k[0] = 'activity'
+        k[1] = self.id
+        k[2] = self.entity_type
+        k[3] = self.entity.send(self.entity.entity_primary_key)
+        k[4] = self.author_type
+        k[5] = self.author.send(self.author.entity_primary_key)
+        k[6] = self.activity_type
+        k[7] = score(self.created_at)
+        k.join(':')
       end
 
       # @private
@@ -82,7 +104,9 @@ module Tekeya
       def group_activities
         if self.group_with_recent
           self.created_at = current_time_from_proper_timezone
-          rel = self.class.where(created_at: self.created_at, activity_type: self.activity_type, entity_id: self.entity_id, entity_type: entity_type)
+          rel = self.class.where( created_at: self.created_at, activity_type: self.activity_type, 
+                                  entity_id: self.entity_id, entity_type: entity_type, 
+                                  author_id: self.author_id, author_type: self.author_type)
           if rel.count > 0
             activity = rel.first
             activity.attachments << self.attachments
@@ -122,4 +146,4 @@ module Tekeya
       end
     end
   end
-end
+end

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

@@ -21,12 +21,12 @@ module Tekeya
           key_components  = key.split(':')
           
           act_id          = key_components[1]
-          act_type        = key_components[4].to_sym
-          act_time        = Time.at(key_components[5].to_i)
+          act_type        = key_components[6].to_sym
+          act_time        = Time.at(key_components[7].to_i)
           
           if act_actor.nil?
-            actor_class = key_components[2].safe_constantize
-            act_actor = actor_class.where(:"#{actor_class.entity_primary_key}" => key_components[3]).first
+            actor_class = key_components[4].safe_constantize
+            act_actor = actor_class.where(:"#{actor_class.entity_primary_key}" => key_components[5]).first
           end
 
           act_attachments = ::Tekeya.redis.smembers(key).map{|act| 
@@ -47,7 +47,7 @@ module Tekeya
           act_id            = activity.id.to_s
           act_type          = activity.activity_type.to_sym
           act_time          = activity.created_at
-          act_actor       ||= activity.entity
+          act_actor       ||= activity.author || activity.entity
           act_attachments   = activity.attachments.map(&:attachable)
 
           return self.new(act_id, act_type, act_attachments, act_actor, act_time)

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

@@ -12,6 +12,7 @@ module Tekeya
           def self.perform(untracked_feed_key, untracker_feed_key)
             # get the keys to the activities so we can decrement the counters later
             activity_keys = ::Tekeya.redis.zrange(untracked_feed_key, 0, -1)
+            return if activity_keys.empty?
 
             ::Tekeya.redis.multi do
               # delete the latest activities of the untracked entity from the tracker feed

data/lib/tekeya/feed/attachable.rb

@@ -12,4 +12,4 @@ module Tekeya
       end
     end
   end
-end
+end

data/lib/tekeya/feed/attachment.rb

@@ -9,6 +9,7 @@ module Tekeya
         belongs_to :notification_attache, polymorphic: true, autosave: true
 
         include ActiveModel::Serializers::JSON
+        attr_accessible :attache, :attachable, :notification_attache
       end
 
       module ClassMethods
@@ -16,4 +17,4 @@ module Tekeya
 
     end
   end
-end
+end

data/lib/tekeya/feed/notification.rb

@@ -15,6 +15,7 @@ module Tekeya
         validates_presence_of :actors
 
         attr_writer :group_with_recent
+        attr_accessible :entity, :subject, :actors, :notification_type, :read, :group_with_recent
       end
 
       module ClassMethods
@@ -90,4 +91,4 @@ module Tekeya
       end
     end
   end
-end
+end

data/lib/tekeya/version.rb

@@ -1,3 +1,3 @@
 module Tekeya
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/spec/spec_helper.rb

@@ -35,7 +35,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.after(:each) do
+  config.before(:each) do
     Tekeya.relations.truncate
     Tekeya.redis.flushall
   end
@@ -63,7 +63,7 @@ RSpec.configure do |config|
       "loglevel"      => "debug",
       "logfile"       => "stdout",
       "databases"     => 16
-    }.map { |k, v| "#{k} #{v}" }.join('\n')
+    }.map { |k, v| "#{k} #{v}" }.join("\n")
     `echo '#{redis_options}' | redis-server -`
   end
 
@@ -75,4 +75,4 @@ RSpec.configure do |config|
 
     FileUtils.rm_r "#{File.dirname(__FILE__)}/rails_app/db/test.sqlite3" rescue nil
   end
-end
+end

data/spec/tekeya/activity_spec.rb

@@ -104,7 +104,10 @@ describe "Tekeya" do
         @act1.destroy
         @act3.destroy
         @act4.destroy
-        @act5.destroy
+
+        Timecop.travel(Time.at(20.minutes)) do
+          @act5.destroy
+        end
       end
 
       it "should remove the activity from the cache when its deleted from the db" do
@@ -167,4 +170,4 @@ describe "Tekeya" do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tekeya
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70202793029420 !ruby/object:Gem::Requirement
+  requirement: &70269641288980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70202793029420
+  version_requirements: *70269641288980
 - !ruby/object:Gem::Dependency
   name: rebat
-  requirement: &70202793028660 !ruby/object:Gem::Requirement
+  requirement: &70269641287740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70202793028660
+  version_requirements: *70269641287740
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70202793027640 !ruby/object:Gem::Requirement
+  requirement: &70269641285760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.23.0
   type: :runtime
   prerelease: false
-  version_requirements: *70202793027640
+  version_requirements: *70269641285760
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70202793026420 !ruby/object:Gem::Requirement
+  requirement: &70269641284580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70202793026420
+  version_requirements: *70269641284580
 description: a social engine for Rails applications based on Redis and RebatDB
 email:
 - omar.mekky@mashsolvents.com