lettr 1.0.2 → 1.0.3

data/README.md

@@ -45,13 +45,13 @@ Just set the Delivery Method of ActionMailer to :lettr, and all Mailings from Ac
 ### Lettr::Mailer
 Let your mailer class inherit from Lettr::Mailer instead of ActionMailer::Base.
 
-    class BookingMailer < Lettr::Mailer
-      FROM = 'intervillas <info@intervillas-florida.com>'
-      def submission_mail(booking)
-        recipients booking.email
+    class ExampleMailer < Lettr::Mailer
+      FROM = 'example <info@example.com>'
+      def example_mail(example)
+        recipients example.email
         from FROM
-        subject I18n.t('booking_mailer.ihre_anfrage')
-        body :booking => booking
+        subject I18n.t('example_mailer.example')
+        body :example => example
       end
     end
 
@@ -66,7 +66,7 @@ Let your mailer class inherit from Lettr::Mailer instead of ActionMailer::Base.
 #### and a hash
 Provide a hash containing the variables, that you used in your template.
 
-    Lettr.test_mail(:test => { :variable_1 => 'foo', :variable_2 => 'bar' }).deliver
+    Lettr.test_mail(:recipient => 'tg@digineo.de', :test => { :variable_1 => 'foo', :variable_2 => 'bar' }).deliver
 
 #### OR
 #### and an object, which responds to :to_nb_hash
@@ -79,7 +79,7 @@ Provide a hash containing the variables, that you used in your template.
 
     test_object = TestClass.new
 
-    Lettr.test_mail(:test => test_object ).deliver
+    Lettr.test_mail(:recipient => 'tg@digineo.de', :test => test_object).deliver
 
 #### OR
 #### automagic
@@ -102,7 +102,7 @@ And the following Template:
 When you do a request to the Lettr Api
 
     test_object = TestClass.new
-    Lettr.test_mail(:test => test_object ).deliver
+    Lettr.test_mail(:recipient => 'tg@digineo.de', :test => test_object ).deliver
 
 Lettr will invoke the methods :variable_1 and :variable_2 on test_object and serialize their return values for the request.
 So the request will result in the following Mailing:

data/lib/lettr.rb

@@ -17,6 +17,7 @@ module Lettr
   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'

data/lib/lettr/base.rb

@@ -5,7 +5,9 @@ class Lettr::Base
   attr_reader :client
 
   def initialize
-    @client = RestClient::Resource.new self.class.site_url, self.class.user, self.class.pass
+    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 self.site_url
@@ -16,19 +18,25 @@ class Lettr::Base
     path = object.collection_path
     payload = object.to_payload
     payload.merge! :files => object.files if object.respond_to?(:files) && object.files
-    client[path].post(payload, DEFAULT_HEADERS)
+    client[path].post(payload, headers)
   end
 
   def destroy object
-    client[object.path].delete DEFAULT_HEADERS
+    client[object.path].delete headers
   end
 
   def find path
-    ActiveSupport::JSON.decode(client[path].get DEFAULT_HEADERS)
+    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
+
 end

data/lib/lettr/collection.rb

@@ -17,7 +17,11 @@ class Lettr::Collection
         if element.class.respond_to? :is_whitelisted?
           raise SecurityError, "method #{var} in class #{element.class} not whitelisted" unless element.class.is_whitelisted?(var)
         end
-        hash[var] = element.send(var)
+        if element.is_a?( String )
+          hash = element
+        else
+          hash[var] = element.send(var)
+        end
       end
       @context << hash
     end

data/lib/lettr/deliverable.rb

@@ -30,6 +30,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
 
     # perform delivery request
     rec = Lettr::Delivery.new @hash, @files

data/lib/lettr/recipient.rb

@@ -16,7 +16,7 @@ Lettr::Recipient = Struct.new( :email, :id, :gender, :firstname, :lastname, :str
   end
 
   def self.delete_by_email email
-    client["#{path}/destroy_by_email"].delete :email => email
+    client["#{path}/destroy_by_email"].delete :email => email #, 'X-Lettr-API-Key' => Lettr.api_key
   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
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Digineo GmbH
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency