RubyGems - carrier - Versions diffs - 0.0.6 → 0.1.0 - Mend

carrier 0.0.6 → 0.1.0

Files changed (156) hide show

data/app/views/carrier/messages/new.html.erb CHANGED

@@ -1,7 +1,13 @@
 <%= render :partial => 'head' %>
+<%= render :partial => 'chosen' %>
+<div id="carrier">
+<div class="carrier_wr">
 <%= render :partial => 'nav_messages' %>
 <h2><%= t('views.carrier.new_header')%></h2>
 <div class="ma_wrapper">
   <%= render 'form' %>
 </div>
+</div>
+</div>

data/app/views/carrier/messages/reply.js.erb CHANGED

@@ -1,6 +1,6 @@
 $('#reply_form').html('<%= escape_javascript(render :partial => 'reply.html.erb') %>');
-$(window).scrollTop($('#message_content').offset().top);
+// stanislaw: TODO $(window).scrollTop($('#reply_form').offset(u).bottom);
 $('#message_content').focus();

data/app/views/carrier/messages/show.html.erb CHANGED

@@ -1,35 +1,37 @@
-<%= render :partial => 'head' %>
-<%= render :partial => 'nav_messages' %>
-<div class="message_ma_box_info">
-  <div class="message_ma_archive_chain" id="archive_chain">
-    <%= render :partial => 'archive_chain', :locals => {:chain => @message.chain} %>
-  </div>
-  <h2><%= @message.subject_without_re %></h2>
-  <%= raw(t('views.carrier.participants')) %>
-  <%= b raw(t('views.carrier.me')) %>,
-  <%= b @message.recipients_names %>
-</div>
+<div id="carrier">
+  <div class="carrier_wr">
+    <%= render :partial => 'head' %>
+    <%= render :partial => 'nav_messages' %>
+    <div class="message_ma_box_info">
+      <div class="message_ma_archive_chain" id="archive_chain">
+        <%= render :partial => 'archive_chain', :locals => {:chain => @message.chain} %>
+      </div>
+      <h2><%= @message.subject_without_re %></h2>
+      <%= raw(t('views.carrier.participants')) %>
+      <%= b raw(t('views.carrier.me')) %>,
+      <%= b @message.recipients_names %>
+    </div>
-<% @message.answers.each do |message| %>
-  <%= render :partial => 'message_collapsed', :locals => {:message => message} %>
-<% end %>
+    <%= render :partial => 'message', :collection => @message.answers %>
-<div class="message_ma_wrapper ma_open">
-  <div class="message_ma_date">
-    <%= @message.date_formatted %>
-  </div>
-  <div class="message_ma_user">
-    <%= @message.sender_name %>
-  </div>
-  <div class="message_ma_subj">
-    <b><%= @message.subject %></b>
-  </div>
-  <div>
-    <%= @message.content %>
-  </div>
-</div>
+    <div class="message_ma_wrapper ma_open">
+      <div class="message_ma_date">
+        <%= @message.date_formatted %>
+      </div>
+      <div class="message_ma_user">
+        <%= @message.sender_name %>
+      </div>
+      <div class="message_ma_subj">
+        <b><%= @message.subject %></b>
+      </div>
+      <div>
+        <%= simple_format @message.content %>
+      </div>
+    </div>
-<div class="ma_wrapper">
-  <%= link_to raw(t 'views.carrier.reply_link'), reply_message_path(@message), :remote => true %>
-  <div id="reply_form"></div>
-</div>
+    <div class="ma_wrapper">
+      <%= link_to raw(t 'views.carrier.reply_link'), reply_message_path(@message), :remote => true %>
+      <div id="reply_form"></div>
+    </div>
+  </div> <!-- // div.carrier_wr -->
+</div> <!-- // div#carrier -->

data/app/views/layouts/carrier/application.html.erb CHANGED

@@ -3,13 +3,13 @@
 <head>
   <title>Carrier</title>
   <%= yield :stylesheets %>
-  <script src="/assets/jquery.min.js" type="text/javascript"></script>
-  <script src="/assets/rails.js" type="text/javascript"></script>
+  <%= javascript_include_tag 'jquery.min', 'rails' %>
   <%= yield :javascripts %>
   <%= csrf_meta_tags %>
 </head>
 <body>
   <div class="carrier_wrapper">
+    <%= content_tag :div, notice, :id => "flash_notice" %>
     <%= yield %>
   </div>
 </body>

data/app/views/partials/_error_messages_for.html.erb CHANGED

@@ -1,6 +1,6 @@
 <div class="errorExplanation" id="errorExplanation">
-  <h2>Заполните поля верно</h2>
-  <p>Проверьте правильность заполнения следующих полей:</p>
+  <h2><%= t('views.carrier.form_is_not_valid') %></h2>
+  <p><%= t('views.carrier.check_following_fields') %></p>
   <ul>
   <% resource.errors.full_messages.each do |msg| %>
     <li><%= msg %></li>

data/carrier.gemspec CHANGED

@@ -5,16 +5,17 @@
 Gem::Specification.new do |s|
   s.name = "carrier"
-  s.version = "0.0.6"
+  s.version = "0.1.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["stanislaw"]
-  s.date = "2011-11-15"
+  s.date = "2011-12-23"
   s.description = "Raw github-like messaging system to reuse across Rails apps. Acts as Rails 3.1 mountable engine. Fast and robust."
   s.email = "s.pankevich@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.textile"
+    "README.textile",
+    "TODO"
   ]
   s.files = [
     ".document",
@@ -24,131 +25,39 @@ Gem::Specification.new do |s|
     "MIT-LICENSE",
     "README.textile",
     "Rakefile",
+    "TODO",
     "VERSION",
     "app/assets/images/.gitkeep",
-    "app/assets/javascripts/autocomplete.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery-ui-i18n.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-af.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ar-DZ.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ar.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-az.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-bg.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-bs.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ca.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-cs.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-da.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-de.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-el.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-en-AU.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-en-GB.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-en-NZ.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-eo.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-es.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-et.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-eu.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-fa.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-fi.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-fo.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-fr-CH.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-fr.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-gl.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-he.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-hr.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-hu.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-hy.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-id.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-is.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-it.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ja.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ko.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-kz.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-lt.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-lv.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ml.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ms.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-nl.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-no.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-pl.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-pt-BR.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-pt.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-rm.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ro.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ru.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sk.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sl.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sq.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sr-SR.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sr.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-sv.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-ta.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-th.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-tj.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-tr.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-uk.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-vi.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-zh-CN.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-zh-HK.js",
-    "app/assets/javascripts/autocomplete/i18n/jquery.ui.datepicker-zh-TW.js",
-    "app/assets/javascripts/autocomplete/jquery.ui.autocomplete.min.js",
-    "app/assets/javascripts/autocomplete/jquery.ui.core.min.js",
-    "app/assets/javascripts/autocomplete/jquery.ui.position.min.js",
-    "app/assets/javascripts/autocomplete/jquery.ui.widget.min.js",
-    "app/assets/javascripts/carrier.js",
+    "app/assets/images/carrier/chosen-sprite.png",
+    "app/assets/javascripts/carrier/chosen.jquery.min.js",
+    "app/assets/javascripts/carrier/chosen.js",
     "app/assets/javascripts/jquery.min.js",
     "app/assets/javascripts/rails.js",
-    "app/assets/javascripts/rich-multiselect/jquery-ui.min.js",
-    "app/assets/javascripts/rich-multiselect/locale/ui-multiselect-de.js",
-    "app/assets/javascripts/rich-multiselect/locale/ui-multiselect-en.js",
-    "app/assets/javascripts/rich-multiselect/locale/ui-multiselect-es.js",
-    "app/assets/javascripts/rich-multiselect/locale/ui-multiselect-fr.js",
-    "app/assets/javascripts/rich-multiselect/locale/ui-multiselect-it.js",
-    "app/assets/javascripts/rich-multiselect/plugins/localisation/jquery.localisation-min.js",
-    "app/assets/javascripts/rich-multiselect/plugins/localisation/jquery.localisation-pack.js",
-    "app/assets/javascripts/rich-multiselect/plugins/localisation/jquery.localisation.js",
-    "app/assets/javascripts/rich-multiselect/plugins/scrollTo/README.txt",
-    "app/assets/javascripts/rich-multiselect/plugins/scrollTo/changes.txt",
-    "app/assets/javascripts/rich-multiselect/plugins/scrollTo/jquery.scrollTo-min.js",
-    "app/assets/javascripts/rich-multiselect/plugins/scrollTo/jquery.scrollTo.js",
-    "app/assets/javascripts/rich-multiselect/ui.multiselect.js",
-    "app/assets/stylesheets/carrier.css",
-    "app/assets/stylesheets/carrier_rich.css",
-    "app/assets/stylesheets/carrier_simple.css",
-    "app/assets/stylesheets/rich-multiselect/ui.multiselect.css",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_0_aaaaaa_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_55_fbf9ee_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_65_ffffff_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_75_cccccc_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_75_dadada_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_75_e6e6e6_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_75_ffffff_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-bg_flat_95_fef1ec_40x100.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-icons_2e83ff_256x240.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-icons_454545_256x240.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-icons_888888_256x240.png",
-    "app/assets/stylesheets/ui-lightness/images/ui-icons_cd0a0a_256x240.png",
-    "app/assets/stylesheets/ui-lightness/jquery-ui-1.8.14.custom.css",
+    "app/assets/stylesheets/carrier/carrier.css",
+    "app/assets/stylesheets/carrier/chosen.css",
     "app/controllers/carrier/application_controller.rb",
     "app/controllers/carrier/chains_controller.rb",
     "app/controllers/carrier/messages_controller.rb",
     "app/helpers/carrier/application_helper.rb",
-    "app/helpers/carrier/post_helper.rb",
     "app/models/carrier/chain.rb",
     "app/models/carrier/message.rb",
     "app/models/carrier/message/scopes.rb",
     "app/models/carrier/message/subject.rb",
     "app/models/carrier/message/validations.rb",
     "app/validators/recipients/exclude_self.rb",
-    "app/validators/recipients/recipients_validator.rb",
+    "app/validators/recipients/recipients_presence_validator.rb",
+    "app/validators/recipients/right_recipients_validator.rb",
     "app/views/carrier/chains/archive.js.erb",
     "app/views/carrier/chains/unarchive.js.erb",
     "app/views/carrier/messages/_archive_chain.html.erb",
+    "app/views/carrier/messages/_chosen.html.erb",
     "app/views/carrier/messages/_form.html.erb",
     "app/views/carrier/messages/_head.html.erb",
     "app/views/carrier/messages/_index_message.html.erb",
+    "app/views/carrier/messages/_message.html.erb",
     "app/views/carrier/messages/_message_collapsed.html.erb",
-    "app/views/carrier/messages/_message_expanded.html.erb",
     "app/views/carrier/messages/_nav_messages.html.erb",
+    "app/views/carrier/messages/_recipients.html.erb",
     "app/views/carrier/messages/_reply.html.erb",
     "app/views/carrier/messages/as_sent.html.erb",
     "app/views/carrier/messages/collapsed.js.erb",
@@ -158,12 +67,7 @@ Gem::Specification.new do |s|
     "app/views/carrier/messages/new.html.erb",
     "app/views/carrier/messages/new.js.erb",
     "app/views/carrier/messages/reply.js.erb",
-    "app/views/carrier/messages/rich/_multiselect.html.erb",
-    "app/views/carrier/messages/rich/_recipients.html.erb",
     "app/views/carrier/messages/show.html.erb",
-    "app/views/carrier/messages/simple/_autocomplete.html.erb",
-    "app/views/carrier/messages/simple/_autocomplete_includes.html.erb",
-    "app/views/carrier/messages/simple/_recipients.html.erb",
     "app/views/layouts/carrier/application.html.erb",
     "app/views/partials/_error_messages_for.html.erb",
     "carrier.gemspec",
@@ -176,10 +80,12 @@ Gem::Specification.new do |s|
     "lib/carrier.rb",
     "lib/carrier/configuration.rb",
     "lib/carrier/configuration/models.rb",
-    "lib/carrier/configuration/ui.rb",
+    "lib/carrier/configuration/routes.rb",
+    "lib/carrier/configuration/user.rb",
     "lib/carrier/rails.rb",
     "lib/carrier/rails/engine.rb",
     "lib/carrier/rails/helpers.rb",
+    "lib/carrier/version.rb",
     "lib/tasks/carrier_tasks.rake",
     "script/rails",
     "spec/carrier/app/controllers/application_controller_spec.rb",
@@ -289,7 +195,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<unread>, [">= 0"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0"])
       s.add_runtime_dependency(%q<sweetloader>, [">= 0"])
-      s.add_development_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.1"])
       s.add_development_dependency(%q<unicorn>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<devise>, [">= 0"])
@@ -303,7 +209,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<unread>, [">= 0"])
       s.add_dependency(%q<sugar-high>, [">= 0"])
       s.add_dependency(%q<sweetloader>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<rails>, ["~> 3.1"])
       s.add_dependency(%q<unicorn>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 0"])
@@ -318,7 +224,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<unread>, [">= 0"])
     s.add_dependency(%q<sugar-high>, [">= 0"])
     s.add_dependency(%q<sweetloader>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<rails>, ["~> 3.1"])
     s.add_dependency(%q<unicorn>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 0"])

data/config/locales/carrier.en.yml CHANGED

@@ -3,7 +3,7 @@ en:
     attributes:
       carrier/message:
         recipients: "'Recipients' field"
-        content: "'Content' field"
+        content: "'Message' field"
     errors:
       models:
         carrier/message:
@@ -11,15 +11,19 @@ en:
             recipients:
               wrong:
                 "is wrong!"
-          #blank:
-            #""
+              empty:
+                "can't be blank"
+              cannot_write_to_self:
+                "cannot write to self!"
   models:
     carrier:
       no_subject: "(No subject)"
   views:
     carrier:
+      # What are the better variants of these messages?
+      form_is_not_valid: "The form is not valid"
+      check_following_fields: "Please fill the following fields right:"
       title: "Simple Messages"
       description: "Description goes here..."
       new_link: "New"
@@ -41,8 +45,10 @@ en:
       new_subject: "Subject"
       new_content: "Message"
       new_send: "Send"
+      no_messages: "No messages yet"
       #last: "Last &raquo;"
       #previous: "&lsaquo; Prev"
       #next: "Next &rsaquo;"
       #truncate: "..."
+      successfully_created: "Message successfully created"

data/config/locales/carrier.ru.yml CHANGED

@@ -9,8 +9,13 @@ ru:
         carrier/message:
           attributes:
             recipients:
+              empty:
+                "не может быть пустым"
               wrong:
                 "заполнено неверно"
+              cannot_write_to_self:
+                "вы не можете написать письмо себе!"
           blank:
             "не может быть пустым"
   models:
@@ -19,9 +24,13 @@ ru:
   views:
     carrier:
+      # Как бы сказать это более по-русски ;)
+      form_is_not_valid: "Форма заполнено неверно!"
+      check_following_fields: "Проверь правильность заполнения следующих полей:"
       title: "Личные сообщения"
       description: "Описание плагина..."
-      new_link: "Новое"
+      new_link: "Написать письмо"
       inbox_link: "Входящие"
       inbox_back_link: "Назад к входящие"
       reply_link: "Ответить в ветку"
@@ -40,9 +49,11 @@ ru:
       new_subject: "Тема"
       new_content: "Сообщение"
       new_send: "Отправить"
+      no_messages: "Сообщений нет"
       #last: "Last &raquo;"
       #previous: "&lsaquo; Prev"
       #next: "Next &rsaquo;"
       #truncate: "..."
       #
+      successfully_created: "Сообщение успешно создано"

data/config/routes.rb CHANGED

@@ -1,8 +1,12 @@
+# Prefix for messages. Defaults to '/messages' resulting in
+# /messages, /messages/1, /messages/sent, /messages/archived
+prefix_for_messages = Carrier.config.routes.prefix_for_messages
 Carrier::Engine.routes.draw do
-  resources :messages do
+  resources :messages, :path => prefix_for_messages do
     member do
-      get :as_sent
       get :reply
       get :expanded
       get :collapsed

data/lib/carrier.rb CHANGED

@@ -3,7 +3,6 @@ require "carrier/rails/engine" if defined?(Rails)
 require 'sweetloader'
 require 'sugar-high/array'
-require 'sugar-high/class_ext'
 require 'sugar-high/rails/concerns'
 require 'sugar-high/dsl'

data/lib/carrier/configuration.rb CHANGED

@@ -2,11 +2,13 @@ require 'singleton'
 module Carrier
   class Configuration
-    autoload_modules :Models, :UI
+    autoload_modules :Models, :User, :Routes
+    attr_writer :routes_prefix
     include Singleton
-    [:models].each do |component|
+    [:models, :routes, :user].each do |component|
       define_method component do
         conf_class(component).instance
       end
@@ -16,10 +18,6 @@ module Carrier
       "#{conf}::#{component.to_s.camelize}".constantize
     end
-    def ui
-      conf::UI.instance
-    end
     def conf
       Carrier::Configuration
     end
@@ -29,7 +27,7 @@ module Carrier
     end
     def check_unread!
-      raise "Add 'acts_as_reader' into your User model" unless ReadMark.reader_class
+      puts "Add 'acts_as_reader' into your User model" unless ReadMark.reader_class
     end
   end
 end