lettr 1.1.0 → 1.1.1

data/init.rb

@@ -1,8 +1,5 @@
 if defined? ActionMailer::Base
   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,98 +1,66 @@
 # encoding: utf-8
 require 'active_support'
+require 'rest-client'
 
 module Lettr
 
-  require 'lettr/base'
-  require 'lettr/resource'
-  require 'lettr/recipient'
-  require 'lettr/deliverable'
-  require 'lettr/object_converter'
-  require 'lettr/api_mailing'
-  require 'lettr/delivery'
-  require 'lettr/collection'
-  require 'lettr/rendered_mailing'
-  require 'lettr/whitelist'
-  require 'lettr/action_mailer'
-  require 'lettr/mailer'
-  require 'lettr/mail_extensions'
+  autoload :Base, 'lettr/base'
+  autoload :Resource, 'lettr/resource'
+  autoload :Recipient, 'lettr/recipient'
+  autoload :Deliverable, 'lettr/deliverable'
+  autoload :ObjectConverter, 'lettr/object_converter'
+  autoload :ApiMailing, 'lettr/api_mailing'
+  autoload :Delivery, 'lettr/delivery'
+  autoload :Collection, 'lettr/collection'
+  autoload :RenderedMailing, 'lettr/rendered_mailing'
+  autoload :Whitelist, 'lettr/whitelist'
+  autoload :ActionMailer, 'lettr/action_mailer'
+  autoload :Mailer, 'lettr/mailer'
+  autoload :MailExtensions, 'lettr/mail_extensions'
+  #require 'lettr/mail_extensions'
+  #require 'lettr/railtie' if defined? Rails::Railtie
 
   mattr_accessor :host
   mattr_accessor :attributes
   mattr_accessor :protocol
-  mattr_accessor :api_mailings
   mattr_accessor :api_key
 
   self.attributes ||= %w{ gender firstname lastname street ccode pcode city }
-  self.protocol ||= 'http'
-  self.host ||= 'www.newsletterboy.de'
-  self.api_mailings = {}
+  self.protocol ||= 'https'
+  self.host ||= 'lettr.de'
 
   def self.credentials=(credentials)
-    Base.user = credentials[:user]
-    Base.pass = credentials[:pass]
+    Lettr::Base.user = credentials[:user]
+    Lettr::Base.pass = credentials[:pass]
   end
 
-  def self.subscribe(recipient)
-    raise 'Object muss über das Attribut :email verfügen.' unless recipient.respond_to? :email
-    rec = Recipient.new recipient.email
-    attributes.each do |attribute|
-      if recipient.respond_to? attribute
-        rec.send("#{attribute}=", recipient.send(attribute))
-      end
-    end
-    rec.approved = true
-    unless rec.save
-      raise rec.errors.join(' ')
+  class << self
+  %w{ subscribe unsubscribe }.each do |meth|
+    define_method meth do |*args|
+      Lettr::Base.send(meth, *args)
     end
-    rec
-  end
-
-  def self.unsubscribe(email)
-    Recipient.delete_by_email(email)
   end
-
-  def self.load_api_mailing_or_fail_loud *args
-    identifier = args[0]
-    api_mailing = self.api_mailings[identifier] ||= ApiMailing.find(identifier)
-    options = args[1]
-    api_mailing.delivery_options = options
-    return api_mailing
-  rescue RestClient::ResourceNotFound => e
-    _create_rendered_mail( *args )
-  end
-
-  def self._check_options_for_rendered_mail! options
-    [:subject, :recipient].each do |opt|
-      raise ArgumentError.new ":#{opt} is required" unless options.has_key?( opt )
-    end
-    raise ArgumentError.new ":html or :text is required" unless (options.has_key?( :text ) || options.has_key?( :html ))
-  end
-
-  def self._create_rendered_mail *args
-    _check_options_for_rendered_mail! args[1]
-    mailing = RenderedMailing.find args[0].to_s
-    mailing.attributes = args[1].merge(:identifier => args[0].to_s)
-    mailing
-  rescue RestClient::ResourceNotFound
-    mailing = RenderedMailing.new args[1].merge(:identifier => args[0].to_s)
-    unless mailing.save
-      raise ArgumentError.new mailing.errors.join(' ')
-    end
-    mailing
-  end
-
-  def self.api_mailings
-    @@api_mailings
   end
 
   def self.method_missing *args, &block
     if args.first.to_s =~ /^to_/
       super
     end
-    load_api_mailing_or_fail_loud *args
+    Lettr::Base.load_api_mailing_or_fail_loud *args
   rescue RestClient::ResourceNotFound
     super
   end
 
 end
+
+if defined? Rails::Railtie
+  class Lettr::Railtie < Rails::Railtie
+
+    initializer 'lettr.init' do
+      ActiveSupport.on_load(:action_mailer) do
+        ActionMailer::Base.add_delivery_method :lettr, Lettr::MailExtensions::Lettr
+      end
+    end
+
+  end
+end

data/lib/lettr/action_mailer.rb

@@ -3,7 +3,7 @@ module Lettr::ActionMailer
   private
 
   def perform_delivery_lettr mail
-    Mail::Lettr.new(:template => @template).deliver! mail
+    Lettr::MailExtensions::Lettr.new(:template => @template).deliver! mail
   end
 
 end

data/lib/lettr/api_mailing.rb

@@ -1,4 +1,4 @@
-Lettr::ApiMailing = Struct.new(:identifier, :subject, :variables) do
+class Lettr::ApiMailing < Struct.new(:identifier, :subject, :variables)
   include Lettr::Resource
   include Lettr::ObjectConverter
   include Lettr::Deliverable

data/lib/lettr/base.rb

@@ -1,42 +1,103 @@
-class Lettr::Base
-  DEFAULT_HEADERS = { :accept => :json }
+# encoding: utf-8
+module Lettr
+  class Base
+    DEFAULT_HEADERS = { :accept => :json }
 
-  cattr_accessor :site, :user, :pass, :content_type
-  attr_reader :client
+    cattr_accessor :site, :user, :pass, :content_type, :api_mailings
+    attr_reader :client
 
-  def initialize
-    resource_args = [ self.class.site_url ]
-    resource_args += [self.class.user, self.class.pass] unless Lettr.api_key
-    @client = RestClient::Resource.new *resource_args
-  end
+    self.api_mailings = {}
 
-  def self.site_url
-    "#{Lettr.protocol}://#{Lettr.host}/"
-  end
+    def initialize
+      resource_args = [ self.class.site_url ]
+      resource_args += [self.class.user, self.class.pass] unless Lettr.api_key
+      @client = RestClient::Resource.new *resource_args
+    end
 
-  def save object
-    path = object.collection_path
-    payload = object.to_payload
-    payload.merge! :files => object.files if object.respond_to?(:files) && object.files
-    client[path].post(payload, headers)
-  end
+    def self.site_url
+      "#{Lettr.protocol}://#{Lettr.host}/"
+    end
 
-  def destroy object
-    client[object.path].delete headers
-  end
+    def save object
+      path = object.collection_path
+      payload = object.to_payload
+      payload.merge! :files => object.files if object.respond_to?(:files) && object.files
+      client[path].post(payload, headers)
+    end
 
-  def find path
-    ActiveSupport::JSON.decode(client[path].get headers)
-  end
+    def destroy object
+      client[object.path].delete headers
+    end
 
-  def [] path
-    client[path]
-  end
+    def find path
+      ActiveSupport::JSON.decode(client[path].get headers)
+    end
+
+    def [] path
+      client[path]
+    end
+
+    def headers
+      headers = DEFAULT_HEADERS
+      headers.merge! 'X-Lettr-API-key' => Lettr.api_key if Lettr.api_key
+      headers
+    end
+
+    def self.subscribe(recipient)
+      raise 'Object muss über das Attribut :email verfügen.' unless recipient.respond_to? :email
+      rec = Lettr::Recipient.new recipient.email
+      Lettr.attributes.each do |attribute|
+        if recipient.respond_to? attribute
+          rec.send("#{attribute}=", recipient.send(attribute))
+        end
+      end
+      rec.approved = true
+      unless rec.save
+        raise rec.errors.join(' ')
+      end
+      rec
+    end
+
+    def self.unsubscribe(email)
+      Lettr::Recipient.delete_by_email(email)
+    end
+
+    def self.load_api_mailing_or_fail_loud *args
+      identifier = args[0]
+      api_mailing = self.api_mailings[identifier] ||= Lettr::ApiMailing.find(identifier)
+      options = args[1]
+      api_mailing.delivery_options = options
+      return api_mailing
+    rescue RestClient::ResourceNotFound => e
+      _create_rendered_mail( *args )
+    end
+
+    def self._check_options_for_rendered_mail! options
+      [:subject, :recipient].each do |opt|
+        raise ArgumentError.new ":#{opt} is required" unless options.has_key?( opt )
+      end
+      raise ArgumentError.new ":html or :text is required" unless (options.has_key?( :text ) || options.has_key?( :html ))
+    end
+
+    def self._create_rendered_mail *args
+      _check_options_for_rendered_mail! args[1]
+      mailing = Lettr::RenderedMailing.find args[0].to_s
+      mailing.attributes = args[1].merge(:identifier => args[0].to_s)
+      mailing
+    rescue RestClient::ResourceNotFound
+      mailing = Lettr::RenderedMailing.new args[1].merge(:identifier => args[0].to_s)
+      unless mailing.save
+        raise ArgumentError.new mailing.errors.join(' ')
+      end
+      mailing
+    end
+
+    def self.api_mailings
+      @@api_mailings
+    end
 
-  def headers
-    headers = DEFAULT_HEADERS
-    headers.merge! 'X-Lettr-API-key' => Lettr.api_key if Lettr.api_key
-    headers
   end
 
 end
+
+

data/lib/lettr/mail_extensions.rb

@@ -1,44 +1,47 @@
-module Mail
-  class Lettr
+module Lettr
+  module MailExtensions
+    class Lettr
 
-    def initialize(values={})
-      @settings = values
-    end
+      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
+      def deliver!(mail)
+        lettr_request_hashes = []
+        raise 'no recipient' unless mail.to
+        raise 'no subject' unless mail.subject
+        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] = part.body
+              lettr_request_hash[:html] = mail.body
             when /text\/plain/
-              lettr_request_hash[:text] = part.body
-            else
-              lettr_request_hash[:attachments] ||= []
-              lettr_request_hash[:attachments] << part.body
+              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
-        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
 end

data/lib/lettr/mailer.rb

@@ -4,4 +4,7 @@ class Lettr::Mailer < ActionMailer::Base
   alias perform_delivery_smtp     perform_delivery_lettr
   alias perform_delivery_sendmail perform_delivery_lettr
   alias perform_delivery_test     perform_delivery_lettr
+
+  self.delivery_method = :lettr
+
 end

data/lib/lettr/railtie.rb

@@ -0,0 +1,11 @@
+#module Lettr
+  #class Railtie < Rails::Railtie
+
+    #initializer 'lettr.init' do
+      #ActiveSupport.on_load(:action_mailer) do
+        #ActionMailer::Base.add_delivery_method :lettr, Lettr::MailExtensions::Lettr
+      #end
+    #end
+
+  #end
+#end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lettr
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Digineo GmbH
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ extra_rdoc_files: []
 files: 
 - lib/lettr/action_mailer.rb
 - lib/lettr/whitelist.rb
+- lib/lettr/railtie.rb
 - lib/lettr/collection.rb
 - lib/lettr/resource.rb
 - lib/lettr/object_converter.rb