email_spec 0.6.6 → 1.0.1

data/History.txt

@@ -1,23 +1,18 @@
+== 1.x (git)
 
-This is the Rails 2 compatible branch/gem.
+== 1.0 2010-07-31 Rails 3.0 Release
+  This release makes email-spec compatible with Rails 3 and RSpec 2.x.
 
-== 0.6.x (git)
+  IMPORTANT: As of 1.0 email-spec is no longer backwards compatible wit Rails 2.x.  I will be maintaining a 0.6
+  branch on github/rubygems for Rails 2 compatibility if anyone wants new features backported.
 
-== 0.6.6
-  * Backports "Support cache method in reset_mailer" (Rob Olson)
-
-== 0.6.5
-  * Fixes gemspec by adding RSpec as a dependency. (Ben Hutchison)
-
-== 0.6.4
-
- === Bugfixes
-  * Updates the matchers to use RSpec's new API instead of deprecated simple_matcher. (Aaron Gibralter)
-
-== 0.6.3
+  This was truly a community effort and I appreciate all of time and effort donated by those involved. Specifically:
+    * Maxim Chernyak for the initial conversion work to Rails 3
+    * Tim Harper for ironing out various matcher bugs
+    * Patrick Muldoon for doing a fantastic job of cleaning up the features and specs.  He also fixed the
+      DelayedJob support and worked through all the bundler issues the project was facing.
 
  === Bugfixes
-  * Checks to prevent deprecation warnings on DelayedJob. (Patrick Muldoon)
   * Further checks for older DelayedJob versions to fix compatibility issues. (Andrea Longhi and others)
 
 == 0.6.2 2010-03-21
@@ -44,7 +39,7 @@ This is the Rails 2 compatible branch/gem.
  === Changes
   * Deprecated steps were removed. (Kieran Pilkington)
 
- === Bugfixes
+ === Bufixes
 
 == 0.5.0 2010-02-22
 
@@ -57,10 +52,10 @@ This is the Rails 2 compatible branch/gem.
     * "save and open all html emails"
     * "save and open all raw emails"
 
- === Bugfixes
+ === Bufixes
   * Gracefully handle cases where emails do not have a 'to' value. (Kieran Pilkington)
 
- === Bugfixes
+ === Bufixes
 
 == 0.4.0 2010-01-07
 
@@ -68,12 +63,12 @@ This is the Rails 2 compatible branch/gem.
     * Added support for action_mailer_cache_delivery plugin. (Dan Dofter)
       You must use the fork at: http://github.com/liangzan/action_mailer_cache_delivery
 
- === Bugfixes
+ === Bufixes
     * be_delivered_from matcher now compares both sender name and email address. (Dan Dofter)
 
 == 0.3.8 2009-12-23
 
- === Bugfixes
+ === Bufixes
     * Guard against cc and bcc fields being nil for ActionMailer. (Piotr Sarnacki)
 
 == 0.3.7 2009-12-17
@@ -133,7 +128,7 @@ Big shoutout to Kieran Pilkington who did the majority of work for this release.
     * Then /^I should not receive any emails?$/
     * When %r{^"([^"]*?)" opens? the email$} do |address|
 
- === Bugfixes
+ === Bufixes
 
  == 0.2.1 2009-5-29
 
@@ -149,19 +144,19 @@ No changes. Bumping version for RubyForge release.
 
  == 0.1.4 2009-5-29
 
- === Bugfixes
+ === Bufixes
   * Require deliveries in the helpers so it doesn't blow up with RSpec. (Craig Webster)
 
  == 0.1.3 2009-4-15
 
- === Bugfixes
+ === Bufixes
   * Fixed regular expressions in genertaed steps. (Ben Mabey)
   * World semantics changed in cucumber (0.2.3.2), email_spec now uses the new API. (Hector Morales)
 
  == 0.1.2 2009-4-05
 
  === New features
- === Bugfixes
+ === Bufixes
   * Actually added the renamed generators to the gem so people could use it! D'oh! (Ben Mabey)
     * You can either use "./script generate email_spec" or "rubigen rails email_spec"
   * Removed Rake tasks from example application to prevent conflicts when used as a plugin. (Ben Mabey)
@@ -170,7 +165,7 @@ No changes. Bumping version for RubyForge release.
  === New features
   * Switched dir structure over to support rubigen. (Dr. Nic)
 
- === Bugfixes
+ === Bufixes
 
  == 0.1.0 2009-3-25
  === New features
@@ -192,7 +187,7 @@ No changes. Bumping version for RubyForge release.
        end
       end
 
-=== Bugfixes
+=== Bufixes
  * Revert parse_email_for_link helper method to allow for text links as well as explicit link finding. (Mischa Fierer)
  * Isolated variances between using email-spec with an ARMailer project. (Luke Melia)
 

data/README.rdoc

@@ -22,8 +22,10 @@ you generally don't want to include those projects unless you need them in produ
 
   gem install email_spec
 
-  # config/environments/test.rb
-  config.gem 'email_spec', :lib => 'email_spec'
+  # Gemfile
+  group :test do
+    gem 'email_spec'
+  end
 
 === Cucumber
 
@@ -37,7 +39,7 @@ It will also add a Before hook for Cucumber so that emails are cleared at the st
 
 Then:
 
-  script/generate email_spec
+  rails generate email_spec:steps
 
 This will give you a bunch of steps to get started with in step_definitions/email_steps.rb
 

data/Rakefile

@@ -1,5 +1,7 @@
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'bundler/setup'
+
+require 'rspec/core/rake_task'
 
 
 begin
@@ -20,22 +22,10 @@ begin
     s.has_rdoc         = true
     s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
     s.rubyforge_project = 'email-spec'
-    s.add_dependency 'rspec'
+    s.add_runtime_dependency 'rspec', '~> 2.0.0'
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
-# TODO: switch to gem bundler
-([['delayed_job', '2.0.3']] + %w[mimetype-fu fixjour pony sinatra rack-test].map{|g| [g]}).each do |gem_args|
-  gem_name = gem_args.first
-  gem_version = gem_args.size > 1 ? gem_args[1] : nil
-  begin
-    gem(*[gem_args].flatten)
-  rescue Gem::LoadError
-    puts "Installing #{gem_name} for the example rails app..."
-    puts `gem install #{gem_name} #{gem_version ? ('--version='+gem_version) : ''} --no-rdoc --no-ri`
-  end
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
 begin
@@ -47,17 +37,13 @@ rescue LoadError
   end
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
 
 namespace :example_app do
-  Spec::Rake::SpecTask.new(:spec) do |spec|
+    RSpec::Core::RakeTask.new do |spec|
     desc "Specs for Example app"
-    spec.libs << 'lib' << 'spec'
-    spec.spec_files = FileList['examples/rails_root/spec/**/*_spec.rb']
+    spec.pattern = './examples/rails3_root/spec/**/*_spec.rb'
   end
 end
 
@@ -65,9 +51,13 @@ task :default => [:features, :spec, 'example_app:spec']
 
 desc "Cleans the project of any tmp file that should not be included in the gemspec."
 task :clean do
-  FileUtils.rm_f('examples/rails_root/features/step_definitions/email_steps.rb')
-  FileUtils.rm_rf('examples/rails_root/log')
-  FileUtils.rm_rf('examples/rails_root/vendor')
+  #remove stuff from example rails apps
+  %w[ rails3 sinatra ].each do |ver|
+    FileUtils.rm_f("examples/#{ver}_root/features/step_definitions/email_steps.rb")
+    FileUtils.rm_rf("examples/#{ver}_root/log")
+    FileUtils.rm_rf("examples/#{ver}_root/vendor")
+  end
+
   %w[*.sqlite3 *.log].each do |pattern|
     `find . -name "#{pattern}" -delete`
   end
@@ -75,4 +65,3 @@ end
 
 desc "Cleans the dir and builds the gem"
 task :prep => [:clean, :gemspec, :build]
-

data/examples/rails3_root/Gemfile

@@ -0,0 +1,17 @@
+source 'http://gemcutter.org'
+
+gem 'rails', '3.0.0.rc'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+gem 'delayed_job', '>=2.0.3'
+gem 'mimetype-fu', :require => 'mimetype_fu'
+
+group :test do
+  gem "test-unit"
+  gem "cucumber-rails"
+  gem "database_cleaner"
+  gem 'capybara'
+  gem "rspec", ">= 2.0.0.beta.19"
+  gem "rspec-rails", ">= 2.0.0.beta.19"
+  gem "email_spec", :path => "../../"
+end

data/examples/rails3_root/Gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: /Users/bmabey/Programming/ruby/email-spec
+  specs:
+    email_spec (0.6.2)
+
+GEM
+  remote: http://gemcutter.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      mail (~> 2.2.5)
+    actionpack (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.9)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.22)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      arel (~> 0.4.0)
+      tzinfo (~> 0.3.22)
+    activeresource (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+    activesupport (3.0.0.rc)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    builder (2.1.2)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.10)
+    daemons (1.1.0)
+    database_cleaner (0.5.2)
+    delayed_job (2.0.3)
+      daemons
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    i18n (0.4.1)
+    json_pure (1.4.3)
+    mail (2.2.5)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    mimetype-fu (0.1.2)
+    nokogiri (1.4.2)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.9)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0.rc)
+      actionmailer (= 3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activerecord (= 3.0.0.rc)
+      activeresource (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      bundler (>= 1.0.0.rc.1)
+      railties (= 3.0.0.rc)
+    railties (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      rake (>= 0.8.3)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    rspec-rails (2.0.0.beta.19)
+      rspec (= 2.0.0.beta.19)
+      webrat (>= 0.7.2.beta.1)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.27)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
+    sqlite3-ruby (1.3.1)
+    term-ansicolor (1.0.5)
+    test-unit (2.1.0)
+    thor (0.14.0)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    trollop (1.16.2)
+    tzinfo (0.3.22)
+    webrat (0.7.2.beta.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  cucumber-rails
+  database_cleaner
+  delayed_job (>= 2.0.3)
+  email_spec!
+  mimetype-fu
+  rails (= 3.0.0.rc)
+  rspec (>= 2.0.0.beta.19)
+  rspec-rails (>= 2.0.0.beta.19)
+  sqlite3-ruby
+  test-unit

data/examples/rails3_root/README

@@ -0,0 +1,5 @@
+== Running features in this app
+
+1. Make sure you have latest bundler gem.
+2. cd into rails3_root and run `bundle install`
+3. run script/rails generate email_spec:steps

data/examples/rails3_root/Rakefile

@@ -0,0 +1,11 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'delayed/tasks'
+
+Rails3Root::Application.load_tasks

data/examples/rails3_root/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/examples/rails3_root/app/controllers/welcome_controller.rb

@@ -0,0 +1,16 @@
+class WelcomeController < ApplicationController
+  def signup
+    UserMailer.signup(params['Email'], params['Name']).deliver
+  end
+
+  def confirm
+  end
+
+  def newsletter
+    Delayed::Job.enqueue(NotifierJob.new(:newsletter,params['Email'], params['Name']))
+  end
+
+  def attachments
+    UserMailer.attachments_mail(params['Email'], params['Name']).deliver
+  end
+end

data/examples/rails3_root/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/examples/rails3_root/app/mailers/user_mailer.rb

@@ -0,0 +1,39 @@
+class UserMailer < ActionMailer::Base
+  default :from => "admin@example.com",
+          :sent_on => Time.now.to_s
+  
+  
+  def signup(email, name)
+    @name = name
+    
+    mail :to => email,
+         :subject => "Account confirmation"
+  end
+
+  def newsletter(email, name)
+    @name = name
+    
+    mail :to => email,
+         :subject => "Newsletter sent"
+  end
+
+  def attachments_mail(email, name)
+    @name = name
+    
+    add_attachment 'image.png'
+    add_attachment 'document.pdf'
+    
+    mail :to => email,
+         :subject => "Attachments test"
+  end
+
+  private
+
+  def add_attachment(attachment_name)
+    attachment_path = "#{Rails.root}/attachments/#{attachment_name}"
+    File.open(attachment_path) do |file|
+      filename = File.basename(file.path)
+      attachments[filename] = {:content_type => File.mime_type?(file), :content => file.read}
+    end
+  end
+end