has_emails 0.1.1 → 0.1.2

data/{CHANGELOG → CHANGELOG.rdoc}

@@ -1,35 +1,28 @@
-*SVN*
+== master
 
-*0.1.1* (June 22nd, 2008)
+== 0.1.2 / 2008-06-29
+
+* Add compatibility with has_messages 0.1.2
+
+== 0.1.1 / 2008-06-22
 
 * Remove log files from gems
 
-*0.1.0* (May 5th, 2008)
+== 0.1.0 / 2008-05-05
 
 * Update to latest has_messages api
-
 * Simplify by removing support for models other than EmailAddresses in Emails
-
 * Updated documentation
 
-*0.0.1* (September 26th, 2007)
+== 0.0.1 / 2007-09-26
 
 * Refactor has_email_address/has_email_addresses so that new associations for unsent/sent emails isn't created for has_email_address
-
 * Add state changes fixtures for tests
-
 * Add tests for ApplicationMailer
-
 * Add support for tracking the original email address for senders/recipients even if the email address changes on the associated model (i.e. EmailAddress/User/etc.)
-
 * Support converting models with an email_address/email_addresses association
-
 * Allow the sender of emails to be an arbitrary string email address
-
 * Add documentation
-
 * Move test fixtures out of the test application root directory
-
 * Convert dos newlines to unix newlines
-
 * Update against latest changes to has_messages

data/{README → README.rdoc}

@@ -5,21 +5,21 @@ logging and asynchronous support.
 
 == Resources
 
-Wiki
-
-* http://wiki.pluginaweek.org/Has_emails
-
 API
 
 * http://api.pluginaweek.org/has_emails
 
+Bugs
+
+* http://pluginaweek.lighthouseapp.com/projects/13272-has_emails
+
 Development
 
-* http://dev.pluginaweek.org/browser/trunk/has_emails
+* http://github.com/pluginaweek/has_emails
 
 Source
 
-* http://svn.pluginaweek.org/trunk/has_emails
+* git://github.com/pluginaweek/has_emails.git
 
 == Description
 
@@ -51,19 +51,19 @@ In addition to queueing emails, you can build them directly like so:
   email.to EmailAddress.find(456)
   email.subject = 'Hey!'
   email.body = 'Does anyone want to go out tonight?'
-  email.deliver!
+  email.deliver
 
 === Replying to emails
 
   reply = email.reply_to_all
   reply.body = "I'd love to go out!"
-  reply.deliver!
+  reply.deliver
 
 === Forwarding emails
 
   forward = email.forward
   forward.body = 'Interested?'
-  forward.deliver!
+  forward.deliver
 
 === Processing email asynchronously
 
@@ -76,13 +76,13 @@ To process queued emails, you need an external cron job that checks and sends
 them like so:
 
   Email.with_state('queued').each do |email|
-    email.deliver!
+    email.deliver
   end
 
 == Testing
 
 Before you can run any tests, the following gem must be installed:
-* plugin_test_helper[http://wiki.pluginaweek.org/Plugin_test_helper]
+* plugin_test_helper[http://github.com/pluginaweek/plugin_test_helper]
 
 To run against a specific version of Rails:
 
@@ -91,6 +91,6 @@ To run against a specific version of Rails:
 == Dependencies
 
 * Rails 2.1 or later
-* plugins_plus[http://wiki.pluginaweek.org/Plugins_plus]
-* has_messages[http://wiki.pluginaweek.org/Has_messages]
-* state_machine[http://wiki.pluginaweek.org/State_machine]
+* plugins_plus[http://github.com/pluginaweek/plugins_plus]
+* has_messages[http://github.com/pluginaweek/has_messages]
+* state_machine[http://github.com/pluginaweek/state_machine]

data/Rakefile

@@ -3,48 +3,56 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
 
-PKG_NAME           = 'has_emails'
-PKG_VERSION        = '0.1.1'
-PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
-RUBY_FORGE_PROJECT = 'pluginaweek'
-
-desc 'Default: run unit tests.'
+spec = Gem::Specification.new do |s|
+  s.name              = 'has_emails'
+  s.version           = '0.1.2'
+  s.platform          = Gem::Platform::RUBY
+  s.summary           = 'Demonstrates a reference implementation for sending emails with logging and asynchronous support.'
+  
+  s.files             = FileList['{app,db,lib,test}/**/*'].to_a - FileList['test/app_root/log/*'].to_a + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc)
+  s.require_path      = 'lib'
+  s.has_rdoc          = true
+  s.test_files        = Dir['test/**/*_test.rb']
+  s.add_dependency    'has_messages', '>= 0.1.2'
+  s.add_dependency    'validates_as_email_address', '>= 0.0.2'
+  
+  s.author            = 'Aaron Pfeifer'
+  s.email             = 'aaron@pluginaweek.org'
+  s.homepage          = 'http://www.pluginaweek.org'
+  s.rubyforge_project = 'pluginaweek'
+end
+  
+desc 'Default: run all tests.'
 task :default => :test
 
-desc 'Test the has_emails plugin.'
+desc "Test the #{spec.name} plugin."
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.test_files = spec.test_files
   t.verbose = true
 end
 
-desc 'Generate documentation for the has_emails plugin.'
+begin
+  require 'rcov/rcovtask'
+  namespace :test do
+    desc "Test the #{spec.name} plugin with Rcov."
+    Rcov::RcovTask.new(:rcov) do |t|
+      t.libs << 'lib'
+      t.test_files = spec.test_files
+      t.rcov_opts << '--exclude="^(?!lib/|app/)"'
+      t.verbose = true
+    end
+  end
+rescue LoadError
+end
+
+desc "Generate documentation for the #{spec.name} plugin."
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'HasEmails'
+  rdoc.title    = spec.name
   rdoc.template = '../rdoc_template.rb'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-spec = Gem::Specification.new do |s|
-  s.name            = PKG_NAME
-  s.version         = PKG_VERSION
-  s.platform        = Gem::Platform::RUBY
-  s.summary         = 'Demonstrates a reference implementation for sending emails with logging and asynchronous support.'
-  
-  s.files           = FileList['{app,db,lib,test}/**/*'].to_a - FileList['test/app_root/log/*'].to_a + %w(CHANGELOG init.rb MIT-LICENSE Rakefile README)
-  s.require_path    = 'lib'
-  s.autorequire     = 'has_emails'
-  s.has_rdoc        = true
-  s.test_files      = Dir['test/**/*_test.rb']
-  s.add_dependency  'has_messages', '>= 0.1.0'
-  s.add_dependency  'validates_as_email_address', '>= 0.0.2'
-  
-  s.author          = 'Aaron Pfeifer'
-  s.email           = 'aaron@pluginaweek.org'
-  s.homepage        = 'http://www.pluginaweek.org'
+  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG.rdoc', 'LICENSE', 'lib/**/*.rb', 'app/**/*.rb')
 end
   
 Rake::GemPackageTask.new(spec) do |p|
@@ -53,14 +61,14 @@ Rake::GemPackageTask.new(spec) do |p|
   p.need_zip = true
 end
 
-desc 'Publish the beta gem'
+desc 'Publish the beta gem.'
 task :pgem => [:package] do
-  Rake::SshFilePublisher.new('aaron@pluginaweek.org', '/home/aaron/gems.pluginaweek.org/public/gems', 'pkg', "#{PKG_FILE_NAME}.gem").upload
+  Rake::SshFilePublisher.new('aaron@pluginaweek.org', '/home/aaron/gems.pluginaweek.org/public/gems', 'pkg', "#{spec.name}-#{spec.version}.gem").upload
 end
 
-desc 'Publish the API documentation'
+desc 'Publish the API documentation.'
 task :pdoc => [:rdoc] do
-  Rake::SshDirPublisher.new('aaron@pluginaweek.org', "/home/aaron/api.pluginaweek.org/public/#{PKG_NAME}", 'rdoc').upload
+  Rake::SshDirPublisher.new('aaron@pluginaweek.org', "/home/aaron/api.pluginaweek.org/public/#{spec.name}", 'rdoc').upload
 end
 
 desc 'Publish the API docs and gem'
@@ -73,10 +81,10 @@ task :release => [:gem, :package] do
   ruby_forge = RubyForge.new.configure
   ruby_forge.login
   
-  %w( gem tgz zip ).each do |ext|
-    file = "pkg/#{PKG_FILE_NAME}.#{ext}"
+  %w(gem tgz zip).each do |ext|
+    file = "pkg/#{spec.name}-#{spec.version}.#{ext}"
     puts "Releasing #{File.basename(file)}..."
     
-    ruby_forge.add_release(RUBY_FORGE_PROJECT, PKG_NAME, PKG_VERSION, file)
+    ruby_forge.add_release(spec.rubyforge_project, spec.name, spec.version, file)
   end
 end

data/test/factory.rb

@@ -1,26 +1,32 @@
 module Factory
-  # Build actions for the class
-  def self.build(klass, &block)
-    name = klass.to_s.underscore
-    define_method("#{name}_attributes", block)
+  # Build actions for the model
+  def self.build(model, &block)
+    name = model.to_s.underscore
     
-    module_eval <<-end_eval
-      def valid_#{name}_attributes(attributes = {})
-        #{name}_attributes(attributes)
-        attributes
-      end
-      
-      def new_#{name}(attributes = {})
-        #{klass}.new(valid_#{name}_attributes(attributes))
-      end
-      
-      def create_#{name}(*args)
-        record = new_#{name}(*args)
-        record.save!
-        record.reload
-        record
-      end
-    end_eval
+    define_method("#{name}_attributes", block)
+    define_method("valid_#{name}_attributes") {|*args| valid_attributes_for(model, *args)}
+    define_method("new_#{name}")              {|*args| new_record(model, *args)}
+    define_method("create_#{name}")           {|*args| create_record(model, *args)}
+  end
+  
+  # Get valid attributes for the model
+  def valid_attributes_for(model, attributes = {})
+    name = model.to_s.underscore
+    send("#{name}_attributes", attributes)
+    attributes
+  end
+  
+  # Build an unsaved record
+  def new_record(model, *args)
+    model.new(valid_attributes_for(model, *args))
+  end
+  
+  # Build and save/reload a record
+  def create_record(model, *args)
+    record = new_record(model, *args)
+    record.save!
+    record.reload
+    record
   end
   
   build Email do |attributes|

data/test/functional/has_emails_test.rb

@@ -36,7 +36,7 @@ class EmailAddresFunctionalsTest < Test::Unit::TestCase
   def test_should_be_able_to_send_new_emails
     email = @email_address.emails.build
     email.to create_email_address(:spec => 'jane.smith@gmail.com')
-    assert email.deliver!
+    assert email.deliver
   end
 end
 
@@ -44,7 +44,7 @@ class EmailAddressWithUnsentEmails < Test::Unit::TestCase
   def setup
     @email_address = create_email_address
     @sent_email = create_email(:sender => @email_address, :to => create_email_address(:spec => 'jane.smith@gmail.com'))
-    @sent_email.deliver!
+    @sent_email.deliver
     @first_draft = create_email(:sender => @email_address)
     @second_draft = create_email(:sender => @email_address)
   end
@@ -65,10 +65,10 @@ class EmailAddressWithSentEmails < Test::Unit::TestCase
     @draft = create_email(:sender => @email_address)
     
     @first_sent_email = create_email(:sender => @email_address, :to => @to)
-    @first_sent_email.deliver!
+    @first_sent_email.deliver
     
     @second_sent_email = create_email(:sender => @email_address, :to => @to)
-    @second_sent_email.deliver!
+    @second_sent_email.deliver
   end
   
   def test_should_have_sent_emails
@@ -88,10 +88,10 @@ class EmailAddressWithReceivedEmails < Test::Unit::TestCase
     @unsent_email = create_email(:sender => @sender, :to => @email_address)
     
     @first_sent_email = create_email(:sender => @sender, :to => @email_address)
-    @first_sent_email.deliver!
+    @first_sent_email.deliver
     
     @second_sent_email = create_email(:sender => @sender, :to => @email_address)
-    @second_sent_email.deliver!
+    @second_sent_email.deliver
   end
   
   def test_should_have_received_emails
@@ -109,16 +109,16 @@ class EmailAddressWithHiddenEmailsTest < Test::Unit::TestCase
     @unsent_email = create_email(:sender => @email_address)
     
     hidden_sent_email = create_email(:sender => @email_address, :to => @friend)
-    hidden_sent_email.deliver!
+    hidden_sent_email.deliver
     hidden_sent_email.hide!
     @sent_email = create_email(:sender => @email_address, :to => @friend)
-    @sent_email.deliver!
+    @sent_email.deliver
     
     hidden_received_email = create_email(:sender => @friend, :to => @email_address)
-    hidden_received_email.deliver!
+    hidden_received_email.deliver
     hidden_received_email.recipients.first.hide!
     @received_email = create_email(:sender => @friend, :to => @email_address)
-    @received_email.deliver!
+    @received_email.deliver
   end
   
   def test_should_not_include_hidden_emails_in_emails

data/test/unit/email_test.rb

@@ -12,7 +12,7 @@ class EmailAfterBeingDeliveredTest < Test::Unit::TestCase
       :cc => create_email_address(:spec => 'support@localhost'),
       :bcc => create_email_address(:spec => 'feedback@localhost')
     )
-    assert @email.deliver!
+    assert @email.deliver
   end
   
   def test_should_send_mail

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: has_emails
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
-autorequire: has_emails
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-22 00:00:00 -04:00
+date: 2008-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: validates_as_email_address
@@ -67,11 +67,11 @@ files:
 - test/unit/email_address_test.rb
 - test/unit/action_mailer_test.rb
 - test/unit/email_test.rb
-- CHANGELOG
+- CHANGELOG.rdoc
 - init.rb
-- MIT-LICENSE
+- LICENSE
 - Rakefile
-- README
+- README.rdoc
 has_rdoc: true
 homepage: http://www.pluginaweek.org
 post_install_message: 
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: pluginaweek
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2