mailit 2009.08 → 2010.06.03

data/AUTHORS

@@ -1,6 +1,8 @@
 Following persons have contributed to mailit.
 (Sorted by number of submitted patches, then alphabetically)
 
-    15 Michael Fellinger <mf@rubyists.com>
+    18 Michael Fellinger <mf@rubyists.com>
+     3 Tobias Matthies <tm@mit2m.de>
      2 Jake Douglas <jakecdouglas@gmail.com>
+     1 Julian Langschaedel <meta.rb@gmail.com>
      1 Kevin Berry <kb@rubyists.com>

data/CHANGELOG

@@ -1,76 +1,106 @@
-[78c844d | 2009-08-25 21:40:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[07a1b52 | 2010-06-03 10:55:57 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.06
+
+[990f3d6 | 2010-06-03 10:55:47 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Bring the tasks up to date
+
+[071eedd | 2010-06-02 06:10:22 UTC] Tobias Matthies <tm@mit2m.de>
+
+  * Fixed headers_prepare
+
+[be7efc5 | 2010-06-02 06:09:34 UTC] Tobias Matthies <tm@mit2m.de>
+
+  * Added basic attachment tests
+
+[75b28b3 | 2010-06-01 20:40:55 UTC] Tobias Matthies <tm@mit2m.de>
+
+  * Fixed mime-type detection
+
+[84e4be5 | 2009-09-28 21:19:29 UTC] Julian Langschaedel <meta.rb@gmail.com>
+
+  * fix mailit/mailer.rb spec
+
+    did open a real connection in specs. changed to MockSMTP, instead.
+
+[b2de414 | 2009-08-26 02:02:11 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Rerelease for gemspec
+
+[78c844d | 2009-08-25 14:40:40 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Another fix
 
-[fb25c19 | 2009-08-25 21:40:01 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[fb25c19 | 2009-08-25 14:40:01 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2009.08
 
-[2e6d77a | 2009-08-25 21:38:53 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[2e6d77a | 2009-08-25 14:38:53 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Fix Rakefile
 
-[585554d | 2009-08-25 05:11:42 UTC] Kevin Berry <kevin@opensourcealchemist.com>
+[585554d | 2009-08-24 22:11:42 UTC] Kevin Berry <kevin@opensourcealchemist.com>
 
   * Take in Pistos's patch, make my own patch to get running for current project, and add seedling structure.
 
-[db73002 | 2009-08-06 06:50:35 UTC] Jake Douglas <jakecdouglas@gmail.com>
+[db73002 | 2009-08-05 23:50:35 UTC] Jake Douglas <jakecdouglas@gmail.com>
 
   * NetSMTP and EventMachine version both actually send mail now. Previous configuration didn't override the #send method correctly so the EM methods weren't loaded. The EM module may only be included now, not used with extend.
 
     Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
 
-[9a36e2f | 2009-08-06 05:39:26 UTC] Jake Douglas <jakecdouglas@gmail.com>
+[9a36e2f | 2009-08-05 22:39:26 UTC] Jake Douglas <jakecdouglas@gmail.com>
 
   * get the value of :noop from the options hash in NetSmtp#send
 
     Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
 
-[c6da60b | 2009-06-08 13:52:33 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[c6da60b | 2009-06-08 06:52:33 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Release new version
 
-[185cf45 | 2009-06-08 13:51:07 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[185cf45 | 2009-06-08 06:51:07 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Fix long outstanding issues
 
-[e429f3b | 2009-04-12 13:38:16 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[e429f3b | 2009-04-12 06:38:16 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Major refactor of Mailer, add support for EventMachine::SmtpClient and remove render_send
 
-[341d76a | 2009-04-12 13:23:33 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[341d76a | 2009-04-12 06:23:33 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Make Mail#header_string and Mail#body_string public
 
-[5716124 | 2009-03-15 14:26:27 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[5716124 | 2009-03-15 06:26:27 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add auth_type and username options for Mailer#send, should work on windows now
 
-[ff38041 | 2009-03-10 21:02:58 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[ff38041 | 2009-03-10 13:02:58 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add gemspec
 
-[07b92d0 | 2009-03-10 20:49:36 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[07b92d0 | 2009-03-10 12:49:36 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add Mailit::Mime - detects and uses available mime providers
 
-[584398c | 2009-03-10 20:48:49 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[584398c | 2009-03-10 12:48:49 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Little improvment to style
 
-[194c990 | 2009-03-10 20:19:08 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[194c990 | 2009-03-10 12:19:08 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add warning if no mime-type detection is possible
 
-[184b20d | 2009-03-10 20:18:54 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[184b20d | 2009-03-10 12:18:54 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add Version
 
-[74e9ca3 | 2009-03-10 20:18:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[74e9ca3 | 2009-03-10 12:18:35 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Add readme
 
-[0a4bcad | 2009-03-10 20:02:28 UTC] Michael Fellinger <m.fellinger@gmail.com>
+[0a4bcad | 2009-03-10 12:02:28 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Initial commit
 

data/Rakefile

@@ -1,72 +1,30 @@
-begin; require 'rubygems'; rescue LoadError; end
-
 require 'rake'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'time'
 require 'date'
-require './lib/mailit'
-
-PROJECT_SPECS = FileList[
-  'spec/*/**/*.rb'
-]
 
+PROJECT_SPECS = Dir['spec/mailit/**/*.rb']
 PROJECT_MODULE = 'Mailit'
-PROJECT_README = 'README'
-#PROJECT_RUBYFORGE_GROUP_ID = 3034
-PROJECT_COPYRIGHT_SUMMARY = [
- "# Copyright (c) 2008-#{Time.now.year} The Rubyists, LLC (effortless systems) <rubyists@rubyists.com>",
- "# Distributed under the terms of the MIT license.",
- "# See the LICENSE file which accompanies this software for the full text",
- "#"
-]
-PROJECT_COPYRIGHT = PROJECT_COPYRIGHT_SUMMARY + [
- "# Permission is hereby granted, free of charge, to any person obtaining a copy",
- '# of this software and associated documentation files (the "Software"), to deal',
- "# in the Software without restriction, including without limitation the rights",
- "# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
- "# copies of the Software, and to permit persons to whom the Software is",
- "# furnished to do so, subject to the following conditions:",
- "#",
- "# The above copyright notice and this permission notice shall be included in",
- "# all copies or substantial portions of the Software.",
- "#",
- '# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR',
- "# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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."
-]
-
-PROJECT_VERSION =
-  if version = ENV['PROJECT_VERSION'] || ENV['VERSION']
-    version
-  else
-    ::VERSION rescue Date.today.strftime("%Y.%m.%d")
-  end
-
-# To release the monthly version do:
-# $ PROJECT_VERSION=2009.03 rake release
+PROJECT_README = 'README.md'
+PROJECT_VERSION = (ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')).dup
 
 PROJECT_FILES = FileList[`git ls-files`.split("\n")].exclude('.gitignore')
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = "mailit"
-  s.author       = "Kevin Berry"
-  s.summary      = "The Mailit library, by Kevin Berry"
-  s.description  = "The Mailit library, by Kevin Berry"
-  s.email        = "kevinberry@nrs.us"
+  s.author       = "Michael 'manveru' Fellinger"
+  s.summary      = "The simple way to create mails"
+  s.email        = "manveru@rubyists.com"
   s.homepage     = "http://github.com/manveru/mailit"
   s.platform     = Gem::Platform::RUBY
   s.version      = PROJECT_VERSION
   s.files        = PROJECT_FILES
   s.has_rdoc     = true
-  s.require_path = "lib"
+  s.require_path = 'lib'
 }
 
-Dir.glob('tasks/*.rake'){|f| import(f) }
+Dir['tasks/*.rake'].each{|f| import(f) }
 
 task :default => [:bacon]
 

data/lib/mailit/mail.rb

@@ -249,11 +249,12 @@ BODY
     end
 
     def headers_prepare(headers)
+      return if headers.nil?
       case headers
       when Array
-        container[:headers] = headers
+        headers
       else
-        container[:headers] = headers.split(/\r?\n/)
+        headers.split(/\r?\n/)
       end
     end
 

data/lib/mailit/mailer.rb

@@ -38,7 +38,7 @@ module Mailit
       :server    => 'smtp.localhost',
       :port      => 25,
       :domain    => 'localhost',
-      :username  => 'foo',
+      :username  => '',
       :password  => 'foo',
       :noop      => false,
       :auth_type => :login, # :plain, :login, :cram_md5
@@ -61,11 +61,13 @@ module Mailit
 
     def send(mail, override = {})
       require 'net/smtp'
+      mailer = override[:mailer] || ::Net::SMTP
 
       server, port, domain, username, password, auth_type, noop =
         settings(override, :server, :port, :domain, :username, :password, :auth_type, :noop)
+      username = mail.from.to_s if username.empty?
 
-      ::Net::SMTP.start(server, port, domain, username, password, auth_type) do |smtp|
+      mailer.start(server, port, domain, username, password, auth_type) do |smtp|
         return if noop
         smtp.send_message(mail.to_s, mail.from, mail.to)
       end

data/lib/mailit/mime.rb

@@ -2,7 +2,7 @@ module Mailit
   module Mime
     module_function
 
-    def mime_for(filename)
+    def type_for(filename)
       detect_handler unless defined?(@mime_handler)
       send(@mime_handler, filename)
     end

data/lib/mailit/version.rb

@@ -1,3 +1,3 @@
 module Mailit
-  VERSION = "2009.08"
+  VERSION = "2010.06.03"
 end

data/mailit.gemspec

@@ -2,24 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mailit}
-  s.version = "2009.08"
+  s.version = "2010.06.03"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kevin Berry"]
-  s.date = %q{2009-08-25}
-  s.description = %q{The Mailit library, by Kevin Berry}
-  s.email = %q{kevinberry@nrs.us}
+  s.authors = ["Michael 'manveru' Fellinger"]
+  s.date = %q{2010-06-03}
+  s.email = %q{manveru@rubyists.com}
   s.files = ["AUTHORS", "CHANGELOG", "MANIFEST", "README.md", "Rakefile", "lib/mailit.rb", "lib/mailit/mail.rb", "lib/mailit/mailer.rb", "lib/mailit/mime.rb", "lib/mailit/version.rb", "lib/version.rb", "mailit.gemspec", "spec/helper.rb", "spec/mailit/mail.rb", "spec/mailit/mailer.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/copyright.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/yard.rake"]
   s.homepage = %q{http://github.com/manveru/mailit}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
-  s.summary = %q{The Mailit library, by Kevin Berry}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{The simple way to create mails}
 
   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
     else
     end
   else

data/spec/helper.rb

@@ -1,4 +1,5 @@
 require File.expand_path("#{__FILE__}/../../lib/mailit")
 require 'bacon'
+require 'Tempfile'
 
 Bacon.summary_on_exit

data/spec/mailit/mail.rb

@@ -105,4 +105,43 @@ describe Mailit::Mail do
 
     mail.to_s.should.include('<a href=3D"http://google.com">click here</a>')
   end
+  
+  should 'make mail with a single attachment' do
+    mail = Mailit::Mail.new
+    tempfile = Tempfile.new('adw')
+    tempfile << "Some text"
+    mail.attach(tempfile.path)
+    mail.attachments.size.should == 1
+    mail.attachments.first[:attachment].should.be == tempfile.read
+    mail.attachments.first[:filename].should == Pathname.new(tempfile.path).basename
+  end
+  
+  should 'make mail with a single attachment and given filename' do
+    mail = Mailit::Mail.new
+    tempfile = Tempfile.new('adw')
+    filename = "tempfile.pdf"
+    tempfile << "Some text"
+    mail.attach_as(tempfile.path, filename)
+    mail.attachments.size.should == 1
+    mail.attachments.first[:attachment].should.be == tempfile.read
+    mail.attachments.first[:filename].should == filename
+  end
+  
+  should 'make mail with multiple attachments and given filenames' do
+    mail = Mailit::Mail.new
+    tempfile1 = Tempfile.new('adw')
+    tempfile1 << "Hello"
+    tempfile1_filename = "tempfile1.pdf"
+    tempfile2 = Tempfile.new('adw')
+    tempfile2 << "World!1"
+    tempfile2_filename = "tempfile2.pdf"
+    mail.attach_as(tempfile1.path, tempfile1_filename)
+    mail.attach_as(tempfile2.path, tempfile2_filename)
+    mail.attachments.size.should == 2
+    mail.attachments[0][:attachment].should.be == tempfile1.read
+    mail.attachments[0][:filename].should == tempfile1_filename
+    mail.attachments[1][:attachment].should.be == tempfile2.read
+    mail.attachments[1][:filename].should == tempfile2_filename
+  end
+  
 end

data/spec/mailit/mailer.rb

@@ -41,7 +41,7 @@ describe Mailit::Mailer do
       'example.com',
       'sender@example.com',
       'foo',
-      :cram_md5
+      :login
     ]
     mock.send_message_args.should == [mail.to_s, mail.from, mail.to]
   end

data/tasks/release.rake

@@ -1,52 +1,65 @@
 namespace :release do
-  task :all => [:release_github, :release_rubyforge]
+  task :prepare => [:reversion, :authors, :gemspec]
+  task :all => ['release:github', 'release:rubyforge', 'release:gemcutter']
 
-  desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
+  desc 'Release on github'
+  task :github => :prepare do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
+    sh('git', 'add',
+       'MANIFEST', 'CHANGELOG', 'AUTHORS',
+       "#{name}.gemspec",
+       "lib/#{name}/version.rb")
 
-git add AUTHORS MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
+    puts <<-INSTRUCTIONS
+================================================================================
 
-Then commit them, tag the commit, and push:
+I added the relevant files, you can commit them, tag the commit, and push:
 
 git commit -m 'Version #{version}'
 git tag -a -m '#{version}' '#{version}'
 git push
 
-INSTRUCTIONS
-
+================================================================================
+    INSTRUCTIONS
   end
 
-  # TODO: Not tested
-  desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
-    name, version = GEMSPEC.name, GEMSPEC.version.to_s
+  desc 'Release on rubyforge'
+  task :rubyforge => ['release:prepare', :package] do
+    name, version = GEMSPEC.name, GEMSPEC.version
+
+    pkgs = Dir["pkg/#{name}-#{version}.{tgz,zip}"].map{|file|
+      "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
+    }
+
+    puts <<-INSTRUCTIONS
+================================================================================
 
-    puts <<INSTRUCTIONS
 To publish to rubyforge do following:
 
 rubyforge login
-rubyforge add_release #{name} #{name} #{version.dump} pkg/#{name}-#{version}.gem
+rubyforge add_release #{name} #{name} '#{version}' pkg/#{name}-#{version}.gem
 
-After you have done these steps, see:
+To publish the archives for distro packagers:
 
-VERSION=#{version.dump} rake release:rubyforge_archives
+#{pkgs.join "\n"}
 
-INSTRUCTIONS
+================================================================================
+    INSTRUCTIONS
   end
 
-  desc 'Display instructions to add archives after release:rubyforge'
-  task :rubyforge_archives do
-    name, version = GEMSPEC.name, GEMSPEC.version.to_s
-    puts "Adding archives for distro packagers is:", ""
+  desc 'Release on gemcutter'
+  task :gemcutter => ['release:prepare', :package] do
+    name, version = GEMSPEC.name, GEMSPEC.version
+
+    puts <<-INSTRUCTIONS
+================================================================================
+
+To publish to gemcutter do following:
 
-    Dir["pkg/#{name}-#{version}.{tgz,zip}"].each do |file|
-      puts "rubyforge add_file %s %s %p %p" % [name, name, version, file]
-    end
+gem push pkg/#{name}-#{version}.gem
 
-    puts
+================================================================================
+    INSTRUCTIONS
   end
 end

metadata

@@ -1,20 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: mailit
 version: !ruby/object:Gem::Version 
-  version: "2009.08"
+  hash: 16081
+  prerelease: false
+  segments: 
+  - 2010
+  - 6
+  - 3
+  version: 2010.06.03
 platform: ruby
 authors: 
-- Kevin Berry
+- Michael 'manveru' Fellinger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: The Mailit library, by Kevin Berry
-email: kevinberry@nrs.us
+description: 
+email: manveru@rubyists.com
 executables: []
 
 extensions: []
@@ -60,23 +66,29 @@ 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: The Mailit library, by Kevin Berry
+summary: The simple way to create mails
 test_files: []