inkwell 1.0.5 → 1.1.1

data/app/models/inkwell/blog_item.rb

@@ -1,5 +1,5 @@
 module Inkwell
   class BlogItem < ActiveRecord::Base
-    attr_accessible :item_id, :owner_id, :is_reblog, :is_comment, :created_at, :updated_at, :is_owner_user
+    attr_accessible :item_id, :owner_id, :is_reblog, :item_type, :created_at, :updated_at, :owner_type
   end
 end

data/app/models/inkwell/comment.rb

@@ -1,13 +1,16 @@
 module Inkwell
   class Comment < ActiveRecord::Base
-    attr_accessible :body, :post_id, :parent_id
+    require_relative '../../../lib/common/base.rb'
+    include ::Inkwell::Constants
+    include ::Inkwell::Common
+
+    attr_accessible :body, :parent_comment_id, :topmost_obj_id, :topmost_obj_type
     attr_accessor :is_reblogged
     attr_accessor :is_favorited
     attr_accessor :item_id_in_line
     attr_accessor :is_reblog_in_blogline
     attr_accessor :from_sources_in_timeline
 
-    validates :"#{::Inkwell::Engine::config.post_table.to_s.singularize}_id", :presence => true
     validates :"#{::Inkwell::Engine::config.user_table.to_s.singularize}_id", :presence => true
     validates :body, :presence => true
 
@@ -15,7 +18,6 @@ module Inkwell
     before_destroy :destroy_comment_processing
 
     belongs_to ::Inkwell::Engine::config.user_table.to_s.singularize
-    belongs_to ::Inkwell::Engine::config.post_table.to_s.singularize
 
     def commentline(options = {})
       options.symbolize_keys!
@@ -63,9 +65,9 @@ module Inkwell
     protected
 
     def remove_info_from_upper_comments(comments_info)
-      return unless self.parent_id
-      parent_comment = ::Inkwell::Comment.find self.parent_id
-      raise "There is no comment with id = #{self.parent_id}" unless parent_comment
+      return unless self.parent_comment_id
+      parent_comment = ::Inkwell::Comment.find self.parent_comment_id
+      raise "There is no comment with id = #{self.parent_comment_id}" unless parent_comment
       users_ids_who_comment_it = ActiveSupport::JSON.decode parent_comment.users_ids_who_comment_it
       users_ids_who_comment_it -= comments_info
       parent_comment.users_ids_who_comment_it = ActiveSupport::JSON.encode users_ids_who_comment_it
@@ -84,40 +86,36 @@ module Inkwell
       ::Inkwell::Comment.delete child_comments_ids_to_deleted
 
       comment_with_child_comments_ids_to_deleted = child_comments_ids_to_deleted << self.id
-      ::Inkwell::TimelineItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :is_comment => true
-      ::Inkwell::FavoriteItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :is_comment => true
-      ::Inkwell::BlogItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :is_comment => true
+      ::Inkwell::TimelineItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :item_type => ItemTypes::COMMENT
+      ::Inkwell::FavoriteItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :item_type => ItemTypes::COMMENT
+      ::Inkwell::BlogItem.delete_all :item_id => comment_with_child_comments_ids_to_deleted, :item_type => ItemTypes::COMMENT
 
       user_id = self.send("#{::Inkwell::Engine::config.user_table.to_s.singularize}_id")
       comment_with_child_comments_info = child_comments << Hash['user_id' => user_id, 'comment_id' => self.id]
       remove_info_from_upper_comments comment_with_child_comments_info
 
-      post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
-      post_id_attr = "#{::Inkwell::Engine::config.post_table.to_s.singularize}_id"
-      parent_post = post_class.find self.send post_id_attr
-      users_ids_who_comment_it = ActiveSupport::JSON.decode parent_post.users_ids_who_comment_it
+      parent_obj = get_class_for_item_type(self.topmost_obj_type).find self.topmost_obj_id
+      users_ids_who_comment_it = ActiveSupport::JSON.decode parent_obj.users_ids_who_comment_it
       users_ids_who_comment_it -= comment_with_child_comments_info
-      parent_post.users_ids_who_comment_it = ActiveSupport::JSON.encode users_ids_who_comment_it
-      parent_post.save
+      parent_obj.users_ids_who_comment_it = ActiveSupport::JSON.encode users_ids_who_comment_it
+      parent_obj.save
     end
 
     def processing_a_comment
-      post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
-      post_id_attr = "#{::Inkwell::Engine::config.post_table.to_s.singularize}_id"
-      parent_post = post_class.find self.send post_id_attr
+      parent_obj = get_class_for_item_type(self.topmost_obj_type).find self.topmost_obj_id
       user_id = self.send "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-      users_ids_who_comment_it = ActiveSupport::JSON.decode parent_post.users_ids_who_comment_it
+      users_ids_who_comment_it = ActiveSupport::JSON.decode parent_obj.users_ids_who_comment_it
       users_ids_who_comment_it << Hash['user_id' => user_id, 'comment_id' => self.id]
-      parent_post.users_ids_who_comment_it = ActiveSupport::JSON.encode users_ids_who_comment_it
-      parent_post.save
+      parent_obj.users_ids_who_comment_it = ActiveSupport::JSON.encode users_ids_who_comment_it
+      parent_obj.save
 
       add_user_info_to_upper_comments
     end
 
     def add_user_info_to_upper_comments
-      if self.parent_id
-        parent_comment = ::Inkwell::Comment.find self.parent_id
-        raise "Comment with id #{comment.parent_id} is not found" unless parent_comment
+      if self.parent_comment_id
+        parent_comment = ::Inkwell::Comment.find self.parent_comment_id
+        raise "Comment with id #{comment.parent_comment_id} is not found" unless parent_comment
         parent_upper_comments_tree = ActiveSupport::JSON.decode parent_comment.upper_comments_tree
         self_upper_comments_tree = parent_upper_comments_tree << parent_comment.id
         self.upper_comments_tree = ActiveSupport::JSON.encode self_upper_comments_tree

data/app/models/inkwell/favorite_item.rb

@@ -1,6 +1,5 @@
 module Inkwell
   class FavoriteItem < ActiveRecord::Base
-    attr_accessible :item_id, :user_id, :is_comment, :created_at, :updated_at
-    belongs_to ::Inkwell::Engine::config.user_table.to_s.singularize
+    attr_accessible :item_id, :owner_id, :item_type, :created_at, :updated_at, :owner_type
   end
 end

data/app/models/inkwell/timeline_item.rb

@@ -1,6 +1,5 @@
 module Inkwell
   class TimelineItem < ActiveRecord::Base
-    attr_accessible :item_id, :user_id, :from_source, :has_many_sources, :is_comment, :created_at, :updated_at
-    belongs_to ::Inkwell::Engine::config.user_table.to_s.singularize
+    attr_accessible :item_id, :owner_id, :from_source, :has_many_sources, :item_type, :created_at, :updated_at, :owner_type
   end
 end

data/db/migrate/20130202130030_change_is_comment_to_item_type.rb

@@ -0,0 +1,18 @@
+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/db/migrate/20130202130040_add_owner_type_to_lines.rb

@@ -0,0 +1,16 @@
+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

data/db/migrate/20130212130858_refactor_comment_table.rb

@@ -0,0 +1,7 @@
+class RefactorCommentTable < ActiveRecord::Migration
+  def change
+    rename_column :inkwell_comments, "#{::Inkwell::Engine::config.post_table.to_s.singularize}_id", :topmost_obj_id
+    add_column :inkwell_comments, :topmost_obj_type, :string
+    ::Inkwell::Comment.update_all :topmost_obj_type => 'p'
+  end
+end

data/db/migrate/20130212130868_rename_parent_id_to_parent_comment_id_in_comment_table.rb

@@ -0,0 +1,5 @@
+class RenameParentIdToParentCommentIdInCommentTable < ActiveRecord::Migration
+  def change
+    rename_column :inkwell_comments, :parent_id, :parent_comment_id
+  end
+end

data/lib/acts_as_inkwell_community/base.rb

@@ -16,11 +16,13 @@ module Inkwell
         before_destroy :destroy_community_processing
 
         include ::Inkwell::ActsAsInkwellCommunity::InstanceMethods
-        include ::Inkwell::Common
       end
     end
 
     module InstanceMethods
+      require_relative '../common/base.rb'
+      include ::Inkwell::Constants
+      include ::Inkwell::Common
 
       def add_user(options = {})
         options.symbolize_keys!
@@ -39,10 +41,10 @@ module Inkwell
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
         user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-        ::Inkwell::BlogItem.where(:owner_id => self.id, :is_owner_user => false).order("created_at DESC").limit(10).each do |blog_item|
+        ::Inkwell::BlogItem.where(:owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY).order("created_at DESC").limit(10).each do |blog_item|
           next if post_class.find(blog_item.item_id).send(user_id_attr) == user.id
 
-          item = ::Inkwell::TimelineItem.send "find_by_item_id_and_#{user_id_attr}_and_is_comment", blog_item.item_id, user.id, blog_item.is_comment
+          item = ::Inkwell::TimelineItem.where(:item_id => blog_item.item_id, :item_type => blog_item.item_type, :owner_id => user.id, :owner_type => OwnerTypes::USER).first
           if item
             item.has_many_sources = true unless item.has_many_sources
             sources = ActiveSupport::JSON.decode item.from_source
@@ -51,7 +53,7 @@ module Inkwell
             item.save
           else
             sources = [Hash['community_id' => self.id]]
-            ::Inkwell::TimelineItem.create :item_id => blog_item.item_id, :is_comment => blog_item.is_comment, :user_id => user.id,
+            ::Inkwell::TimelineItem.create :item_id => blog_item.item_id, :item_type => blog_item.item_type, :owner_id => user.id, :owner_type => OwnerTypes::USER,
                                            :from_source => ActiveSupport::JSON.encode(sources), :created_at => blog_item.created_at
           end
         end
@@ -78,9 +80,7 @@ module Inkwell
         user.communities_ids = ActiveSupport::JSON.encode communities_ids
         user.save
 
-        user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-
-        timeline_items = ::Inkwell::TimelineItem.where "from_source like '%{\"community_id\":#{self.id}%' and #{user_id_attr} = #{user.id}"
+        timeline_items = ::Inkwell::TimelineItem.where(:owner_id => user.id, :owner_type => OwnerTypes::USER).where "from_source like '%{\"community_id\":#{self.id}%'"
         timeline_items.delete_all :has_many_sources => false
         timeline_items.each do |item|
           from_source = ActiveSupport::JSON.decode item.from_source
@@ -166,15 +166,15 @@ module Inkwell
         raise "user tried to add post of another user" unless post.send(user_id_attr) == user.id
         raise "post is already added to this community" if post.communities_row.include? self.id
 
-        ::Inkwell::BlogItem.create :owner_id => self.id, :is_owner_user => false, :item_id => post.id, :is_comment => false
+        ::Inkwell::BlogItem.create :owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY, :item_id => post.id, :item_type => ItemTypes::POST
         communities_ids = ActiveSupport::JSON.decode post.communities_ids
         communities_ids << self.id
         post.communities_ids = ActiveSupport::JSON.encode communities_ids
         post.save
 
         users_with_existing_items = [user.id]
-        ::Inkwell::TimelineItem.where(:item_id => post.id, :is_comment => false).each do |item|
-          users_with_existing_items << item.send(user_id_attr)
+        ::Inkwell::TimelineItem.where(:item_id => post.id, :item_type => ItemTypes::POST).each do |item|
+          users_with_existing_items << item.owner_id
           item.has_many_sources = true
           from_source = ActiveSupport::JSON.decode item.from_source
           from_source << Hash['community_id' => self.id]
@@ -184,7 +184,7 @@ module Inkwell
 
         self.users_row.each do |user_id|
           next if users_with_existing_items.include? user_id
-          ::Inkwell::TimelineItem.create :item_id => post.id, user_id_attr => user_id, :is_comment => false,
+          ::Inkwell::TimelineItem.create :item_id => post.id, :owner_id => user_id, :owner_type => OwnerTypes::USER, :item_type => ItemTypes::POST,
                                          :from_source => ActiveSupport::JSON.encode([Hash['community_id' => self.id]])
         end
       end
@@ -208,13 +208,13 @@ module Inkwell
         end
         raise "post isn't in community" unless post.communities_row.include? self.id
 
-        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :is_owner_user => false, :item_id => post.id, :is_comment => false
+        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY, :item_id => post.id, :item_type => ItemTypes::POST
         communities_ids = ActiveSupport::JSON.decode post.communities_ids
         communities_ids.delete self.id
         post.communities_ids = ActiveSupport::JSON.encode communities_ids
         post.save
 
-        items = ::Inkwell::TimelineItem.where(:item_id => post.id, :is_comment => false).where("from_source like '%{\"community_id\":#{self.id}%'")
+        items = ::Inkwell::TimelineItem.where(:item_id => post.id, :item_type => ItemTypes::POST).where("from_source like '%{\"community_id\":#{self.id}%'")
         items.where(:has_many_sources => false).delete_all
         items.where(:has_many_sources => true).each do |item|
           from_source = ActiveSupport::JSON.decode item.from_source
@@ -232,9 +232,9 @@ module Inkwell
         for_user = options[:for_user]
 
         if last_shown_obj_id
-          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :is_owner_user => false).where("created_at < ?", Inkwell::BlogItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
+          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY).where("created_at < ?", Inkwell::BlogItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
         else
-          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :is_owner_user => false).order("created_at DESC").limit(limit)
+          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY).order("created_at DESC").limit(limit)
         end
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
@@ -306,7 +306,7 @@ module Inkwell
           item.save
         end
 
-        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :is_owner_user => false
+        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :owner_type => OwnerTypes::COMMUNITY
 
       end
     end

data/lib/acts_as_inkwell_post/base.rb

@@ -19,13 +19,15 @@ module Inkwell
         after_create :processing_a_post
         before_destroy :destroy_post_processing
 
-        has_many :comments, :class_name => 'Inkwell::Comment'
-
         include ::Inkwell::ActsAsInkwellPost::InstanceMethods
+
       end
     end
 
     module InstanceMethods
+      require_relative '../common/base.rb'
+      include ::Inkwell::Constants
+
       def commentline(options = {})
         options.symbolize_keys!
         last_shown_comment_id = options[:last_shown_comment_id]
@@ -33,9 +35,9 @@ module Inkwell
         for_user = options[:for_user]
 
         if last_shown_comment_id
-          comments = self.comments.where("created_at < ?", Inkwell::Comment.find(last_shown_comment_id).created_at).order("created_at DESC").limit(limit)
+          comments = ::Inkwell::Comment.where(:topmost_obj_id => self.id, :topmost_obj_type => ItemTypes::POST).where("created_at < ?", Inkwell::Comment.find(last_shown_comment_id).created_at).order("created_at DESC").limit(limit)
         else
-          comments = self.comments.order("created_at DESC").limit(limit)
+          comments = ::Inkwell::Comment.where(:topmost_obj_id => self.id, :topmost_obj_type => ItemTypes::POST).order("created_at DESC").limit(limit)
         end
 
         if for_user
@@ -75,24 +77,23 @@ module Inkwell
         user_class = Object.const_get ::Inkwell::Engine::config.user_table.to_s.singularize.capitalize
         user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
         user = user_class.find self.send(user_id_attr)
-        ::Inkwell::BlogItem.create :item_id => self.id, :is_reblog => false, :owner_id => self.send(user_id_attr), :is_owner_user => true, :is_comment => false
-
+        ::Inkwell::BlogItem.create :item_id => self.id, :is_reblog => false, :owner_id => self.send(user_id_attr), :owner_type => OwnerTypes::USER, :item_type => ItemTypes::POST
         user.followers_row.each do |user_id|
           encode_sources = [ Hash['user_id' => user.id, 'type' => 'following'] ]
-          ::Inkwell::TimelineItem.create :item_id => self.id, user_id_attr => user_id, :is_comment => false,
+          ::Inkwell::TimelineItem.create :item_id => self.id, :owner_id => user_id, :owner_type => OwnerTypes::USER, :item_type => ItemTypes::POST,
                               :from_source => ActiveSupport::JSON.encode(encode_sources)
         end
       end
 
       def destroy_post_processing
-        ::Inkwell::TimelineItem.delete_all :item_id => self.id, :is_comment => false
-        ::Inkwell::FavoriteItem.delete_all :item_id => self.id, :is_comment => false
-        ::Inkwell::BlogItem.delete_all :item_id => self.id, :is_comment => false
-        comments = self.comments
+        ::Inkwell::TimelineItem.delete_all :item_id => self.id, :item_type => ItemTypes::POST
+        ::Inkwell::FavoriteItem.delete_all :item_id => self.id, :item_type => ItemTypes::POST
+        ::Inkwell::BlogItem.delete_all :item_id => self.id, :item_type => ItemTypes::POST
+        comments = ::Inkwell::Comment.where(:topmost_obj_id => self.id, :topmost_obj_type => ItemTypes::POST)
         comments.each do |comment|
-          ::Inkwell::TimelineItem.delete_all :item_id => comment.id, :is_comment => true
-          ::Inkwell::FavoriteItem.delete_all :item_id => comment.id, :is_comment => true
-          ::Inkwell::BlogItem.delete_all :item_id => comment.id, :is_comment => true
+          ::Inkwell::TimelineItem.delete_all :item_id => comment.id, :item_type => ItemTypes::COMMENT
+          ::Inkwell::FavoriteItem.delete_all :item_id => comment.id, :item_type => ItemTypes::COMMENT
+          ::Inkwell::BlogItem.delete_all :item_id => comment.id, :item_type => ItemTypes::COMMENT
           ::Inkwell::Comment.delete comment
         end
       end

data/lib/acts_as_inkwell_user/base.rb

@@ -11,14 +11,15 @@ module Inkwell
     module Config
       def acts_as_inkwell_user
         has_many :comments, :class_name => 'Inkwell::Comment'
-        has_many :favorite_items, :class_name => 'Inkwell::FavoriteItem'
-        has_many :timeline_items, :class_name => 'Inkwell::TimelineItem'
         include ::Inkwell::ActsAsInkwellUser::InstanceMethods
-        include ::Inkwell::Common
       end
     end
 
     module InstanceMethods
+      require_relative '../common/base.rb'
+      include ::Inkwell::Constants
+      include ::Inkwell::Common
+
       def blogline(options = {})
         options.symbolize_keys!
         last_shown_obj_id = options[:last_shown_obj_id]
@@ -26,15 +27,15 @@ module Inkwell
         for_user = options[:for_user]
 
         if last_shown_obj_id
-          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :is_owner_user => true).where("created_at < ?", Inkwell::BlogItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
+          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).where("created_at < ?", Inkwell::BlogItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
         else
-          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :is_owner_user => true).order("created_at DESC").limit(limit)
+          blog_items = ::Inkwell::BlogItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).order("created_at DESC").limit(limit)
         end
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
         result = []
         blog_items.each do |item|
-          if item.is_comment
+          if item.item_type == ItemTypes::COMMENT
             blog_obj = ::Inkwell::Comment.find item.item_id
           else
             blog_obj = post_class.find item.item_id
@@ -53,6 +54,17 @@ module Inkwell
         result
       end
 
+      def create_comment(options={})
+        options.symbolize_keys!
+        raise "for_object should be passed" unless options[:for_object]
+        raise "comment body should be passed" unless options[:body]
+        for_object = options[:for_object]
+        options[:topmost_obj_id] = for_object.id
+        options[:topmost_obj_type] = get_item_type for_object
+        options.delete :for_object
+        self.comments.create options
+      end
+
       def communities_row
         ActiveSupport::JSON.decode self.communities_ids
       end
@@ -60,7 +72,7 @@ module Inkwell
       def favorite(obj)
         return if self.favorite? obj
 
-        FavoriteItem.create :item_id => obj.id, :user_id => self.id, :is_comment => is_comment(obj)
+        FavoriteItem.create :item_id => obj.id, :owner_id => self.id, :owner_type => OwnerTypes::USER, :item_type => get_item_type(obj)
 
         users_ids_who_favorite_it = ActiveSupport::JSON.decode obj.users_ids_who_favorite_it
         users_ids_who_favorite_it << self.id
@@ -69,16 +81,13 @@ module Inkwell
       end
 
       def favorite?(obj)
-        user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-        (FavoriteItem.send("find_by_item_id_and_is_comment_and_#{user_id_attr}", obj.id, is_comment(obj), self.id)) ? true : false
+        FavoriteItem.where(:item_id => obj.id, :item_type => get_item_type(obj), :owner_id => self.id, :owner_type => OwnerTypes::USER).first ? true : false
       end
 
       def unfavorite(obj)
         return unless self.favorite? obj
 
-        user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-        record = FavoriteItem.send "find_by_item_id_and_is_comment_and_#{user_id_attr}", obj.id, is_comment(obj), self.id
-        record.destroy
+        ::Inkwell::FavoriteItem.where(:item_id => obj.id, :item_type => get_item_type(obj), :owner_id => self.id, :owner_type => OwnerTypes::USER).destroy_all
 
         users_ids_who_favorite_it = ActiveSupport::JSON.decode obj.users_ids_who_favorite_it
         users_ids_who_favorite_it.delete self.id
@@ -93,15 +102,15 @@ module Inkwell
         for_user = options[:for_user]
 
         if last_shown_obj_id
-          favorites = self.favorite_items.where("created_at < ?", Inkwell::FavoriteItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
+          favorites = ::Inkwell::FavoriteItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).where("created_at < ?", Inkwell::FavoriteItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
         else
-          favorites = self.favorite_items.order("created_at DESC").limit(limit)
+          favorites = ::Inkwell::FavoriteItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).order("created_at DESC").limit(limit)
         end
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
         result = []
         favorites.each do |item|
-          if item.is_comment
+          if item.item_type == ItemTypes::COMMENT
             favorited_obj = ::Inkwell::Comment.find item.item_id
           else
             favorited_obj = post_class.find item.item_id
@@ -135,13 +144,13 @@ module Inkwell
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
         user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-        ::Inkwell::BlogItem.where(:owner_id => user.id, :is_owner_user => true).order("created_at DESC").limit(10).each do |blog_item|
+        ::Inkwell::BlogItem.where(:owner_id => user.id, :owner_type => OwnerTypes::USER).order("created_at DESC").limit(10).each do |blog_item|
           if blog_item.is_reblog
-            item_class = blog_item.is_comment? ? ::Inkwell::Comment : post_class
+            item_class = blog_item.item_type == ItemTypes::COMMENT ? ::Inkwell::Comment : post_class
             next if item_class.find(blog_item.item_id).send(user_id_attr) == self.id
           end
 
-          item = ::Inkwell::TimelineItem.send "find_by_item_id_and_#{user_id_attr}_and_is_comment", blog_item.item_id, self.id, blog_item.is_comment
+          item = TimelineItem.where(:item_id => blog_item.item_id, :owner_id => self.id, :owner_type => OwnerTypes::USER, :item_type => blog_item.item_type).first
           if item
             item.has_many_sources = true unless item.has_many_sources
             sources = ActiveSupport::JSON.decode item.from_source
@@ -159,7 +168,7 @@ module Inkwell
             else
               sources << Hash['user_id' => user.id, 'type' => 'following']
             end
-            ::Inkwell::TimelineItem.create :item_id => blog_item.item_id, :is_comment => blog_item.is_comment, :user_id => self.id,
+            ::Inkwell::TimelineItem.create :item_id => blog_item.item_id, :item_type => blog_item.item_type, :owner_id => self.id, :owner_type => OwnerTypes::USER,
                                            :from_source => ActiveSupport::JSON.encode(sources), :created_at => blog_item.created_at
           end
         end
@@ -179,9 +188,7 @@ module Inkwell
         self.followings_ids = ActiveSupport::JSON.encode followings
         self.save
 
-        user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-
-        timeline_items = ::Inkwell::TimelineItem.where "from_source like '%{\"user_id\":#{user.id}%' and #{user_id_attr} = #{self.id}"
+        timeline_items = ::Inkwell::TimelineItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).where "from_source like '%{\"user_id\":#{user.id}%'"
         timeline_items.delete_all :has_many_sources => false
         timeline_items.each do |item|
           from_source = ActiveSupport::JSON.decode item.from_source
@@ -209,10 +216,10 @@ module Inkwell
         return if self.reblog? obj
         raise "User tries to reblog his post." if self.id == obj.user_id
 
-        is_comment = is_comment(obj)
+        item_type = get_item_type(obj)
 
         user_id_attr = "#{::Inkwell::Engine::config.user_table.to_s.singularize}_id"
-        BlogItem.create :item_id => obj.id, :is_reblog => true, :owner_id => self.id, :is_owner_user => true, :is_comment => is_comment
+        BlogItem.create :item_id => obj.id, :is_reblog => true, :owner_id => self.id, :owner_type => OwnerTypes::USER, :item_type => item_type
 
         users_ids_who_reblog_it = ActiveSupport::JSON.decode obj.users_ids_who_reblog_it
         users_ids_who_reblog_it << self.id
@@ -221,7 +228,7 @@ module Inkwell
 
         self.followers_row.each do |user_id|
           next if obj.send(user_id_attr) == user_id
-          item = TimelineItem.send "find_by_item_id_and_#{user_id_attr}_and_is_comment", obj.id, user_id, is_comment
+          item = TimelineItem.where(:item_id => obj.id, :owner_id => user_id, :owner_type => OwnerTypes::USER, :item_type => item_type).first
           if item
             item.has_many_sources = true unless item.has_many_sources
             sources = ActiveSupport::JSON.decode item.from_source
@@ -230,30 +237,30 @@ module Inkwell
             item.save
           else
             encode_sources = ActiveSupport::JSON.encode [Hash['user_id' => self.id, 'type' => 'reblog']]
-            TimelineItem.create :item_id => obj.id, :created_at => obj.created_at, user_id_attr => user_id, :from_source => encode_sources, :is_comment => is_comment
+            TimelineItem.create :item_id => obj.id, :created_at => obj.created_at, :owner_id => user_id, :owner_type => OwnerTypes::USER, :from_source => encode_sources, :item_type => item_type
           end
         end
       end
 
       def reblog?(obj)
-        BlogItem.exists? :item_id => obj.id, :owner_id => self.id, :is_owner_user => true, :is_reblog => true, :is_comment => is_comment(obj)
+        BlogItem.exists? :item_id => obj.id, :owner_id => self.id, :owner_type => OwnerTypes::USER, :is_reblog => true, :item_type => get_item_type(obj)
       end
 
       def unreblog(obj)
         return unless self.reblog? obj
         raise "User tries to unreblog his post." if self.id == obj.user_id
 
-        is_comment = is_comment(obj)
+        item_type = get_item_type(obj)
 
         users_ids_who_reblog_it = ActiveSupport::JSON.decode obj.users_ids_who_reblog_it
         users_ids_who_reblog_it.delete self.id
         obj.users_ids_who_reblog_it = ActiveSupport::JSON.encode users_ids_who_reblog_it
         obj.save
 
-        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :is_owner_user => true, :item_id => obj.id, :is_reblog => true, :is_comment => is_comment
+        ::Inkwell::BlogItem.delete_all :owner_id => self.id, :owner_type => OwnerTypes::USER, :item_id => obj.id, :is_reblog => true, :item_type => item_type
 
-        TimelineItem.delete_all :user_id => self.followers_row, :has_many_sources => false, :item_id => obj.id, :is_comment => is_comment
-        TimelineItem.where(:user_id => self.followers_row, :item_id => obj.id, :is_comment => is_comment).each do |item|
+        TimelineItem.delete_all :owner_id => self.followers_row, :owner_type => OwnerTypes::USER, :has_many_sources => false, :item_id => obj.id, :item_type => item_type
+        TimelineItem.where(:owner_id => self.followers_row, :owner_type => OwnerTypes::USER, :item_id => obj.id, :item_type => item_type).each do |item|
             sources = ActiveSupport::JSON.decode item.from_source
             sources.delete Hash['user_id' => self.id, 'type' => 'reblog']
             item.has_many_sources = false if sources.size < 2
@@ -269,15 +276,15 @@ module Inkwell
         for_user = options[:for_user]
 
         if last_shown_obj_id
-          timeline_items = self.timeline_items.where("created_at < ?", Inkwell::TimelineItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
+          timeline_items = ::Inkwell::TimelineItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).where("created_at < ?", Inkwell::TimelineItem.find(last_shown_obj_id).created_at).order("created_at DESC").limit(limit)
         else
-          timeline_items = self.timeline_items.order("created_at DESC").limit(limit)
+          timeline_items = ::Inkwell::TimelineItem.where(:owner_id => self.id, :owner_type => OwnerTypes::USER).order("created_at DESC").limit(limit)
         end
 
         post_class = Object.const_get ::Inkwell::Engine::config.post_table.to_s.singularize.capitalize
         result = []
         timeline_items.each do |item|
-          if item.is_comment
+          if item.item_type == ItemTypes::COMMENT
             timeline_obj = ::Inkwell::Comment.find item.item_id
           else
             timeline_obj = post_class.find item.item_id