radiant-forms-extension 3.3.0 → 3.3.1

data/VERSION

@@ -1 +1 @@
-3.3.0
+3.3.1

data/app/models/form_mail.rb

@@ -31,64 +31,53 @@ class FormMail
   end
   
   def from
-    from = nil
-    unless @config[:field].nil? or !@config[:field][:from].blank?
-      from = Forms::Tags::Responses.retrieve(@data, @config[:field][:from])
-    else
-      from = @config[:from]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:from])
+    rescue
+      @config[:from]
     end
-    from
   end
   
   def recipients
-    to = nil
-    unless @config[:field].nil? or !@config[:field][:to].blank?
-      to = Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
-    else
-      to = @config[:to]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
+    rescue
+      @config[:to]
     end
-    to
   end
   
   def reply_to
-    reply_to = nil
-    unless @config[:field].nil? or !@config[:field][:reply_to].blank?
-      reply_to = Forms::Tags::Responses.retrieve(@data, @config[:field][:reply_to])
-    else
-      reply_to = @config[:reply_to]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:reply_to])
+    rescue
+      @config[:reply_to]
     end
-    reply_to
   end
   
   def sender
-    sender = nil
-    unless @config[:field].nil? or !@config[:field][:sender].blank?
-      sender = Forms::Tags::Responses.retrieve(@data, @config[:field][:sender])
-    else
-      sender = @config[:sender]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:sender])
+    rescue
+      @config[:sender]
     end
-    sender
   end
   
   def subject
-    subject = nil
-    unless @config[:field].nil? or !@config[:field][:subject].blank?
-      subject = Forms::Tags::Responses.retrieve(@data, @config[:field][:subject])
-    else
-      subject = @config[:subject]
+    begin
+      Forms::Tags::Responses.retrieve(@data, @config[:field][:subject])
+    rescue
+      @config[:subject]
     end
-    subject
   end
   
   def body
     # This parses the content of the form
     @parser = Radius::Parser.new(PageContext.new(@page), :tag_prefix => 'r')
     if @config[:body]
-      @body = @parser.parse(@form.send(@config[:body]))
+      @parser.parse(@form.send(@config[:body]))
     else
-      @body = @parser.parse(@form.content)
+      @parser.parse(@form.content)
     end
-    @body
   end
   
   def cc

data/radiant-forms-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.3.0"
+  s.version = "3.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-12-14}
+  s.date = %q{2010-12-15}
   s.description = %q{Send data from a page to a form handler, extendable with addons}
   s.email = %q{dirk.kelly@squaretalent.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 3
-  - 0
-  version: 3.3.0
+  - 1
+  version: 3.3.1
 platform: ruby
 authors: 
 - dirkkelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +08:00
+date: 2010-12-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency