mail_safe 0.3.0 → 0.3.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Myron Marston
+Copyright (c) 2009-2010 Myron Marston
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -69,14 +69,12 @@ When mail safe replaces an email address, it appends a notice to the bottom of t
 
   **************************************************
 
-== Version Compatibility
+== Version Compatibility and Continuous Integration
 
-specs.should pass if RUBY_VERSION =~ /^1.(8.6|8.7|9.1)$/ && Rails.version =~ /^(1.2.6|2.\d.\d|3.0.0.beta)$/
-
-== Continuous Integration
-
-You can see the current status of the spec suite, for Ruby 1.8.6 and 1.9.1, on {runcoderun.org}[http://runcoderun.com/myronmarston/mail_safe].
+Mail safe works on ruby {1.8.6}[http://integrity186.heroku.com/mail-safe], {1.8.7}[http://integrity187.heroku.com/mail-safe] and {1.9.1}[http://integrity191.heroku.com/mail-safe],
+and any version of actionmailer since 1.3.6 (the version used by rails 1.2.6), including 3.0.0.  The builds (linked to above)
+use {ginger}[http://github.com/freelancing-god/ginger] to run the specs against 16 different versions of actionmailer.
 
 == Copyright
 
-Copyright (c) 2009 Myron Marston, Kashless.org. See LICENSE for details.
+Copyright (c) 2009-2010 Myron Marston, Kashless.org. See LICENSE for details.

data/Rakefile

@@ -13,27 +13,21 @@ begin
     gem.add_dependency 'actionmailer',  '>= 1.3.6'
     gem.add_development_dependency 'rspec', '>= 1.2.9'
 
+    gem.files.exclude 'vendor/ginger'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.rspec_opts = %w[--format documentation]
 end
 
 task :spec => :check_dependencies if defined?(Jeweler)
 
-task :default => :spec
+task :default => :ginger
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -51,3 +45,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc 'Run ginger tests'
+task :ginger do
+  $LOAD_PATH << File.join(*%w[vendor ginger lib])
+  ARGV.clear
+  ARGV << 'spec'
+  load File.join(*%w[vendor ginger bin ginger])
+end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:build: 
 :major: 0
 :minor: 3
-:patch: 0
-:build: 
+:patch: 1

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { 'rspec2' }

data/ginger_scenarios.rb

@@ -13,22 +13,31 @@ Ginger.configure do |config|
   config.aliases["action_pack"] = "actionpack"
   config.aliases["active_support"] = "activesupport"
 
-  rails3 = create_scenario('3.0.0.beta')
-  rails3['mail'] = '2.1.3'
-  config.scenarios << rails3
+  # Rails 3 doesn't work on Ruby 1.8.6 or 1.9.1 so skip it.
+  if RUBY_VERSION == '1.8.7'
+    rails3 = create_scenario('3.0.0')
+    rails3['mail'] = '2.2.7'
+    config.scenarios << rails3
+  end
 
-  %w(
-  2.3.5 2.3.4 2.3.3 2.3.2
-  2.2.3 2.2.2
-  2.1.2 2.1.1 2.1.0
-  2.0.5 2.0.4 2.0.2 2.0.1 2.0.0
-  ).each do |version|
+  %w( 2.3.9 2.3.8 2.3.5 2.3.4 2.3.3 2.3.2 ).each do |version|
     config.scenarios << create_scenario(version)
   end
 
-  rails126 = Ginger::Scenario.new("Rails 1.2.6")
-  rails126[/^action_?mailer$/] = '1.3.6'
-  rails126[/^action_?pack$/] = '1.13.6'
-  rails126[/^active_?support$/] = '1.4.4'
-  config.scenarios << rails126
-end
+  # Rails 2.3 was the first version that ran on ruby 1.9, so don't bother testing older versions.
+  if RUBY_VERSION =~ /^1\.8/
+    %w(
+    2.2.3 2.2.2
+    2.1.2 2.1.1 2.1.0
+    2.0.5 2.0.4 2.0.2 2.0.1 2.0.0
+    ).each do |version|
+      config.scenarios << create_scenario(version)
+    end
+
+    rails126 = Ginger::Scenario.new("Rails 1.2.6")
+    rails126[/^action_?mailer$/] = '1.3.6'
+    rails126[/^action_?pack$/] = '1.13.6'
+    rails126[/^active_?support$/] = '1.4.4'
+    config.scenarios << rails126
+  end
+end

data/lib/mail_safe.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'action_mailer'
 require 'action_mailer/version'
 

data/lib/mail_safe/address_replacer.rb

@@ -114,9 +114,10 @@ The original recipients were:
         end
       else
         def add_postscript(part, postscript)
+          postscript = postscript.html_safe  if postscript.respond_to?(:html_safe)
           part.body = part.body.to_s + postscript
         end
       end
     end
   end
-end
+end

data/mail_safe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_safe}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myron Marston"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-10-14}
   s.email = %q{myron.marston@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
+     "autotest/discover.rb",
      "ginger_scenarios.rb",
      "lib/mail_safe.rb",
      "lib/mail_safe/address_replacer.rb",
@@ -29,29 +30,28 @@ Gem::Specification.new do |s|
      "lib/mail_safe/rails2_hook.rb",
      "lib/mail_safe/rails3_hook.rb",
      "mail_safe.gemspec",
-     "spec/spec/config_spec.rb",
-     "spec/spec/mailer_spec.rb",
-     "spec/spec/mailers/test_mailer.rb",
-     "spec/spec/spec.opts",
-     "spec/spec/spec_helper.rb"
+     "spec/config_spec.rb",
+     "spec/mailer_spec.rb",
+     "spec/mailers/test_mailer.rb",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/myronmarston/mail_safe}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Keep your ActionMailer emails from escaping into the wild during development.}
   s.test_files = [
-    "spec/spec/config_spec.rb",
-     "spec/spec/mailer_spec.rb",
-     "spec/spec/mailers/test_mailer.rb",
-     "spec/spec/spec_helper.rb"
+    "spec/config_spec.rb",
+     "spec/mailer_spec.rb",
+     "spec/mailers/test_mailer.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<actionmailer>, [">= 1.3.6"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else

data/spec/{spec/mailer_spec.rb → mailer_spec.rb}

@@ -12,9 +12,9 @@ describe MailSafe do
     end
   end
 
-  def have_addresses(*addresses)
-    simple_matcher("have addresses #{addresses.inspect}") do |array|
-      array.to_a.sort == addresses
+  RSpec::Matchers.define :have_addresses do |*expected|
+    match do |actual|
+      actual.to_a.sort == expected
     end
   end
 
@@ -93,15 +93,15 @@ describe MailSafe do
     end
 
     def part(type)
-      @email.parts.detect { |p| p.content_type == type }.body.to_s
+      @email.parts.detect { |p| p.content_type =~ type }.body.to_s
     end
 
     it 'adds a text post script to the body of the text part' do
-      part('text/plain').should =~ TEXT_POSTSCRIPT_PHRASE
+      part(/text\/plain/).should =~ TEXT_POSTSCRIPT_PHRASE
     end
 
     it 'adds an html post script to the body of the html part' do
-      part('text/html').should =~  HTML_POSTSCRIPT_PHRASE
+      part(/text\/html/).should =~  HTML_POSTSCRIPT_PHRASE
     end
   end
 end

data/spec/{spec/mailers → mailers}/test_mailer.rb

@@ -1,13 +1,7 @@
-if ActionMailer::VERSION::MAJOR == 3
-  require 'action_dispatch/http/mime_type' # needs to be required to avoid an error: uninitialized constant AbstractController::Collector::Mime
-end
-
 class TestMailer < ActionMailer::Base
   # template root must be set for multipart emails, or ActionMailer will throw an exception.
-  if respond_to?(:view_paths)
-    view_paths.unshift File.dirname(__FILE__)
-  else
-    template_root File.dirname(__FILE__)
+  if ActionMailer::VERSION::MAJOR == 2
+    self.template_root = File.dirname(__FILE__)
   end
 
   def plain_text_message(options)
@@ -23,6 +17,8 @@ class TestMailer < ActionMailer::Base
     subject    "Html Message Test"
     body       "<p>Here is the message body.</p>"
     content_type 'text/html'
+
+    body(body.html_safe)  if body.respond_to?(:html_safe)
   end
 
   def multipart_message(options)
@@ -33,7 +29,10 @@ class TestMailer < ActionMailer::Base
     content_type 'multipart/alternative'
 
     part :content_type => 'text/plain', :body => "Here is the message body."
-    part :content_type => 'text/html',  :body => "<p>Here is the message body.</p>"
+
+    html_body = "<p>Here is the message body.</p>"
+    html_body = html_body.html_safe  if html_body.respond_to?(:html_safe)
+    part :content_type => 'text/html',  :body => html_body
   end
 
   protected

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. vendor ginger lib])
+require 'ginger'
+require 'mail_safe'
+require 'mailers/test_mailer'
+
+ActionMailer::Base.delivery_method = :test
+
+require 'rspec'
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.debug = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_safe
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -61,6 +66,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- autotest/discover.rb
 - ginger_scenarios.rb
 - lib/mail_safe.rb
 - lib/mail_safe/address_replacer.rb
@@ -68,11 +74,10 @@ files:
 - lib/mail_safe/rails2_hook.rb
 - lib/mail_safe/rails3_hook.rb
 - mail_safe.gemspec
-- spec/spec/config_spec.rb
-- spec/spec/mailer_spec.rb
-- spec/spec/mailers/test_mailer.rb
-- spec/spec/spec.opts
-- spec/spec/spec_helper.rb
+- spec/config_spec.rb
+- spec/mailer_spec.rb
+- spec/mailers/test_mailer.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/myronmarston/mail_safe
 licenses: []
@@ -83,28 +88,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Keep your ActionMailer emails from escaping into the wild during development.
 test_files: 
-- spec/spec/config_spec.rb
-- spec/spec/mailer_spec.rb
-- spec/spec/mailers/test_mailer.rb
-- spec/spec/spec_helper.rb
+- spec/config_spec.rb
+- spec/mailer_spec.rb
+- spec/mailers/test_mailer.rb
+- spec/spec_helper.rb

data/spec/spec/spec.opts

@@ -1 +0,0 @@
---color

data/spec/spec/spec_helper.rb

@@ -1,21 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
-require 'rubygems'
-require 'ginger'
-require 'mail_safe'
-require 'mailers/test_mailer'
-
-begin
-  require 'ruby-debug'
-  Debugger.start
-  Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
-rescue LoadError
-  # ruby-debug wasn't available so neither can the debugging be
-end
-
-ActionMailer::Base.delivery_method = :test
-
-Spec::Runner.configure do |config|
-end