radiant-forms-extension 3.2.1 → 3.2.2

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/lib/forms/tags/core.rb

@@ -176,6 +176,18 @@ module Forms
         result
       end
       
+      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?
+      end
+      
       desc %{
         Clears the response object
         
@@ -186,17 +198,47 @@ module Forms
         
         nil
       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?
+      end
       
-      desc %{ 
-        Allows access to the response of a submitted form
-        @<r:response>...<r:get /><r:clear />...</r:response>@
+      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]
         
-        _Will not expand if a form has not been submitted or has been cleared_
+        tag.expand unless tag.locals.response_extension.present?
+      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>
+        </pre>
       }
-      tag 'response' do |tag|
-        tag.locals.response = Forms::Tags::Responses.current(tag,request)
+      tag 'response:if_get' do |tag|
+        query = tag.attr['name'].to_sym
+        result = tag.locals.response_extension[query]
         
-        tag.expand if tag.locals.response.present? and tag.locals.response.result.present?
+        tag.expand if result.present? and result === true
+      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>
+        </pre>
+      }
+      tag 'response:unless_get' do |tag|
+        query = tag.attr['name'].to_sym
+        result = tag.locals.response_extension[query]
+        
+        tag.expand if !result.present? or result != true
       end
       
       desc %{ 
@@ -246,6 +288,7 @@ module Forms
         tag.globals.indexes[key] = 0
         nil
       end
+      
     end
   end
 end

data/radiant-forms-extension.gemspec

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

@@ -28,4 +28,15 @@ CONFIG
     create_record :form, :test, attributes
   end
   
+  helpers do
+    def mock_response
+      @response = OpenStruct.new({
+        :result => {
+          :results => {}
+        }
+      })
+      mock(Forms::Tags::Responses).current(anything,anything) { @response }
+    end
+  end
+  
 end

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

@@ -1,8 +1,45 @@
 require 'spec/spec_helper'
 
 describe Forms::Tags::Core do
+  
   dataset :pages, :forms
   
+  context 'contained tags' do
+  
+    it 'should describe these tags' do
+      Forms::Tags::Core.tags.sort.should == [
+        'form',
+        'form:label',
+        'form:text',
+        'form:password',
+        'form:reset',
+        'form:checkbox',
+        'form:radio',
+        'form:hidden',
+        'form:file',
+        'form:button',
+        'form:select',
+        'form:radios',
+        'form:option',
+        'form:submit',
+        'form:read',
+        'form:read:each',
+        
+        'response',
+        'response:clear',
+        'response:get',
+        'response:if_results', 
+        'response:unless_results',
+        'response:if_get', 
+        'response:unless_get',  
+        
+        'index',
+        'reset'    
+      ].sort
+    end
+    
+  end
+  
   context 'form output' do
     
     before :all do
@@ -108,4 +145,97 @@ describe Forms::Tags::Core do
     
   end
   
+  context 'response' do
+    
+    context 'conditionals' do
+
+      before :each do
+        @page = pages(:home)
+        mock_response
+      end
+
+      describe 'if_results' do
+        context 'extension sent results' do
+          it 'should render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+
+            tag = %{<r:response:if_results extension='bogus'>success</r:response:if_results>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'extension did not send results' do
+          it 'should not render' do
+            tag = %{<r:response:if_results extension='bogus'>failure</r:response:if_results>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
+
+      describe 'unless_results' do
+        context 'extension did not send results' do
+          it 'should render' do
+            tag = %{<r:response:unless_results extension='bogus'>success</r:response:unless_results>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'extension sent results' do
+          it 'should not render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+
+            tag = %{<r:response:unless_results extension='bogus'>failure</r:response:unless_results>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
+
+      describe 'if_get' do
+        context 'extension sent positive results' do
+          it 'should render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+
+            tag = %{<r:response:if_results extension='bogus'><r:if_get name='payment'>success</r:if_get></r:response:if_results>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'extension sent negative results' do
+          it 'should not render' do
+            @response.result[:results] = { :bogus => { :payment => false } }
+
+            tag = %{<r:response:if_results extension='bogus'><r:if_get name='payment'>failure</r:if_get></r:response:if_results>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
+
+      describe 'unless_get' do
+        context 'extension sent positive results' do
+          it 'should render' do
+            @response.result[:results] = { :bogus => { :payment => false } }
+
+            tag = %{<r:response:if_results extension='bogus'><r:unless_get name='payment'>success</r:unless_get></r:response:if_results>}
+            exp = %{success}
+            @page.should render(tag).as(exp)
+          end
+        end
+        context 'extension sent negative results' do
+          it 'should not render' do
+            @response.result[:results] = { :bogus => { :payment => true } }
+
+            tag = %{<r:response:if_results extension='bogus'><r:unless_get name='payment'>failure</r:unless_get></r:response:if_results>}
+            exp = %{}
+            @page.should render(tag).as(exp)
+          end
+        end
+      end
+
+    end
+    
+  end
+  
 end

data/spec/spec.opts

@@ -1,7 +1,4 @@
 --colour
---format
-progress
---loadby
-mtime
---reverse
---debugger
+--format specdoc
+--loadby mtime
+--reverse

metadata

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