lettr 1.0.4 → 1.1.0

data/README.md

@@ -13,8 +13,6 @@ For Rails 3.x or if you use Bundler drop the following line into your Gemfile:
 
     gem 'lettr'
 
-NOTE: In a Rails 3 Application you currently cant use Delivery Method nor Lettr::Mailer.
-
 ## Configuration
 There are some configuration options you can provide either inside config/environment.rb or config/environments/$RAILS_ENV.rb or create an initializer in config/initializers.
 At least you have to provide your lettr login credentials:

data/init.rb

@@ -1,3 +1,8 @@
 if defined? ActionMailer::Base
-  ActionMailer::Base.send(:include, Lettr::ActionMailer)
+  if defined? TMail
+    ActionMailer::Base.send(:include, Lettr::ActionMailer)
+  elsif defined? Mail
+    require 'lettr/mail_extensions'
+    ActionMailer::Base.add_delivery_method :lettr, Mail::Lettr
+  end
 end

data/lib/lettr.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'active_support'
 
 module Lettr
@@ -12,6 +13,9 @@ module Lettr
   require 'lettr/collection'
   require 'lettr/rendered_mailing'
   require 'lettr/whitelist'
+  require 'lettr/action_mailer'
+  require 'lettr/mailer'
+  require 'lettr/mail_extensions'
 
   mattr_accessor :host
   mattr_accessor :attributes
@@ -83,6 +87,9 @@ module Lettr
   end
 
   def self.method_missing *args, &block
+    if args.first.to_s =~ /^to_/
+      super
+    end
     load_api_mailing_or_fail_loud *args
   rescue RestClient::ResourceNotFound
     super

data/lib/lettr/action_mailer.rb

@@ -3,37 +3,7 @@ module Lettr::ActionMailer
   private
 
   def perform_delivery_lettr mail
-    lettr_request_hashes = []
-    mail.to.each do |recipient|
-      lettr_request_hash = {}
-      lettr_request_hash[:recipient] = recipient
-      lettr_request_hash[:subject] = mail.subject
-      if mail.parts.empty?
-        case mail.content_type
-        when 'text/html'
-          lettr_request_hash[:html] = mail.body
-        when 'text/plain'
-          lettr_request_hash[:text] = mail.body
-        end
-      else
-        mail.parts.each do |part|
-          case part.content_type
-          when 'text/html'
-            lettr_request_hash[:html] = part.body
-          when 'text/plain'
-            lettr_request_hash[:text] = part.body
-          else
-            lettr_request_hash[:attachments] ||= []
-            lettr_request_hash[:attachments] << part.body
-          end
-        end
-      end
-      lettr_request_hashes << lettr_request_hash
-    end
-    identifier = @template
-    lettr_request_hashes.each do |lettr_request_hash|
-      Lettr.send(identifier, lettr_request_hash).deliver
-    end
-
+    Mail::Lettr.new(:template => @template).deliver! mail
   end
+
 end

data/lib/lettr/deliverable.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Lettr::Deliverable
 
   def self.included base
@@ -30,7 +31,7 @@ module Lettr::Deliverable
     group_variables if respond_to? :group_variables
     handle_options
     append_used_variables if respond_to? :append_used_variables
-    Rails.logger.debug @hash.inspect
+    Rails.logger.debug @hash.inspect if defined? Rails
 
     # perform delivery request
     rec = Lettr::Delivery.new @hash, @files

data/lib/lettr/mail_extensions.rb

@@ -0,0 +1,44 @@
+module Mail
+  class Lettr
+
+    def initialize(values={})
+      @settings = values
+    end
+
+    def deliver!(mail)
+      lettr_request_hashes = []
+      raise 'no recipient' unless mail.to
+      mail.to.each do |recipient|
+        lettr_request_hash = {}
+        lettr_request_hash[:recipient] = recipient
+        lettr_request_hash[:subject] = mail.subject
+        if mail.parts.empty?
+          case mail.content_type
+          when /text\/html/
+            lettr_request_hash[:html] = mail.body
+          when /text\/plain/
+            lettr_request_hash[:text] = mail.body
+          end
+        else
+          mail.parts.each do |part|
+            case part.content_type
+            when /text\/html/
+              lettr_request_hash[:html] = part.body
+            when /text\/plain/
+              lettr_request_hash[:text] = part.body
+            else
+              lettr_request_hash[:attachments] ||= []
+              lettr_request_hash[:attachments] << part.body
+            end
+          end
+        end
+        lettr_request_hashes << lettr_request_hash
+      end
+      identifier = @settings[:template] || mail.subject.downcase.gsub(/\s/, '_')
+      lettr_request_hashes.each do |lettr_request_hash|
+        ::Lettr.send(identifier, lettr_request_hash).deliver
+      end
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lettr
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Digineo GmbH
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +01:00
+date: 2011-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: actionmailer
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: lettr.de Api
 email: kontakt@digineo.de
 executables: []
@@ -97,6 +111,7 @@ files:
 - lib/lettr/deliverable.rb
 - lib/lettr/rendered_mailing.rb
 - lib/lettr/base.rb
+- lib/lettr/mail_extensions.rb
 - lib/lettr/api_mailing.rb
 - lib/lettr.rb
 - lib/tasks/newsletter_boy.rake