mailboxer 0.6.0 → 0.6.1

data/lib/mailboxer/models/messageable.rb

@@ -47,9 +47,9 @@ module Mailboxer
 
         #Sends a messages, starting a new conversation, with the messageable
         #as originator
-        def send_message(recipients, msg_body, subject,sanitize_text=true)
+        def send_message(recipients, msg_body, subject, sanitize_text=true, attachment=nil)
           convo = Conversation.new({:subject => subject})
-          message = Message.new({:sender => self, :conversation => convo,  :body => msg_body, :subject => subject})
+          message = Message.new({:sender => self, :conversation => convo,  :body => msg_body, :subject => subject, :attachment => attachment})
           message.recipients = recipients.is_a?(Array) ? recipients : [recipients]
           message.recipients = message.recipients.uniq
           return message.deliver false,sanitize_text
@@ -57,33 +57,33 @@ module Mailboxer
 
         #Basic reply method. USE NOT RECOMENDED.
         #Use reply_to_sender, reply_to_all and reply_to_conversation instead.
-        def reply(conversation, recipients, reply_body, subject = nil,sanitize_text=true)
+        def reply(conversation, recipients, reply_body, subject=nil, sanitize_text=true, attachment=nil)
           subject = subject || "RE: #{conversation.subject}"
-          response = Message.new({:sender => self, :conversation => conversation, :body => reply_body, :subject => subject})
+          response = Message.new({:sender => self, :conversation => conversation, :body => reply_body, :subject => subject, :attachment => attachment})
           response.recipients = recipients.is_a?(Array) ? recipients : [recipients]
           response.recipients = response.recipients.uniq
           response.recipients.delete(self)
-          return response.deliver true,sanitize_text
+          return response.deliver true, sanitize_text
         end
 
         #Replies to the sender of the message in the conversation
-        def reply_to_sender(receipt, reply_body, subject = nil,sanitize_text=true)
-          return reply(receipt.conversation, receipt.message.sender, reply_body, subject,sanitize_text)
+        def reply_to_sender(receipt, reply_body, subject=nil, sanitize_text=true, attachment=nil)
+          return reply(receipt.conversation, receipt.message.sender, reply_body, subject, sanitize_text, attachment)
         end
 
         #Replies to all the recipients of the message in the conversation
-        def reply_to_all(receipt, reply_body, subject = nil,sanitize_text=true)
-          return reply(receipt.conversation, receipt.message.recipients, reply_body, subject,sanitize_text)
+        def reply_to_all(receipt, reply_body, subject=nil, sanitize_text=true, attachment=nil)
+          return reply(receipt.conversation, receipt.message.recipients, reply_body, subject, sanitize_text, attachment)
         end
 
         #Replies to all the recipients of the last message in the conversation and untrash any trashed message by messageable
         #if should_untrash is set to true (this is so by default)
-        def reply_to_conversation(conversation, reply_body, subject = nil, should_untrash = true,sanitize_text=true)
+        def reply_to_conversation(conversation, reply_body, subject=nil, should_untrash=true, sanitize_text=true, attachment=nil)
           #move conversation to inbox if it is currently in the trash and should_untrash parameter is true.
           if should_untrash && mailbox.is_trashed?(conversation)
             mailbox.receipts_for(conversation).untrash
           end
-          return reply(conversation, conversation.last_message.recipients, reply_body, subject,sanitize_text)
+          return reply(conversation, conversation.last_message.recipients, reply_body, subject, sanitize_text, attachment)
         end
 
         #Mark the object as read for messageable.
@@ -177,7 +177,16 @@ module Mailboxer
           return nil
           end
         end
+
+        def search_messages(query)
+          @search = Receipt.search do
+            fulltext query
+            with :receiver_id, self.id
+          end
+
+          @search.results.map { |r| r.conversation }.uniq
+        end
       end
     end
   end
-end
+end

data/mailboxer.gemspec

@@ -1,38 +1,43 @@
 Gem::Specification.new do |s|
-	s.name = "mailboxer"
-	s.version = "0.6.0"
-	s.authors = ["Eduardo Casanova Cuesta"]
-	s.summary = "Messaging system for rails apps."
-	s.description = "A Rails engine that allows any model to act as messageable, allowing it to exchange messages " +
-	                 "with any other messageable model, even different ones. It supports the use of conversations with " +
-	                 "two or more recipients to organize the messages. You have a complete use of a mailbox object for " + 
-	                 "each messageable model that manages an inbox, sentbox and trash for conversations. It also supports " + 
-	                 "sending notifications to messageable models, intended to be used as system notifications."
-	s.email = "ecasanovac@gmail.com"
-	s.homepage = "https://github.com/ging/mailboxer"
-	s.files = `git ls-files`.split("\n")
+  s.name = "mailboxer"
+  s.version = "0.6.1"
+  s.authors = ["Eduardo Casanova Cuesta"]
+  s.summary = "Messaging system for rails apps."
+  s.description = "A Rails engine that allows any model to act as messageable, allowing it to exchange messages " +
+                   "with any other messageable model, even different ones. It supports the use of conversations with " +
+                   "two or more recipients to organize the messages. You have a complete use of a mailbox object for " + 
+                   "each messageable model that manages an inbox, sentbox and trash for conversations. It also supports " + 
+                   "sending notifications to messageable models, intended to be used as system notifications."
+  s.email = "ecasanovac@gmail.com"
+  s.homepage = "https://github.com/ging/mailboxer"
+  s.files = `git ls-files`.split("\n")
 
-	# Gem dependencies
-	#
-	# SQL foreign keys
-	s.add_runtime_dependency('foreigner', '>= 0.9.1')
+  # Gem dependencies
+  #
+  # SQL foreign keys
+  s.add_runtime_dependency('foreigner', '>= 0.9.1')
 
-	# Development Gem dependencies
-	#
-  s.add_runtime_dependency('rails', '>= 3.1.0')
-	# Testing database
-	s.add_development_dependency('sqlite3-ruby')
-	# Debugging
-	if RUBY_VERSION < '1.9'
-		s.add_development_dependency('ruby-debug', '>= 0.10.3')
-	end
-	# Specs
-	s.add_development_dependency('rspec-rails', '>= 2.6.1')
-	# Fixtures
-	s.add_development_dependency('factory_girl', '>= 1.3.2')
-	# Population
-	s.add_development_dependency('forgery', '>= 0.3.6')
-	# Integration testing
-	s.add_development_dependency('capybara', '>= 0.3.9')
+  # Development Gem dependencies
+  #
+  s.add_runtime_dependency('rails', '> 3.0.0')
+  s.add_runtime_dependency('carrierwave', '>= 0.5.8')
+  s.add_runtime_dependency('sunspot_rails', '>= 1.3.0')
+  # Debugging
+  if RUBY_VERSION < '1.9'
+    s.add_development_dependency('ruby-debug', '>= 0.10.3')
+  end
+  # Specs
+  s.add_development_dependency('rspec-rails', '>= 2.6.1')
+  # Fixtures
+  s.add_development_dependency('factory_girl', '>= 1.3.2')
+  # Population
+  s.add_development_dependency('forgery', '>= 0.3.6')
+  # Integration testing
+  s.add_development_dependency('capybara', '>= 0.3.9')
+  # Searching
+  s.add_development_dependency('sunspot_solr', '>= 1.3.0')
+  # Testing database
+  s.add_development_dependency('sqlite3-ruby') unless RUBY_PLATFORM == 'java'
+  s.add_development_dependency('jdbc-sqlite3') if RUBY_PLATFORM == 'java'
+  s.add_development_dependency('activerecord-jdbcsqlite3-adapter') if RUBY_PLATFORM == 'java'
 end
-

data/spec/dummy/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/spec/dummy/Gemfile

@@ -1,6 +1,32 @@
 source 'http://rubygems.org'
 
-gem 'mailboxer', :path => '../../../mailboxer'
+gem 'rails', '~> 3.0.0'
+gem 'mailboxer', :path => '../../'
 
-gem 'mysql', '2.8.1'
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
 
+gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", :platform => :jruby
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+# group :development, :test do
+#   gem 'webrat'
+# end

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

@@ -0,0 +1,4 @@
+class HomeController < ApplicationController
+  def index
+  end
+end

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

@@ -4,3 +4,4 @@ class Cylon < ActiveRecord::Base
     return nil
   end
 end
+

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

@@ -3,4 +3,4 @@ class User < ActiveRecord::Base
   def mailboxer_email(object)
     return email
   end
-end
+end

data/spec/dummy/app/views/home/index.html.haml

@@ -0,0 +1,7 @@
+%p Welcome to Mailboxer!
+%nav
+  - if user_signed_in?
+    = link_to "Sign out", destroy_user_session_path
+  - else
+    = link_to "Sign in", new_user_session_path
+    = link_to "Sign up", new_user_registration_path

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

@@ -0,0 +1,11 @@
+!!!
+%html
+  %head
+    %title Mailboxer Dummy App
+    = stylesheet_link_tag "application"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+  %body
+    %p#notice= notice
+    %p#alert= alert
+    = yield

data/spec/dummy/config/application.rb

@@ -1,12 +1,8 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 
-Bundler.require
+Bundler.require(:default, Rails.env) if defined?(Bundler)
 require "mailboxer"
 
 module Dummy
@@ -43,3 +39,4 @@ module Dummy
     config.filter_parameters += [:password]
   end
 end
+

data/spec/dummy/config/database.yml

@@ -1,5 +1,8 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3
@@ -11,9 +14,8 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  database: ":memory:"
+  timeout: 500
 
 production:
   adapter: sqlite3

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

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/environment.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development

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

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/environment.rb
 
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests

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

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/environment.rb
 
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that

data/spec/dummy/config/initializers/mailboxer.rb

@@ -7,6 +7,11 @@ Mailboxer.setup do |config|
   config.default_from = "no-reply@mailboxer.com"
   
   #Configures the methods needed by mailboxer
-  #config.email_method = :mailboxer_email
-  #config.name_method = :name
+  config.email_method = :mailboxer_email
+  config.name_method = :name
+
+  #Configures if you use or not a search engine and wich one are you using
+  #Supported enignes: [:solr,:sphinx] 
+  config.search_enabled = false
+  config.search_engine = :solr
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'd8c8c5941e7498f0125435caa175cbb17244f1f40ddd4ff804d297714f6f5d4f3501504a9fda81ff91f57e38927848d29f824fd28334231593c610291dd76796'
+Dummy::Application.config.secret_token = '7fae989fc55949807eede0078ff2a5462e64c74e01e6c72a2900cb5d26f68cac114c8a854dda93e1b7675bf5a0d93ba105bf245176fa28a318c1cb5778a8ec0f'

data/spec/dummy/config/initializers/session_store.rb

@@ -4,5 +4,5 @@ Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
+# (create the session table with "rake db:sessions:create")
 # Dummy::Application.config.session_store :active_record_store

data/spec/dummy/config/locales/en.yml

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
   hello: "Hello world"

data/spec/dummy/config/routes.rb

@@ -1,6 +1,4 @@
 Dummy::Application.routes.draw do
-  resources :users
-
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -50,7 +48,7 @@ Dummy::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root :to => "users#index"
+  root :to => 'home#index'
 
   # See how all your routes lay out with "rake routes"
 

data/spec/dummy/config/sunspot.yml

@@ -0,0 +1,17 @@
+production:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: WARNING
+
+development:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: INFO
+
+test:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: WARNING

data/spec/dummy/db/migrate/20120123185903_add_attachments.rb

@@ -0,0 +1,13 @@
+class AddAttachments < ActiveRecord::Migration
+  def self.up
+    change_table :notifications do |t|
+      t.string :attachment, :default => nil
+    end
+  end
+
+  def self.down
+    change_table :notifications do |t|
+      t.remove :attachment
+    end
+  end
+end

data/spec/dummy/public/index.html

@@ -0,0 +1,239 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Ruby on Rails: Welcome aboard</title>
+    <style type="text/css" media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+
+
+      #page {
+        background-color: #f0f0f0;
+        width: 750px;
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        border-top: none;
+        padding: 25px;
+        width: 500px;
+      }
+
+      #sidebar {
+        float: right;
+        width: 175px;
+      }
+
+      #footer {
+        clear: both;
+      }
+
+
+      #header, #about, #getting-started {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+
+
+      #header {
+        background-image: url("images/rails.png");
+        background-repeat: no-repeat;
+        background-position: top left;
+        height: 64px;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+
+
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+
+
+      #getting-started {
+        border-top: 1px solid #ccc;
+        margin-top: 25px;
+        padding-top: 15px;
+      }
+      #getting-started h1 {
+        margin: 0;
+        font-size: 20px;
+      }
+      #getting-started h2 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+        margin-bottom: 25px;
+      }
+      #getting-started ol {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #getting-started li {
+        font-size: 18px;
+        color: #888;
+        margin-bottom: 25px;
+      }
+      #getting-started li h2 {
+        margin: 0;
+        font-weight: normal;
+        font-size: 18px;
+        color: #333;
+      }
+      #getting-started li p {
+        color: #555;
+        font-size: 13px;
+      }
+
+
+      #sidebar ul {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #sidebar ul h3 {
+        margin-top: 25px;
+        font-size: 16px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ccc;
+      }
+      #sidebar li {
+        list-style-type: none;
+      }
+      #sidebar ul.links li {
+        margin-bottom: 5px;
+      }
+
+    </style>
+    <script type="text/javascript">
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","rails/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="sidebar">
+        <ul id="sidebar-items">
+          <li>
+            <h3>Browse the documentation</h3>
+            <ul class="links">
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
+              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
+              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
+      <div id="content">
+        <div id="header">
+          <h1>Welcome aboard</h1>
+          <h2>You&rsquo;re riding Ruby on Rails!</h2>
+        </div>
+
+        <div id="about">
+          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+
+        <div id="getting-started">
+          <h1>Getting started</h1>
+          <h2>Here&rsquo;s how to get rolling:</h2>
+
+          <ol>
+            <li>
+              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
+              <p>To see all available options, run it without parameters.</p>
+            </li>
+
+            <li>
+              <h2>Set up a default route and remove or rename this file</h2>
+              <p>Routes are set up in config/routes.rb.</p>
+            </li>
+
+            <li>
+              <h2>Create your database</h2>
+              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
+            </li>
+          </ol>
+        </div>
+      </div>
+
+      <div id="footer">&nbsp;</div>
+    </div>
+  </body>
+</html>