inkwell 0.0.3 → 0.1.1

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

@@ -47,7 +47,7 @@ describe "BlogLine" do
     @morozovm.reblog @salkar_post9
     @morozovm.favorite @salkar_post9
 
-    bline = @salkar.blogline(nil, 10, @morozovm)
+    bline = @salkar.blogline :for_user => @morozovm
     bline.size.should == 10
     bline[0].should == @morozovm_post2
     bline[0].is_reblog_in_blogline.should == true

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

@@ -59,7 +59,7 @@ describe "Comments" do
     commentline[0].id.should == @comment2.id
     commentline[9].id.should == @comment11.id
 
-    commentline = @salkar_post.commentline @comment10.id
+    commentline = @salkar_post.commentline :last_shown_comment_id => @comment10.id
     commentline.size.should == 10
     commentline[0].id.should == @comment.id
     commentline[9].id.should == @comment9.id
@@ -80,17 +80,17 @@ describe "Comments" do
     @comment10 = @salkar.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id)
     @comment11 = @morozovm.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id)
 
-    commentline = @salkar_post.commentline nil, 5
+    commentline = @salkar_post.commentline :limit => 5
     commentline.size.should == 5
     commentline[0].id.should == @comment7.id
     commentline[4].id.should == @comment11.id
 
-    commentline = @salkar_post.commentline @comment10.id, 5
+    commentline = @salkar_post.commentline :last_shown_comment_id => @comment10.id, :limit => 5
     commentline.size.should == 5
     commentline[0].id.should == @comment5.id
     commentline[4].id.should == @comment9.id
 
-    commentline = @salkar_post.commentline @comment5.id, 7
+    commentline = @salkar_post.commentline :last_shown_comment_id => @comment5.id, :limit => 7
     commentline.size.should == 5
     commentline[0].id.should == @comment.id
     commentline[4].id.should == @comment4.id
@@ -284,7 +284,7 @@ describe "Comments" do
     commentline[0].id.should == @comment2.id
     commentline[9].id.should == @comment11.id
 
-    commentline = @salkar_post.commentline @comment10.id
+    commentline = @salkar_post.commentline :last_shown_comment_id => @comment10.id
     commentline.size.should == 10
     commentline[0].id.should == @comment.id
     commentline[9].id.should == @comment9.id
@@ -310,7 +310,7 @@ describe "Comments" do
     commentline[0].id.should == @comment2.id
     commentline[9].id.should == @comment11.id
 
-    commentline = @salkar_post.commentline @comment10.id
+    commentline = @salkar_post.commentline :last_shown_comment_id => @comment10.id
     commentline.size.should == 10
     commentline[0].id.should == @comment.id
     commentline[9].id.should == @comment9.id
@@ -331,19 +331,19 @@ describe "Comments" do
     @comment11 = @morozovm.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id, :parent_id => @comment.id)
 
     @comment.reload
-    commentline = @comment.commentline nil, 5
+    commentline = @comment.commentline :limit => 5
     commentline.size.should == 5
     commentline[0].id.should == @comment7.id
     commentline[4].id.should == @comment11.id
 
     @comment.reload
-    commentline = @comment.commentline @comment10.id, 5
+    commentline = @comment.commentline :last_shown_comment_id => @comment10.id, :limit => 5
     commentline.size.should == 5
     commentline[0].id.should == @comment5.id
     commentline[4].id.should == @comment9.id
 
     @comment.reload
-    commentline = @comment.commentline @comment5.id, 7
+    commentline = @comment.commentline :last_shown_comment_id => @comment5.id, :limit => 7
     commentline.size.should == 4
     commentline[0].id.should == @comment1.id
     commentline[3].id.should == @comment4.id
@@ -357,13 +357,13 @@ describe "Comments" do
     @morozovm.favorite @comment2
 
     @comment.reload
-    commentline = @comment.commentline nil, 10, @salkar
+    commentline = @comment.commentline :for_user => @salkar
     commentline[0].id.should == @comment1.id
     commentline[0].is_favorited.should == true
     commentline[1].id.should == @comment2.id
     commentline[1].is_favorited.should == false
 
-    commentline = @comment.commentline nil, 10, @morozovm
+    commentline = @comment.commentline :for_user => @morozovm
     commentline[0].id.should == @comment1.id
     commentline[0].is_favorited.should == false
     commentline[1].id.should == @comment2.id
@@ -378,18 +378,39 @@ describe "Comments" do
     @morozovm.favorite @comment2
 
     @salkar_post.reload
-    commentline = @salkar_post.commentline nil, 10, @salkar
+    commentline = @salkar_post.commentline :for_user => @salkar
     commentline[1].id.should == @comment1.id
     commentline[1].is_favorited.should == true
     commentline[2].id.should == @comment2.id
     commentline[2].is_favorited.should == false
 
-    commentline = @salkar_post.commentline nil, 10, @morozovm
+    commentline = @salkar_post.commentline :for_user => @morozovm
     commentline[1].id.should == @comment1.id
     commentline[1].is_favorited.should == false
     commentline[2].id.should == @comment2.id
     commentline[2].is_favorited.should == true
   end
 
+  it "comment count for post should been received" do
+    @salkar_post.comments.size.should == 0
+    @salkar_post.comment_count.should == 0
+    @comment = @salkar.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id)
+    @comment1 = @morozovm.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id, :parent_id => @comment.id)
+    @comment2 = @salkar.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id, :parent_id => @comment.id)
+    @salkar_post.reload
+    @salkar_post.comments.size.should == 3
+    @salkar_post.comment_count.should == 3
+  end
+
+  it "comment count for comment should been received" do
+    @comment = @salkar.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id)
+    @comment.reload
+    @comment.comment_count.should == 0
+    @comment1 = @morozovm.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id, :parent_id => @comment.id)
+    @comment2 = @salkar.comments.create(:body => 'Lets You Party Like a Facebook User', :post_id => @salkar_post.id, :parent_id => @comment.id)
+    @comment.reload
+    @comment.comment_count.should == 2
+  end
+
 
 end

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

@@ -159,8 +159,11 @@ describe "Favorites" do
     fline[9].class.to_s.should == 'Inkwell::Comment'
     fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment.id, true).id
 
+    fline_same = @salkar.favoriteline :last_shown_obj_id => nil, :limit => 10, :for_user => nil
+    fline_same.should == fline
+
     from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment2.id, true).id
-    fline = @salkar.favoriteline(from_favorite_item_id)
+    fline = @salkar.favoriteline(:last_shown_obj_id => from_favorite_item_id)
     fline.size.should == 10
     fline[0].id.should == @salkar_comment4.id
     fline[0].class.to_s.should == 'Inkwell::Comment'
@@ -170,7 +173,7 @@ describe "Favorites" do
     fline[9].item_id_in_line.should == ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@salkar_comment.id, true).id
 
     from_favorite_item_id = ::Inkwell::FavoriteItem.find_by_item_id_and_is_comment(@morozovm_comment2.id, true).id
-    fline = @salkar.favoriteline(from_favorite_item_id, 5)
+    fline = @salkar.favoriteline(:last_shown_obj_id => from_favorite_item_id, :limit => 5)
     fline.size.should == 5
     fline[0].id.should == @salkar_comment4.id
     fline[0].class.to_s.should == 'Inkwell::Comment'
@@ -214,7 +217,7 @@ describe "Favorites" do
     @morozovm.reblog @salkar_post1
 
 
-    fline = @salkar.favoriteline(nil,10,@morozovm)
+    fline = @salkar.favoriteline(:for_user => @morozovm)
     fline.size.should == 10
     fline[0].id.should == @salkar_post1.id
     fline[0].class.to_s.should == 'Post'
@@ -233,4 +236,24 @@ describe "Favorites" do
     end
   end
 
+  it "favorite count should been received for post" do
+    @talisman = User.create :nick => "Talisman"
+    @salkar_post.reload
+    @salkar_post.favorite_count.should == 0
+    @morozovm.favorite @salkar_post
+    @talisman.favorite @salkar_post
+    @salkar_post.reload
+    @salkar_post.favorite_count.should == 2
+  end
+
+  it "favorite count should been received for post" do
+    @talisman = User.create :nick => "Talisman"
+    @salkar_comment.reload
+    @salkar_comment.favorite_count.should == 0
+    @morozovm.favorite @salkar_comment
+    @talisman.favorite @salkar_comment
+    @salkar_comment.reload
+    @salkar_comment.favorite_count.should == 2
+  end
+
 end

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

@@ -108,15 +108,18 @@ describe "Reblog" do
   it "timeline items should delete for followers when user unreblog post" do
     @talisman = User.create :nick => "Talisman"
     @talisman.follow @morozovm
+    @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.first
+    item = @talisman.timeline_items.where(:item_id => @salkar_post, :is_comment => false).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
   end
 
   it "timeline items should delete for followers when user unreblog comment" do
@@ -138,6 +141,8 @@ describe "Reblog" do
     @talisman.reblog @salkar_post
     @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
     item.from_source.should == ActiveSupport::JSON.encode([{'user_id' => @talisman.id, 'type' => 'reblog'}, {'user_id' => @salkar.id, 'type' => 'following'}])
@@ -148,6 +153,27 @@ describe "Reblog" do
     item = @morozovm.timeline_items.where(:item_id => @salkar_post, :is_comment => false).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
+  end
+
+  it "reblog count should been received for post" do
+    @talisman = User.create :nick => "Talisman"
+    @salkar_post.reload
+    @salkar_post.reblog_count.should == 0
+    @morozovm.reblog @salkar_post
+    @talisman.reblog @salkar_post
+    @salkar_post.reload
+    @salkar_post.reblog_count.should == 2
+  end
+
+  it "reblog count should been received for post" do
+    @talisman = User.create :nick => "Talisman"
+    @salkar_comment.reload
+    @salkar_comment.reblog_count.should == 0
+    @morozovm.reblog @salkar_comment
+    @talisman.reblog @salkar_comment
+    @salkar_comment.reload
+    @salkar_comment.reblog_count.should == 2
   end
 
 end

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

@@ -32,7 +32,7 @@ describe "Timeline" do
     @talisman.follow @morozovm
     @talisman.reload
 
-    tline = @talisman.timeline(nil, 10, @salkar)
+    tline = @talisman.timeline(:for_user => @salkar)
     tline.size.should == 10
     tline[0].should == @morozovm_post2
     tline[1].should == @morozovm_post1
@@ -58,7 +58,7 @@ describe "Timeline" do
     @morozovm.reblog @salkar_comment
     @morozovm.favorite @salkar_comment
     @talisman.reload
-    tline = @talisman.timeline(nil, 10, @morozovm)
+    tline = @talisman.timeline(:last_shown_obj_id => nil, :limit => 10,:for_user => @morozovm)
     tline.size.should == 1
     tline[0].should == @salkar_comment
     tline[0].is_reblogged.should == true

data/test/dummy_without_community/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/test/dummy_without_community/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/dummy_without_community/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/test/dummy_without_community/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/dummy_without_community/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/dummy_without_community/app/models/post.rb

@@ -0,0 +1,6 @@
+class Post < ActiveRecord::Base
+  attr_accessible :title, :body
+  belongs_to :user
+
+  acts_as_inkwell_post
+end

data/test/dummy_without_community/app/models/user.rb

@@ -0,0 +1,7 @@
+class User < ActiveRecord::Base
+  attr_accessible :nick
+  has_many :posts, :dependent => :destroy
+
+  acts_as_inkwell_user
+
+end

data/test/dummy_without_community/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy_without_community/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/dummy_without_community/config/application.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require
+require "inkwell"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+    
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+  end
+end
+

data/test/dummy_without_community/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy_without_community/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/test/dummy_without_community/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/dummy_without_community/config/environments/development.rb

@@ -0,0 +1,30 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end