kiss 1.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0
+1.0.1

data/lib/kiss/action.rb

@@ -70,19 +70,19 @@ class Kiss
     def validate_arg(index, format, required = false)
       Kiss.validate_value(@args[index], format, required, "arg #{index}")
     end
-  
+    
     # Creates and invokes new Kiss::Mailer instance to send email message via sendmail.
-    def sendmail(options)
-      Kiss::Mailer.new.sendmail({
-        :data => data
+    def sendmail(options = {})
+      send_email({
+        :engine => :sendmail
       }.merge(options))
     end
   
-    # Creates and invokes new Kiss::Mailer instance to send email message via SMTP,
-    # unless options specify :engine => :sendmail.
-    def send_email(options)
-      controller.new_email.send({
-        :data => data
+    # Creates and invokes new Kiss::Mailer instance to send email message via SMTP.
+    def send_email(options = {})
+      Kiss::Mailer.new.send_email({
+        :data => data,
+        :controller => controller
       }.merge(options))
     end
   

data/lib/kiss/mailer.rb

@@ -3,24 +3,26 @@ class Kiss
   class Mailer
     include Kiss::TemplateMethods
     
-    # Creates new email message object.
-    def initialize(controller,options = {})
-      @controller = controller
-      @options = {
-        :engine => :sendmail
-      }.merge(options)
-      
-      @data = {}
+    attr_accessor :controller
+    
+    def merge_options(options = {})
+      @options.merge!(options)
+      @controller = options[:controller] || @controller
+      @data = options[:data] || @data
     end
     
-    def controller
-      @controller
+    # Creates new email message object.
+    def initialize(options = {})
+      @options = {}
+      @data = {}
+      
+      merge_options(options) if options
     end
     
     # Renders email template to string, unless message option is
     # already set to a string value.
-    def prepare_email_message(options = {})
-      @options.merge!(options)
+    def prepare_email_message(options = nil)
+      merge_options(options) if options
     
       unless @options[:message].is_a?(String)
         if template_name = @options[:template]
@@ -39,16 +41,12 @@ class Kiss
       return @options[:message]
     end
     
-    # Sets data to be passed to email template.
-    def set(key,value)
-      @data[key] = value
-    end
-    
     # Attempts to send message using SMTP, unless :engine option is set to
     # :sendmail.
-    def send(options)
-      @options.merge!(options)
-      if options[:engine] == :sendmail
+    def send(options = nil)
+      merge_options(options) if options
+      
+      if @options[:engine] == :sendmail
         return sendmail
       else
         return send_smtp
@@ -56,7 +54,9 @@ class Kiss
     end
     
     # Attempts to send message using /usr/sbin/sendmail.
-    def sendmail(options = {})
+    def sendmail(options = nil)
+      merge_options(options) if options
+      
       prepare_email_message(options)
     
       IO.popen(@options[:sendmail_path] || "/usr/sbin/sendmail -t","w") do |pipe|
@@ -65,7 +65,9 @@ class Kiss
     end
     
     # Attempts to send message using Net::SMTP.
-    def send_smtp(options = {})
+    def send_smtp(options = nil)
+      merge_options(options) if options
+      
       prepare_email_message(options)
     
       require 'net/smtp' unless defined?(Net::SMTP)

data/lib/kiss/model.rb

@@ -50,7 +50,7 @@ class Kiss
         association_reflections[name]
       end
       
-      include Kiss::KissAccessors
+      include Kiss::ControllerAccessors
     end
     
     def method_missing(meth)

data/lib/kiss.rb

@@ -820,7 +820,9 @@ class Kiss
   
   # Returns new Kiss::Mailer object using specified options.
   def new_email(options = {})
-    Kiss::Mailer.new(options)
+    mailer = Kiss::Mailer.new(options)
+    mailer.controller = self
+    mailer
   end
   
   # Kiss Model cache, used to invoke and store Kiss database models.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kiss
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Shawn Van Ittersum