radiant-forms-extension 3.2.4 → 3.2.5

data/VERSION

@@ -1 +1 @@
-3.2.4
+3.2.5

data/app/controllers/forms_controller.rb

@@ -8,32 +8,56 @@ class FormsController < ApplicationController
     @response = find_or_create_response
     @response.update_attribute(:result, nil)
     
-    redirect_to :back
+    redirect_to :back rescue redirect_to '/'
   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
-    
-    # We need a response object
+  end
+  
+  def set_response
     @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|
@@ -44,13 +68,6 @@ class FormsController < ApplicationController
     end
     # Those results are merged into the response object
     @response.result = @response.result.merge!({ :results => @results})
-    
-    begin
-      @response.save!
-      redirect_to @form.redirect_to.present? ? @form.redirect_to : @page.url
-    rescue
-      "Form '#{@form.title}' could not be submitted."
-    end
   end
   
 end

data/forms_extension.rb

@@ -1,5 +1,5 @@
 class FormsExtension < Radiant::Extension
-  version     '3.2.4'
+  version     YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
   description 'Radiant Form extension. Site wide, useful form management'
   url         'http://github.com/squaretalent/radiant-forms-extension'
   

data/lib/forms/controllers/application_controller.rb

@@ -10,20 +10,14 @@ 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

@@ -190,14 +190,14 @@ module Forms
         Expands if a response object exists in the user session
       }
       tag 'response:if_response' do |tag|
-        tag.expand if tag.locals.response.present? and tag.locals.response.results.present?
+        tag.expand if tag.locals.response.present? and tag.locals.response.result.present?
       end
       
       desc %{ 
         Expands unless a response object exists in the user session
       }
       tag 'response:unless_response' do |tag|
-        tag.expand if tag.locals.response.blank? or tag.locals.response.results.blank?
+        tag.expand if tag.locals.response.blank? or tag.locals.response.result.blank?
       end
       
       desc %{
@@ -242,31 +242,27 @@ module Forms
       
       desc %{ Expand if there is a positive response to a specified for value of an extension
         
-        <pre>
-          <r:response:if_get extension='bogus_gateway' name='checkout'>yay</r:response:if_get>
-        </pre>
+        @<r:response:if_get extension='bogus_gateway' name='checkout'>yay</r:response:if_get>@
       }
       tag 'response:if_get' do |tag|
         if tag.locals.response_extension.present?
           query = tag.attr['name'].to_sym
           result = tag.locals.response_extension[query]
         
-          tag.expand if result.present? and result === true
+          tag.expand if result
         end
       end
       
       desc %{ Expand if there is a negative response to a specified for value of an extension
         
-        <pre>
-          <r:response:unless_get extension='bogus_gateway' name='checkout'>no</r:response:unless_get>
-        </pre>
+        @<r:response:unless_get extension='bogus_gateway' name='checkout'>no</r:response:unless_get>@
       }
       tag 'response:unless_get' do |tag|
         if tag.locals.response_extension.present?
           query = tag.attr['name'].to_sym
           result = tag.locals.response_extension[query]
         
-          tag.expand if !result.present? or result != true
+          tag.expand unless result
         else
           tag.expand
         end

data/radiant-forms-extension.gemspec

@@ -1,82 +1,80 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.2.4"
+  s.version = "3.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-11-22}
   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 = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "app/controllers/admin/forms_controller.rb",
-     "app/controllers/forms_controller.rb",
-     "app/models/form.rb",
-     "app/models/form_mail.rb",
-     "app/models/form_mailer.rb",
-     "app/models/form_page.rb",
-     "app/models/response.rb",
-     "app/views/admin/forms/_fields.html.haml",
-     "app/views/admin/forms/_filters.html.haml",
-     "app/views/admin/forms/_form.html.haml",
-     "app/views/admin/forms/_header.html.haml",
-     "app/views/admin/forms/edit.html.haml",
-     "app/views/admin/forms/index.html.haml",
-     "app/views/admin/forms/new.html.haml",
-     "app/views/admin/forms/remove.html.haml",
-     "config/locales/en.yml",
-     "config/routes.rb",
-     "cucumber.yml",
-     "db/migrate/001_create_forms.rb",
-     "db/migrate/002_create_user_observer.rb",
-     "db/migrate/003_rename_output_to_content.rb",
-     "db/migrate/004_create_responses.rb",
-     "db/migrate/20100929150423_change_to_updated_by_id.rb",
-     "db/migrate/20101012230144_add_another_content_field.rb",
-     "forms_extension.rb",
-     "lib/forms/config.rb",
-     "lib/forms/controllers/application_controller.rb",
-     "lib/forms/controllers/site_controller.rb",
-     "lib/forms/interface/forms.rb",
-     "lib/forms/models/extension.rb",
-     "lib/forms/models/page.rb",
-     "lib/forms/tags/core.rb",
-     "lib/forms/tags/helpers.rb",
-     "lib/forms/tags/responses.rb",
-     "lib/tasks/forms_extension_tasks.rake",
-     "public/images/admin/extensions/form/form.png",
-     "radiant-forms-extension.gemspec",
-     "spec/controllers/forms_controller_spec.rb",
-     "spec/datasets/forms.rb",
-     "spec/lib/forms/tags/core_spec.rb",
-     "spec/models/form_spec.rb",
-     "spec/models/response_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "app/controllers/admin/forms_controller.rb",
+    "app/controllers/forms_controller.rb",
+    "app/models/form.rb",
+    "app/models/form_mail.rb",
+    "app/models/form_mailer.rb",
+    "app/models/form_page.rb",
+    "app/models/response.rb",
+    "app/views/admin/forms/_fields.html.haml",
+    "app/views/admin/forms/_filters.html.haml",
+    "app/views/admin/forms/_form.html.haml",
+    "app/views/admin/forms/_header.html.haml",
+    "app/views/admin/forms/edit.html.haml",
+    "app/views/admin/forms/index.html.haml",
+    "app/views/admin/forms/new.html.haml",
+    "app/views/admin/forms/remove.html.haml",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "cucumber.yml",
+    "db/migrate/001_create_forms.rb",
+    "db/migrate/002_create_user_observer.rb",
+    "db/migrate/003_rename_output_to_content.rb",
+    "db/migrate/004_create_responses.rb",
+    "db/migrate/20100929150423_change_to_updated_by_id.rb",
+    "db/migrate/20101012230144_add_another_content_field.rb",
+    "forms_extension.rb",
+    "lib/forms/config.rb",
+    "lib/forms/controllers/application_controller.rb",
+    "lib/forms/controllers/site_controller.rb",
+    "lib/forms/interface/forms.rb",
+    "lib/forms/models/extension.rb",
+    "lib/forms/models/page.rb",
+    "lib/forms/tags/core.rb",
+    "lib/forms/tags/helpers.rb",
+    "lib/forms/tags/responses.rb",
+    "lib/tasks/forms_extension_tasks.rake",
+    "public/images/admin/extensions/form/form.png",
+    "radiant-forms-extension.gemspec",
+    "spec/controllers/forms_controller_spec.rb",
+    "spec/datasets/forms.rb",
+    "spec/lib/forms/tags/core_spec.rb",
+    "spec/models/form_spec.rb",
+    "spec/models/response_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/squaretalent/radiant-forms-extension}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Forms Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/forms_controller_spec.rb",
-     "spec/datasets/forms.rb",
-     "spec/lib/forms/tags/core_spec.rb",
-     "spec/models/form_spec.rb",
-     "spec/models/response_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/datasets/forms.rb",
+    "spec/lib/forms/tags/core_spec.rb",
+    "spec/models/form_spec.rb",
+    "spec/models/response_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/controllers/forms_controller_spec.rb

@@ -5,18 +5,42 @@ describe FormsController do
   
   context '#new' do
     
-    it 'should redirect to :back' do
-      request.env['HTTP_REFERER'] = '/back'
+    before :each do
       @object = Object.new
       stub(@object).result = { :some => 'array'}
 
       mock(controller).find_or_create_response { @object }
       mock(@object).update_attribute(:result, nil)
-
-      get :new
+    end
+    
+    context 'referrer set' do
+      
+      before :each do
+        request.env['HTTP_REFERER'] = '/back'        
+      end
+      
+      it 'should redirect to :back' do
+        get :new
+        
+        response.should redirect_to("/back")
+      end
       
-      response.should redirect_to("/back")
     end
+    
+    context 'no referrer set' do
+      
+      it 'should redirect to index' do
+        get :new
+        
+        response.should redirect_to('/')
+      end
+      
+    end
+    
+
+    
+    
+    
   end
   
   context '#create' do

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

@@ -155,6 +155,66 @@ describe Forms::Tags::Core do
         @page = pages(:home)
         mock_response
       end
+      
+      describe 'if_response' do
+        context 'response and result exist' do
+          it 'should render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+            
+            tag = %{<r:response:if_response>success</r:response:if_response>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'result does not exist' do
+          it 'should not render' do
+            @response.result = nil
+            
+            tag = %{<r:response:if_response>failure</r:response:if_response>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'response does not exist' do
+          it 'should not render' do
+            @response = nil
+            
+            tag = %{<r:response:if_response>failure</r:response:if_response>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
+      
+      describe 'unless_response' do
+        context 'response and result exist' do
+          it 'should not render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+            
+            tag = %{<r:response:unless_response>failure</r:response:unless_response>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'result does not exist' do
+          it 'should not render' do
+            @response.result = nil
+            
+            tag = %{<r:response:unless_response>success</r:response:unless_response>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'response does not exist' do
+          it 'should not render' do
+            @response = nil
+            
+            tag = %{<r:response:unless_response>success</r:response:unless_response>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
 
       describe 'if_results' do
         context 'extension sent results' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 2
-  - 4
-  version: 3.2.4
+  - 5
+  version: 3.2.5
 platform: ruby
 authors: 
 - dirkkelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +08:00
+date: 2010-11-22 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - README.md
 - Rakefile
 - VERSION
@@ -81,8 +80,8 @@ homepage: http://github.com/squaretalent/radiant-forms-extension
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-*/.DS_Store
-pkg