has_emails 0.2.1 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,6 +1,10 @@
 == master
 
-== 0.2.1 / 2008-01-11
+== 0.3.0
+
+* Add compatibility with has_messages 0.4.0 / Rails 2.3
+
+== 0.2.1 / 2009-01-11
 
 * Add compatibility with has_messages 0.3.1 / state_machine 0.5.0
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2007 Aaron Pfeifer & Neil Abraham
+Copyright (c) 2006-2009 Aaron Pfeifer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -23,16 +23,17 @@ Source
 
 == Description
 
-Emailing between users and other parts of a system is a fairly common feature in
-web applications, especially for those that support social networking.  Emailing
-doesn't necessarily need to be between users, but can also act as a way for the
-web application to send notices and other notifications to users.
+Emailing between users and other parts of a system is a fairly common feature
+in web applications, especially for those that support social networking.
+Emailing doesn't necessarily need to be between users, but can also act as a
+way for the web application to send notices and other notifications to users.
 
 Rails already provides ActionMailer as a way of sending emails.  However, the
-framework does not provide an easy way to persist emails, track their status, and
-process them asynchronously.  Designing and building a framework that supports this
-can be complex and takes away from the business focus.  This plugin can help ease
-that process by demonstrating a complete implementation of these features.
+framework does not provide an easy way to persist emails, track their status,
+and process them asynchronously.  Designing and building a framework that
+supports this can be complex and takes away from the business focus.  This
+plugin can help ease that process by demonstrating a reference implementation
+of these features.
 
 == Usage
 
@@ -90,7 +91,6 @@ To run against a specific version of Rails:
 
 == Dependencies
 
-* Rails 2.1 or later
+* Rails 2.3 or later
 * has_messages[http://github.com/pluginaweek/has_messages]
 * state_machine[http://github.com/pluginaweek/state_machine]
-* plugins_plus[http://github.com/pluginaweek/plugins_plugins] (optional if app files are copied to your project tree)

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'has_emails'
-  s.version           = '0.2.1'
+  s.version           = '0.3.0'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Demonstrates a reference implementation for sending emails with logging and asynchronous support.'
   
@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']
-  s.add_dependency    'has_messages', '>= 0.3.1'
+  s.add_dependency    'has_messages', '>= 0.4.0'
   s.add_dependency    'validates_as_email_address', '>= 0.0.2'
   
   s.author            = 'Aaron Pfeifer'

data/app/models/email_address.rb

@@ -6,19 +6,20 @@
 # 
 # == Associations
 # 
-# Email addresses have the following associations defined as a result of using the
-# +has_emails+ macro:
-# * +emails+ - Emails that were composed and are visible to the owner.  Emails may have been sent or unsent.
-# * +received_emails+ - Emails that have been received from others and are visible.  Emails may have been read or unread.
+# Email addresses have the following associations defined as a result of using
+# the +has_emails+ macro:
+# * +emails+ - Emails that were composed and are visible to the owner.  Emails
+#   may have been sent or unsent.
+# * +received_emails+ - Emails that have been received from others and are
+#   visible.  Emails may have been read or unread.
 # * +unsent_emails+ - Emails that have not yet been delivered
 # * +sent_emails+ - Emails that have already been delivered
 class EmailAddress < ActiveRecord::Base
   has_emails
   
-  validates_presence_of       :spec
-  validates_as_email_address  :spec
-  validates_uniqueness_of     :spec,
-                                :scope => 'name'
+  validates_presence_of :spec
+  validates_as_email_address :spec
+  validates_uniqueness_of :spec, :scope => 'name'
   
   class << self
     # Finds or create an email address based on the given value

data/lib/has_emails.rb

@@ -6,12 +6,15 @@ require 'has_emails/extensions/action_mailer'
 module HasEmails
   module MacroMethods
     # Creates the following email associations:
-    # * +emails+ - Emails that were composed and are visible to the owner.  Emails may have been sent or unsent.
-    # * +received_emails - Emails that have been received from others and are visible.  Emails may have been read or unread.
+    # * +emails+ - Emails that were composed and are visible to the owner.
+    #   Emails may have been sent or unsent.
+    # * +received_emails - Emails that have been received from others and are
+    #   visible.  Emails may have been read or unread.
     # 
     # == Creating new emails
     # 
-    # To create a new email, the +emails+ association should be used, for example:
+    # To create a new email, the +emails+ association should be used.  For
+    # example:
     # 
     #   address = EmailAddress.find(123)
     #   email = user.emails.build

data/test/app_root/config/environment.rb

@@ -1,10 +1,10 @@
 require 'config/boot'
-require "#{File.dirname(__FILE__)}/../../../../plugins_plus/boot"
 
 Rails::Initializer.run do |config|
   config.plugin_paths << '..'
-  config.plugins = %w(plugins_plus state_machine has_messages validates_as_email_address has_emails)
+  config.plugins = %w(plugin_tracker state_machine has_messages validates_as_email_address has_emails)
   config.cache_classes = false
   config.whiny_nils = true
   config.action_mailer.delivery_method = :test
+  config.action_controller.session = {:key => 'rails_session', :secret => 'd229e4d22437432705ab3985d4d246'}
 end

data/test/app_root/db/migrate/001_migrate_has_messages_to_version_2.rb

@@ -1,9 +1,18 @@
 class MigrateHasMessagesToVersion2 < ActiveRecord::Migration
   def self.up
-    Rails::Plugin.find(:has_messages).migrate(2)
+    ActiveRecord::Migrator.new(:up, "#{directory}/db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:up)
+    end
   end
   
   def self.down
-    Rails::Plugin.find(:has_messages).migrate(0)
+    ActiveRecord::Migrator.new(:up, "#{directory}/db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:down)
+    end
   end
+  
+  private
+    def self.directory
+      Rails.plugins.find {|plugin| plugin.name == 'has_messages'}.directory
+    end
 end

data/test/app_root/db/migrate/002_migrate_has_emails_to_version_1.rb

@@ -1,9 +1,13 @@
 class MigrateHasEmailsToVersion1 < ActiveRecord::Migration
   def self.up
-    Rails::Plugin.find(:has_emails).migrate(1)
+    ActiveRecord::Migrator.new(:up, "#{Rails.root}/../../db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:up)
+    end
   end
   
   def self.down
-    Rails::Plugin.find(:has_emails).migrate(0)
+    ActiveRecord::Migrator.new(:up, "#{Rails.root}/../../db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:down)
+    end
   end
 end

data/test/app_root/vendor/plugins/plugin_tracker/init.rb

@@ -0,0 +1,5 @@
+class << Rails
+  attr_accessor :plugins
+end
+
+Rails.plugins = initializer.loaded_plugins

data/test/functional/has_emails_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class EmailAddressByDefaultFunctionalTest < Test::Unit::TestCase
+class EmailAddressByDefaultFunctionalTest < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address
   end
@@ -22,7 +22,7 @@ class EmailAddressByDefaultFunctionalTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressFunctionalTest < Test::Unit::TestCase
+class EmailAddressFunctionalTest < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address
   end
@@ -40,7 +40,7 @@ class EmailAddressFunctionalTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressWithUnsentEmails < Test::Unit::TestCase
+class EmailAddressWithUnsentEmails < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address
     @sent_email = create_email(:sender => @email_address, :to => create_email_address(:spec => 'jane.smith@gmail.com'))
@@ -58,7 +58,7 @@ class EmailAddressWithUnsentEmails < Test::Unit::TestCase
   end
 end
 
-class EmailAddressWithSentEmails < Test::Unit::TestCase
+class EmailAddressWithSentEmails < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address
     @to = create_email_address(:spec => 'jane.smith@gmail.com')
@@ -80,7 +80,7 @@ class EmailAddressWithSentEmails < Test::Unit::TestCase
   end
 end
 
-class EmailAddressWithReceivedEmails < Test::Unit::TestCase
+class EmailAddressWithReceivedEmails < ActiveSupport::TestCase
   def setup
     @sender = create_email_address
     @email_address = create_email_address(:spec => 'jane.smith@gmail.com')
@@ -99,7 +99,7 @@ class EmailAddressWithReceivedEmails < Test::Unit::TestCase
   end
 end
 
-class EmailAddressWithHiddenEmailsTest < Test::Unit::TestCase
+class EmailAddressWithHiddenEmailsTest < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address
     @friend = create_email_address(:spec => 'jane.smith@gmail.com')

data/test/unit/action_mailer_test.rb

@@ -1,21 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class ActionMailerTest < Test::Unit::TestCase
-  class TestMailer < ActionMailer::Base
-    def signed_up(recipient)
-      subject    'Thanks for signing up'
-      from       'MyWebApp <welcome@mywebapp.com>'
-      recipients recipient
-      cc         'Nobody <nobody@mywebapp.com>'
-      bcc        'root@mywebapp.com'
-      body       'Congratulations!'
-    end
+class TestMailer < ActionMailer::Base
+  def signed_up(recipient)
+    subject    'Thanks for signing up'
+    from       'MyWebApp <welcome@mywebapp.com>'
+    recipients recipient
+    cc         'Nobody <nobody@mywebapp.com>'
+    bcc        'root@mywebapp.com'
+    body       'Congratulations!'
   end
-  
-  def setup
-    ActionMailer::Base.deliveries = []
-  end
-  
+end
+
+class TestMailerTest < ActionMailer::TestCase
   def test_should_use_camelized_application_name_for_default_subject_prefix
     assert_equal '[AppRoot] ', ActionMailer::Base.default_subject_prefix
   end

data/test/unit/email_address_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class EmailAddressByDefaultTest < Test::Unit::TestCase
+class EmailAddressByDefaultTest < ActiveSupport::TestCase
   def setup
     @email_address = EmailAddress.new
   end
@@ -14,7 +14,7 @@ class EmailAddressByDefaultTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressTest < Test::Unit::TestCase
+class EmailAddressTest < ActiveSupport::TestCase
   def test_should_be_valid_with_a_set_of_valid_attributes
     email_address = new_email_address
     assert email_address.valid?
@@ -79,7 +79,7 @@ class EmailAddressTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressFromAddressTest < Test::Unit::TestCase
+class EmailAddressFromAddressTest < ActiveSupport::TestCase
   def setup
     @email_address = EmailAddress.new(:address => 'John Smith <john.smith@gmail.com>')
   end
@@ -97,7 +97,7 @@ class EmailAddressFromAddressTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressFromAddressWithoutNameTest < Test::Unit::TestCase
+class EmailAddressFromAddressWithoutNameTest < ActiveSupport::TestCase
   def setup
     @email_address = EmailAddress.new(:address => 'john.smith@gmail.com')
   end
@@ -115,7 +115,7 @@ class EmailAddressFromAddressWithoutNameTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressAfterBeingCreatedTest < Test::Unit::TestCase
+class EmailAddressAfterBeingCreatedTest < ActiveSupport::TestCase
   def setup
     @email_address = create_email_address(:name => 'John Smith', :spec => 'john.smith@gmail.com')
   end
@@ -133,7 +133,7 @@ class EmailAddressAfterBeingCreatedTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddressAsAClassTest < Test::Unit::TestCase
+class EmailAddressAsAClassTest < ActiveSupport::TestCase
   def test_should_be_able_to_split_address_containing_name
     name, spec = EmailAddress.split_address('John Smith <john.smith@gmail.com>')
     assert_equal 'John Smith', name

data/test/unit/email_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class EmailAfterBeingDeliveredTest < Test::Unit::TestCase
+class EmailAfterBeingDeliveredTest < ActiveSupport::TestCase
   def setup
     ActionMailer::Base.deliveries = []
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_emails
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-11 00:00:00 -05:00
+date: 2009-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: validates_as_email_address
@@ -65,9 +65,10 @@ files:
 - test/app_root/db/migrate/001_migrate_has_messages_to_version_2.rb
 - test/app_root/config
 - test/app_root/config/environment.rb
-- test/app_root/app
-- test/app_root/app/models
-- test/app_root/app/models/empty
+- test/app_root/vendor
+- test/app_root/vendor/plugins
+- test/app_root/vendor/plugins/plugin_tracker
+- test/app_root/vendor/plugins/plugin_tracker/init.rb
 - CHANGELOG.rdoc
 - init.rb
 - LICENSE
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Demonstrates a reference implementation for sending emails with logging and asynchronous support.