inkwell 1.0.4 → 1.0.5

data/test/dummy_without_community/spec/functional/blogline_spec.rb

@@ -9,9 +9,10 @@ describe "BlogLine" do
   end
 
   it "blogitem record should been created for new post" do
-    @salkar.blog_items.size.should == 1
-    item = @salkar.blog_items.first
-    item.user_id.should == @salkar.id
+    ::Inkwell::BlogItem.where(:owner_id => @salkar.id, :is_owner_user => true).size.should == 1
+    item = ::Inkwell::BlogItem.where(:owner_id => @salkar.id, :is_owner_user => true).first
+    item.owner_id.should == @salkar.id
+    item.is_owner_user.should be
     item.item_id.should == @salkar_post.id
     item.is_reblog.should == false
     item.is_comment.should == false

data/test/dummy_without_community/spec/functional/comments_spec.rb

@@ -156,8 +156,8 @@ describe "Comments" do
     users_ids_who_comment_it.should == [{"user_id"=>@salkar.id, "comment_id"=>@comment.id}]
     ::Inkwell::TimelineItem.create :item_id => @comment.id, :user_id => @morozovm.id, :is_comment => true
     ::Inkwell::FavoriteItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment.id, :user_id => @morozovm.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment.id, :owner_id => @morozovm.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
     ::Inkwell::FavoriteItem.all.size.should == 1
     ::Inkwell::TimelineItem.all.size.should == 1
     ::Inkwell::BlogItem.all.size.should == 3
@@ -183,9 +183,9 @@ describe "Comments" do
     ::Inkwell::FavoriteItem.create :item_id => @comment_to_delete.id, :user_id => @salkar.id, :is_comment => true
     ::Inkwell::TimelineItem.create :item_id => @comment.id, :user_id => @morozovm.id, :is_comment => true
     ::Inkwell::FavoriteItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment_to_delete.id, :user_id => @morozovm.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment_to_delete.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment_to_delete.id, :owner_id => @morozovm.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment_to_delete.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
     ::Inkwell::FavoriteItem.all.size.should == 2
     ::Inkwell::TimelineItem.all.size.should == 2
     ::Inkwell::BlogItem.all.size.should == 4
@@ -214,9 +214,9 @@ describe "Comments" do
     ::Inkwell::FavoriteItem.create :item_id => @comment2.id, :user_id => @salkar.id, :is_comment => true
     ::Inkwell::TimelineItem.create :item_id => @comment.id, :user_id => @morozovm.id, :is_comment => true
     ::Inkwell::FavoriteItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment2.id, :user_id => @morozovm.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment2.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment2.id, :owner_id => @morozovm.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment2.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
     ::Inkwell::FavoriteItem.all.size.should == 2
     ::Inkwell::TimelineItem.all.size.should == 2
     ::Inkwell::BlogItem.all.size.should == 4
@@ -245,9 +245,9 @@ describe "Comments" do
     ::Inkwell::FavoriteItem.create :item_id => @comment2.id, :user_id => @salkar.id, :is_comment => true
     ::Inkwell::TimelineItem.create :item_id => @comment.id, :user_id => @morozovm.id, :is_comment => true
     ::Inkwell::FavoriteItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment2.id, :user_id => @morozovm.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment2.id, :user_id => @salkar.id, :is_comment => true
-    ::Inkwell::BlogItem.create :item_id => @comment.id, :user_id => @salkar.id, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment2.id, :owner_id => @morozovm.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment2.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
+    ::Inkwell::BlogItem.create :item_id => @comment.id, :owner_id => @salkar.id, :is_owner_user => true, :is_comment => true
     ::Inkwell::FavoriteItem.all.size.should == 2
     ::Inkwell::TimelineItem.all.size.should == 2
     ::Inkwell::BlogItem.all.size.should == 4

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

@@ -116,5 +116,15 @@ describe "Following" do
     item.has_many_sources.should == false
   end
 
+  it "self reblogs after follow should not transferred to timeline" do
+    @talisman = User.create :nick => "Talisman"
+    @talisman.reblog @salkar_post
+    @salkar.follow @talisman
+    @salkar.reload
+    @salkar.timeline.size.should == 0
+  end
+
+
+
 
 end

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

@@ -13,14 +13,14 @@ describe "Reblog" do
   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, :user_id => @morozovm.id, :is_reblog => true).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 == 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, :user_id => @morozovm.id, :is_reblog => true).size.should == 1
+    ::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
     @salkar_comment.reload
     @salkar_comment.users_ids_who_reblog_it.should == "[#{@morozovm.id}]"
   end
@@ -92,7 +92,7 @@ describe "Reblog" 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, :user_id => @morozovm.id, :is_reblog => true).size.should == 0
+    ::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
     @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, :user_id => @morozovm.id, :is_reblog => true).size.should == 0
+    ::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
     @salkar_comment.reload
     @salkar_comment.users_ids_who_reblog_it.should == "[]"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inkwell
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &73115360 !ruby/object:Gem::Requirement
+  requirement: &69687760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73115360
+  version_requirements: *69687760
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73114850 !ruby/object:Gem::Requirement
+  requirement: &69687510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73114850
+  version_requirements: *69687510
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73114330 !ruby/object:Gem::Requirement
+  requirement: &69687320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73114330
+  version_requirements: *69687320
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &74491890 !ruby/object:Gem::Requirement
+  requirement: &69687090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74491890
+  version_requirements: *69687090
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &74491680 !ruby/object:Gem::Requirement
+  requirement: &69686880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74491680
+  version_requirements: *69686880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74491430 !ruby/object:Gem::Requirement
+  requirement: &69686630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *74491430
+  version_requirements: *69686630
 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.
@@ -163,14 +163,16 @@ files:
 - test/dummy_without_community/db/schema.rb
 - test/dummy_without_community/db/seeds.rb
 - test/dummy_without_community/db/test.sqlite3
-- test/dummy_without_community/db/migrate/20130120124015_create_inkwell_comments.rb
-- test/dummy_without_community/db/migrate/20130120124010_create_inkwell_timeline_items.rb
-- test/dummy_without_community/db/migrate/20130120124012_create_inkwell_blog_items.rb
-- test/dummy_without_community/db/migrate/20130120124011_add_columns_to_posts.rb
+- test/dummy_without_community/db/migrate/20130208134749_change_tables_for_communities.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/20130120124013_create_inkwell_favorite_items.rb
-- test/dummy_without_community/db/migrate/20130120124014_add_columns_to_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/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
+- test/dummy_without_community/db/migrate/20130208134750_add_community_ids_to_post.inkwell.rb
+- test/dummy_without_community/db/migrate/20130208134747_add_columns_to_users.inkwell.rb
 - test/dummy_without_community/log/development.log
 - test/dummy_without_community/log/test.log
 - test/dummy_without_community/public/500.html
@@ -229,17 +231,17 @@ files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- 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/20121202112556_create_users.rb
-- test/dummy/db/migrate/20130206112226_add_columns_to_posts.inkwell.rb
+- test/dummy/db/migrate/20130208134952_add_columns_to_users.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/20130206112229_add_columns_to_users.inkwell.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/20130208134948_create_inkwell_timeline_items.inkwell.rb
 - test/dummy/db/migrate/20121202111750_create_posts.rb
-- test/dummy/db/migrate/20130206112227_create_inkwell_blog_items.inkwell.rb
-- test/dummy/db/migrate/20130206112225_create_inkwell_timeline_items.inkwell.rb
-- test/dummy/db/migrate/20130207112455_add_community_ids_to_post.inkwell.rb
-- test/dummy/db/migrate/20130206112228_create_inkwell_favorite_items.inkwell.rb
-- test/dummy/db/migrate/20130206112231_change_tables_for_communities.inkwell.rb
-- test/dummy/db/migrate/20130206112230_create_inkwell_comments.inkwell.rb
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/500.html
@@ -323,14 +325,16 @@ test_files:
 - test/dummy_without_community/db/schema.rb
 - test/dummy_without_community/db/seeds.rb
 - test/dummy_without_community/db/test.sqlite3
-- test/dummy_without_community/db/migrate/20130120124015_create_inkwell_comments.rb
-- test/dummy_without_community/db/migrate/20130120124010_create_inkwell_timeline_items.rb
-- test/dummy_without_community/db/migrate/20130120124012_create_inkwell_blog_items.rb
-- test/dummy_without_community/db/migrate/20130120124011_add_columns_to_posts.rb
+- test/dummy_without_community/db/migrate/20130208134749_change_tables_for_communities.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/20130120124013_create_inkwell_favorite_items.rb
-- test/dummy_without_community/db/migrate/20130120124014_add_columns_to_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/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
+- test/dummy_without_community/db/migrate/20130208134750_add_community_ids_to_post.inkwell.rb
+- test/dummy_without_community/db/migrate/20130208134747_add_columns_to_users.inkwell.rb
 - test/dummy_without_community/log/development.log
 - test/dummy_without_community/log/test.log
 - test/dummy_without_community/public/500.html
@@ -389,17 +393,17 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- 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/20121202112556_create_users.rb
-- test/dummy/db/migrate/20130206112226_add_columns_to_posts.inkwell.rb
+- test/dummy/db/migrate/20130208134952_add_columns_to_users.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/20130206112229_add_columns_to_users.inkwell.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/20130208134948_create_inkwell_timeline_items.inkwell.rb
 - test/dummy/db/migrate/20121202111750_create_posts.rb
-- test/dummy/db/migrate/20130206112227_create_inkwell_blog_items.inkwell.rb
-- test/dummy/db/migrate/20130206112225_create_inkwell_timeline_items.inkwell.rb
-- test/dummy/db/migrate/20130207112455_add_community_ids_to_post.inkwell.rb
-- test/dummy/db/migrate/20130206112228_create_inkwell_favorite_items.inkwell.rb
-- test/dummy/db/migrate/20130206112231_change_tables_for_communities.inkwell.rb
-- test/dummy/db/migrate/20130206112230_create_inkwell_comments.inkwell.rb
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/500.html