conversations 0.0.1 → 0.0.2

data/.gitignore

@@ -5,4 +5,5 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
-coverage/
+coverage/
+*.gem

data/Gemfile.lock

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    conversations (0.0.1)
-      jquery-rails (~> 1.0.19)
-      rails (~> 3.1.3)
+    conversations (0.0.2)
+      jquery-rails (~> 2.1.1)
+      rails (~> 3.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    addressable (2.3.2)
+    arel (3.0.2)
+    builder (3.0.4)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -45,91 +45,92 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.8)
-      ffi (~> 1.0.6)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.3.2)
-      activesupport
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
+    ffi (1.1.5)
     hike (1.2.1)
-    i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.4)
-    mail (2.3.0)
+    json (1.7.5)
+    libwebsocket (0.1.5)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.16.0)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.0.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.34)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/README.md

@@ -1,7 +1,7 @@
 Conversations
 =
 
-This project rocks big time and uses MIT-LICENSE.
+This project uses the MIT-LICENSE.
 
 Installation
 -
@@ -35,6 +35,29 @@ file.
 `has_conversations`
 to User model
 
+* Add following code
+
+```
+def name
+  self.email
+end
+```
+
+to User model
+
+* Add
+
+```
+def index
+  ...
+  respond_to do |format|
+    format.json { render :json => User.where("email like ?", "%#{params[:q]}%").map(&:attributes) }
+  end
+end
+```
+
+to User controller
+
 * Add links to the conversations anywhere you want
 `<%= link_to 'Messages', user_conversations_path(current_user) %>`
 

data/app/assets/javascripts/conversations.js

@@ -1,5 +1,8 @@
 //= require_tree .
 
 $(function () {
-  $('#conversations_conversation_to_tokens').tokenInput('/users.json', { crossDomain: false });
+  $('#conversations_conversation_to_tokens').tokenInput('/users.json', {
+		crossDomain: false,
+		propertyToSearch: 'email'
+	});
 });

data/app/assets/stylesheets/conversations.css

@@ -1,4 +1,14 @@
 /*
  *= require_self
  *= require_tree . 
-*/
+*/
+
+.message {
+  padding: 10px;
+  border-bottom: 1px solid #000;
+  margin-bottom: 10px;
+}
+.message-head {
+  font-weight: bold;
+  margin-bottom: 5px;
+}

data/app/controllers/conversations/conversations_controller.rb

@@ -13,8 +13,9 @@ module Conversations
       @conversation = Conversation.new params[:conversations_conversation]
       @conversation.user_conversations.build
       @conversation.user_conversations.first.user = @user
-      @conversation.messages.build :body => params[:conversations_conversation][:messages_attributes]['0'][:body]
-      @conversation.messages.first.user = @user
+      # @conversation.messages.build if @conversation.messages.empty?
+      @conversation.messages = []
+      @conversation.messages.build body: params[:conversations_conversation][:messages_attributes]['0'][:body], user_id: @user.id
       if @conversation.save
         redirect_to user_conversation_path(@user, @user.user_conversations.last), notice: 'Conversation was successfully created.'
       else

data/app/models/conversations/conversation.rb

@@ -1,6 +1,6 @@
 module Conversations
   class Conversation < ActiveRecord::Base
-    attr_accessible :subject, :to_tokens
+    attr_accessible :subject, :to_tokens, :messages_attributes
     attr_accessor :to_tokens
   
     has_many :user_conversations

data/app/models/conversations/message.rb

@@ -1,6 +1,6 @@
 module Conversations
   class Message < ActiveRecord::Base
-    attr_accessible :user_id, :conversation_id, :body
+    attr_accessible :user_id, :conversation_id, :body, :user
   
     belongs_to :user
     belongs_to :conversation

data/app/views/conversations/conversations/new.html.erb

@@ -1,6 +1,16 @@
-<h1>New Conversation</h1>
+<h1><%= t('conversation.new.new_conversation') %></h1>
 
 <%= form_for(@conversation, :url => user_conversations_path) do |f| %>
+  <% if @conversation.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= "#{pluralize(@conversation.errors.count, "error")} prohibited this order from being saved:" %></ul>
+      <ul>
+        <% @conversation.errors.full_messages.each do |msg| %>
+          <li><%= msg%></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
   <div>
     <%= f.label :to_tokens %>
     <%= f.text_field :to_tokens %>

data/app/views/conversations/user_conversations/index.html.erb

@@ -1,4 +1,4 @@
-<h1><%= @user.name %>'s Conversations</h1>
+<h1><%= @user.name %>'s <%= Conversations::Conversation.model_name.human %></h1>
 
 <ul>
   <% for conversation in @conversations do %>
@@ -12,6 +12,4 @@
   <% end %>
 </ul>
 
-<%= link_to "Create a New Conversation", new_user_conversation_path(@user) %>
-<br>
-<%= link_to "Back to User", user_path(@user) %>
+<%= link_to t('conversation.index.new_conversation'), new_user_conversation_path(@user) %>

data/app/views/conversations/user_conversations/show.html.erb

@@ -1,35 +1,36 @@
 <h1><%= @conversation.subject %></h1>
 
-<div>
-  <h4>From: <%= @user.name %></h4>
-  <h4>To:</h4>
-  <ul>
-    <%# TODO: move method into model %>
-    <% for user in @conversation.users.reject! { |u| u == @user } do %>
-      <li><%= link_to user.name, user %></li>
-    <% end %>
-  </ul>
-</div>
+<p>
+  <b><%= t('conversation.show.participants') %></b>:
+  <%= @conversation.users.map{|u| u.name}.join(', ') %>
+  <br />
+  <b><%= t('conversation.show.created_at') %></b>:
+  <%= l @conversation.created_at %>
+</p>
 
 <% for message in @conversation.messages do %>
-  <div class="message"><%= time_ago_in_words(message.created_at) %> ago, <%= message.user.name %> wrote:
-    <div class="message_body"><%= message.body %></div>
+  <div class="message">
+    <div class="message-head">
+      <%= t('conversation.show.wrote', person: message.user.name) %>
+      <%= t('conversation.show.time_ago', time: time_ago_in_words(message.created_at)) %>:
+    </div>
+    <div class="message-body">
+      <%= message.body %>
+    </div>
   </div>
 <% end %>
-
 <%= form_for(@message, :url => user_conversation_messages_path(@conversation.user, @conversation)) do |f| %>
   <div>
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
+    <%= f.text_area :body, cols: 75, rows: 5 %>
   </div>
-  <%= f.submit %>
+  <p><%= f.submit %></p>
 <% end %>
 
 <% if current_user == @conversation.user && !@conversation.read? %>
-  <%= link_to "Mark as read", mark_as_read_user_conversation_path(@conversation.user, @conversation), :method => :post %>
+  <%= link_to t('conversation.show.mark_as_read'), mark_as_read_user_conversation_path(@conversation.user, @conversation), :method => :post %>
 <% elsif current_user == @conversation.user && @conversation.read? %>
-  <%= link_to "Mark as unread", mark_as_unread_user_conversation_path(@conversation.user, @conversation), :method => :post %>
+  <%= link_to t('conversation.show.mark_as_unread'), mark_as_unread_user_conversation_path(@conversation.user, @conversation), :method => :post %>
 <% end %>
 <br />
 
-<%= link_to "Back to conversations", user_conversations_path(@user) %>
+<%= link_to t('conversation.show.back_to_conversations'), user_conversations_path(@user) %>

data/config/locales/de.yml

@@ -0,0 +1,28 @@
+de:
+  conversation:
+    index:
+      new_conversation: 'Neue Konversation erstellen'
+    new:
+      new_conversation: 'Neue Konversation'
+    show:
+      participants: 'Teilnehmer'
+      time_ago: "vor %{time}"
+      wrote: '%{person} schrieb'
+      mark_as_read: 'Als gelesen markieren'
+      mark_as_unread: 'Als ungelesen markieren'
+      back_to_conversations: 'Zurück zu den Konversationen'
+      created_at: 'Erstellt am'
+  activerecord:
+    models:
+      conversations/conversation:
+        one: 'Konversation'
+        other: 'Konversationen'
+      conversations/message:
+        one: 'Nachricht'
+        other: 'Nachrichten'
+    attributes:
+      conversations/conversation:
+        to_tokens: 'An'
+        subject: 'Betreff'
+      conversations/message:
+        body: 'Text'

data/config/routes.rb

@@ -1,8 +1,8 @@
 Rails.application.routes.draw do  
   resources :users do
-    resources :conversations, :controller => "conversations/conversations", :only => [:new, :create]
-    resources :conversations, :controller => "conversations/user_conversations", :except => [:new, :create] do
-      resources :messages, :controller => "conversations/messages"
+    resources :conversations, controller: "conversations/conversations", only: [:new, :create]
+    resources :conversations, controller: "conversations/user_conversations", except: [:new, :create] do
+      resources :messages, controller: "conversations/messages"
       member do
         post :mark_as_read
         post :mark_as_unread

data/conversations.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Patrick Bartels"]
   s.email       = ["patrick@bartels.ug"]
   s.homepage    = %q{https://github.com/roughneck/conversations}
-  s.summary     = "Summary of Conversations."
-  s.description = "Description of Conversations."
+  s.summary     = "Messaging gem for rails applications"
+  s.description = "Conversations is a messaging system that enables users of devise-based Rails applications to exchanges messages with any other user. It supports conversations with multiple participants."
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   
   s.rubyforge_project = "conversations"
 
-  s.add_dependency "rails", "~> 3.1.3"
-  s.add_dependency "jquery-rails", "~> 1.0.19"
+  s.add_dependency "rails", "~> 3.2.0"
+  s.add_dependency "jquery-rails", "~> 2.1.1"
 
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency "rspec-rails", "~> 2.8"

data/lib/conversations/version.rb

@@ -1,3 +1,3 @@
 module Conversations
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/integration/user_conversations_controller_spec.rb

@@ -34,18 +34,18 @@ feature "UserConversation", %q{} do
   
   scenario "view a conversation" do
     visit user_conversation_path @sender, @user_conversation
-    page.should have_content('From')
+    page.should have_content('Participants')
   end
   
   scenario "mark a conversation as un/read" do
     visit user_path @recipient
     click_link 'Sign In as This User'
     visit user_conversation_path @recipient, @user_conversation
-    page.should have_content('Mark as read')
-    click_link 'Mark as read'
-    page.should have_content('Mark as unread')
-    click_link 'Mark as unread'
-    page.should have_content('Mark as read')
+    page.should have_content('Mark As Read')
+    click_link 'Mark As Read'
+    page.should have_content('Mark As Unread')
+    click_link 'Mark As Unread'
+    page.should have_content('Mark As Read')
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conversations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70164230071100 !ruby/object:Gem::Requirement
+  requirement: &70341804465420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70164230071100
+  version_requirements: *70341804465420
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70164230070440 !ruby/object:Gem::Requirement
+  requirement: &70341804464900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70164230070440
+  version_requirements: *70341804464900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70164230069860 !ruby/object:Gem::Requirement
+  requirement: &70341804464200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70164230069860
+  version_requirements: *70341804464200
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70164230067860 !ruby/object:Gem::Requirement
+  requirement: &70341804463740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70164230067860
+  version_requirements: *70341804463740
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70164230064280 !ruby/object:Gem::Requirement
+  requirement: &70341804463160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70164230064280
+  version_requirements: *70341804463160
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70164230058160 !ruby/object:Gem::Requirement
+  requirement: &70341804462700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70164230058160
+  version_requirements: *70341804462700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70164230042400 !ruby/object:Gem::Requirement
+  requirement: &70341804462180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,8 +87,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70164230042400
-description: Description of Conversations.
+  version_requirements: *70341804462180
+description: Conversations is a messaging system that enables users of devise-based
+  Rails applications to exchanges messages with any other user. It supports conversations
+  with multiple participants.
 email:
 - patrick@bartels.ug
 executables: []
@@ -118,6 +120,7 @@ files:
 - app/views/conversations/conversations/new.html.erb
 - app/views/conversations/user_conversations/index.html.erb
 - app/views/conversations/user_conversations/show.html.erb
+- config/locales/de.yml
 - config/routes.rb
 - conversations.gemspec
 - lib/conversations.rb
@@ -213,18 +216,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2920880207248402247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2920880207248402247
 requirements: []
 rubyforge_project: conversations
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Summary of Conversations.
+summary: Messaging gem for rails applications
 test_files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js