radiant-forms-extension 3.2.8 → 3.3.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/README.md

@@ -62,9 +62,9 @@ Using forms 'DRY's up the process of creating and reusing forms across a site (w
     
 ### Content
     
-    <h2>Contact from <r:form:read name='contact[name]' /></h2>
+    <h2>Contact from <r:get name='contact[name]' /></h2>
     
-    <p>You can get back to them on <r:form:read name='contact[email]' /></p>
+    <p>You can get back to them on <r:get name='contact[email]' /></p>
     
     <p>Cheers, <br /> <strong>Cool Mailer</strong></p>
     
@@ -194,4 +194,4 @@ A showcase of how to use addons, allows you to send emails directly from the pag
       config.gem 'ruby-debug',        :version => '0.10.3'
       config.gem 'webrat',            :version => '0.7.1'
       config.gem 'rr',                :version => '0.10.11'
-    end
+    end

data/VERSION

@@ -1 +1 @@
-3.2.8
+3.3.0

data/app/controllers/forms_controller.rb

@@ -12,52 +12,28 @@ class FormsController < ApplicationController
   end
 
   def update
-    set_page
-    set_form
-    set_response
-    set_configuration
-    
-    execute_extensions
-    
-    begin
-      @response.save!
-      redirect_to @form.redirect_to.present? ? @form.redirect_to : @page.url
-    rescue
-      "Form '#{@form.title}' could not be submitted."
-    end
-  end
-  
-protected
-
-  def set_page
     @page = Page.find(params[:page_id]) rescue Page.first
     @page.data    = params 
     @page.request = OpenStruct.new({
       :referrer => request.referer,
       :session => session # Creating a pretend response object
     })
-  end
-  
-  def set_form
+    
     @form = Form.find(params[:id])
     @form.page = @page
-  end
-  
-  def set_response
+    
+    # We need a response object
     @response = find_or_create_response
+    # Put the submitted data into the response object
     @response.result = Forms::Config.deep_symbolize_keys(params)
-  end
-  
-  def set_configuration
+    
     begin
       # Grab the form configuration data
       @form[:extensions] = Forms::Config.convert(@form.config)
     rescue
       raise "Form '#{@form.title}' has not been configured"
     end
-  end
-  
-  def execute_extensions
+    
     @results =  {}
     # Iterate through each configured extension
     @form[:extensions].each do |name, config|

data/app/models/form_mail.rb

@@ -31,53 +31,64 @@ class FormMail
   end
   
   def from
-    begin
-      Forms::Tags::Responses.retrieve(@data, @config[:field][:from])
-    rescue
-      @config[: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]
     end
+    from
   end
   
   def recipients
-    begin
-      Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
-    rescue
-      @config[:to]
+    to = nil
+    unless @config[:field].nil? or !@config[:field][:to].blank?
+      to = Forms::Tags::Responses.retrieve(@data, @config[:field][:to])
+    else
+      to = @config[:to]
     end
+    to
   end
   
   def reply_to
-    begin
-      Forms::Tags::Responses.retrieve(@data, @config[:field][:reply_to])
-    rescue
-      @config[: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]
     end
+    reply_to
   end
   
   def sender
-    begin
-      Forms::Tags::Responses.retrieve(@data, @config[:field][:sender])
-    rescue
-      @config[: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]
     end
+    sender
   end
   
   def subject
-    begin
-      Forms::Tags::Responses.retrieve(@data, @config[:field][:subject])
-    rescue
-      @config[: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]
     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]
-      @parser.parse(@form.send(@config[:body]))
+      @body = @parser.parse(@form.send(@config[:body]))
     else
-      @parser.parse(@form.content)
+      @body = @parser.parse(@form.content)
     end
+    @body
   end
   
   def cc

data/lib/forms/controllers/application_controller.rb

@@ -10,14 +10,20 @@ module Forms
           end
           
           def find_response
+            response = nil
+            
             begin
               response = Response.find(request.session[:form_response])
             rescue
               response = nil
             end
+                        
+            response
           end
           
           def find_or_create_response
+            response = nil
+            
             if find_response
               response = find_response
             else

data/lib/forms/tags/core.rb

@@ -68,28 +68,6 @@ module Forms
           %(<input type="#{type}" value="#{value}" #{Forms::Tags::Helpers.attributes(tag)} />)
         end
       end
-
-      %w(textarea).each do |type|
-        desc %{
-          Render a @<#{type}>...</#{type}>@ tag to be used in a form
-          <pre><code><r:form:#{type} name="object[key]" /></code></pre>
-          
-          **Required**
-          * *name* the name of the data to be sent
-          
-          **Optional**
-          * *class* css class names
-          * *placeholder* default text, which is cleared when clicked
-          * *maxlength* the maximum amount of characters
-        }
-        tag "form:#{type}" do |tag|
-          Forms::Tags::Helpers.require!(tag,"form:#{type}",'name')
-          
-          tag.attr['type'] = type
-          
-          %(<#{type} #{Forms::Tags::Helpers.attributes(tag)}>#{tag.expand}</#{type}>)
-        end
-      end
       
       desc %{
         Renders a @<select>...</select>@ tag to be used in a form
@@ -338,10 +316,6 @@ module Forms
         nil
       end
       
-      tag 'param' do |tag|
-        tag.locals.page.params[tag.attr['name']]
-      end
-      
     end
   end
 end

data/radiant-forms-extension.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.2.8"
+  s.version = "3.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2010-12-14}
   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 = [
     "README.md"
   ]
   s.files = [
+    ".bundle/config",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -64,7 +65,6 @@ Gem::Specification.new do |s|
     "lib/forms/tags/core.rb",
     "lib/forms/tags/helpers.rb",
     "lib/forms/tags/responses.rb",
-    "lib/radiant-forms-extension.rb",
     "lib/tasks/forms_extension_tasks.rake",
     "public/images/admin/extensions/form/form.png",
     "public/stylesheets/sass/admin/extensions/forms/edit.sass",

data/spec/lib/forms/tags/core_spec.rb

@@ -11,7 +11,6 @@ describe Forms::Tags::Core do
         'form',
         'form:label',
         'form:text',
-        'form:textarea',
         'form:password',
         'form:reset',
         'form:checkbox',
@@ -36,7 +35,6 @@ describe Forms::Tags::Core do
         'response:if_get', 
         'response:unless_get',  
         
-        'param',
         'index',
         'reset'    
       ].sort
@@ -96,25 +94,6 @@ describe Forms::Tags::Core do
       end
       
     end
-
-    %w(textarea).each do |type|
-
-      describe "<r:form:#{type}>" do      
-        
-        it 'should render the correct HTML' do
-          tag = %{<r:form:#{type} name="test[field]" />}
-          expected = %{<#{type} name="test[field]" class="#{type}" id="test_field"></#{type}>}
-          @page.should render(tag).as(expected)
-        end
-        
-        it 'should require the name attribute' do
-          tag = %{<r:form:#{type} />}
-          @page.should_not render(tag)
-        end
-        
-      end
-      
-    end
     
     describe '<r:form:select>' do
       
@@ -154,7 +133,7 @@ describe Forms::Tags::Core do
       it 'should require the name attribute' do
         tag = %{<r:form:radios />}
         @page.should_not render(tag)
-      end      
+      end
       
     end
     
@@ -168,21 +147,6 @@ describe Forms::Tags::Core do
     
   end
   
-  context 'param' do
-    
-    before :each do 
-      @page = pages(:home)
-      stub(@page).params { { 'test' => 'param'} }
-    end
-    
-    it 'should return the requested param' do
-      tag = %{<r:param name='test' />}
-      exp = %{param}
-      @page.should render(tag).as(exp)
-    end
-    
-  end
-  
   context 'response' do
     
     context 'conditionals' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 11
   prerelease: false
   segments: 
   - 3
-  - 2
-  - 8
-  version: 3.2.8
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - dirkkelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +08:00
+date: 2010-12-14 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .bundle/config
 - README.md
 - Rakefile
 - VERSION
@@ -91,7 +92,6 @@ files:
 - lib/forms/tags/core.rb
 - lib/forms/tags/helpers.rb
 - lib/forms/tags/responses.rb
-- lib/radiant-forms-extension.rb
 - lib/tasks/forms_extension_tasks.rake
 - public/images/admin/extensions/form/form.png
 - public/stylesheets/sass/admin/extensions/forms/edit.sass

data/lib/radiant-forms-extension.rb

@@ -1 +0,0 @@
-# Nothing to see here