inkwell 1.2.0 → 1.4.1

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

@@ -21,10 +21,15 @@ describe "Following" do
     @salkar.follow @morozovm
     @salkar.reload
     @morozovm.reload
-    @salkar.followings_ids.should == "[#{@morozovm.id}]"
+    @morozovm.followings_row.should == []
+    @morozovm.followers_row.should == [@salkar.id]
+    @morozovm.follower_count.should == 1
+    @morozovm.following_count.should == 0
+    @salkar.follower_count.should == 0
+    @salkar.following_count.should == 1
     @salkar.followings_row.should == [@morozovm.id]
-    @salkar.followers_ids.should == "[]"
     @salkar.followers_row.should == []
+    ::Inkwell::Following.exists?(:follower_id => @salkar.id, :followed_id => @morozovm.id).should == true
 
     ::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
@@ -38,10 +43,6 @@ describe "Following" do
     end
 
     ::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 == "[]"
-    @morozovm.followings_row.should == []
   end
 
   it "created_at from blog_item should transferred to timeline_item for follower when he follow this user" do
@@ -59,8 +60,12 @@ describe "Following" do
     @morozovm.reload
     @salkar.follow?(@morozovm).should be
     @morozovm.follow?(@salkar).should == false
+  end
+
+  it "user should not follow already followed user" do
     @salkar.follow @morozovm
-    @salkar.follow?(@morozovm).should be
+    @salkar.follow?(@morozovm).should == true
+    expect{@salkar.follow @morozovm}.to raise_error
   end
 
   it "user should not follow himself" do
@@ -75,6 +80,14 @@ describe "Following" do
     @salkar.reload
     ::Inkwell::TimelineItem.where(:owner_id => @salkar.id, :owner_type => ::Inkwell::Constants::OwnerTypes::USER).size.should == 0
 
+    @salkar.followings_row.should == []
+    @salkar.followers_row.should == []
+    @morozovm.followings_row.should == []
+    @morozovm.followers_row.should == []
+    @salkar.follower_count.should == 0
+    @salkar.following_count.should == 0
+    @morozovm.follower_count.should == 0
+    @morozovm.following_count.should == 0
   end
 
   it "reblog should added to followers timeline when follow" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inkwell
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &79324780 !ruby/object:Gem::Requirement
+  requirement: &68819720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *79324780
+  version_requirements: *68819720
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &79324050 !ruby/object:Gem::Requirement
+  requirement: &68818400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *79324050
+  version_requirements: *68818400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &79340440 !ruby/object:Gem::Requirement
+  requirement: &68817170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79340440
+  version_requirements: *68817170
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &79339600 !ruby/object:Gem::Requirement
+  requirement: &68816570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79339600
+  version_requirements: *68816570
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &79338890 !ruby/object:Gem::Requirement
+  requirement: &68834090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79338890
+  version_requirements: *68834090
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79336950 !ruby/object:Gem::Requirement
+  requirement: &68832840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *79336950
+  version_requirements: *68832840
 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.
@@ -94,6 +94,8 @@ files:
 - app/models/inkwell/timeline_item.rb
 - app/models/inkwell/blog_item.rb
 - app/models/inkwell/favorite_item.rb
+- app/models/inkwell/community_user.rb
+- app/models/inkwell/following.rb
 - app/models/inkwell/comment.rb
 - config/routes.rb
 - db/migrate/20121209121955_create_inkwell_blog_items.rb
@@ -101,14 +103,17 @@ files:
 - 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/20130212130898_refactor_user_community_relation.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/20130212130908_refactor_invites_bans_mutes.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
 - db/migrate/20130212130878_change_community_table_for_adding_types_and_user_access.rb
+- db/migrate/20130212130888_refactor_followings_relation.rb
 - lib/inkwell/version.rb
 - lib/inkwell/engine.rb
 - lib/common/base.rb
@@ -172,6 +177,7 @@ files:
 - 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/20130313083916_refactor_user_community_relation.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
@@ -181,7 +187,9 @@ files:
 - test/dummy_without_community/db/migrate/20130219152806_change_community_table_for_adding_types_and_user_access.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/20130313083915_refactor_followings_relation.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134750_add_community_ids_to_post.inkwell.rb
+- test/dummy_without_community/db/migrate/20130313083917_refactor_invites_bans_mutes.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
@@ -241,14 +249,17 @@ files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/db/migrate/20130312084529_refactor_invites_bans_mutes.inkwell.rb
 - 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/20130227154519_refactor_followings_relation.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/20130228115224_refactor_user_community_relation.inkwell.rb
 - test/dummy/db/migrate/20130217135512_change_community_table_for_adding_types_and_user_access.inkwell.rb
 - test/dummy/db/migrate/20130208134954_change_tables_for_communities.inkwell.rb
 - test/dummy/db/migrate/20130201155147_create_communities.rb
@@ -344,6 +355,7 @@ test_files:
 - 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/20130313083916_refactor_user_community_relation.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
@@ -353,7 +365,9 @@ test_files:
 - test/dummy_without_community/db/migrate/20130219152806_change_community_table_for_adding_types_and_user_access.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/20130313083915_refactor_followings_relation.inkwell.rb
 - test/dummy_without_community/db/migrate/20130208134750_add_community_ids_to_post.inkwell.rb
+- test/dummy_without_community/db/migrate/20130313083917_refactor_invites_bans_mutes.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
@@ -413,14 +427,17 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/db/migrate/20130312084529_refactor_invites_bans_mutes.inkwell.rb
 - 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/20130227154519_refactor_followings_relation.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/20130228115224_refactor_user_community_relation.inkwell.rb
 - test/dummy/db/migrate/20130217135512_change_community_table_for_adding_types_and_user_access.inkwell.rb
 - test/dummy/db/migrate/20130208134954_change_tables_for_communities.inkwell.rb
 - test/dummy/db/migrate/20130201155147_create_communities.rb