goatmail 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13683a9c7ec6109131989e5717ff34615b43b50f
-  data.tar.gz: ffdb73b2ac5a73f746987623261c059c0faf9bd9
+SHA256:
+  metadata.gz: 60129bf941275eb62aca03cf40690205bc98ea6a5c32a9405b14eeb4adbd0126
+  data.tar.gz: f5be5dd481df2a40d39b290d0f0cdf1805db1062eb1f7a3321bb5be7e86d75ff
 SHA512:
-  metadata.gz: 4b4fdd461cc450689780927f4d4db370ec147eb877d2ea49d4a5504741f6e3b730d9d124a88a0785a91ffe8406864e55330ada740ccd7a8b256824a7e96b338c
-  data.tar.gz: 15ef1105ee23da4adf259ac1de0c50f35545320e387c586c2e6195ef71e9bc9ce2abf97a793af9b50f8772e75c08bc9520831eb445fcf4bc1927c9ab31a76cad
+  metadata.gz: 1e603fe208760588d06212425270dd15f4891fd1a4bd4ce04bf90803c61cc9d2e7e16c79b9693c2aae4a47f06a088f05c8baef5d0fca499e9aea7b90b2dadaca
+  data.tar.gz: e3b4bad9eb816d10b81cb80e39f948014620f44ab2666e3019f7f6c3f1a58f969c89a2b6c6f9414a8cbb81e4c5faca8e07c492770feff7710c00ed0f0a01c62c

data/.travis.yml

@@ -1,23 +1,23 @@
 language: ruby
-before_install: gem install bundler --pre
+cache: bundler
+before_install:
+  - gem install bundler
 install:
-  - gem update --system
   - bundle update
-script: xvfb-run rake
+script: xvfb-run bundle exec rake
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - rbx-2
-  - jruby
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
   - jruby-head
+  - rbx-3
 branches:
   only:
     - master
 matrix:
   allow_failures:
-    - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head
-
+    - rvm: rbx-3

data/README.md

@@ -39,6 +39,8 @@ Sample::Application.routes.draw do
 end
 ```
 
+If you use the Rails 5, Please use a combination with the Sinatra 2.0 later version.
+
 ## Padrino Setup
 
 Then set the delivery method and mount app in `config/apps.rb`
@@ -58,6 +60,19 @@ end
 Padrino.mount('SampleProject::App', :app_file => Padrino.root('app/app.rb')).to('/')
 ```
 
+If an exception occurs that "Gem Load Error is: undefined method 'version' for Padrino:Module", please try this:
+
+```ruby
+# Gemfile
+gem 'goatmail', :group => :development, :require => false
+
+# config/boot.rb
+Padrino.before_load do
+  require 'goatmail'
+end
+```
+
+
 ## Sinatra Sample
 
 ```ruby
@@ -83,8 +98,10 @@ map '/' do
   run Sample::App.new
 end
 
-map '/inbox' do
-  run Goatmail::App.new
+if ENV['RACK_ENV'] == 'development'
+  map '/inbox' do
+    run Goatmail::App.new
+  end
 end
 ```
 

data/goatmail.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "letter_opener"
+  spec.add_dependency "letter_opener", '>= 1.5.0'
   spec.add_dependency "sinatra"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/goatmail.rb

@@ -2,9 +2,9 @@ require 'goatmail/delivery_method'
 require 'goatmail/app'
 
 module Goatmail
-
   class << self
     def location
+      @location ||= LetterOpener.configuration.location
       @location ||= Rails.root.join('tmp/goatmail')  if defined? Rails
       @location ||= Padrino.root('tmp/goatmail')     if defined? Padrino
       @location
@@ -14,7 +14,6 @@ module Goatmail
       @location = path
     end
   end
-
 end
 
 require "goatmail/railtie" if defined? Rails::Railtie

data/lib/goatmail/delivery_method.rb

@@ -4,18 +4,21 @@ module Goatmail
   class DeliveryMethod < LetterOpener::DeliveryMethod
 
     def initialize(options = {})
+      options[:location] ||= Goatmail.location
+      super
       raise InvalidOption, "A location option is required when using the Goatmail delivery method" if Goatmail.location.nil?
-      self.settings = options
     end
 
     def deliver!(mail)
-      location = File.join(Goatmail.location, "#{Time.now.to_i}_#{Digest::SHA1.hexdigest(mail.encoded)[0..6]}")
-      messages = LetterOpener::Message.rendered_messages(location, mail)
+      validate_mail!(mail)
+      location = File.join(settings[:location], "#{Time.now.to_f.to_s.tr('.', '_')}_#{Digest::SHA1.hexdigest(mail.encoded)[0..6]}")
+      messages = LetterOpener::Message.rendered_messages(mail, location: location, message_template: settings[:message_template])
       meta_data = {
         subject: mail.subject.to_s,
         to:      mail.to.join(", "),
         from:    mail.from.join(', ')
       }
+
       File.open(File.join(location, 'meta'), 'wb') {|f| Marshal.dump(meta_data, f)}
       messages
     end

data/lib/goatmail/railtie.rb

@@ -2,7 +2,7 @@ module Goatmail
   class Railtie < Rails::Railtie
     initializer "goatmail.add_delivery_method" do
       ActiveSupport.on_load :action_mailer do
-        ActionMailer::Base.add_delivery_method :goatmail, Goatmail::DeliveryMethod, location: Rails.root.join("tmp", "goatmail")
+        ActionMailer::Base.add_delivery_method :goatmail, Goatmail::DeliveryMethod, location: Goatmail.location
       end
     end
   end if defined? Rails::Railtie

data/lib/goatmail/version.rb

@@ -1,5 +1,5 @@
 module Goatmail
-  VERSION = "1.1.1" unless defined? Goatmail::VERSION
+  VERSION = "1.2.0" unless defined? Goatmail::VERSION
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goatmail
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Takeshi Yabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: letter_opener
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Sinatra-based letter_opener web interface