facteur 1.2.1 → 1.3.0

data/lib/facteur/mailbox.rb

@@ -0,0 +1,16 @@
+module Facteur
+  if Object.const_defined? :ActiveRecord
+    class Mailbox < ActiveRecord::Base
+      include Facteur::MailboxModel
+    end
+    
+  elsif Object.const_defined? :Mongoid
+    class Mailbox
+      include Mongoid::Document
+      include Facteur::MailboxModel
+    end
+    
+  else
+    raise "Facteur only supports ActiveRecord and Mongoid"
+  end
+end

data/lib/facteur/mailbox_model.rb

@@ -1,11 +1,14 @@
 module Facteur
   module MailboxModel
-    def self.included(receiver)
-      receiver.class_exec do
-        belongs_to :addressee, :polymorphic => true
-        has_many :messages
-        validates_presence_of :name
-        validates_uniqueness_of :name, :scope => [:addressee_id, :addressee_type]
+    extend ActiveSupport::Concern
+
+    included do
+      if self.ancestors.map(&:to_s).include?("ActiveRecord::Base")
+        include Facteur::ActiveRecordMailboxModel
+      elsif self.ancestors.map(&:to_s).include?("Mongoid::Document")
+        include Facteur::MongoidMailboxModel
+      else
+        raise "Facteur only supports ActiveRecord and Mongoid"
       end
     end
   end

data/lib/facteur/message.rb

@@ -0,0 +1,16 @@
+module Facteur
+  if Object.const_defined? :ActiveRecord
+    class Message < ActiveRecord::Base
+      include Facteur::MessageModel
+    end
+    
+  elsif Object.const_defined? :Mongoid
+    class Message
+      include Mongoid::Document
+      include Facteur::MessageModel
+    end
+    
+  else
+    raise "Facteur only supports ActiveRecord and Mongoid"
+  end
+end

data/lib/facteur/message_model.rb

@@ -1,16 +1,16 @@
-module Facteur
-  module MessageModel
-    def self.included(receiver)
-      receiver.class_exec do
-        validates_presence_of :author_id, :mailbox_id, :body
-
-        belongs_to :mailbox
-        belongs_to :author, :class_name => "User", :foreign_key => "author_id"
-
-        delegate :addressee, :to => :mailbox
-        delegate :addressee_type, :to => :mailbox
-      end
-    end
-  end
-end
-
+module Facteur
+  module MessageModel
+    extend ActiveSupport::Concern
+
+    included do
+      if self.ancestors.map(&:to_s).include?("ActiveRecord::Base")
+        include Facteur::ActiveRecordMessageModel
+      elsif self.ancestors.map(&:to_s).include?("Mongoid::Document")
+        include Facteur::MongoidMessageModel
+      else
+        raise "Facteur only supports ActiveRecord and Mongoid"
+      end
+    end
+  end
+end
+

data/lib/facteur/mongoid_addressee_model.rb

@@ -0,0 +1,12 @@
+require 'mongoid'
+
+module Facteur
+  module MongoidAddresseeModel
+    include Facteur::BaseAddresseeModel
+    extend ActiveSupport::Concern
+
+    included do
+      embeds_many :mailboxes, :class_name => "Facteur::Mailbox"
+    end
+  end
+end

data/lib/facteur/mongoid_mailbox_model.rb

@@ -0,0 +1,18 @@
+require 'mongoid'
+
+module Facteur
+  module MongoidMailboxModel
+    extend ActiveSupport::Concern
+
+    included do
+      field :name
+      field :default, :default => false
+      
+      embedded_in :addressee, :class_name => Facteur.addressee_model, :inverse_of => :mailboxes
+      embeds_many :messages, :class_name => "Facteur::Message"
+      
+      validates_uniqueness_of :name
+      validates_presence_of :name
+    end
+  end
+end

data/lib/facteur/mongoid_message_model.rb

@@ -0,0 +1,19 @@
+require 'mongoid'
+
+module Facteur
+  module MongoidMessageModel
+    extend ActiveSupport::Concern
+
+    included do
+      field :body
+      field :subject
+      
+      embedded_in :mailbox, :class_name => "Facteur::Mailbox"
+      referenced_in :author, :class_name => Facteur.addressee_model
+      references_and_referenced_in_many :addressees, :class_name => Facteur.addressee_model
+      
+      validates_presence_of :body, :author_id
+    end
+  end
+end
+

data/lib/facteur/version.rb

@@ -0,0 +1,3 @@
+module Facteur
+  VERSION = "1.3.0"
+end

data/lib/generators/facteur/install/install_generator.rb

@@ -1,28 +1,25 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module Facteur
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      def self.source_root
-        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-      end
-
-      def self.next_migration_number
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      end
-
-      desc "Generate the facteur's message and mailbox models"
-      def create_facteur_files
-        template 'message.rb', 'app/models/message.rb'
-        template 'create_messages.rb', "db/migrate/#{self.class.next_migration_number}_create_messages.rb"
-        
-        sleep(1)
-        template 'mailbox.rb', 'app/models/mailbox.rb'
-        template 'create_mailboxes.rb', "db/migrate/#{self.class.next_migration_number}_create_mailboxes.rb"
-      end
-    end
-  end
-end
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Facteur
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def self.next_migration_number
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+
+      desc "Generate the facteur's message and mailbox models"
+      def create_facteur_files
+        template 'create_messages.rb', "db/migrate/#{self.class.next_migration_number}_create_messages.rb"
+        sleep(1)
+        template 'create_mailboxes.rb', "db/migrate/#{self.class.next_migration_number}_create_mailboxes.rb"
+      end
+    end
+  end
+end

data/lib/generators/facteur/install/templates/create_mailboxes.rb

@@ -1,15 +1,15 @@
-class CreateMailboxes < ActiveRecord::Migration
-  def self.up
-    create_table :mailboxes do |t|
-      t.string :name
-      t.text :contents
-      t.integer :addressee_id
-      t.string :addressee_type
-      t.boolean :default, :default => false
-    end
-  end
-
-  def self.down
-    drop_table :mailboxes
-  end
+class CreateMailboxes < ActiveRecord::Migration
+  def self.up
+    create_table :mailboxes do |t|
+      t.string :name
+      t.text :contents
+      t.integer :addressee_id
+      t.string :addressee_type
+      t.boolean :default, :default => false
+    end
+  end
+
+  def self.down
+    drop_table :mailboxes
+  end
 end

data/lib/generators/facteur/install/templates/create_messages.rb

@@ -1,20 +1,20 @@
-class CreateMessages < ActiveRecord::Migration
-  def self.up
-    create_table :messages do |t|
-      t.string    :subject
-      t.text      :body
-      t.integer   :mailbox_id
-      t.integer   :author_id
-      t.boolean   :deleted_by_author, :default => false
-      t.datetime  :deleted_by_author_at
-      t.boolean   :deleted_by_addressee, :default => false
-      t.datetime  :deleted_by_addressee_at
-      t.boolean   :read, :default => false
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :messages
-  end
+class CreateMessages < ActiveRecord::Migration
+  def self.up
+    create_table :messages do |t|
+      t.string    :subject
+      t.text      :body
+      t.integer   :mailbox_id
+      t.integer   :author_id
+      t.boolean   :deleted_by_author, :default => false
+      t.datetime  :deleted_by_author_at
+      t.boolean   :deleted_by_addressee, :default => false
+      t.datetime  :deleted_by_addressee_at
+      t.boolean   :read, :default => false
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :messages
+  end
 end

data/spec/activerecord/activerecord_spec_helper.rb

@@ -0,0 +1,11 @@
+require 'active_record'
+require 'spec_helper'
+
+Dir[File.expand_path('../../support/activerecord/*.rb', __FILE__)].each{|f| require f }
+
+RSpec.configure do |c|
+  c.before(:suite) do
+    CreateSchema.suppress_messages{ CreateSchema.migrate(:up) }
+  end
+end
+

data/spec/activerecord/facteur_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/activerecord_spec_helper')
+
+describe Facteur::AddresseeModel do
+  context "When users are created after activating facteur" do
+    before(:all) do
+      # create a user model with facteur activated
+      Object.send(:remove_const, :Member) if Object.const_defined?(:Member)
+      Member = Class.new(ActiveRecord::Base)
+      Member.class_exec do
+        validates_uniqueness_of :name
+        include Facteur::AddresseeModel
+        mailbox :private_mailbox, :default => true
+        mailbox :public_mailbox
+      end
+      
+      # create the users
+      Member.delete_all
+      create_users
+    end
+  
+    it_should_behave_like "an addressee model"
+  end
+  
+  context "When users are created before activating facteur" do
+    before(:all) do
+      # create a user model without amistad activated
+      Object.send(:remove_const, :Member) if Object.const_defined?(:Member)
+      Member = Class.new(ActiveRecord::Base)
+      Member.class_exec do
+        validates_uniqueness_of :name
+      end
+      
+      # create the users
+      Member.delete_all
+      create_users
+      
+      # activate facteur
+      Member.class_exec do
+        include Facteur::AddresseeModel
+        mailbox :private_mailbox, :default => true
+        mailbox :public_mailbox
+      end
+    end
+  
+    it_should_behave_like "an addressee model"
+  end
+end

data/spec/mongoid/facteur_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/mongoid_spec_helper')
+
+describe Facteur::AddresseeModel do
+  context "When users are created after activating facteur" do
+    before(:all) do
+      # create a user model with facteur activated
+      Object.send(:remove_const, :Member) if Object.const_defined?(:Member)
+      Member = Class.new
+      Member.class_exec do
+        include Mongoid::Document
+        include Facteur::AddresseeModel
+        field :name, :require => true
+        mailbox :private_mailbox, :default => true
+        mailbox :public_mailbox
+      end
+      
+      # create the users
+      Member.delete_all
+      create_users
+    end
+  
+    it_should_behave_like "an addressee model"
+  end
+  
+  context "When users are created before activating facteur" do
+    before(:all) do
+      # create a user model without amistad activated
+      Object.send(:remove_const, :Member) if Object.const_defined?(:Member)
+      Member = Class.new
+      Member.class_exec do
+        include Mongoid::Document
+        field :name, :require => true
+      end
+      
+      # create the users
+      Member.delete_all
+      create_users
+      
+      # activate facteur
+      Member.class_exec do
+        include Facteur::AddresseeModel
+        mailbox :private_mailbox, :default => true
+        mailbox :public_mailbox
+      end
+    end
+  
+    it_should_behave_like "an addressee model"
+  end
+end

data/spec/mongoid/mongoid_spec_helper.rb

@@ -0,0 +1,11 @@
+require 'mongoid'
+require 'spec_helper'
+
+Dir[File.expand_path('../../support/mongoid/*.rb', __FILE__)].each{|f| require f }
+
+RSpec.configure do |c|
+  c.before(:suite) do
+    Database.connect
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,67 +1,10 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rspec'
-require 'active_record'
-require 'logger'
-require 'facteur'
-
-SPEC_ROOT = File.dirname(__FILE__)
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
-)
-
-ActiveRecord::Migration.verbose = false
-
-ActiveRecord::Schema.define do
-  create_table :users, :force => true do |t|
-    t.string :name, :null => false
-  end
-
-  create_table :mailboxes, :force => true do |t|
-    t.string :name
-    t.text :contents
-    t.integer :addressee_id
-    t.string :addressee_type
-    t.boolean :default
-  end
-  
-  create_table :messages, :force => true do |t|
-    t.string    :subject
-    t.text      :body
-    t.integer   :mailbox_id
-    t.integer   :author_id
-    t.boolean   :deleted_by_author, :default => false
-    t.datetime  :deleted_by_author_at
-    t.boolean   :deleted_by_addressee, :default => false
-    t.datetime  :deleted_by_addressee_at
-    t.boolean   :read, :default => false
-  end
-end
-
-#ActiveRecord::Base.logger = Logger.new(File.open("#{SPEC_ROOT}/db/database.log", 'a'))
-
-class User < ActiveRecord::Base
-  include Facteur::AddresseeModel
-  
-  mailbox :private_mailbox, :default => true
-  mailbox :public_mailbox
-end
-
-class Mailbox < ActiveRecord::Base
-  include Facteur::MailboxModel
-end
-
-class Message < ActiveRecord::Base
-  include Facteur::MessageModel 
-end
-
-def create_users
-  User.delete_all
-  Mailbox.delete_all
-  %w(John Peter James Mary Jane Victoria).each do |name|
-    eval "@#{name.downcase} = User.create(:name => '#{name}')"
-  end
-end
-
+require 'rspec'
+require 'awesome_print'
+require 'facteur'
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
+
+def create_users
+  %w(John Peter James Mary Jane Victoria).each do |name|
+    instance_variable_set("@#{name.downcase}".to_sym, Member.create(:name => name))
+  end
+end