carrier 0.1.1 → 0.1.2

data/Gemfile

@@ -6,22 +6,26 @@ gem 'unread'
 gem 'sugar-high'
 gem 'sweetloader'
 
-group :development, :test do
-  gem 'rails', '~>3.1'
+group :development do
   gem 'unicorn'
+  gem 'rake-kit'
+  gem "jeweler",  ">= 1.6.4"
+end
+
+group :development, :test do
+  gem 'rails', '3.2.2'
   gem 'mysql2'
   gem 'devise'
-  gem 'rake-kit'
   gem 'cutter'
-  gem "jeweler",  ">= 1.6.4"
-  gem "rspec-rails", '>= 2.5'
+  # gem 'ruby-debug19', :require => "ruby-debug"
 end
 
 group :test do
-  gem 'capybara'
-  gem 'factory_girl' 
+  gem "rspec-rails", '>= 2.5'
+  gem 'factory_girl_rails' 
   gem 'spork'
   gem "launchy"
   gem 'shoulda'
+  gem 'cucumber-rails'
 end
 

data/Rakefile

@@ -22,7 +22,7 @@ end
 Jeweler::RubygemsDotOrgTasks.new
 
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/carrier/messages_controller.rb

@@ -3,7 +3,13 @@
 module Carrier
   class MessagesController < ApplicationController
     
-    after_filter :only => [:show] { @message.mark_as_read! :for => current_user }
+    before_filter :only => [:show] do
+      @message = Message.find(params[:id], :include => :chain)
+  
+      @message.chain_messages.each do |message|
+        message.mark_as_read! :for => current_user 
+      end
+    end
     
     def reply
       @message = Message.new_answer params[:id], current_user
@@ -24,7 +30,6 @@ module Carrier
     end
 
     def show
-      @message = Message.find(params[:id], :include => :chain)
     end
 
     # TODO: introduce [:id or :username] key to be passed with to= param

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

@@ -1,8 +1,7 @@
-<%= content_tag :div, :class => "message_collapse", :id => "message-#{message.id}" do %>   
+<%= content_tag_for :div, message do %>   
   <div class="message_ma_wrapper ma_open">
     <div class="message_ma_date"><%= raw 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>
 <% end %>

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

@@ -5,7 +5,7 @@
   <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.label :content, t('views.carrier.reply_content') %><br />
       <%= f.text_area :content, :rows => 6 %>
     </div>
 
@@ -16,7 +16,7 @@
     <%= f.hidden_field :subject %>
 
     <div class="actions">
-      <%= f.submit 'Отправить' %>
+      <%= f.submit t('views.carrier.reply_send') %>
     </div>
   </div>
 <% end %>

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

@@ -21,9 +21,6 @@
       <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>

data/carrier.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "carrier"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["stanislaw"]
-  s.date = "2011-12-23"
+  s.date = "2012-04-05"
   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",
-    "TODO"
+    "README.textile"
   ]
   s.files = [
     ".document",
@@ -25,7 +24,6 @@ Gem::Specification.new do |s|
     "MIT-LICENSE",
     "README.textile",
     "Rakefile",
-    "TODO",
     "VERSION",
     "app/assets/images/.gitkeep",
     "app/assets/images/carrier/chosen-sprite.png",
@@ -84,7 +82,6 @@ Gem::Specification.new do |s|
     "lib/carrier/rails/helpers.rb",
     "lib/carrier/version.rb",
     "lib/tasks/carrier_tasks.rake",
-    "script/rails",
     "spec/carrier/app/controllers/application_controller_spec.rb",
     "spec/carrier/app/models/message_scopes_spec.rb",
     "spec/carrier/app/models/message_spec.rb",
@@ -129,6 +126,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config.ru",
     "spec/dummy/config/application.rb",
     "spec/dummy/config/boot.rb",
+    "spec/dummy/config/cucumber.yml",
     "spec/dummy/config/database.yml",
     "spec/dummy/config/database_mysql.yml",
     "spec/dummy/config/database_pgsql.yml",
@@ -154,11 +152,25 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20110814164229_create_chains.rb",
     "spec/dummy/db/schema.rb",
     "spec/dummy/db/seeds.rb",
+    "spec/dummy/factories/message.rb",
+    "spec/dummy/factories/user.rb",
+    "spec/dummy/features/carrier.feature",
+    "spec/dummy/features/step_definitions/debug_steps.rb",
+    "spec/dummy/features/step_definitions/resources_steps.rb",
+    "spec/dummy/features/step_definitions/web_steps.rb",
+    "spec/dummy/features/support/carrier_routes_helper.rb",
+    "spec/dummy/features/support/env.rb",
+    "spec/dummy/features/support/paths.rb",
+    "spec/dummy/features/support/rails_helper.rb",
+    "spec/dummy/features/support/singleton.rb",
+    "spec/dummy/features/support/transaction.rb",
+    "spec/dummy/lib/tasks/cucumber.rake",
     "spec/dummy/log/.gitkeep",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
+    "spec/dummy/script/cucumber",
     "spec/dummy/script/rails",
     "spec/dummy/test/fixtures/posts.yml",
     "spec/dummy/test/fixtures/users.yml",
@@ -169,18 +181,15 @@ Gem::Specification.new do |s|
     "spec/dummy/test/unit/post_test.rb",
     "spec/dummy/test/unit/user_test.rb",
     "spec/dummy_spec_helper.rb",
-    "spec/integration/carrier_spec.rb",
     "spec/requests/main_spec.rb",
     "spec/support/controller_macros.rb",
     "spec/support/factories.rb",
-    "spec/support/rspec_helpers.rb",
-    "test/helper.rb",
-    "test/test_carrier.rb"
+    "spec/support/rspec_helpers.rb"
   ]
   s.homepage = "http://github.com/stanislaw/carrier"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.19"
   s.summary = "Raw github-like messaging system to reuse across Rails apps"
 
   if s.respond_to? :specification_version then
@@ -192,28 +201,26 @@ 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"])
       s.add_development_dependency(%q<unicorn>, [">= 0"])
+      s.add_development_dependency(%q<rake-kit>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<rails>, ["= 3.2.2"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<devise>, [">= 0"])
-      s.add_development_dependency(%q<rake-kit>, [">= 0"])
       s.add_development_dependency(%q<cutter>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.5"])
     else
       s.add_dependency(%q<require_all>, [">= 0"])
       s.add_dependency(%q<kaminari>, [">= 0"])
       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"])
       s.add_dependency(%q<unicorn>, [">= 0"])
+      s.add_dependency(%q<rake-kit>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<rails>, ["= 3.2.2"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 0"])
-      s.add_dependency(%q<rake-kit>, [">= 0"])
       s.add_dependency(%q<cutter>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.5"])
     end
   else
     s.add_dependency(%q<require_all>, [">= 0"])
@@ -221,14 +228,13 @@ 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"])
     s.add_dependency(%q<unicorn>, [">= 0"])
+    s.add_dependency(%q<rake-kit>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<rails>, ["= 3.2.2"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 0"])
-    s.add_dependency(%q<rake-kit>, [">= 0"])
     s.add_dependency(%q<cutter>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.5"])
   end
 end
 

data/config/locales/carrier.en.yml

@@ -45,6 +45,10 @@ en:
       new_subject: "Subject"
       new_content: "Message"
       new_send: "Send"
+      
+      reply_send: "Reply"
+      reply_content: "Message"
+
       no_messages: "No messages yet"
       #last: "Last »"
       #previous: "‹ Prev"

data/config/locales/carrier.ru.yml

@@ -49,6 +49,10 @@ ru:
       new_subject: "Тема"
       new_content: "Сообщение"
       new_send: "Отправить"
+      
+      reply_send: "Ответить"
+      reply_content: "Сообщение"
+     
       no_messages: "Сообщений нет"
       #last: "Last »"
       #previous: "‹ Prev"

data/lib/carrier/rails/engine.rb

@@ -2,7 +2,7 @@ module Carrier
   
   def self.carrier_requires
     validators = Dir[File.join ::Carrier.config.root, "app/validators/**/*.rb"]
-    models = Dir[File.join ::Carrier.config.root, "app/models/**/*.rb"]
+    models = Dir[File.join ::Carrier.config.root, "app/models/carrier/**/*.rb"]
     
     (validators + models).each do |rb_file|
       require_dependency rb_file

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
 module ApplicationHelper
+  include Carrier::ApplicationHelper
 end

data/spec/dummy/app/views/devise/registrations/new.html.erb

@@ -6,6 +6,9 @@
   <p><%= f.label :email %><br />
   <%= f.email_field :email %></p>
 
+  <p><%= f.label :username %><br />
+  <%= f.text_field :username %></p>
+
   <p><%= f.label :password %><br />
   <%= f.password_field :password %></p>
 

data/spec/dummy/app/views/layouts/application.html.erb

@@ -11,6 +11,6 @@
 <%= yield %>
 
 <%= link_to 'Carrier', '/carrier' %>
-<%= link_to 'Sign out', destroy_user_session_path, :method => :delete %>
+<%= link_to 'Sign out', main_app.destroy_user_session_path, :method => :delete %>
 </body>
 </html>

data/spec/dummy/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/spec/dummy/config/database.yml

@@ -3,7 +3,7 @@ development:
   host:     localhost
   database: carrier_development
   username: root 
-  password: root
+  password: 
   encoding: utf8
 
 test: &test
@@ -11,7 +11,7 @@ test: &test
   host:     localhost
   database: carrier_test
   username: root
-  password: root
+  password: 
   encoding: utf8
 
 production:

data/spec/dummy/config/environments/test.rb

@@ -7,6 +7,8 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
+  config.use_transactional_fixtures = true
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"

data/spec/dummy/db/schema.rb

@@ -14,14 +14,14 @@
 ActiveRecord::Schema.define(:version => 20110814164229) do
 
   create_table "chains", :force => true do |t|
-    t.string   "participants",      :default => "--- []\n\n"
-    t.string   "archived_for",      :default => "--- []\n\n"
+    t.string   "participants",      :default => "--- []\n"
+    t.string   "archived_for",      :default => "--- []\n"
     t.integer  "having_chain_id"
     t.string   "having_chain_type"
-    t.string   "chain_type",        :default => "--- :simple\n"
+    t.string   "chain_type",        :default => "--- :simple\n...\n"
     t.integer  "messages_count",    :default => 0
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                          :null => false
+    t.datetime "updated_at",                                          :null => false
   end
 
   add_index "chains", ["archived_for", "participants"], :name => "participants_and_archived_index"
@@ -30,21 +30,21 @@ ActiveRecord::Schema.define(:version => 20110814164229) do
 
   create_table "messages", :force => true do |t|
     t.integer  "sender"
-    t.string   "recipients", :default => "--- []\n\n"
+    t.string   "recipients", :default => "--- []\n"
     t.string   "subject"
     t.text     "content"
     t.boolean  "last",       :default => false
     t.integer  "chain_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                         :null => false
+    t.datetime "updated_at",                         :null => false
   end
 
   add_index "messages", ["chain_id"], :name => "index_messages_on_chain_id"
   add_index "messages", ["created_at"], :name => "index_messages_on_created_at"
 
   create_table "posts", :force => true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "read_marks", :force => true do |t|
@@ -69,8 +69,8 @@ ActiveRecord::Schema.define(:version => 20110814164229) do
     t.string   "last_sign_in_ip"
     t.string   "name"
     t.string   "username"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
   end
 
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true

data/spec/dummy/factories/message.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :message, :class => Carrier::Message do
+    sender_user { |su| singleton(:user) }
+    recipients { |r| [ singleton(:second_user).id ] } 
+
+    content "content of test message"
+    subject "subject of test message"
+  end
+end

data/spec/dummy/factories/user.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :user do
+    email 'stanislaw@gmail.com'
+    username 'stanislaw'
+    password '666666'
+  end
+
+  factory :second_user, :class => User do
+    email 'miloviza@gmail.com'
+    username 'milovila'
+    password '666666'
+  end
+end

data/spec/dummy/features/carrier.feature

@@ -0,0 +1,79 @@
+Feature:
+  In order to have simple github-like messaging functionality on my site
+  As a user
+  I want to send, receive and manage messages easily 
+
+  Scenario: Listing Carrier main page when there are no messages created
+    Given I am logged in as user 
+    When I am on Carrier's main page
+    Then I should see "No messages yet"
+
+  Scenario: Listing Carrier inbox page when there is a message I sent 
+    Given There is user with username "stanislaw"
+    And There is second user with username "miloviza"
+    And There is a message with content "Hello, Miloviza!"
+    And I am logged in as user 
+    When I am on Carrier's 'inbox' page
+    Then I should see "No messages yet"
+
+  Scenario: Listing Carrier 'sent' page when there is a message I sent 
+    Given There is user with username "stanislaw"
+    And There is second user with username "miloviza"
+    And There is a message with content "Hello, Miloviza!"
+    And I am logged in as user 
+    When I am on Carrier's 'sent' page
+    Then I should see "Hello, Miloviza!"
+
+
+  Scenario: Creating a message
+    Given There is user with username "stanislaw"
+    And There is second user with username "miloviza"
+    And I am logged in as user 
+    And I go to new message path
+    And I select "miloviza" from "Recipients"
+    And I fill in "Subject" with "Subject for test message"
+    And I fill in "Message" with "Content for test message"
+    And I press "Send"
+    Then I should see "Message successfully created"
+    Then I should see "Subject for test message"
+    Then I should see "Content for test message"
+
+  @javascript
+  Scenario: Archiving a message
+    Given There is user with username "stanislaw"
+    And I am logged in as user
+
+    And There is second user with username "miloviza" 
+    And There is a message with content "Hello, Miloviza!"
+    And I go to this message page
+    When I click "Archive!"
+    Then I should see "Thread archived"
+
+  @javascript
+  Scenario: Un-archiving a message
+    Given There is user with username "stanislaw"
+    And I am logged in as user
+
+    And There is second user with username "miloviza" 
+    And There is a message with content "Hello, Miloviza!"
+    And I go to this message page
+    And I click "Archive!"
+    Then I should see "Unarchive?"
+
+    When I click "Unarchive?"
+    Then I should see "Archive!"
+    
+  @javascript
+  Scenario: Answering a message
+    Given There is user with username "stanislaw"
+    And I am logged in as user
+
+    And There is second user with username "miloviza" 
+    And There is a message with content "Hello, Miloviza!"
+    And I go to this message page
+
+    And I click "Reply into thread"
+    And I fill in "Message" with "This is the answer to the message"
+    And I press "Reply"
+    Then I should see "This is the answer to the message"
+    Then I should not see "Reply" within "#reply_form"