inkwell 1.0.5 → 1.1.1

data/test/dummy/spec/functional/favorite_spec.rb

@@ -6,7 +6,7 @@ describe "Favorites" do
     @salkar = User.create :nick => "Salkar"
     @morozovm = User.create :nick => "Morozovm"
     @salkar_post = @salkar.posts.create :body => "salkar_post_test_body"
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
   end
 
   it "Post should been favorited" do
@@ -22,7 +22,7 @@ describe "Favorites" do
   end
 
   it "Post should been favorited" do
-    ::Inkwell::FavoriteItem.create :item_id => @salkar_post.id, :user_id => @salkar.id, :is_comment => false
+    ::Inkwell::FavoriteItem.create :item_id => @salkar_post.id, :owner_id => @salkar.id, :item_type => ::Inkwell::Constants::ItemTypes::POST, :owner_type => ::Inkwell::Constants::OwnerTypes::USER
     ::Inkwell::FavoriteItem.all.size.should == 1
     @salkar.favorite?(@salkar_post).should == true
   end
@@ -33,7 +33,7 @@ describe "Favorites" do
   end
 
   it "Comment should been favorited" do
-    ::Inkwell::FavoriteItem.create :item_id => @salkar_comment.id, :user_id => @salkar.id, :is_comment => true
+    ::Inkwell::FavoriteItem.create :item_id => @salkar_comment.id, :owner_id => @salkar.id, :item_type => ::Inkwell::Constants::ItemTypes::COMMENT, :owner_type => ::Inkwell::Constants::OwnerTypes::USER
     ::Inkwell::FavoriteItem.all.size.should == 1
     @salkar.favorite?(@salkar_comment).should == true
   end
@@ -123,17 +123,17 @@ describe "Favorites" do
 
   it "Favoriteline should been return" do
     @salkar_post = @salkar.posts.create :body => "salkar_post_test_body"
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
     @morozovm_post = @morozovm.posts.create :body => "salkar_post_test_body"
-    @morozovm_comment = @morozovm.comments.create :post_id => @morozovm_post.id, :body => "salkar_comment_body"
-    @salkar_comment1 = @salkar.comments.create :post_id => @morozovm_post.id, :body => "salkar_comment_body"
+    @morozovm_comment = @morozovm.create_comment :for_object => @morozovm_post, :body => "salkar_comment_body"
+    @salkar_comment1 = @salkar.create_comment :for_object => @morozovm_post, :body => "salkar_comment_body"
     @morozovm_post1 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post2 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post3 = @morozovm.posts.create :body => "salkar_post_test_body"
-    @salkar_comment2 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @salkar_comment3 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @salkar_comment4 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @morozovm_comment2 = @morozovm.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
+    @salkar_comment2 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @salkar_comment3 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @salkar_comment4 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @morozovm_comment2 = @morozovm.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
     @salkar_post1 = @salkar.posts.create :body => "salkar_post_test_body"
 
     @salkar.favorite @salkar_post
@@ -154,48 +154,48 @@ describe "Favorites" do
     fline.size.should == 10
     fline[0].id.should == @salkar_post1.id
     fline[0].class.to_s.should == 'Post'
-    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_post1.id, false).id
+    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@salkar_post1.id, ::Inkwell::Constants::ItemTypes::POST).id
     fline[9].id.should == @morozovm_comment.id
     fline[9].class.to_s.should == 'Inkwell::Comment'
-    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment.id, true).id
+    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@morozovm_comment.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
 
     fline_same = @salkar.favoriteline :last_shown_obj_id => nil, :limit => 10, :for_user => nil
     fline_same.should == fline
 
-    from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment2.id, true).id
+    from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@morozovm_comment2.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
     fline = @salkar.favoriteline(:last_shown_obj_id => from_favorite_item_id)
     fline.size.should == 10
     fline[0].id.should == @salkar_comment4.id
     fline[0].class.to_s.should == 'Inkwell::Comment'
-    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_comment4.id, true).id
+    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@salkar_comment4.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
     fline[9].id.should == @salkar_comment.id
     fline[9].class.to_s.should == 'Inkwell::Comment'
-    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_comment.id, true).id
+    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@salkar_comment.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
 
-    from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment2.id, true).id
+    from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@morozovm_comment2.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
     fline = @salkar.favoriteline(:last_shown_obj_id => from_favorite_item_id, :limit => 5)
     fline.size.should == 5
     fline[0].id.should == @salkar_comment4.id
     fline[0].class.to_s.should == 'Inkwell::Comment'
-    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_comment4.id, true).id
+    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@salkar_comment4.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
     fline[4].id.should == @morozovm_post2.id
     fline[4].class.to_s.should == 'Post'
-    fline[4].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_post2.id, false).id
+    fline[4].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@morozovm_post2.id, ::Inkwell::Constants::ItemTypes::POST).id
   end
 
   it "Favoriteline should been return for for_user" do
     @salkar_post = @salkar.posts.create :body => "salkar_post_test_body"
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
     @morozovm_post = @morozovm.posts.create :body => "salkar_post_test_body"
-    @morozovm_comment = @morozovm.comments.create :post_id => @morozovm_post.id, :body => "salkar_comment_body"
-    @salkar_comment1 = @salkar.comments.create :post_id => @morozovm_post.id, :body => "salkar_comment_body"
+    @morozovm_comment = @morozovm.create_comment :for_object => @morozovm_post, :body => "salkar_comment_body"
+    @salkar_comment1 = @salkar.create_comment :for_object => @morozovm_post, :body => "salkar_comment_body"
     @morozovm_post1 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post2 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post3 = @morozovm.posts.create :body => "salkar_post_test_body"
-    @salkar_comment2 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @salkar_comment3 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @salkar_comment4 = @salkar.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
-    @morozovm_comment2 = @morozovm.comments.create :post_id => @morozovm_post3.id, :body => "salkar_comment_body"
+    @salkar_comment2 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @salkar_comment3 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @salkar_comment4 = @salkar.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
+    @morozovm_comment2 = @morozovm.create_comment :for_object => @morozovm_post3, :body => "salkar_comment_body"
     @salkar_post1 = @salkar.posts.create :body => "salkar_post_test_body"
 
     @salkar.favorite @salkar_post
@@ -221,7 +221,7 @@ describe "Favorites" do
     fline.size.should == 10
     fline[0].id.should == @salkar_post1.id
     fline[0].class.to_s.should == 'Post'
-    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_post1.id, false).id
+    fline[0].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@salkar_post1.id, ::Inkwell::Constants::ItemTypes::POST).id
     fline[0].is_favorited.should == true
     fline[0].is_reblogged.should == true
     fline[2].id.should == @salkar_comment4.id
@@ -229,7 +229,7 @@ describe "Favorites" do
     fline[2].is_reblogged.should == true
     fline[9].id.should == @morozovm_comment.id
     fline[9].class.to_s.should == 'Inkwell::Comment'
-    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment.id, true).id
+    fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_item_type(@morozovm_comment.id, ::Inkwell::Constants::ItemTypes::COMMENT).id
     fline[9].is_favorited.should == true
     for i in 1..8
       fline[i].is_favorited.should == false

data/test/dummy/spec/functional/following_spec.rb

@@ -6,7 +6,7 @@ describe "Following" do
     @salkar = User.create :nick => "Salkar"
     @morozovm = User.create :nick => "Morozovm"
     @salkar_post = @salkar.posts.create :body => "salkar_post_test_body"
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
     @salkar_post1 = @salkar.posts.create :body => "salkar_post_test_body"
     @salkar_post2 = @salkar.posts.create :body => "salkar_post_test_body"
     @salkar_post3 = @salkar.posts.create :body => "salkar_post_test_body"
@@ -14,7 +14,7 @@ describe "Following" do
     @morozovm_post1 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post2 = @morozovm.posts.create :body => "salkar_post_test_body"
     @morozovm_post3 = @morozovm.posts.create :body => "salkar_post_test_body"
-    @morozovm_comment = @morozovm.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @morozovm_comment = @morozovm.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
   end
 
   it "user should follow another user" do
@@ -26,18 +26,18 @@ describe "Following" do
     @salkar.followers_ids.should == "[]"
     @salkar.followers_row.should == []
 
-    @salkar.timeline_items.size.should == 4
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post.id, false).should be
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post1.id, false).should be
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post2.id, false).should be
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post3.id, false).should be
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_comment.id, true).should == nil
-    @salkar.timeline_items.each do |item|
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 4
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post.id, ::Inkwell::Constants::ItemTypes::POST).should be
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post1.id, ::Inkwell::Constants::ItemTypes::POST).should be
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post2.id, ::Inkwell::Constants::ItemTypes::POST).should be
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post3.id, ::Inkwell::Constants::ItemTypes::POST).should be
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_comment.id, ::Inkwell::Constants::ItemTypes::COMMENT).should == nil
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).each do |item|
       item.has_many_sources.should == false
       ActiveSupport::JSON.decode(item.from_source).should == [Hash['user_id' => @morozovm.id, 'type' => 'following']]
     end
 
-    @morozovm.timeline_items.size.should == 0
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 0
     @morozovm.followers_ids.should == "[#{@salkar.id}]"
     @morozovm.followers_row.should == [@salkar.id]
     @morozovm.followings_ids.should == "[]"
@@ -46,10 +46,10 @@ describe "Following" do
 
   it "created_at from blog_item should transferred to timeline_item for follower when he follow this user" do
     @salkar.follow @morozovm
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post.id, false).created_at.to_s.should == @morozovm_post.created_at.to_s
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post1.id, false).created_at.to_s.should == @morozovm_post1.created_at.to_s
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post2.id, false).created_at.to_s.should == @morozovm_post2.created_at.to_s
-    @salkar.timeline_items.find_by_item_id_and_is_comment(@morozovm_post3.id, false).created_at.to_s.should == @morozovm_post3.created_at.to_s
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post.id, ::Inkwell::Constants::ItemTypes::POST).created_at.to_s.should == @morozovm_post.created_at.to_s
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post1.id, ::Inkwell::Constants::ItemTypes::POST).created_at.to_s.should == @morozovm_post1.created_at.to_s
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post2.id, ::Inkwell::Constants::ItemTypes::POST).created_at.to_s.should == @morozovm_post2.created_at.to_s
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).find_by_item_id_and_item_type(@morozovm_post3.id, ::Inkwell::Constants::ItemTypes::POST).created_at.to_s.should == @morozovm_post3.created_at.to_s
   end
 
   it "user should follow another user (follow?)" do
@@ -70,10 +70,10 @@ describe "Following" do
   it "user should unfollow another user" do
     @salkar.follow @morozovm
     @salkar.reload
-    @salkar.timeline_items.size.should == 4
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 4
     @salkar.unfollow @morozovm
     @salkar.reload
-    @salkar.timeline_items.size.should == 0
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 0
 
   end
 
@@ -81,11 +81,11 @@ describe "Following" do
     @talisman = User.create :nick => "Talisman"
     @talisman.reblog @salkar_post
     @morozovm.follow @talisman
-    @morozovm.timeline_items.size.should == 1
-    item = @morozovm.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'}])
     item.item_id.should == @salkar_post.id
-    item.is_comment.should == false
+    item.item_type.should == ::Inkwell::Constants::ItemTypes::POST
   end
 
   it "timeline item should not delete if has many sources when unfollow" do
@@ -93,25 +93,25 @@ describe "Following" do
     @talisman.reblog @salkar_post
     @morozovm.follow @talisman
     @morozovm.follow @salkar
-    @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'},{'user_id' => @salkar.id, 'type' => 'following'}])
     item.has_many_sources.should == true
 
     @morozovm.unfollow @salkar
-    @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'}])
     item.has_many_sources.should == false
 
     @morozovm.follow @salkar
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'},{'user_id' => @salkar.id, 'type' => 'following'}])
     item.has_many_sources.should == true
 
     @morozovm.unfollow @talisman
-    @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @salkar.id, 'type' => 'following'}])
     item.has_many_sources.should == false
   end

data/test/dummy/spec/functional/reblog_spec.rb

@@ -7,20 +7,20 @@ describe "Reblog" do
     @morozovm = User.create :nick => "Morozovm"
     @talisman = User.create :nick => "Talisman"
     @salkar_post = @salkar.posts.create :body => "salkar_post_test_body"
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
   end
 
   it "user should reblog post" do
     @morozovm.reblog @salkar_post
-    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :is_comment => false).size.should == 2
-    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :is_comment => false, :owner_id => @morozovm.id, :is_owner_user => true, :is_reblog => true).size.should == 1
+    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 2
+    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :item_type => ::Inkwell::Constants::ItemTypes::POST, :owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER, :is_reblog => true).size.should == 1
     @salkar_post.reload
     @salkar_post.users_ids_who_reblog_it.should == "[#{@morozovm.id}]"
   end
 
   it "user should reblog comment" do
     @morozovm.reblog @salkar_comment
-    ::Inkwell::BlogItem.where(:item_id => @salkar_comment.id, :is_comment => true, :owner_id => @morozovm.id, :is_owner_user => true, :is_reblog => true).size.should == 1
+    ::Inkwell::BlogItem.where(:item_id => @salkar_comment.id, :item_type => ::Inkwell::Constants::ItemTypes::COMMENT, :owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER, :is_reblog => true).size.should == 1
     @salkar_comment.reload
     @salkar_comment.users_ids_who_reblog_it.should == "[#{@morozovm.id}]"
   end
@@ -28,38 +28,38 @@ describe "Reblog" do
   it "timeline item should been created for followers when user reblog post" do
     @talisman.follow @morozovm
     @morozovm.reblog @salkar_post
-    @talisman.timeline_items.size.should == 1
-    item = @talisman.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.item_id.should == @salkar_post.id
     item.created_at.to_i.should == @salkar_post.created_at.to_i
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @morozovm.id, 'type' => 'reblog'}])
-    item.is_comment.should == false
+    item.item_type.should == ::Inkwell::Constants::ItemTypes::POST
   end
 
   it "timeline item should been created for followers when user reblog comment" do
     @talisman.follow @morozovm
     @morozovm.reblog @salkar_comment
-    @talisman.timeline_items.size.should == 1
-    item = @talisman.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.item_id.should == @salkar_comment.id
     item.created_at.to_i.should == @salkar_comment.created_at.to_i
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @morozovm.id, 'type' => 'reblog'}])
-    item.is_comment.should == true
+    item.item_type.should == ::Inkwell::Constants::ItemTypes::COMMENT
   end
 
   it "timeline item should not been created for follower's post/comment" do
     @salkar.follow @morozovm
     @morozovm.reblog @salkar_post
     @morozovm.reblog @salkar_comment
-    @salkar.timeline_items.size.should == 0
+    ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 0
   end
 
   it "one timeline item should created for one post with two sources" do
     @talisman.follow @morozovm
     @morozovm.reblog @salkar_post
     @talisman.follow @salkar
-    @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @talisman.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.has_many_sources.should == true
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @morozovm.id, 'type' => 'reblog'},{'user_id' => @salkar.id, 'type' => 'following'}])
   end
@@ -68,8 +68,8 @@ describe "Reblog" do
     @talisman.follow @morozovm
     @talisman.follow @salkar
     @morozovm.reblog @salkar_post
-    @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @talisman.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.has_many_sources.should == true
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @salkar.id, 'type' => 'following'}, {'user_id' => @morozovm.id, 'type' => 'reblog'}])
   end
@@ -91,8 +91,8 @@ describe "Reblog" do
   it "user should unreblog post" do
     @morozovm.reblog @salkar_post
     @morozovm.unreblog @salkar_post
-    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :is_comment => false).size.should == 1
-    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :is_comment => false, :owner_id => @morozovm.id, :is_owner_user => true, :is_reblog => true).size.should == 0
+    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    ::Inkwell::BlogItem.where(:item_id => @salkar_post.id, :item_type => ::Inkwell::Constants::ItemTypes::POST, :owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER, :is_reblog => true).size.should == 0
     @salkar_post.reload
     @salkar_post.users_ids_who_reblog_it.should == "[]"
   end
@@ -100,7 +100,7 @@ describe "Reblog" do
   it "user should unreblog comment" do
     @morozovm.reblog @salkar_comment
     @morozovm.unreblog @salkar_comment
-    ::Inkwell::BlogItem.where(:item_id => @salkar_comment.id, :is_comment => true, :owner_id => @morozovm.id, :is_owner_user => true, :is_reblog => true).size.should == 0
+    ::Inkwell::BlogItem.where(:item_id => @salkar_comment.id, :item_type => ::Inkwell::Constants::ItemTypes::COMMENT, :owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER, :is_reblog => true).size.should == 0
     @salkar_comment.reload
     @salkar_comment.users_ids_who_reblog_it.should == "[]"
   end
@@ -111,15 +111,15 @@ describe "Reblog" do
     @morozovm_post = @morozovm.posts.create :body => "morozovm_post_test_body"
     @morozovm.reblog @salkar_post
 
-    @talisman.timeline_items.size.should == 2
-    @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 2
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.has_many_sources.should == false
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @morozovm.id, 'type' => 'reblog'}])
 
     @morozovm.unreblog @salkar_post
-    @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 0
-    @talisman.timeline_items.size.should == 1
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 0
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 1
   end
 
   it "timeline items should delete for followers when user unreblog comment" do
@@ -127,13 +127,13 @@ describe "Reblog" do
     @talisman.follow @morozovm
     @morozovm.reblog @salkar_comment
 
-    @talisman.timeline_items.where(:item_id => @salkar_comment, :is_comment => true).size.should == 1
-    item = @talisman.timeline_items.first
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_comment, :item_type => ::Inkwell::Constants::ItemTypes::COMMENT).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).first
     item.has_many_sources.should == false
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @morozovm.id, 'type' => 'reblog'}])
 
     @morozovm.unreblog @salkar_comment
-    @talisman.timeline_items.where(:item_id => @salkar_comment, :is_comment => true).size.should == 0
+    ::Inkwell::TimelineItem.where(:owner_id => @talisman.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_comment, :item_type => ::Inkwell::Constants::ItemTypes::COMMENT).size.should == 0
   end
 
   it "timeline item should not been delete if post has many sources and unreblogged by following" do
@@ -142,18 +142,18 @@ describe "Reblog" do
     @morozovm.follow @talisman
     @morozovm.follow @salkar
     @talisman_post = @talisman.posts.create :body => "talisman_post_test_body"
-    @morozovm.timeline_items.size == 2
-    @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size == 2
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'}, {'user_id' => @salkar.id, 'type' => 'following'}])
     item.has_many_sources.should == true
 
     @talisman.unreblog @salkar_post
-    @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).size.should == 1
-    item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).first
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).size.should == 1
+    item = ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).where(:item_id => @salkar_post, :item_type => ::Inkwell::Constants::ItemTypes::POST).first
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @salkar.id, 'type' => 'following'}])
     item.has_many_sources.should == false
-    @morozovm.timeline_items.size == 2
+    ::Inkwell::TimelineItem.where(:owner_id => @morozovm.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size == 2
   end
 
   it "reblog count should been received for post" do

data/test/dummy/spec/functional/timeline_spec.rb

@@ -53,7 +53,7 @@ describe "Timeline" do
   end
 
   it "comment should been in timeline" do
-    @salkar_comment = @salkar.comments.create :post_id => @salkar_post.id, :body => "salkar_comment_body"
+    @salkar_comment = @salkar.create_comment :for_object => @salkar_post, :body => "salkar_comment_body"
     @talisman.follow @morozovm
     @morozovm.reblog @salkar_comment
     @morozovm.favorite @salkar_comment

data/test/dummy_without_community/db/migrate/20130213115833_change_is_comment_to_item_type.inkwell.rb

@@ -0,0 +1,19 @@
+# This migration comes from inkwell (originally 20130202130030)
+class ChangeIsCommentToItemType < ActiveRecord::Migration
+  def change
+      add_column :inkwell_blog_items, :item_type, :string
+      ::Inkwell::BlogItem.where(:is_comment => true).update_all(:item_type => 'c')
+      ::Inkwell::BlogItem.where(:is_comment => false).update_all(:item_type => 'p')
+      remove_column :inkwell_blog_items, :is_comment
+
+      add_column :inkwell_favorite_items, :item_type, :string
+      ::Inkwell::FavoriteItem.where(:is_comment => true).update_all(:item_type => 'c')
+      ::Inkwell::FavoriteItem.where(:is_comment => false).update_all(:item_type => 'p')
+      remove_column :inkwell_favorite_items, :is_comment
+
+      add_column :inkwell_timeline_items, :item_type, :string
+      ::Inkwell::TimelineItem.where(:is_comment => true).update_all(:item_type => 'c')
+      ::Inkwell::TimelineItem.where(:is_comment => false).update_all(:item_type => 'p')
+      remove_column :inkwell_timeline_items, :is_comment
+  end
+end

data/test/dummy_without_community/db/migrate/20130213115834_add_owner_type_to_lines.inkwell.rb

@@ -0,0 +1,17 @@
+# This migration comes from inkwell (originally 20130202130040)
+class AddOwnerTypeToLines < ActiveRecord::Migration
+  def change
+    add_column :inkwell_blog_items, :owner_type, :string
+    ::Inkwell::BlogItem.where(:is_owner_user => true).update_all(:owner_type => 'u')
+    ::Inkwell::BlogItem.where(:is_owner_user => false).update_all(:owner_type => 'c')
+    remove_column :inkwell_blog_items, :is_owner_user
+
+    add_column :inkwell_favorite_items, :owner_type, :string
+    ::Inkwell::FavoriteItem.update_all(:owner_type => 'u')
+    rename_column :inkwell_favorite_items, "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id", :owner_id
+
+    add_column :inkwell_timeline_items, :owner_type, :string
+    ::Inkwell::TimelineItem.update_all(:owner_type => 'u')
+    rename_column :inkwell_timeline_items, "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id", :owner_id
+  end
+end