mailboxer 0.6.2 → 0.6.3

data/README.md

@@ -184,7 +184,7 @@ end
 
 ### How can I paginate conversations?
 
-You can use Kaminari to paginate the conversations as normal. Please, make sure you use the last version as mailboxer uses @select('DISTINCT conversations.*')@ which was not respected before Kaminari 0.12.4 according to its changelog. Working corretly on Kaminari 0.13.0.
+You can use Kaminari to paginate the conversations as normal. Please, make sure you use the last version as mailboxer uses `select('DISTINCT conversations.*')` which was not respected before Kaminari 0.12.4 according to its changelog. Working corretly on Kaminari 0.13.0.
 
 ````ruby
   #Paginating all conversations using :page parameter and 9 per page
@@ -220,7 +220,11 @@ This is done this way because receipts save the information about the relation b
 You can take a look at the full documentation of Mailboxer in [rubydoc.info](http://rubydoc.info/gems/mailboxer/frames).
 
 ## I need a GUI!
-Check out the [rails-messaging](https://github.com/frodefi/rails-messaging) project.
+
+If you need a GUI you should take a look a this links:
+
+* The [rails-messaging](https://github.com/frodefi/rails-messaging) project.
+* The wiki page [GUI Example on a real application](https://github.com/ging/mailboxer/wiki/GUI-Example-on-a-real-application).
 
 ## Contributors
 * [Roendal](https://github.com/ging/mailboxer/commits/master?author=Roendal) (Eduardo Casanova)

data/db/migrate/20111204163911_add_attachments.rb

@@ -0,0 +1,5 @@
+class AddAttachments < ActiveRecord::Migration
+  def change
+    add_column :notifications, :attachment, :string
+  end
+end

data/lib/generators/mailboxer/install_generator.rb

@@ -17,13 +17,16 @@ class Mailboxer::InstallGenerator < Rails::Generators::Base #:nodoc:
   end
 
   def copy_migrations
-    migrations = ["create_mailboxer.rb","add_notified_object.rb","add_notification_code.rb","add_attachments.rb"]
+    migrations = [["20110511145103_create_mailboxer.rb","create_mailboxer.rb"],
+                  ["20110719110700_add_notified_object.rb","add_notified_object.rb"],
+                  ["20110912163911_add_notification_code.rb","add_notification_code.rb"],
+                  ["20111204163911_add_attachments.rb","add_attachments.rb"]]
     migrations.each do |migration|
-      begin
-        migration_template migration, "db/migrate/" + migration
-      rescue
-        puts "Another migration is already named '" + migration + "'. Moving to next one."
-      end
+    #  begin
+        migration_template "../../../../db/migrate/" + migration[0], "db/migrate/" + migration[1]
+     # rescue
+     #   puts "Another migration is already named '" + migration + "'. Moving to next one."
+     # end
     end
   end
 end

data/lib/mailboxer/engine.rb

@@ -1,7 +1,11 @@
 # Database foreign keys
 require 'foreigner'
 require 'carrierwave'
-require 'sunspot_rails'
+begin 
+  require 'sunspot_rails'
+rescue LoadError
+  puts 'Not loading sunspot_rails. Gem not present.'
+end
 
 module Mailboxer
   class Engine < Rails::Engine

data/mailboxer.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
   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 " +
+  s.description = "A Rails engine that allows any model to act as messageable, adding the ability 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 " + 
@@ -27,14 +27,11 @@ Gem::Specification.new do |s|
   # Specs
   s.add_development_dependency('rspec-rails', '>= 2.6.1')
   # Fixtures
-  s.add_development_dependency('factory_girl', '>= 1.3.2')
+  s.add_development_dependency('factory_girl', '>= 2.6.0')
   # 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_rails', '>= 1.3.0')
-  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'

data/spec/dummy/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '~> 3.0.0'
 gem 'mailboxer', :path => '../../'
+gem 'factory_girl'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

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

@@ -14,4 +14,4 @@ Mailboxer.setup do |config|
   #Supported enignes: [:solr,:sphinx] 
   config.search_enabled = false
   config.search_engine = :solr
-end
+end

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

@@ -0,0 +1,5 @@
+class AddAttachments < ActiveRecord::Migration
+  def change
+    add_column :notifications, :attachment, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,74 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20120305103203) do
+
+  create_table "conversations", :force => true do |t|
+    t.string   "subject",    :default => ""
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
+  create_table "cylons", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "ducks", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "notifications", :force => true do |t|
+    t.string   "type"
+    t.text     "body"
+    t.string   "subject",              :default => ""
+    t.integer  "sender_id"
+    t.string   "sender_type"
+    t.integer  "conversation_id"
+    t.boolean  "draft",                :default => false
+    t.datetime "updated_at",                              :null => false
+    t.datetime "created_at",                              :null => false
+    t.integer  "notified_object_id"
+    t.string   "notified_object_type"
+    t.string   "notification_code"
+    t.string   "attachment"
+  end
+
+  add_index "notifications", ["conversation_id"], :name => "index_notifications_on_conversation_id"
+
+  create_table "receipts", :force => true do |t|
+    t.integer  "receiver_id"
+    t.string   "receiver_type"
+    t.integer  "notification_id",                                  :null => false
+    t.boolean  "read",                          :default => false
+    t.boolean  "trashed",                       :default => false
+    t.boolean  "deleted",                       :default => false
+    t.string   "mailbox_type",    :limit => 25
+    t.datetime "created_at",                                       :null => false
+    t.datetime "updated_at",                                       :null => false
+  end
+
+  add_index "receipts", ["notification_id"], :name => "index_receipts_on_notification_id"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+end

data/spec/factories/cylon.rb

@@ -1,4 +1,10 @@
-Factory.define :cylon do |c|
-  c.sequence(:name) { |n| "Cylon #{ n }" }
-  c.sequence(:email) { |n| "cylon#{ n }@cylon.com" }
+FactoryGirl.define do
+  factory :cylon do
+    sequence :name do |n|
+      "Cylon #{ n }"
+    end
+    sequence :email do |n|
+      "cylon#{ n }@cylon.com"
+    end
+  end
 end

data/spec/factories/duck.rb

@@ -1,4 +1,10 @@
-Factory.define :duck do |d|
-  d.sequence(:name) { |n| "Duck #{ n }" }
-  d.sequence(:email) { |n| "duck#{ n }@duck.com" }
-end
+FactoryGirl.define do
+  factory :duck do
+    sequence :name do |n|
+      "Duck #{ n }"
+    end
+    sequence :email do |n|
+      "duck#{ n }@duck.com"
+    end
+  end
+end

data/spec/factories/user.rb

@@ -1,4 +1,10 @@
-Factory.define :user do |u|
-  u.sequence(:name) { |n| "User #{ n }" }
-  u.sequence(:email) { |n| "user#{ n }@user.com" }
+FactoryGirl.define do
+  factory :user do
+    sequence :name do |n|
+      "User #{ n }"
+    end
+    sequence :email do |n|
+      "user#{ n }@user.com"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: foreigner
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
-        - 1
-        - 3
         - 2
-        version: 1.3.2
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -145,42 +145,10 @@ dependencies:
         version: 0.3.9
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sunspot_rails
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sunspot_solr
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,8 +158,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
-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.
+  version_requirements: *id009
+description: A Rails engine that allows any model to act as messageable, adding the ability 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.
 email: ecasanovac@gmail.com
 executables: []
 
@@ -208,7 +176,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - app/mailers/message_mailer.rb
 - app/mailers/notification_mailer.rb
 - app/models/conversation.rb
@@ -224,11 +191,11 @@ files:
 - app/views/notification_mailer/new_notification_email.html.erb
 - app/views/notification_mailer/new_notification_email.text.erb
 - config/locales/en.yml
+- db/migrate/20110511145103_create_mailboxer.rb
+- db/migrate/20110719110700_add_notified_object.rb
+- db/migrate/20110912163911_add_notification_code.rb
+- db/migrate/20111204163911_add_attachments.rb
 - lib/generators/mailboxer/install_generator.rb
-- lib/generators/mailboxer/templates/add_attachments.rb
-- lib/generators/mailboxer/templates/add_notification_code.rb
-- lib/generators/mailboxer/templates/add_notified_object.rb
-- lib/generators/mailboxer/templates/create_mailboxer.rb
 - lib/generators/mailboxer/templates/initializer.rb
 - lib/generators/mailboxer/views_generator.rb
 - lib/mailboxer.rb
@@ -268,10 +235,11 @@ files:
 - spec/dummy/db/migrate/20110228120600_create_users.rb
 - spec/dummy/db/migrate/20110306002940_create_ducks.rb
 - spec/dummy/db/migrate/20110306015107_create_cylons.rb
-- spec/dummy/db/migrate/20120123185900_create_mailboxer.rb
-- spec/dummy/db/migrate/20120123185901_add_notified_object.rb
-- spec/dummy/db/migrate/20120123185902_add_notification_code.rb
-- spec/dummy/db/migrate/20120123185903_add_attachments.rb
+- spec/dummy/db/migrate/20120305103200_create_mailboxer.rb
+- spec/dummy/db/migrate/20120305103201_add_notified_object.rb
+- spec/dummy/db/migrate/20120305103202_add_notification_code.rb
+- spec/dummy/db/migrate/20120305103203_add_attachments.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/VERSION

@@ -1 +0,0 @@
-0.2.1

data/lib/generators/mailboxer/templates/add_attachments.rb

@@ -1,13 +0,0 @@
-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/db/migrate/20120123185903_add_attachments.rb

@@ -1,13 +0,0 @@
-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