radiant-forms-extension 3.2.2 → 3.2.4

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.2.4

data/app/controllers/forms_controller.rb

@@ -4,10 +4,18 @@ class FormsController < ApplicationController
   
   skip_before_filter :verify_authenticity_token
 
+  def new
+    @response = find_or_create_response
+    @response.update_attribute(:result, nil)
+    
+    redirect_to :back
+  end
+
   def update
     @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
     })
     

data/config/routes.rb

@@ -4,6 +4,6 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :forms
   end
   
-  map.resources :forms, :only => [ :update ]
+  map.resources :forms, :only => [ :new, :update ]
   
 end

data/forms_extension.rb

@@ -1,5 +1,5 @@
 class FormsExtension < Radiant::Extension
-  version     '2.0'
+  version     '3.2.4'
   description 'Radiant Form extension. Site wide, useful form management'
   url         'http://github.com/squaretalent/radiant-forms-extension'
   

data/lib/forms/tags/core.rb

@@ -179,13 +179,25 @@ module Forms
       desc %{ 
         Allows access to the response of a submitted form
         @<r:response>...<r:get /><r:clear />...</r:response>@
-        
-        _Will not expand if a form has not been submitted or has been cleared_
       }
       tag 'response' do |tag|
         tag.locals.response = Forms::Tags::Responses.current(tag,request)
         
-        tag.expand if tag.locals.response.present? and tag.locals.response.result.present?
+        tag.expand
+      end
+      
+      desc %{ 
+        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?
+      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?
       end
       
       desc %{
@@ -194,58 +206,77 @@ module Forms
         @<r:response:clear />@
       }
       tag 'response:clear' do |tag|
-        Forms::Tags::Responses.clear(tag)
+        if tag.locals.response.present? and tag.locals.response.result.present?
+          Forms::Tags::Responses.clear(tag)
+        end
         
-        nil
+        tag.expand
       end
 
       desc %{ Expand if there is a response to a specified for value }
       tag 'response:if_results' do |tag|
         extension = tag.attr['extension'].to_sym
-        tag.locals.response_extension = tag.locals.response.result[:results][extension]
-        
-        tag.expand if tag.locals.response_extension.present?
+        if tag.locals.response.result.present?
+          tag.locals.response_extension = tag.locals.response.result[:results][extension]
+          
+          if tag.locals.response_extension.present?
+            tag.expand
+          end
+        end
       end
       
       desc %{ Expand if there is a response to a specified for value }
       tag 'response:unless_results' do |tag|
         extension = tag.attr['extension'].to_sym
-        tag.locals.response_extension = tag.locals.response.result[:results][extension]
         
-        tag.expand unless tag.locals.response_extension.present?
+        unless tag.locals.response.result.present?
+          tag.expand
+        else
+          tag.locals.response_extension = tag.locals.response.result[:results][extension]
+          
+          unless tag.locals.response_extension.present?
+            tag.expand
+          end
+        end
       end
       
       desc %{ Expand if there is a positive response to a specified for value of an extension
         
         <pre>
-          <r:response:if_get extension='bogus_gateway' value='checkout'>yay</r:response:if_get>
+          <r:response:if_get extension='bogus_gateway' name='checkout'>yay</r:response:if_get>
         </pre>
       }
       tag 'response:if_get' do |tag|
-        query = tag.attr['name'].to_sym
-        result = tag.locals.response_extension[query]
+        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.present? and result === true
+        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' value='checkout'>no</r:response:unless_get>
+          <r:response:unless_get extension='bogus_gateway' name='checkout'>no</r:response:unless_get>
         </pre>
       }
       tag 'response:unless_get' do |tag|
-        query = tag.attr['name'].to_sym
-        result = tag.locals.response_extension[query]
+        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 if !result.present? or result != true
+        else
+          tag.expand
+        end
       end
       
       desc %{ 
         Access the attributes of a submitted form.
         
         @<r:response:get name="object[value]" />@ an object which was submitted with the form
-        @<r:response:get name="result[mail][value]" />@ a response to the mail extension hooking the form
+        @<r:response:get name="results[mail][value]" />@ a response to the mail extension hooking the form
         
         _Refer to the readme on extensions to find out what they return_
       }

data/radiant-forms-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.2.2"
+  s.version = "3.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-10-26}
   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 = [

data/spec/controllers/forms_controller_spec.rb

@@ -3,6 +3,22 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe FormsController do
   dataset :pages, :forms
   
+  context '#new' do
+    
+    it 'should redirect to :back' do
+      request.env['HTTP_REFERER'] = '/back'
+      @object = Object.new
+      stub(@object).result = { :some => 'array'}
+
+      mock(controller).find_or_create_response { @object }
+      mock(@object).update_attribute(:result, nil)
+
+      get :new
+      
+      response.should redirect_to("/back")
+    end
+  end
+  
   context '#create' do
     
     before :each do

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

@@ -26,6 +26,8 @@ describe Forms::Tags::Core do
         'form:read:each',
         
         'response',
+        'response:if_response',
+        'response:unless_response',
         'response:clear',
         'response:get',
         'response:if_results', 
@@ -174,6 +176,15 @@ describe Forms::Tags::Core do
       end
 
       describe 'unless_results' do
+        context 'response result does not exist' do
+          it 'should render' do
+            @response.result = nil
+
+            tag = %{<r:response:unless_results extension='bogus'>success</r:response:unless_results>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
         context 'extension did not send results' do
           it 'should render' do
             tag = %{<r:response:unless_results extension='bogus'>success</r:response:unless_results>}
@@ -190,6 +201,7 @@ describe Forms::Tags::Core do
             @page.should render(tag).as(exp)
           end
         end
+        
       end
 
       describe 'if_get' do

data/spec/spec.opts

@@ -1,4 +1,3 @@
 --colour
 --format specdoc
---loadby mtime
---reverse
+--loadby mtime

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 4
+  version: 3.2.4
 platform: ruby
 authors: 
 - dirkkelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +08:00
+date: 2010-10-26 00:00:00 +08:00
 default_executable: 
 dependencies: []