inkwell 1.0.5 → 1.1.1

data/test/dummy_without_community/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_without_community/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_without_community/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inkwell
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &69687760 !ruby/object:Gem::Requirement
+  requirement: &79187780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *69687760
+  version_requirements: *79187780
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &69687510 !ruby/object:Gem::Requirement
+  requirement: &79185940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *69687510
+  version_requirements: *79185940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69687320 !ruby/object:Gem::Requirement
+  requirement: &79184480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69687320
+  version_requirements: *79184480
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &69687090 !ruby/object:Gem::Requirement
+  requirement: &79183940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69687090
+  version_requirements: *79183940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &69686880 !ruby/object:Gem::Requirement
+  requirement: &79201300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69686880
+  version_requirements: *79201300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69686630 !ruby/object:Gem::Requirement
+  requirement: &79200320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *69686630
+  version_requirements: *79200320
 description: Inkwell provides simple way to add social networking features like comments,
   reblogs, favorites, following/followers, communities and timelines to your Ruby
   on Rails application.
@@ -98,12 +98,16 @@ files:
 - config/routes.rb
 - db/migrate/20121209121955_create_inkwell_blog_items.rb
 - db/migrate/20121209124743_create_inkwell_comments.rb
+- db/migrate/20130202130030_change_is_comment_to_item_type.rb
 - db/migrate/20121202140816_add_columns_to_posts.rb
 - db/migrate/20121202140510_create_inkwell_timeline_items.rb
 - db/migrate/20130202130010_change_tables_for_communities.rb
 - db/migrate/20121209124435_add_columns_to_users.rb
+- db/migrate/20130212130868_rename_parent_id_to_parent_comment_id_in_comment_table.rb
 - db/migrate/20121209123557_create_inkwell_favorite_items.rb
+- db/migrate/20130212130858_refactor_comment_table.rb
 - db/migrate/20130202130020_add_community_ids_to_post.rb
+- db/migrate/20130202130040_add_owner_type_to_lines.rb
 - lib/inkwell/version.rb
 - lib/inkwell/engine.rb
 - lib/common/base.rb
@@ -164,10 +168,13 @@ files:
 - test/dummy_without_community/db/seeds.rb
 - test/dummy_without_community/db/test.sqlite3
 - test/dummy_without_community/db/migrate/20130208134749_change_tables_for_communities.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115835_refactor_comment_table.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134745_create_inkwell_blog_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20121202112556_create_users.rb
 - test/dummy_without_community/db/migrate/20130208134743_create_inkwell_timeline_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134748_create_inkwell_comments.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115834_add_owner_type_to_lines.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115833_change_is_comment_to_item_type.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134744_add_columns_to_posts.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134746_create_inkwell_favorite_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20121202111750_create_posts.rb
@@ -234,12 +241,16 @@ files:
 - test/dummy/db/migrate/20130208134951_create_inkwell_favorite_items.inkwell.rb
 - test/dummy/db/migrate/20130208134949_add_columns_to_posts.inkwell.rb
 - test/dummy/db/migrate/20130208134955_add_community_ids_to_post.inkwell.rb
+- test/dummy/db/migrate/20130213101736_refactor_comment_table.inkwell.rb
 - test/dummy/db/migrate/20121202112556_create_users.rb
 - test/dummy/db/migrate/20130208134952_add_columns_to_users.inkwell.rb
+- test/dummy/db/migrate/20130212130848_add_owner_type_to_lines.inkwell.rb
+- test/dummy/db/migrate/20130213121414_rename_parent_id_to_parent_comment_id_in_comment_table.inkwell.rb
 - test/dummy/db/migrate/20130208134954_change_tables_for_communities.inkwell.rb
 - test/dummy/db/migrate/20130201155147_create_communities.rb
 - test/dummy/db/migrate/20130208134950_create_inkwell_blog_items.inkwell.rb
 - test/dummy/db/migrate/20130208134953_create_inkwell_comments.inkwell.rb
+- test/dummy/db/migrate/20130210231424_change_is_comment_to_item_type.inkwell.rb
 - test/dummy/db/migrate/20130208134948_create_inkwell_timeline_items.inkwell.rb
 - test/dummy/db/migrate/20121202111750_create_posts.rb
 - test/dummy/log/development.log
@@ -326,10 +337,13 @@ test_files:
 - test/dummy_without_community/db/seeds.rb
 - test/dummy_without_community/db/test.sqlite3
 - test/dummy_without_community/db/migrate/20130208134749_change_tables_for_communities.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115835_refactor_comment_table.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134745_create_inkwell_blog_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20121202112556_create_users.rb
 - test/dummy_without_community/db/migrate/20130208134743_create_inkwell_timeline_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134748_create_inkwell_comments.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115834_add_owner_type_to_lines.inkwell.rb
+- test/dummy_without_community/db/migrate/20130213115833_change_is_comment_to_item_type.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134744_add_columns_to_posts.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134746_create_inkwell_favorite_items.inkwell.rb
 - test/dummy_without_community/db/migrate/20121202111750_create_posts.rb
@@ -396,12 +410,16 @@ test_files:
 - test/dummy/db/migrate/20130208134951_create_inkwell_favorite_items.inkwell.rb
 - test/dummy/db/migrate/20130208134949_add_columns_to_posts.inkwell.rb
 - test/dummy/db/migrate/20130208134955_add_community_ids_to_post.inkwell.rb
+- test/dummy/db/migrate/20130213101736_refactor_comment_table.inkwell.rb
 - test/dummy/db/migrate/20121202112556_create_users.rb
 - test/dummy/db/migrate/20130208134952_add_columns_to_users.inkwell.rb
+- test/dummy/db/migrate/20130212130848_add_owner_type_to_lines.inkwell.rb
+- test/dummy/db/migrate/20130213121414_rename_parent_id_to_parent_comment_id_in_comment_table.inkwell.rb
 - test/dummy/db/migrate/20130208134954_change_tables_for_communities.inkwell.rb
 - test/dummy/db/migrate/20130201155147_create_communities.rb
 - test/dummy/db/migrate/20130208134950_create_inkwell_blog_items.inkwell.rb
 - test/dummy/db/migrate/20130208134953_create_inkwell_comments.inkwell.rb
+- test/dummy/db/migrate/20130210231424_change_is_comment_to_item_type.inkwell.rb
 - test/dummy/db/migrate/20130208134948_create_inkwell_timeline_items.inkwell.rb
 - test/dummy/db/migrate/20121202111750_create_posts.rb
 - test/dummy/log/development.log