carrier 0.0.6 → 0.1.0

data/app/controllers/carrier/chains_controller.rb

@@ -1,15 +1,17 @@
 # encoding: UTF-8
 module Carrier
-  class ChainsController < ApplicationController
+  class ChainsController < Carrier::ApplicationController
+
+    before_filter :only => %w[archive unarchive] do
+      @user = User.send find_method_for_user, params[:user_id]
+      @chain = Carrier::Chain.find(params[:chain_id])
+    end
+    
     def archive
-      @chain = Chain.find(params[:chain_id])
-      @user = User.find(params[:user_id])
       @chain.archive_for!(@user)
     end
 
     def unarchive
-      @chain = Chain.find(params[:chain_id])
-      @user = User.find(params[:user_id])
       @chain.unarchive_for!(@user)
     end
   end

data/app/controllers/carrier/messages_controller.rb

@@ -3,7 +3,7 @@
 module Carrier
   class MessagesController < ApplicationController
     
-    after_filter :only => [:as_sent, :show] { @message.mark_as_read! :for => current_user }
+    after_filter :only => [:show] { @message.mark_as_read! :for => current_user }
     
     [:collapsed, :expanded].each do |mode|
       define_method(mode) do 
@@ -30,23 +30,21 @@ module Carrier
       render 'index'
     end
 
-    def as_sent
-      @message = Message.find(params[:id], :include => :chain)
-    end
-
     def show
       @message = Message.find(params[:id], :include => :chain)
     end
 
+    # TODO: introduce [:id or :username] key to be passed with to= param
     def new
       @message = Message.new
+      @message.recipients_names = params[:to] if params[:to]
     end
 
     def create
       @message = Message.new(params[:message])
       respond_to do |format|
         if @message.save
-          format.html { redirect_to(as_sent_message_path(@message), :notice => 'Message successfully created!') }
+          format.html { redirect_to(@message, :notice => t('views.carrier.successfully_created')) }
           format.js
         else
           format.js { render :action => "new" }

data/app/helpers/carrier/application_helper.rb

@@ -7,20 +7,17 @@ module Carrier
     end
 
     def archived? message
-      return false if !message || message.new_record?
-      message.archived_for? current_user
+      return if !message || message.new_record?
+      message.archived_for?(current_user) 
     end
 
     def b string
-      raw "<b>%s</b>" % string
-    end
-
-    def without_current_user
-      User.all.without(current_user).map{|user| "'#{user.username}'" }.join(', ')
+      content_tag :b, string
     end
 
+    # Extract this query somewhere... 
     def without_current_user_select
-      User.all.without(current_user).collect {|user| [user.username, user.id] }
+      User.select('id, username').where(User.arel_table[:id].not_in(current_user.id)).collect {|user| [user.username, user.id] }
     end
   end
 end

data/app/models/carrier/chain.rb

@@ -2,14 +2,14 @@
 module Carrier
   class Chain < ActiveRecord::Base
 
-    set_table_name Carrier.config.models.table_for :chain
+    self.table_name = Carrier.config.models.table_for :chain
 
     serialize :participants, Array
     serialize :archived_for, Array
 
     paginates_per 25
 
-    has_many :messages, :order => "created_at"
+    has_many :messages, :order => "created_at", :class_name => "Carrier::Message"
 
     accepts_nested_attributes_for :messages, :reject_if => proc { |attrs| attrs.all? {|k,v| v.blank?}}
 

data/app/models/carrier/message.rb

@@ -1,17 +1,19 @@
 # encoding: UTF-8
 module Carrier
   class Message < ActiveRecord::Base
-    set_table_name Carrier.config.models.table_for :message
+    self.table_name = Carrier.config.models.table_for :message
     
     concerned_with :scopes, :subject, :validations
 
     serialize :recipients, Array
     paginates_per 25
   
-    belongs_to :chain, :counter_cache => true
-    belongs_to :sender_user, :foreign_key => "sender", :class_name => "User"
-
+    belongs_to :chain, :counter_cache => true, :class_name => "Carrier::Chain"
+    
+    delegate :messages, :to => :chain, :prefix => true
     delegate :archived_for?, :archived_for_any_user?, :participants!, :to => :chain
+    
+    belongs_to :sender_user, :foreign_key => "sender", :class_name => "User"
 
     acts_as_readable :on => :created_at
 
@@ -48,10 +50,6 @@ module Carrier
     def chain_archived?
       chain && archived_for_any_user?
     end
-    
-    def chain!
-      self.chain = Chain.create if !chain 
-    end
 
     def make_last
       self.last = true
@@ -71,23 +69,27 @@ module Carrier
     end
 
     def default_subject!
-      self.subject = I18n.t 'models.carrier.no_subject' if !subject || subject.empty?
+      self.subject = I18n.t('models.carrier.no_subject') if !subject || subject.empty?
     end
 
     def sender_name
       sender_user.username
     end
 
-    def recipients_names
-      recipients.collect{|id| User.find(id, :select => "username").username}.join(', ') #
-    end
-
     def recipients_ids
       recipients
     end
 
     def recipients_ids= ra
-      self.recipients = ra.scan(/\w+/).map(&:to_i)
+      self.recipients = ra.scan(/\d+/).map(&:to_i)
+    end
+
+    def recipients= r_arr
+      super r_arr.without("").map(&:to_i)
+    end
+
+    def recipients_names
+      recipients.collect{|id| User.find(id, :select => "username").username}.join(', ') #
     end
 
     def recipients_names= recipients_array
@@ -101,18 +103,20 @@ module Carrier
     end
 
     def participants
-      [] | recipients << sender
+      ([] | recipients << sender).compact
     end
     
-    def chain_messages
-      chain.messages
-    end
-
     def date_formatted
       created_at.strftime('%H:%M %d.%m')
     end
 
     protected
 
+    private
+
+    def chain!
+      self.chain = Carrier::Chain.create if !chain 
+    end
+
   end
 end

data/app/models/carrier/message/validations.rb

@@ -1,7 +1,7 @@
 module Carrier
   class Message < ActiveRecord::Base
     validates :sender, :presence => true
-    validates :recipients, :presence => true, :recipients => true, :exclude_self => true
+    validates :recipients, :recipients_presence => true, :exclude_self => true, :right_recipients => true
     validates :content, :presence => true
   end
 end

data/app/validators/recipients/exclude_self.rb

@@ -3,7 +3,7 @@ class ExcludeSelfValidator < ActiveModel::EachValidator
     recipients = record.send(attribute)
     
     if recipients.include?(record.sender)
-      record.errors.add attribute, (options[:message] || "cannot write to self!")
+      record.errors.add :recipients, (options[:message] || t('activerecord.errors.models.carrier/message.attributes.recipients.cannot_write_to_self') )
       recipients.delete(record.sender) 
     end
   end

data/app/validators/recipients/recipients_presence_validator.rb

@@ -0,0 +1,8 @@
+class RecipientsPresenceValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    recipients = record.send(attribute)
+   
+    record.errors.add :recipients, (options[:message] || I18n.t('activerecord.errors.models.carrier/message.attributes.recipients.empty')) if recipients.empty?
+
+  end
+end

data/app/validators/recipients/right_recipients_validator.rb

@@ -0,0 +1,10 @@
+class RightRecipientsValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    recipients = record.send(attribute)
+   
+    if recipients.include?(nil)
+      record.errors.add :recipients, (options[:message] || I18n.t('activerecord.errors.models.carrier/message.attributes.recipients.wrong'))
+      recipients.compact!
+    end
+  end
+end

data/app/views/carrier/messages/_chosen.html.erb

@@ -0,0 +1,7 @@
+<%= content_for :stylesheets do %>
+<%= stylesheet_link_tag "carrier/chosen" %>
+<% end %>
+
+<%= content_for :javascripts do %>
+<%= javascript_include_tag "carrier/chosen" %>
+<% end %>

data/app/views/carrier/messages/_form.html.erb

@@ -1,30 +1,36 @@
 <%= form_for([carrier, @message], :html => { :autocomplete => :off }) do |f| %>
-  
-<%= error_messages_for @message %>
 
-<div class="message_ma_new_wrapper">
-  <div class="message_ma_new_wrapper_1">
-  	<div class="field">
-      <%= f.label :recipients_names, t('views.carrier.new_recipients') %><br />
-      <div id="recipients">
-        <%= render :partial => "carrier/messages/#{carrier_ui}/recipients", :locals => {:f => f } %>
+  <%= error_messages_for @message %>
+  
+  <div class="message_ma_new_wrapper">
+    <div class="message_ma_new_wrapper_1">
+      <div class="field">
+        <div>
+          <%= f.label :recipients, t('views.carrier.new_recipients') %>
+        </div>
+        <div id="recipients">
+          <%= render :partial => "carrier/messages/recipients", :locals => {:f => f } %>
+        </div>
+      </div>    
+    </div>
+    <div class="message_ma_new_wrapper_2">
+      <div class="field">
+        <div>
+          <%= f.label :subject, t('views.carrier.new_subject') %>
+        </div>
+        <%= f.text_field :subject %>
       </div>
-    </div>    
+      <div class="field">
+        <div>
+          <%= f.label :content, t('views.carrier.new_content') %>
+        </div>
+        <%= f.text_area :content, :rows => 6 %>
+      </div>
+      <%= f.hidden_field :sender, :value => current_user.id %>
+      <div class="actions">
+        <%= f.submit t('views.carrier.new_send') %>
+      </div>    
+    </div> 
   </div>
-  <div class="message_ma_new_wrapper_2">
-    <div class="field">
-      <%= f.label :subject, t('views.carrier.new_subject') %><br />
-      <%= f.text_field :subject %>
-    </div>
-    <div class="field">
-      <%= f.label :content, t('views.carrier.new_content') %><br />
-      <%= f.text_area :content, :rows => 6 %>
-    </div>
-    <%= f.hidden_field :sender, :value => current_user.id %>
-    <div class="actions">
-      <%= f.submit t('views.carrier.new_send') %>
-    </div>    
-  </div> 
-</div>
 
 <% end %>

data/app/views/carrier/messages/_head.html.erb

@@ -1,8 +1,3 @@
 <%= content_for :stylesheets do %>
-  <%= stylesheet_link_tag "carrier" %>
-  <%= stylesheet_link_tag "carrier_#{carrier_ui}" %>
+  <%= stylesheet_link_tag "carrier/carrier" %>
 <% end %>
-
-<%= content_for :javascripts do %>
-<% end %>
-

data/app/views/carrier/messages/_index_message.html.erb

@@ -1,4 +1,4 @@
-<%= link_to (action_name == 'sent' ? carrier.as_sent_message_path(message) : message), :class => "message_ma_wrapper #{'ma_has_new' if m > 0 }" do %>
+<%= link_to message, :class => "message_ma_wrapper #{'ma_has_new' if m > 0 }" do %>
   <div class="message_ma_date"><%= message.date_formatted %></div>
   <div class="message_ma_users">
     <%= truncate(message.sender_name + " + " + message.recipients_names, :length => 20) %>
@@ -7,7 +7,7 @@
     </span>
   </div>    
   <div class="message_ma_body">
-    <%= raw truncate(%| <span class="message_ma_subj %s">%s</span> &raquo; %s | % [('ma_has_new' if m > 0), message.subject, message.content], :length => 140) %>
+    <%= simple_format truncate(%| <span class="message_ma_subj %s">%s</span> &raquo; %s | % [('ma_has_new' if m > 0), message.subject, message.content], :length => 140) %>
   </div>
 <% end %>
 

data/app/views/carrier/messages/_message_collapsed.html.erb

@@ -6,7 +6,7 @@
       <% if unread_messages.include? message %>
       <b class='red'>unread</b>
       <% end %>
-      <%= raw truncate("%s &raquo; %s" % [message.subject, message.content], :length => 88) %>
+      <%= simple_format truncate("%s &raquo; %s" % [message.subject, message.content], :length => 88) %>
     </div>
   </div>
 <% end %>

data/app/views/carrier/messages/_nav_messages.html.erb

@@ -1,14 +1,14 @@
 <div class="carrier_nav_line">
   <div class="carrier_nav_line_inner">  
 
-    <div class="carrier_new">
-      <%= link_to raw(t 'views.carrier.new_link'), carrier.new_message_path %>
+    <div class="carrier_new<%= ' active' if request.fullpath =~ /#{prefix_for_messages}\/new\Z/ %>">
+      <%= link_to raw(t 'views.carrier.new_link'), carrier.new_message_path, :class => "#{'active' if request.fullpath =~ /#{prefix_for_messages}\/new\Z/ }"%>
     </div>
     <div class="carrier_nav">
       <ul>
-        <li class="<%= 'active' if request.fullpath =~ /messages(\/\d+)?\z/ && !archived?(@message) %>"><%= link_to raw(t 'views.carrier.inbox_link'), carrier.messages_path %></li>
-        <li class="<%= 'active' if request.fullpath =~ /messages\/(\d+\/.*)?sent/ %>"><%= link_to raw(t 'views.carrier.sent_link'), carrier.sent_messages_path %></li>
-        <li class="<%= 'active' if request.fullpath =~ /messages\/archive/ || archived?(@message) %>"><%= link_to raw(t 'views.carrier.archived_link'), carrier.archive_messages_path %></li>
+        <li class="<%= 'active' if request.fullpath =~ /#{prefix_for_messages}(\/\d+)?\z/ && !archived?(@message) %>"><%= link_to raw(t 'views.carrier.inbox_link'), carrier.messages_path %></li>
+        <li class="<%= 'active' if request.fullpath =~ /#{prefix_for_messages}\/(\d+\/.*)?sent/ %>"><%= link_to raw(t 'views.carrier.sent_link'), carrier.sent_messages_path %></li>
+        <li class="<%= 'active' if request.fullpath =~ /#{prefix_for_messages}\/archive/ || archived?(@message) %>"><%= link_to raw(t 'views.carrier.archived_link'), carrier.archive_messages_path %></li>
       </ul>
     </div>
   </div>

data/app/views/carrier/messages/_recipients.html.erb

@@ -0,0 +1 @@
+<%= select("message", "recipients", without_current_user_select, {}, { :multiple => true, :class => 'chosen', :"data-placeholder" => " " }) %>

data/app/views/carrier/messages/_reply.html.erb

@@ -1,19 +1,22 @@
 <%= form_for(@message, :remote => true) do |f| %>
   
-<%= error_messages_for @message %>  
+  <%= error_messages_for @message %>  
 
-<div class="message_ma_new_wrapper replay_message_ma">
-  <h4><span class=""><%= current_user.username %></span> &rArr; <span class="red"><%= @message.recipients_names %></span></h4>
-  <div class="field">
-    <%= f.label "Сообщение:" %><br />
-    <%= f.text_area :content, :rows => 6 %>
-  </div>
-  <%= f.hidden_field :recipients_ids %>
-  <%= f.hidden_field :chain_id %>
-  <%= f.hidden_field :sender %>
-  <%= f.hidden_field :answers_to %>
-  <div class="actions">
-    <%= f.submit 'Отправить' %>
+  <div class="message_ma_new_wrapper replay_message_ma">
+    <h4><span class=""><%= current_user.username %></span> &rArr; <span class="red"><%= @message.recipients_names %></span></h4>
+    <div class="field">
+      <%= f.label "Сообщение:" %><br />
+      <%= f.text_area :content, :rows => 6 %>
+    </div>
+
+    <%= f.hidden_field :recipients_ids %>
+    <%= f.hidden_field :chain_id %>
+    <%= f.hidden_field :sender %>
+    <%= f.hidden_field :answers_to %>
+    <%= f.hidden_field :subject %>
+
+    <div class="actions">
+      <%= f.submit 'Отправить' %>
+    </div>
   </div>
- </div>
 <% end %>

data/app/views/carrier/messages/as_sent.html.erb

@@ -1,3 +1,5 @@
+<div id="carrier">
+<div class="carrier_wr">
 <%= render :partial => 'head' %>
 <%= render :partial => 'nav_messages' %>
 <div class="message_ma_box_info">
@@ -34,3 +36,5 @@
   <%= link_to raw(t 'views.carrier.reply_link'), reply_message_path(@message), :remote => true %>
   <div id="reply_form"></div>   
 </div>
+</div>
+</div>

data/app/views/carrier/messages/create.js.erb

@@ -1 +1 @@
-document.location.href = '<%= as_sent_message_path(@message) %>'
+document.location.href = '<%= message_path @message %>'

data/app/views/carrier/messages/index.html.erb

@@ -1,9 +1,20 @@
+<div id="carrier">
+<div class="carrier_wr">
 <%= render :partial => 'head' %>
 <%= render :partial => 'nav_messages' %>
 <div class="carrier_messagelist"> 
+  <% if @messages.any? %>
   <% @messages.each do |message| %>
     <%= render :partial => 'index_message', :locals => {:message => message, :m => (message & unread_messages).size} %>
   <% end if @messages.size > 0 %>
   <%= paginate @messages, :window => 4 %>
-</div>  
+  <% end %>
 
+  <% unless @messages.any? %>
+    <div class="no_messages">
+      <%= raw(t('views.carrier.no_messages')) %>
+    </div>
+  <% end %>
+</div>  
+</div>
+</div>