facteur 0.3.2 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+1.0.0

data/lib/facteur/addressee_model.rb

@@ -59,10 +59,10 @@ module Facteur
         options[:body] = message
         if options[:to].is_a? Array
           options[:to].each do |addressee|
-            send_message_to(addressee, options[:in], options[:body])
+            send_message_to(addressee, options[:in], options[:body], options[:subject])
           end
         else
-          send_message_to(options[:to], options[:in], options[:body])
+          send_message_to(options[:to], options[:in], options[:body], options[:subject])
         end
       end
       
@@ -84,14 +84,10 @@ module Facteur
       def create_mailbox(name, options={})
         mailbox = Mailbox.new(:name => name.to_s)
         mailbox.addressee = self
+        mailbox.default = options[:default]
         return false if mailbox.save == false
         
         @default_mailbox = name if options[:default]
-        self.class.class_eval do
-          define_method(name) do
-            self.mailboxes.where(:name => name.to_s).first
-          end
-        end
         true
       end
       
@@ -103,6 +99,12 @@ module Facteur
         self.send "#{name}"
       end
       
+      def method_missing(method, *args, &block)
+        mailbox = Mailbox.find(:first, :conditions => {:name => method.to_s, :addressee_id => self.attributes["id"], :addressee_type => self.class.to_s})
+        return mailbox if not mailbox.nil?
+        super
+      end
+      
       private
       
       # creates the mailboxes defined in the configuration
@@ -115,7 +117,7 @@ module Facteur
       end
       
       # send a message to an addressee
-      def send_message_to(addressee, mailbox_name, contents)
+      def send_message_to(addressee, mailbox_name, contents, subject=nil)
         return false if addressee.nil? or contents.nil?
         
         mailbox_name = @default_mailbox if mailbox_name.nil?
@@ -125,6 +127,7 @@ module Facteur
         message.author = self
         message.mailbox = addressee.send(mailbox_name)
         message.body = contents
+        message.subject = subject
         message.save
       end
     end

data/spec/facteur_spec.rb

@@ -29,55 +29,17 @@ describe Facteur::AddresseeModel do
     end
     
     it "creates the addressee's mailboxes" do
-      @john.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @john.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      
-      @peter.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @peter.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      
-      @james.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @james.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      
-      @mary.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @mary.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      
-      @jane.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @jane.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      
-      @victoria.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @victoria.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      User.all.each do |user|
+        user.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+        user.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      end
     end
     
     it "defines the mailboxes accessors" do
-      @john.should respond_to :private_mailbox
-      @john.should respond_to :public_mailbox
-      @john.private_mailbox.should_not be_nil
-      @john.public_mailbox.should_not be_nil
-      
-      @peter.should respond_to :private_mailbox
-      @peter.should respond_to :public_mailbox
-      @peter.private_mailbox.should_not be_nil
-      @peter.public_mailbox.should_not be_nil
-      
-      @james.should respond_to :private_mailbox
-      @james.should respond_to :public_mailbox
-      @james.private_mailbox.should_not be_nil
-      @james.public_mailbox.should_not be_nil
-      
-      @mary.should respond_to :private_mailbox
-      @mary.should respond_to :public_mailbox
-      @mary.private_mailbox.should_not be_nil
-      @mary.public_mailbox.should_not be_nil
-      
-      @jane.should respond_to :private_mailbox
-      @jane.should respond_to :public_mailbox
-      @jane.private_mailbox.should_not be_nil
-      @jane.public_mailbox.should_not be_nil
-      
-      @victoria.should respond_to :private_mailbox
-      @victoria.should respond_to :public_mailbox
-      @victoria.private_mailbox.should_not be_nil
-      @victoria.public_mailbox.should_not be_nil
+      User.all.each do |user|
+        user.private_mailbox.should_not be_nil
+        user.public_mailbox.should_not be_nil
+      end
     end
   end
   
@@ -95,29 +57,11 @@ describe Facteur::AddresseeModel do
     end
     
     it "should add the new mailbox to all the existing users" do
-      @john.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @john.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @john.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @peter.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @peter.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @peter.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @james.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @james.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @james.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @mary.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @mary.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @mary.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @jane.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @jane.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @jane.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @victoria.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @victoria.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @victoria.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      User.all.each do |user|
+        user.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+        user.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+        user.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      end
     end
   end
   
@@ -132,6 +76,12 @@ describe Facteur::AddresseeModel do
       message = @peter.private_mailbox.messages.last
       message.author.should == @john
       message.body.should == 'message contents'
+      
+      @john.send_message('message contents', :to => @peter, :in => :private_mailbox, :subject => 'test').should == true
+      message = @peter.private_mailbox.messages.last
+      message.author.should == @john
+      message.body.should == 'message contents'
+      message.subject.should == 'test'
     end
     
     it "sends the messages in the default mailbox" do

metadata

@@ -3,10 +3,10 @@ name: facteur
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency