tekeya 0.0.9 → 0.0.10

data/lib/tekeya/entity.rb

@@ -16,11 +16,14 @@ module Tekeya
       has_many :activities, as: :entity, class_name: "::Tekeya::Activity", dependent: :destroy do
         # Returns activities dating up to 10 days in the past
         def recent
-          unless ::Tekeya::Configuration.instance.feed_storage_orm.to_sym == :mongoid
+          c = unless ::Tekeya::Configuration.instance.feed_storage_orm.to_sym == :mongoid
             where("created_at > ?", 10.days.ago).order('created_at DESC')
           else
             criteria.where(:created_at.gte => 10.days.ago).desc('created_at')
           end
+
+          c = yield c if block_given?
+          c
         end
 
         # Any method missing invoked on activities is considered a new activity
@@ -301,13 +304,13 @@ module Tekeya
     # Returns the entity's recent activities
     #
     # @return [Array] the list of recent activities by this entity
-    def profile_feed
+    def profile_feed(&blck)
       acts = []
       pkey = self.profile_feed_key
       recent_activities_count = ::Tekeya.redis.zcard(pkey)
 
       # Check if the cache is not empty
-      if recent_activities_count > 0
+      if recent_activities_count > 0 && !block_given?
         # Retrieve the aggregate keys from redis
         acts_keys = ::Tekeya.redis.zrevrange(pkey, 0, -1)
         # Retrieve the aggregates
@@ -322,7 +325,7 @@ module Tekeya
         end
       else
         # Retrieve the activities from the DB
-        db_recent_activities = self.activities.recent
+        db_recent_activities = self.activities.recent(&blck)
         db_recent_activities.each do |activity|
           acts << ::Tekeya::Feed::Activity::Item.from_db(activity, activity.author)
         end
@@ -334,23 +337,29 @@ module Tekeya
     # Returns the entity's feed
     #
     # @return [Array] the list of activities for the entities tracked by this entity
-    def feed
+    def feed(&blck)
       acts = []
       fkey = self.feed_key
       recent_activities_count = ::Tekeya.redis.zcard(fkey)
       
       # Check if the cache is not empty
-      if recent_activities_count > 0
+      if recent_activities_count > 0 && !block_given?
         # Retrieve the aggregate keys from redis
         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)
+          # 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
         (self.tracking + [self]).each do |tracker|
-          db_recent_activities = tracker.activities.recent
+          db_recent_activities = tracker.activities.recent(&blck)
           db_recent_activities.each do |activity|
             acts << ::Tekeya::Feed::Activity::Item.from_db(activity, tracker)
           end
@@ -416,17 +425,19 @@ module Tekeya
     # Retrieves rebat relations
     def tekeya_relations_of(from, relation_type, entity_type, reverse = false)
       result_entity_class = entity_type.safe_constantize if entity_type
-      unless reverse
+      relations = unless reverse
         ::Tekeya.relations.where(from.send(from.class.entity_primary_key), from.class.name, nil, entity_type, relation_type).entries.map do |entry|
-          result_entity_class ||= entry.toEntityType.safe_constantize
-          result_entity_class.where(:"#{result_entity_class.entity_primary_key}" => entry.toEntityId).first
+          entity_class = result_entity_class || entry.toEntityType.safe_constantize
+          entity_class.where(:"#{entity_class.entity_primary_key}" => entry.toEntityId).first
         end
       else
         ::Tekeya.relations.where(nil, entity_type, from.send(from.class.entity_primary_key), from.class.name, relation_type).entries.map do |entry|
-          result_entity_class ||= entry.fromEntityType.safe_constantize
-          result_entity_class.where(:"#{result_entity_class.entity_primary_key}" => entry.fromEntityId).first
+          entity_class = result_entity_class || entry.fromEntityType.safe_constantize
+          entity_class.where(:"#{entity_class.entity_primary_key}" => entry.fromEntityId).first
         end
       end
+
+      relations.compact
     end
 
     # @private

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

@@ -2,13 +2,14 @@ module Tekeya
   module Feed
     module Activity
       class Item
-        attr_reader :activity_id, :activity_type, :attachments, :actor, :timestamp
+        attr_reader :activity_id, :activity_type, :attachments, :actor, :author, :timestamp
 
-        def initialize(activity_id, activity_type, attachments, actor, timestamp)
+        def initialize(activity_id, activity_type, attachments, actor, author, timestamp)
           @activity_id = activity_id
           @activity_type = activity_type
           @attachments = attachments
           @actor = actor
+          @author = author
           @timestamp = timestamp
         end
 
@@ -25,8 +26,15 @@ module Tekeya
           act_time        = Time.at(key_components[7].to_i)
           
           if act_actor.nil?
-            actor_class = key_components[4].safe_constantize
-            act_actor = actor_class.where(:"#{actor_class.entity_primary_key}" => key_components[5]).first
+            actor_class = key_components[2].safe_constantize
+            act_actor = actor_class.where(:"#{actor_class.entity_primary_key}" => key_components[3]).first
+          end
+
+          act_author = unless key_components[2] == key_components[4] && key_components[3] == key_components[5]
+            author_class = key_components[4].safe_constantize
+            author_class.where(:"#{actor_class.entity_primary_key}" => key_components[5]).first
+          else
+            act_actor
           end
 
           act_attachments = ::Tekeya.redis.smembers(key).map{|act| 
@@ -35,7 +43,7 @@ module Tekeya
             att['attachable_type'].safe_constantize.find att['attachable_id']
           }
 
-          return self.new(act_id, act_type, act_attachments, act_actor, act_time)
+          return self.new(act_id, act_type, act_attachments, act_actor, act_author, act_time)
         end
 
         # Builds a feed item a DB activity
@@ -47,10 +55,11 @@ module Tekeya
           act_id            = activity.id.to_s
           act_type          = activity.activity_type.to_sym
           act_time          = activity.created_at
-          act_actor       ||= activity.author || activity.entity
+          act_actor       ||= activity.entity
+          act_author        = activity.author
           act_attachments   = activity.attachments.map(&:attachable)
 
-          return self.new(act_id, act_type, act_attachments, act_actor, act_time)
+          return self.new(act_id, act_type, act_attachments, act_actor, act_author, act_time)
         end
       end
     end

data/lib/tekeya/version.rb

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

data/spec/fabricators/company_fabricator.rb

@@ -0,0 +1,3 @@
+Fabricator(:company) do
+  name { "#{Faker::Name.name}'s Company" }
+end

data/spec/rails_app/app/active_record/company.rb

@@ -0,0 +1,3 @@
+class Company < ActiveRecord::Base
+  include Tekeya::Entity
+end

data/spec/rails_app/app/mongoid/company.rb

@@ -0,0 +1,7 @@
+class Company
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Tekeya::Entity
+
+  field :name, type: String
+end

data/spec/rails_app/db/migrate/103_create_companies.rb

@@ -0,0 +1,9 @@
+class CreateCompanies < ActiveRecord::Migration
+  def change
+    create_table :companies do |t|
+      t.string  :name
+
+      t.timestamps
+    end
+  end
+end

data/spec/tekeya/activity_spec.rb

@@ -15,9 +15,9 @@ describe "Tekeya" do
       @act2 = @user.activities.liked Fabricate(:status)
       @act3 = @user.activities.shared Fabricate(:status)
 
-      # Created after the grouping interval
+      # Created before the grouping interval
       @act4 = @user.activities.new activity_type: :liked, attachments: [Fabricate.build(:attachment)]
-      @act4.stub(:current_time_from_proper_timezone => @act1.created_at + 20.minutes)
+      @act4.stub(:current_time_from_proper_timezone => @act1.created_at - 20.minutes)
       @act4.save!
 
       # Manually not grouped

data/spec/tekeya/entity_spec.rb

@@ -102,11 +102,14 @@ describe "Tekeya" do
       describe "retrieval" do
         before :each do
           @user3 = Fabricate(:user)
+          @company = Fabricate(:company)
+
           @user.track(@user2)
           @user.block(@user3)
           @user.join(@group)
           @user2.join(@group)
           @user3.join(@group)
+          @company.track(@user2)
         end
 
         it "should return tracked entities" do
@@ -115,6 +118,7 @@ describe "Tekeya" do
 
         it "should return trackers" do
           @user2.trackers.include?(@user).should == true
+          @user2.trackers.include?(@company).should == true
         end
 
         it "should return blocked entities" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tekeya
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70269641288980 !ruby/object:Gem::Requirement
+  requirement: &70225140539400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70269641288980
+  version_requirements: *70225140539400
 - !ruby/object:Gem::Dependency
   name: rebat
-  requirement: &70269641287740 !ruby/object:Gem::Requirement
+  requirement: &70225140538900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70269641287740
+  version_requirements: *70225140538900
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70269641285760 !ruby/object:Gem::Requirement
+  requirement: &70225140538420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.23.0
   type: :runtime
   prerelease: false
-  version_requirements: *70269641285760
+  version_requirements: *70225140538420
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70269641284580 !ruby/object:Gem::Requirement
+  requirement: &70225140537940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70269641284580
+  version_requirements: *70225140537940
 description: a social engine for Rails applications based on Redis and RebatDB
 email:
 - omar.mekky@mashsolvents.com
@@ -107,17 +107,20 @@ files:
 - lib/tekeya/railtie.rb
 - lib/tekeya/version.rb
 - spec/fabricators/attachment_fabricator.rb
+- spec/fabricators/company_fabricator.rb
 - spec/fabricators/group_fabricator.rb
 - spec/fabricators/status_fabricator.rb
 - spec/fabricators/user_fabricator.rb
 - spec/orm/active_record.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/Rakefile
+- spec/rails_app/app/active_record/company.rb
 - spec/rails_app/app/active_record/group.rb
 - spec/rails_app/app/active_record/status.rb
 - spec/rails_app/app/active_record/user.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
+- spec/rails_app/app/mongoid/company.rb
 - spec/rails_app/app/mongoid/group.rb
 - spec/rails_app/app/mongoid/status.rb
 - spec/rails_app/app/mongoid/user.rb
@@ -140,6 +143,7 @@ files:
 - spec/rails_app/db/migrate/100_create_users.rb
 - spec/rails_app/db/migrate/101_create_groups.rb
 - spec/rails_app/db/migrate/102_create_statuses.rb
+- spec/rails_app/db/migrate/103_create_companies.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/public/404.html
 - spec/rails_app/public/422.html
@@ -181,17 +185,20 @@ specification_version: 3
 summary: a social engine for Rails applications based on Redis and RebatDB.
 test_files:
 - spec/fabricators/attachment_fabricator.rb
+- spec/fabricators/company_fabricator.rb
 - spec/fabricators/group_fabricator.rb
 - spec/fabricators/status_fabricator.rb
 - spec/fabricators/user_fabricator.rb
 - spec/orm/active_record.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/Rakefile
+- spec/rails_app/app/active_record/company.rb
 - spec/rails_app/app/active_record/group.rb
 - spec/rails_app/app/active_record/status.rb
 - spec/rails_app/app/active_record/user.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
+- spec/rails_app/app/mongoid/company.rb
 - spec/rails_app/app/mongoid/group.rb
 - spec/rails_app/app/mongoid/status.rb
 - spec/rails_app/app/mongoid/user.rb
@@ -214,6 +221,7 @@ test_files:
 - spec/rails_app/db/migrate/100_create_users.rb
 - spec/rails_app/db/migrate/101_create_groups.rb
 - spec/rails_app/db/migrate/102_create_statuses.rb
+- spec/rails_app/db/migrate/103_create_companies.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/public/404.html
 - spec/rails_app/public/422.html