carrier 0.1.2 → 0.1.3

data/Gemfile

@@ -13,7 +13,7 @@ group :development do
 end
 
 group :development, :test do
-  gem 'rails', '3.2.2'
+  gem 'rails', '>= 3.1'
   gem 'mysql2'
   gem 'devise'
   gem 'cutter'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/carrier/messages_controller.rb

@@ -3,11 +3,16 @@
 module Carrier
   class MessagesController < ApplicationController
     
-    before_filter :only => [:show] do
+    before_filter :only => [:show, :as_sent] do
       @message = Message.find(params[:id], :include => :chain)
   
-      @message.chain_messages.each do |message|
-        message.mark_as_read! :for => current_user 
+      @message.mark_chain_as_read_for current_user
+    end
+   
+    [:collapsed, :expanded].each do |mode|
+      define_method(mode) do 
+        @message = Message.find(params[:id])
+        # @message.mark_as_read! :for => current_user if mode == :expanded
       end
     end
     
@@ -42,7 +47,7 @@ module Carrier
       @message = Message.new(params[:message])
       respond_to do |format|
         if @message.save
-          format.html { redirect_to(@message, :notice => t('views.carrier.successfully_created')) }
+          format.html { redirect_to(carrier.messages_path, :notice => t('views.carrier.successfully_created')) }
           format.js
         else
           format.js { render :action => "new" }

data/app/models/carrier/message.rb

@@ -37,7 +37,7 @@ module Carrier
         in_answer_to = find id
         new :sender     => user.id,
             :recipients => find_recipients(in_answer_to, user),
-            :subject    => re(in_answer_to.subject),
+            :subject    => in_answer_to.subject,
             :chain_id   => in_answer_to.chain_id,
             :answers_to => in_answer_to.id
       end
@@ -47,6 +47,12 @@ module Carrier
       end
     end
 
+    def mark_chain_as_read_for user
+      chain_messages.each do |message|
+        message.mark_as_read! :for => user
+      end
+    end
+
     def chain_archived?
       chain && archived_for_any_user?
     end
@@ -89,7 +95,7 @@ module Carrier
     end
 
     def recipients_names
-      recipients.collect{|id| User.find(id, :select => "username").username}.join(', ') #
+      User.where(:id => recipients).pluck(:username).join(', ')
     end
 
     def recipients_names= recipients_array
@@ -103,15 +109,13 @@ module Carrier
     end
 
     def participants
-      ([] | recipients << sender).compact
+      (recipients + [sender]).compact
     end
     
     def date_formatted
       created_at.strftime('%H:%M %d.%m')
     end
 
-    protected
-
     private
 
     def chain!

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

@@ -1,6 +1,7 @@
 module Carrier
   class Message < ActiveRecord::Base
-    
+
+=begin
     class << self
       def re name
         if name.match(/re/).nil?
@@ -19,6 +20,7 @@ module Carrier
     def subject_without_re
       subject.gsub(/re\[\d+\]: /,'')
     end
+=end
 
   end
 end

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

@@ -1,6 +1,6 @@
 <% if chain.archived_for?(current_user) %>
 <%= b raw(t 'views.carrier.thread_archived') %>  
-<%= link_to raw(t 'views.carrier.unarchive_link'), unarchive_chain_path(:chain_id => chain, :user_id => current_user), :remote => true, :method => :post %>
+<%= link_to raw(t 'views.carrier.unarchive_link'), carrier.unarchive_chain_path(:chain_id => chain, :user_id => current_user), :remote => true, :method => :post %>
 <% else %>
-<%= link_to raw(t 'views.carrier.archive_link'), archive_chain_path(:chain_id => chain, :user_id => current_user), :remote => true, :method => :post %>
+<%= link_to raw(t 'views.carrier.archive_link'), carrier.archive_chain_path(:chain_id => chain, :user_id => current_user), :remote => true, :method => :post %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= link_to message, :class => "message_ma_wrapper #{'ma_has_new' if m > 0 }" do %>
+<%= link_to (action_name == 'sent' ? carrier.as_sent_message_path(message) : carrier.message_path(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) %>

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

@@ -0,0 +1,13 @@
+<%= link_to carrier.expanded_message_path(message), :remote => true, :class => "message_collapse", :id => "message-#{message.id}" do %>   
+  <div class="message_ma_wrapper">
+    <div class="message_ma_date"><%= raw message.date_formatted %></div>
+    <div class="message_ma_user"><%= message.sender_name %></div>
+    <div>
+      <% if unread_messages.include? message %>
+      <b class='red'>unread</b>
+      <% end %>
+
+      <%= simple_format truncate(message.content, :length => 88) %>
+    </div>
+  </div>
+<% end %>

data/app/views/carrier/messages/{_message.html.erb → _message_expanded.html.erb}

@@ -1,4 +1,4 @@
-<%= content_tag_for :div, message do %>   
+<%= link_to carrier.collapsed_message_path(message), :remote => true, :class => "message_collapse", :id => "message-#{message.id}" 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>

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

@@ -1,4 +1,4 @@
-<%= form_for(@message, :remote => true) do |f| %>
+<%= form_for(@message, :url => carrier.messages_path, :remote => true) do |f| %>
   
   <%= error_messages_for @message %>  
 

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

@@ -1,40 +1,47 @@
 <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>
+  <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 %></h2>
 
-<% @message.answers.each do |message| %>
-  <%= render :partial => 'message_expanded', :locals => {:message => message } if message.sender == current_user.id %>
-  <%= render :partial => 'message_collapsed', :locals => {:message => message } if message.sender != current_user.id %>
-<% end %>
+      <%= raw(t('views.carrier.participants')) %>
+      <%= b raw(t('views.carrier.me')) %>,
+      <%= b @message.recipients_names %>
+    </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>
-    <b><%= @message.subject %></b>
-  </div>
-  <div>
-    <%= @message.content %>
-  </div>
-</div>
+    <% @message.answers.each do |message| %>
+    <% if message.sender == current_user.id %>
+    <%= render :partial => 'message_expanded', :locals => {:message => message } %>
+    <% else %>
+    <%= render :partial => 'message_collapsed', :locals => {:message => message } %>
+    <% end %>
+    <% end %>
 
-<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 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>
+        <b><%= @message.subject %></b>
+      </div>
+      
+      <div>
+        <%= @message.content %>
+      </div>
+    </div>
+
+    <div class="ma_wrapper">
+      <%= link_to raw(t 'views.carrier.reply_link'), carrier.reply_message_path(@message), :remote => true %>
+      <div id="reply_form"></div>   
+    </div>
+  </div>
 </div>

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

@@ -0,0 +1 @@
+$('#message-<%= @message.id %>').replaceWith('<%= escape_javascript(render :partial => 'message_collapsed.html.erb', :locals => {:message => @message}) %>')

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

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

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

@@ -0,0 +1 @@
+$('#message-<%= @message.id %>').replaceWith('<%= escape_javascript(render :partial => 'message_expanded.html.erb', :locals => {:message => @message }) %>')

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

@@ -6,13 +6,15 @@
       <div class="message_ma_archive_chain" id="archive_chain">
         <%= render :partial => 'archive_chain', :locals => {:chain => @message.chain} %>
       </div>  
-      <h2><%= @message.subject_without_re %></h2>
+      <h2><%= @message.subject %></h2>
       <%= raw(t('views.carrier.participants')) %>
       <%= b raw(t('views.carrier.me')) %>,
       <%= b @message.recipients_names %>
     </div>
 
-    <%= render :partial => 'message', :collection => @message.answers %>
+    <% @message.answers.each do |message| %>
+    <%= render :partial => 'message_collapsed', :locals => { :message => message } %>
+    <% end %>
 
     <div class="message_ma_wrapper ma_open">
       <div class="message_ma_date">
@@ -27,7 +29,7 @@
     </div>
 
     <div class="ma_wrapper">    
-      <%= link_to raw(t 'views.carrier.reply_link'), reply_message_path(@message), :remote => true %>    
+      <%= link_to raw(t 'views.carrier.reply_link'), carrier.reply_message_path(@message), :remote => true %>    
       <div id="reply_form"></div>   
     </div>
   </div> <!-- // div.carrier_wr -->

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

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
   <title>Carrier</title>
   <%= yield :stylesheets %>
   <%= javascript_include_tag 'jquery.min', 'rails' %>

data/carrier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "carrier"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["stanislaw"]
-  s.date = "2012-04-05"
+  s.date = "2012-05-24"
   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 = [
@@ -52,12 +52,15 @@ Gem::Specification.new do |s|
     "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",
     "app/views/carrier/messages/create.js.erb",
+    "app/views/carrier/messages/expanded.js.erb",
     "app/views/carrier/messages/index.html.erb",
     "app/views/carrier/messages/new.html.erb",
     "app/views/carrier/messages/new.js.erb",
@@ -97,13 +100,11 @@ Gem::Specification.new do |s|
     "spec/dummy/app/assets/stylesheets/scaffold.css",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/controllers/default_controller.rb",
-    "spec/dummy/app/controllers/posts_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
     "spec/dummy/app/helpers/default_helper.rb",
     "spec/dummy/app/helpers/posts_helper.rb",
     "spec/dummy/app/mailers/.gitkeep",
     "spec/dummy/app/models/.gitkeep",
-    "spec/dummy/app/models/post.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/views/default/index.html.erb",
     "spec/dummy/app/views/devise/confirmations/new.html.erb",
@@ -183,8 +184,7 @@ Gem::Specification.new do |s|
     "spec/dummy_spec_helper.rb",
     "spec/requests/main_spec.rb",
     "spec/support/controller_macros.rb",
-    "spec/support/factories.rb",
-    "spec/support/rspec_helpers.rb"
+    "spec/support/singleton.rb"
   ]
   s.homepage = "http://github.com/stanislaw/carrier"
   s.licenses = ["MIT"]
@@ -204,7 +204,7 @@ Gem::Specification.new do |s|
       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<rails>, [">= 3.1"])
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<devise>, [">= 0"])
       s.add_development_dependency(%q<cutter>, [">= 0"])
@@ -217,7 +217,7 @@ Gem::Specification.new do |s|
       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<rails>, [">= 3.1"])
       s.add_dependency(%q<mysql2>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 0"])
       s.add_dependency(%q<cutter>, [">= 0"])
@@ -231,7 +231,7 @@ Gem::Specification.new do |s|
     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<rails>, [">= 3.1"])
     s.add_dependency(%q<mysql2>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 0"])
     s.add_dependency(%q<cutter>, [">= 0"])

data/config/routes.rb

@@ -7,6 +7,7 @@ Carrier::Engine.routes.draw do
 
   resources :messages, :path => prefix_for_messages do
     member do
+      get :as_sent
       get :reply
       get :expanded
       get :collapsed

data/lib/carrier.rb

@@ -1,4 +1,6 @@
-require "carrier/rails/engine" if defined?(Rails)
+require 'rails'
+
+require "carrier/rails/engine"
 
 require 'sweetloader'
 

data/lib/carrier/rails/engine.rb

@@ -32,7 +32,7 @@ module Carrier
 end
 
 module Carrier
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
     engine_name :carrier
     isolate_namespace Carrier
 
@@ -46,13 +46,8 @@ module Carrier
       end
     end
     
-    initializer "carrier" do
-      #Carrier.models_requires
-    end
-
     config.to_prepare do
       Carrier.carrier_requires
-      Carrier.check_unread!
       # Carrier.models_requires
      
       Carrier.include_helpers

data/lib/carrier/version.rb

@@ -1,3 +1,3 @@
 module Carrier
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/carrier/app/models/message_scopes_spec.rb

@@ -2,21 +2,25 @@ Message = Carrier::Message
 Chain = Carrier::Chain
 
 describe Carrier::Message do
-  concern "Scopes" do
+  context "Scopes" do
 
     let(:user) do
-      @user ||= create(:user)
+      singleton(:user)
     end
     
     specify {
       Message.count.should == 0
       Chain.count.should == 0
       Message.for_or_by(user).size.should == 0
-      create(:first_message, :sender_user => user)
+      
+      create(:message, :sender_user => user)
+      
       Message.for(user).size.should == 0
       Message.by(user).size.should == 1
       Message.for_or_by(user).size.should == 1
+
       create(:second_message)
+      
       Message.for(user).size.should == 1
       Message.by(user).size.should == 1
       Message.for_or_by(user).size.should == 2

data/spec/carrier/app/models/message_spec.rb

@@ -20,19 +20,11 @@ describe Carrier::Message do
     subject.recipients.should == []
   end
 
-  concern "Validations" do
-    it "should not save messages with empty .content field" do
-      lambda {
-        subject.content = ''
-        subject.save!
-      }.should raise_error(ActiveRecord::RecordInvalid)
-    end
-    it "should not save messages with wrong recipients" do
-      lambda {
-        subject.sender = 1
-        subject.content = 'something'
-        subject.save!
-      }.should raise_error(ActiveRecord::RecordInvalid)
+  context "#recipients_names" do
+    it "should return recipients names joined by ', '" do
+      message = singleton :message
+      message.recipients_names.should == "miloviza, marixa"
     end
   end
+
 end

data/spec/dummy/app/controllers/default_controller.rb

@@ -1,5 +1,4 @@
 class DefaultController < ApplicationController
   def index
   end
-
 end

data/spec/dummy/config/routes.rb

@@ -7,8 +7,6 @@ Rails.application.routes.draw do
     get 'sign_in', :to => 'devise/sessions#new'
   end
 
-  resources :posts
-
   mount Carrier::Engine => "/carrier" 
 
   root :to => "default#index"

data/spec/dummy/factories/message.rb

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

data/spec/dummy/factories/user.rb

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

data/spec/dummy/features/carrier.feature

@@ -35,8 +35,8 @@ Feature:
     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"
+    # Then I should see "Subject for test message"
+    # Then I should see "Content for test message"
 
   @javascript
   Scenario: Archiving a message

data/spec/dummy_spec_helper.rb

@@ -10,6 +10,7 @@ require 'cutter'
 require 'shoulda'
 require 'factory_girl_rails'
 
+require_all File.expand_path('../dummy/factories', __FILE__)
 require_all File.expand_path('../support', __FILE__)
 
 # ActiveRecord::Base.logger = Logger.new(STDERR)
@@ -32,7 +33,8 @@ RSpec.configure do |config|
   config.after(:each, :type => :request) {Warden.test_reset!}
 
   config.mock_with :rspec
-  
+ 
+  include SingletonHelper
   config.include FactoryGirl::Syntax::Methods
 
   config.use_transactional_fixtures = true

data/spec/support/singleton.rb

@@ -0,0 +1,17 @@
+module SingletonHelper
+  def singleton name, *options
+    @@singletons ||= {}
+    
+    begin 
+      @@singletons[name].reload
+    
+    rescue NoMethodError, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotFound => e
+      # puts "singleton error (#{e.class}): " << e.message
+      @@singletons[name] ||= create name, *options
+    end
+  end
+
+  def reset_singletons!
+    @@singletons = {}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrier
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -247,12 +247,15 @@ files:
 - 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
 - app/views/carrier/messages/create.js.erb
+- app/views/carrier/messages/expanded.js.erb
 - app/views/carrier/messages/index.html.erb
 - app/views/carrier/messages/new.html.erb
 - app/views/carrier/messages/new.js.erb
@@ -292,13 +295,11 @@ files:
 - spec/dummy/app/assets/stylesheets/scaffold.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/default_controller.rb
-- spec/dummy/app/controllers/posts_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/helpers/default_helper.rb
 - spec/dummy/app/helpers/posts_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
-- spec/dummy/app/models/post.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/default/index.html.erb
 - spec/dummy/app/views/devise/confirmations/new.html.erb
@@ -378,8 +379,7 @@ files:
 - spec/dummy_spec_helper.rb
 - spec/requests/main_spec.rb
 - spec/support/controller_macros.rb
-- spec/support/factories.rb
-- spec/support/rspec_helpers.rb
+- spec/support/singleton.rb
 homepage: http://github.com/stanislaw/carrier
 licenses:
 - MIT
@@ -395,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 645920563
+      hash: -583455053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/dummy/app/controllers/posts_controller.rb

@@ -1,83 +0,0 @@
-class PostsController < ApplicationController
-  # GET /posts
-  # GET /posts.json
-  def index
-    @posts = Post.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @posts }
-    end
-  end
-
-  # GET /posts/1
-  # GET /posts/1.json
-  def show
-    @post = Post.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @post }
-    end
-  end
-
-  # GET /posts/new
-  # GET /posts/new.json
-  def new
-    @post = Post.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @post }
-    end
-  end
-
-  # GET /posts/1/edit
-  def edit
-    @post = Post.find(params[:id])
-  end
-
-  # POST /posts
-  # POST /posts.json
-  def create
-    @post = Post.new(params[:post])
-
-    respond_to do |format|
-      if @post.save
-        format.html { redirect_to @post, notice: 'Post was successfully created.' }
-        format.json { render json: @post, status: :created, location: @post }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /posts/1
-  # PUT /posts/1.json
-  def update
-    @post = Post.find(params[:id])
-
-    respond_to do |format|
-      if @post.update_attributes(params[:post])
-        format.html { redirect_to @post, notice: 'Post was successfully updated.' }
-        format.json { head :ok }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /posts/1
-  # DELETE /posts/1.json
-  def destroy
-    @post = Post.find(params[:id])
-    @post.destroy
-
-    respond_to do |format|
-      format.html { redirect_to posts_url }
-      format.json { head :ok }
-    end
-  end
-end

data/spec/dummy/app/models/post.rb

@@ -1,2 +0,0 @@
-class Post < ActiveRecord::Base
-end

data/spec/support/factories.rb

@@ -1,47 +0,0 @@
-FactoryGirl.define do
-  factory :first_message, :class => Carrier::Message do
-    id 1
-    association :sender_user, :factory => :user
-    recipients [2, 3]
-    content "Hello!"
-    subject "FirstMessage"
-    association :chain, :factory => :chain
-  end
-
-  factory :second_message, :class => Carrier::Message do
-    id 2
-    association :sender_user, :factory => :user_second
-    recipients [3, 1]
-    content "Hello you too!"
-    subject "SecondMessage"
-    association :chain, :factory => :chain
-  end
-
-  factory :user do
-    id 1
-    username "stanisla"
-    email "stanisla@gmail.com"
-    password "666666"
-    password_confirmation "666666"
-  end
-
-  factory :user_second, :class => User do
-    id 2
-    username "marixa"
-    email "marixa@gmail.com"
-    password "666666"
-    password_confirmation "666666"
-  end
-
-  factory :user_third, :class => User do
-    id 3
-    username "miloviza"
-    email "miloviza@gmail.com"
-    password "666666"
-    password_confirmation "666666"
-  end 
-
-  factory :chain, :class => Carrier::Chain do
-  end
-end
-

data/spec/support/rspec_helpers.rb

@@ -1,22 +0,0 @@
-
-module RSpec
-  module Core
-    class ExampleGroup
-
-      class << self
-        alias_method :concern, :describe if instance_methods.include?(:describe)
-
-        def register_concern
-          alias_method :concern, :describe if instance_methods.include?(:describe)
-        end
-
-        def singleton_method_added name
-          class << self
-            undef_method :register_concern
-          end if name == :describe
-        end
-
-      end
-    end
-  end
-end