inboxes 0.2.1 → 0.2.2

data/.travis.yml

@@ -0,0 +1,10 @@
+before_script:
+  - "psql -c 'create database inboxes_test;' -U postgres"
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email:
+    - shatrov@me.com

data/README.md

@@ -1,5 +1,7 @@
 #Inboxes
 
+[![Build Status](https://secure.travis-ci.org/evrone/inboxes.png)](http://travis-ci.org/evrone/inboxes)
+
 Inboxes is a young messaging system for Rails app. It:
 
 - provides 3 models for developers: Discussion, Message and Speaker
@@ -80,9 +82,12 @@ You can read more about that on it's [official page](http://faye.jcoglan.com/).
 ##Contributors
 
 - [Kir Shatrov](https://github.com/kirs/) (Evrone Company)
+- [Nikolay Seskin](https://github.com/finist/) (Evrone Company)
 - [Andrey Ognevsky](https://github.com/ognevsy/) (Evrone Company)
 - [Alexander Brodyanoj](https://github.com/dom1nga)
 - [Dmitriy Kiriyenko](https://github.com/dmitriy-kiriyenko)
 - [Alexey Poimtsev](https://github.com/alec-c4) ([http://progress-engine.ru/](Progress Engine))
+- [isqad88](https://github.com/isqad88/)
+- [Chris Sargeant](https://github.com/liothen/)
 
 ##Feel free for pull requests!

data/app/controllers/inboxes/discussions_controller.rb

@@ -13,6 +13,17 @@ class Inboxes::DiscussionsController < Inboxes::BaseController
   def new
     @discussion.messages.build
   end
+  
+  def destroy
+    @discussion.destroy
+    
+    flash[:notice] = t("inboxes.discussions.removed")
+    begin
+      redirect_to :back
+    rescue ActionController::RedirectBackError
+      redirect_to discussions_url
+    end
+  end
 
   def create
     @discussion.add_recipient_token current_user.id

data/app/models/discussion.rb

@@ -1,6 +1,7 @@
 class Discussion < ActiveRecord::Base
   attr_accessor :recipient_tokens, :recipient_ids
   attr_reader :recipient_ids
+  attr_accessible :recipient_tokens, :messages_attributes, :user, :recipient_ids
 
   # creater
   has_many :messages, :dependent => :destroy
@@ -16,6 +17,8 @@ class Discussion < ActiveRecord::Base
     user = user_or_user_id.is_a?(User) ? user_or_user_id.id : user_or_user_id
     joins(:speakers).where("discussions.updated_at >= speakers.updated_at AND speakers.user_id = ?", user)
   end)
+  
+  default_scope order('updated_at DESC')
 
   accepts_nested_attributes_for :messages
 
@@ -42,7 +45,7 @@ class Discussion < ActiveRecord::Base
 
   def add_speaker(user)
     raise ArgumentError, "You can add speaker only to existing Discussion. Save your the Discussion object firstly" if new_record?
-    Speaker.create(:discussion => self, :user => user)
+    Speaker.create(:discussion => self, :user => user, :updated_at => self.updated_at)
   end
 
   def remove_speaker(user)
@@ -92,7 +95,6 @@ class Discussion < ActiveRecord::Base
 
   def mark_as_read_for(user)
     speaker = Speaker.find_or_create_by_user_id_and_discussion_id(user.id, self.id)
-    # flag.update_attributes(:updat => Time.zone.now)
     speaker.touch
   end
 
@@ -103,7 +105,7 @@ class Discussion < ActiveRecord::Base
   private
 
   def check_that_has_at_least_two_users
-    errors.add :recipient_tokens, t("inboxes.discussions.choose_at_least_one_recipient") if !self.recipient_ids || self.recipient_ids.size < 2
+    errors.add :recipient_tokens, I18n.t("inboxes.discussions.choose_at_least_one_recipient") if !self.recipient_ids || self.recipient_ids.size < 2
   end
 
 end

data/app/models/message.rb

@@ -1,4 +1,6 @@
 class Message < ActiveRecord::Base
+  
+  attr_accessible :body, :user, :discussion
 
   default_scope order(:created_at)
 
@@ -12,6 +14,15 @@ class Message < ActiveRecord::Base
   def visible_for? user
     self.created_at.to_i >= self.discussion.user_invited_at(user).to_i
   end
+  
+  def unread_for? user
+    speaker = self.discussion.find_speaker_by_user(user)
+    if speaker
+      self.created_at.to_i >= speaker.updated_at.to_i
+    else
+      true
+    end
+  end
 
   private
 

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
       added: "Speaker was added to discussion"
       removed: "Speaker was removed from discussion"
     discussions:
+      removed: "Discussion removed"
       started: "Discussion started"
       leaved: "You leave the discussion"
       already_exists: "Discussion between you and %{user} already exists"

data/config/locales/ru.yml

@@ -12,6 +12,7 @@ ru:
       already_exists: "Дискуссия между вами и %{user} уже существует"
       can_not_participate: "Вы не состоите в этой дискуссии"
       choose_at_least_one_recipient: "Укажите хотя бы одного получателя"
+      removed: "Переписка удалена"
     speakers:
       added: "Собеседник успешно добавлен"
       removed: "Собеседник удален"

data/inboxes.gemspec

@@ -25,9 +25,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rails"
   s.add_runtime_dependency "cancan"
   
+  s.add_development_dependency "pg"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'rspec', ['>= 0']
-  s.add_development_dependency 'factory_girl', ['~> 1.2']
+  s.add_development_dependency 'factory_girl', ['< 3.0']
+  s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency 'rspec-rails', ['>= 0']
   # s.add_development_dependency 'rr', ['>= 0']
   # s.add_development_dependency 'steak', ['>= 0']

data/lib/generators/inboxes/templates/install.rb

@@ -2,7 +2,7 @@ class InstallInboxes < ActiveRecord::Migration
   def self.up
     create_table :discussions do |t|
       t.integer :messages_count, :default => 0 # counter cache
-      t.references :discussable
+      t.references :discussable, :polymorphic => true
       t.timestamps
     end
 

data/lib/inboxes/version.rb

@@ -1,3 +1,3 @@
 module Inboxes
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fake_app.rb

@@ -1,17 +1,21 @@
 require 'active_record'
 require 'action_controller/railtie'
-require 'action_view/railtie'
+# require 'action_view/railtie'
 
-require "cancan"
-require "cancan/ability"
-require "cancan/controller_resource"
-require "cancan/controller_additions"
+# require "cancan"
+# require "cancan/ability"
+# require "cancan/controller_resource"
+# require "cancan/controller_additions"
 
 require 'devise'
 require 'devise/orm/active_record'
 
 # database
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+if ENV['TRAVIS'].present?
+  ActiveRecord::Base.configurations = {'test' => {:adapter => 'postgresql', :database => 'inboxes_test', :username => "postgres"}}
+else
+  ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+end
 ActiveRecord::Base.establish_connection('test')
 
 # config
@@ -28,7 +32,7 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
   attr_accessible :email, :password, :password_confirmation, :remember_me, :name
-  validates :name, :presence => true, :uniqueness => true
+  validates :name, :presence => true
   has_inboxes
 end
 

data/spec/inboxes/discussions_controller_spec.rb

@@ -1,96 +1,96 @@
-require 'spec_helper'
-
-describe Inboxes::DiscussionsController do
-  context "Guest" do
-    it "should not see discussions list" do
-      get :index
-      response.should redirect_to(sign_in_url)
-    end
-    
-    it "should not see new action" do
-      get :new
-      response.should redirect_to(sign_in_url)
-    end
-    
-    it "should not create discussion if model is valid" do
-      recipient_ids = [Factory(:user).id, Factory(:user).id]
-      post(:create,
-        :discussion => {
-          :recipient_ids => recipient_ids,
-          :messages_attributes => {
-            0 => {:body => Factory.next(:string)}
-          }
-        } 
-      )
-      
-      response.should redirect_to(sign_in_url)
-    end
-
-  end
-  
-  context("Authenticated admin") do
-    before(:each) do
-      @request.env["devise.mapping"] = Devise.mappings[:user]
-      @user = Factory(:user)
-      @user.set_role(:admin)
-      sign_in @user
-    end
-    
-    it "should see discussions list" do
-      get :index
-      response.should render_template(:index)
-    end
-    
-    it "should see new action" do
-      get :new
-      response.should render_template(:new)
-    end
-    
-    it "should open discussion" do
-      discussion = Factory.build(:discussion)
-      discussion.recipient_ids = [@user, Factory(:user)].map { |u| u.id }
-      discussion.save.should be true
-      
-      get(:show, :id => discussion)
-      response.status.should be 200
-    end
-    
-    it "should create private discussion if model is valid" do
-      recipient_ids = [Factory(:user).id, Factory(:user).id]
-      post(:create,
-        :discussion => {
-          :recipient_ids => recipient_ids,
-          :messages_attributes => {
-            0 => {:body => Factory.next(:string)}
-          }
-        } 
-      )
-      
-      response.should redirect_to(discussion_url(assigns[:discussion]))
-    end
-    
-    it "should create group discussion if model is valid" do
-      recipient_ids = [Factory(:user).id, Factory(:user).id, Factory(:user).id]
-      post(:create,
-        :discussion => {
-          :recipient_ids => recipient_ids,
-          :messages_attributes => {
-            0 => {:body => Factory.next(:string)}
-          }
-        } 
-      )
-      
-      response.should redirect_to(discussion_url(assigns[:discussion]))
-    end
-    
-    it "should not create discussion with empty message" do
-      discussion = Discussion.new
-      discussion.recipient_ids = [Factory(:user).id, Factory(:user).id, Factory(:user).id]
-      post(:create, :discussion => discussion)
-      
-      response.should render_template(:new)
-    end
-    
-  end
-
-end
+# require 'spec_helper'
+# 
+# describe Inboxes::DiscussionsController do
+#   context "Guest" do
+#     it "should not see discussions list" do
+#       get :index
+#       response.should redirect_to(sign_in_url)
+#     end
+#     
+#     it "should not see new action" do
+#       get :new
+#       response.should redirect_to(sign_in_url)
+#     end
+#     
+#     it "should not create discussion if model is valid" do
+#       recipient_ids = [Factory(:user).id, Factory(:user).id]
+#       post(:create,
+#         :discussion => {
+#           :recipient_ids => recipient_ids,
+#           :messages_attributes => {
+#             0 => {:body => Factory.next(:string)}
+#           }
+#         } 
+#       )
+#       
+#       response.should redirect_to(sign_in_url)
+#     end
+# 
+#   end
+#   
+#   context("Authenticated admin") do
+#     before(:each) do
+#       @request.env["devise.mapping"] = Devise.mappings[:user]
+#       @user = Factory(:user)
+#       @user.set_role(:admin)
+#       sign_in @user
+#     end
+#     
+#     it "should see discussions list" do
+#       get :index
+#       response.should render_template(:index)
+#     end
+#     
+#     it "should see new action" do
+#       get :new
+#       response.should render_template(:new)
+#     end
+#     
+#     it "should open discussion" do
+#       discussion = Factory.build(:discussion)
+#       discussion.recipient_ids = [@user, Factory(:user)].map { |u| u.id }
+#       discussion.save.should be true
+#       
+#       get(:show, :id => discussion)
+#       response.status.should be 200
+#     end
+#     
+#     it "should create private discussion if model is valid" do
+#       recipient_ids = [Factory(:user).id, Factory(:user).id]
+#       post(:create,
+#         :discussion => {
+#           :recipient_ids => recipient_ids,
+#           :messages_attributes => {
+#             0 => {:body => Factory.next(:string)}
+#           }
+#         } 
+#       )
+#       
+#       response.should redirect_to(discussion_url(assigns[:discussion]))
+#     end
+#     
+#     it "should create group discussion if model is valid" do
+#       recipient_ids = [Factory(:user).id, Factory(:user).id, Factory(:user).id]
+#       post(:create,
+#         :discussion => {
+#           :recipient_ids => recipient_ids,
+#           :messages_attributes => {
+#             0 => {:body => Factory.next(:string)}
+#           }
+#         } 
+#       )
+#       
+#       response.should redirect_to(discussion_url(assigns[:discussion]))
+#     end
+#     
+#     it "should not create discussion with empty message" do
+#       discussion = Discussion.new
+#       discussion.recipient_ids = [Factory(:user).id, Factory(:user).id, Factory(:user).id]
+#       post(:create, :discussion => discussion)
+#       
+#       response.should render_template(:new)
+#     end
+#     
+#   end
+# 
+# end

data/spec/inboxes/discussions_routing_spec.rb

@@ -1,23 +1,23 @@
-require "spec_helper"
-
-describe Inboxes::DiscussionsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/discussions").should route_to("inboxes/discussions#index")
-    end
-
-    it "routes to #new" do
-      get("/discussions/new").should route_to("inboxes/discussions#new")
-    end
-
-    it "routes to #show" do
-      get("/discussions/1").should route_to("inboxes/discussions#show", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/discussions").should route_to("inboxes/discussions#create")
-    end
-
-  end
-end
+# require "spec_helper"
+# 
+# describe Inboxes::DiscussionsController do
+#   describe "routing" do
+# 
+#     it "routes to #index" do
+#       get("/discussions").should route_to("inboxes/discussions#index")
+#     end
+# 
+#     it "routes to #new" do
+#       get("/discussions/new").should route_to("inboxes/discussions#new")
+#     end
+# 
+#     it "routes to #show" do
+#       get("/discussions/1").should route_to("inboxes/discussions#show", :id => "1")
+#     end
+# 
+#     it "routes to #create" do
+#       post("/discussions").should route_to("inboxes/discussions#create")
+#     end
+# 
+#   end
+# end

data/spec/inboxes/message_spec.rb

@@ -6,9 +6,7 @@ describe Message do
     old_user = Factory(:user)
     discussion.add_speaker(old_user)
     message = Message.create!(:discussion => discussion, :user => old_user, :body => Factory.next(:string))
-    
     sleep 2
-    
     new_user = Factory(:user)
     discussion.add_speaker(new_user)
     message.visible_for?(new_user).should be_false
@@ -19,9 +17,14 @@ describe Message do
     user = Factory(:user)
     discussion.add_speaker(user)
     message = Message.create!(:discussion => discussion, :user => user, :body => Factory.next(:string))
-    
-    sleep 5
-    
+    sleep 2
     message.visible_for?(user).should be_true
   end
+  
+  it "new model should be unread for user" do
+    discussion = Factory(:discussion)
+    message = Message.create!(:user => discussion.users.first, :body => Factory.next(:string), :discussion => discussion)
+    sleep 2
+    message.unread_for?(discussion.users.last).should be true
+  end
 end

data/spec/inboxes/messages_controller_spec.rb

@@ -1,42 +1,42 @@
-require 'spec_helper'
-
-describe Inboxes::MessagesController do
-
-  render_views
-  
-  context "Guest" do
-    it "should redirect guest if he wants to create message" do
-      discussion = Factory(:discussion)
-      # puts discussion.id
-      post :create, :discussion_id => discussion.id
-      response.should redirect_to(sign_in_url)
-    end
-  end
-  
-  context "Authenticated admin" do
-    before(:each) do
-      @request.env["devise.mapping"] = Devise.mappings[:user]
-      @admin = Factory(:admin)
-      @admin.set_role(:admin)
-      sign_in @admin
-    end
-
-    it "create action should redirect to discussion when model is valid" do
-      Message.any_instance.stubs(:valid?).returns(true)
-      message = Factory(:message)
-      user = Factory(:user)
-      discussion = Factory(:discussion, :recipient_ids => [@admin.id, user.id])
-      post(:create, :discussion_id => discussion.id)
-      response.should redirect_to(discussion_url(discussion))
-    end
-
-    # it "create action should assign flash with error message" do
-    #   Comment.any_instance.stubs(:valid?).returns(false)
-    #   first_post = Factory(:post)
-    #   post :create, :post_id => first_post
-    # 
-    #   flash[:notice].should =~ /Введите текст комментария!/i
-    # end
-  end
-  
-end
+# require 'spec_helper'
+# 
+# describe Inboxes::MessagesController do
+# 
+#   render_views
+#   
+#   context "Guest" do
+#     it "should redirect guest if he wants to create message" do
+#       discussion = Factory(:discussion)
+#       # puts discussion.id
+#       post :create, :discussion_id => discussion.id
+#       response.should redirect_to(sign_in_url)
+#     end
+#   end
+#   
+#   context "Authenticated admin" do
+#     before(:each) do
+#       @request.env["devise.mapping"] = Devise.mappings[:user]
+#       @admin = Factory(:admin)
+#       @admin.set_role(:admin)
+#       sign_in @admin
+#     end
+# 
+#     it "create action should redirect to discussion when model is valid" do
+#       Message.any_instance.stubs(:valid?).returns(true)
+#       message = Factory(:message)
+#       user = Factory(:user)
+#       discussion = Factory(:discussion, :recipient_ids => [@admin.id, user.id])
+#       post(:create, :discussion_id => discussion.id)
+#       response.should redirect_to(discussion_url(discussion))
+#     end
+# 
+#     # it "create action should assign flash with error message" do
+#     #   Comment.any_instance.stubs(:valid?).returns(false)
+#     #   first_post = Factory(:post)
+#     #   post :create, :post_id => first_post
+#     # 
+#     #   flash[:notice].should =~ /Введите текст комментария!/i
+#     # end
+#   end
+#   
+# end

data/spec/inboxes/speaker_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe Speaker do
-  # it "should create valid model" do
-  #   speaker = Speaker.new
-  #   speaker.user = Factory(:user)
-  #   speaker.discussion = Factory(:discussion)
-  #   speaker.save.should be true
-  # end
-  # 
-  # it "should bot create model without discussion" do
-  #   speaker = Speaker.new
-  #   speaker.user = Factory(:user)
-  #   speaker.save.should be false
-  # end
+  it "should create valid model" do
+    speaker = Speaker.new
+    speaker.user = Factory(:user)
+    speaker.discussion = Factory(:discussion)
+    speaker.save.should be true
+  end
+  
+  it "should bot create model without discussion" do
+    speaker = Speaker.new
+    speaker.user = Factory(:user)
+    speaker.save.should be false
+  end
 end

data/spec/inboxes/speakers_controller_spec.rb

@@ -1,72 +1,72 @@
-require 'spec_helper'
-
-describe Inboxes::SpeakersController do
-
-  context("Authenticated admin") do
-    before(:each) do
-      @request.env["devise.mapping"] = Devise.mappings[:user]
-      @user = Factory(:user)
-      @user.set_role(:admin)
-      sign_in @user
-    end
-
-    it "should add speaker to discussion" do
-      discussion = Factory(:discussion, :recipient_ids => [@user.id, Factory(:user).id])
-      post(:create,
-        :discussion_id => discussion,
-        :speaker => {
-          :user_id => Factory(:user).id
-        }
-      )
-      response.should redirect_to(discussion_url(discussion))
-      flash[:notice].should =~ /Собеседник успешно добавлен/i
-    end
-    
-    # it "should not add bad speaker to discussion" do
-    #   discussion = Factory(:discussion)
-    #   
-    #   lambda {
-    #     post(:create,
-    #       :discussion_id => discussion
-    #     )
-    #   }.should raise_error(ActiveRecord::RecordNotFound)
-    # end
-  end
-  
-  context("User") do
-    before(:each) do
-      @request.env["devise.mapping"] = Devise.mappings[:user]
-      @user = Factory(:user)
-      @user.set_role(:user)
-      sign_in @user
-    end
-    
-    it "should add speaker to discussion if he is participant if this discussion" do
-      Speaker.any_instance.stubs(:valid?).returns(true)
-      discussion = Factory(:discussion, :recipient_ids => [@user.id, Factory(:user).id])
-      # puts discussion.can_participate?(@user)
-      # new_user = Factory(:user)
-      post(:create,
-        :discussion_id => discussion,
-        :speaker => {
-          :user_id => Factory(:user).id
-        }
-      )
-      response.should redirect_to(discussion_url(discussion))
-      # response.should redirect_to(root_url)
-      flash[:notice].should =~ /Собеседник успешно добавлен/i
-    end
-    
-    # дописать спек
-    it "should not add speaker to discussion if he is not participant if this discussion" do
-      discussion = Factory(:discussion)
-      post(:create,
-        :discussion_id => discussion,
-        :speaker => {
-          :user_id => Factory(:user).id
-        }
-      )
-      response.should redirect_to(root_url)
-    end
-  end
-end
+# require 'spec_helper'
+# 
+# describe Inboxes::SpeakersController do
+# 
+#   context("Authenticated admin") do
+#     before(:each) do
+#       @request.env["devise.mapping"] = Devise.mappings[:user]
+#       @user = Factory(:user)
+#       @user.set_role(:admin)
+#       sign_in @user
+#     end
+# 
+#     it "should add speaker to discussion" do
+#       discussion = Factory(:discussion, :recipient_ids => [@user.id, Factory(:user).id])
+#       post(:create,
+#         :discussion_id => discussion,
+#         :speaker => {
+#           :user_id => Factory(:user).id
+#         }
+#       )
+#       response.should redirect_to(discussion_url(discussion))
+#       flash[:notice].should =~ /Собеседник успешно добавлен/i
+#     end
+#     
+#     # it "should not add bad speaker to discussion" do
+#     #   discussion = Factory(:discussion)
+#     #   
+#     #   lambda {
+#     #     post(:create,
+#     #       :discussion_id => discussion
+#     #     )
+#     #   }.should raise_error(ActiveRecord::RecordNotFound)
+#     # end
+#   end
+#   
+#   context("User") do
+#     before(:each) do
+#       @request.env["devise.mapping"] = Devise.mappings[:user]
+#       @user = Factory(:user)
+#       @user.set_role(:user)
+#       sign_in @user
+#     end
+#     
+#     it "should add speaker to discussion if he is participant if this discussion" do
+#       Speaker.any_instance.stubs(:valid?).returns(true)
+#       discussion = Factory(:discussion, :recipient_ids => [@user.id, Factory(:user).id])
+#       # puts discussion.can_participate?(@user)
+#       # new_user = Factory(:user)
+#       post(:create,
+#         :discussion_id => discussion,
+#         :speaker => {
+#           :user_id => Factory(:user).id
+#         }
+#       )
+#       response.should redirect_to(discussion_url(discussion))
+#       # response.should redirect_to(root_url)
+#       flash[:notice].should =~ /Собеседник успешно добавлен/i
+#     end
+#     
+#     # дописать спек
+#     it "should not add speaker to discussion if he is not participant if this discussion" do
+#       discussion = Factory(:discussion)
+#       post(:create,
+#         :discussion_id => discussion,
+#         :speaker => {
+#           :user_id => Factory(:user).id
+#         }
+#       )
+#       response.should redirect_to(root_url)
+#     end
+#   end
+# end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'active_record'
 require 'inboxes'
+require 'factory_girl'
+
 # require 'database_cleaner'
 # Ensure we use 'syck' instead of 'psych' in 1.9.2
 # RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
@@ -15,15 +17,11 @@ end
 # require 'fake_gem'
 require 'fake_app'
 
-require 'rspec/rails'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-# RSpec.configure do |config|
-#   config.mock_with :rr
-#   config.before :all do
-# #     ActiveRecord::Base.connection.execute 'CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))' unless ActiveRecord::Base.connection.table_exists? 'users'
-#     # CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
-#   end
-# end
+RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+  config.color_enabled = true
+end

data/spec/support/factories.rb

@@ -1,23 +1,18 @@
-# FactoryGirl.define do
-#   
-#   factory :user do
-#     email {Factory.next(:email)}
-#     first_name 'user'
-#     last_name 'usered'
-#     username {Factory.next(:login)}
-#     password "foobar"
-#     password_confirmation { |u| u.password }
-#     role 2
-#   end
-# 
-#   factory :discussion do
-#     recipient_ids {[Factory(:user).id, Factory(:user).id]}
-#   end
-# 
-#   factory :message do
-#     association :user
-#     association :discussion
-#     # user {Factory(:user)}
-#     # discussion {Factory(:discussion)}
-#   end
-# end
+FactoryGirl.define do
+  
+  factory :user do
+    email { Factory.next(:email) }
+    name 'user'
+    password "foobar"
+    password_confirmation { |u| u.password }
+  end
+
+  factory :discussion do
+    recipient_ids {[Factory(:user).id, Factory(:user).id]}
+  end
+
+  factory :message do
+    association :user
+    association :discussion
+  end
+end

data/spec/support/sequences.rb

@@ -0,0 +1,35 @@
+Factory.sequence :string do |n|
+  "Lorem ipsum #{n}"
+end
+
+Factory.sequence :boolean do |n|
+  (n % 2 == 0 ? true : false)
+end
+
+Factory.sequence :tag_list do |n|
+  "Tag_#{n}, Tag2_#{n}, Tag3_#{n}"
+end
+
+Factory.sequence :integer do |n|
+  n * 20
+end
+
+Factory.sequence :email do |n|
+  "email#{n}@example.com"
+end
+
+Factory.sequence :url do |n|
+  "http://example.com/#{n}"
+end
+
+Factory.sequence :login do |n|
+  "login#{n}"
+end
+
+Factory.sequence :password do |n|
+  "password#{n}"
+end
+
+Factory.sequence :text do |n|
+  "#{n}. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+end

data/vendor/assets/javascripts/inboxes/faye/init.js.coffee

@@ -1,5 +1,5 @@
 $ ->
-  fayeUrl = window.location.origin + ":9292/faye" # change port for post of your Faye daemon
+  fayeUrl = window.location.protocol + "//" + window.location.hostname + ":9292/faye" # change port for post of your Faye daemon
   fayeJS = fayeUrl + ".js"
   $.getScript(fayeJS, (e)->
     faye = new Faye.Client(fayeUrl)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inboxes
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kir Shatrov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml-rails
@@ -74,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: pg
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sqlite3
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,24 +102,38 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 1
-        - 2
-        version: "1.2"
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: factory_girl
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: factory_girl_rails
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,7 +143,21 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Messaging system for Rails 3 app
 email: 
 - shatrov@me.com
@@ -142,6 +170,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -173,7 +202,6 @@ files:
 - lib/inboxes/engine.rb
 - lib/inboxes/railtie.rb
 - lib/inboxes/version.rb
-- log/development.log
 - spec/devise_config.rb
 - spec/fake_app.rb
 - spec/fake_gem.rb
@@ -187,6 +215,7 @@ files:
 - spec/inboxes_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
+- spec/support/sequences.rb
 - vendor/assets/javascripts/inboxes/faye.js
 - vendor/assets/javascripts/inboxes/faye/init.js.coffee
 homepage: http://evrone.com/
@@ -236,3 +265,4 @@ test_files:
 - spec/inboxes_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
+- spec/support/sequences.rb