radiant-forms-extension 3.2.0.beta.1 → 3.2.1

data/VERSION

@@ -1 +1 @@
-3.2.0.beta.1
+3.2.1

data/app/controllers/forms_controller.rb

@@ -5,14 +5,15 @@ class FormsController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   def update
-    @form = Form.find(params[:id])
-    
     @page = Page.find(params[:page_id]) rescue Page.first
     @page.data    = params 
     @page.request = OpenStruct.new({
       :session => session # Creating a pretend response object
     })
     
+    @form = Form.find(params[:id])
+    @form.page = @page
+    
     # We need a response object
     @response = find_or_create_response
     # Put the submitted data into the response object
@@ -27,15 +28,10 @@ class FormsController < ApplicationController
     
     @results =  {}
     # Iterate through each configured extension
-    @form[:extensions].each do |ext, config|
-      # New Instance of the FormExtension class
-      extension = ("Form#{ext.to_s.pluralize.classify}".constantize).new(@form, @page) 
-      # .pluralize.classify means singulars like business and address are converted correctly
-      
-      # Result of the extension create method gets merged
-      result = extension.create
+    @form[:extensions].each do |name, config|
+      result = @form.call_extension(name,config)
       
-      @results.merge!({ ext.to_sym => result }) # merges this extensions results
+      @results.merge!({ name.to_sym => result })
       session.merge!(result[:session]) if result[:session].present?
     end
     # Those results are merged into the response object

data/app/models/form.rb

@@ -1,5 +1,7 @@
 class Form < ActiveRecord::Base
   
+  attr_accessor :page
+  
   default_scope           :order => 'forms.title ASC'
   
   validates_presence_of   :title
@@ -8,4 +10,19 @@ class Form < ActiveRecord::Base
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
   
+  def call_extension(name,config)
+    result = {}
+    # Create a class from the config extension
+    extension = config[:extension]
+    if extension.present?
+      klass     = "Form#{extension.to_s.pluralize.classify}".constantize
+      # .pluralize.classify means singulars like business and address are converted correctly
+      # Create a new instance of that extension
+      klass = (klass).new(self, self.page, config) 
+  
+      # Result of the extension create method gets merged
+      result = klass.create
+    end
+  end
+  
 end

data/app/models/form_mail.rb

@@ -2,8 +2,6 @@ class FormMail
   include Forms::Models::Extension
   
   def create
-    @body   = @page.render_snippet(@form)
-    
     begin
       FormMailer.deliver_mail(
         :recipients     => recipients,
@@ -14,7 +12,8 @@ class FormMail
         :cc             => cc,
         :headers        => headers,
         :content_type   => content_type,
-        :charset        => charset
+        :charset        => charset,
+        :config         => @config
       )
       @sent = true
     rescue Exception => exception
@@ -82,7 +81,14 @@ class FormMail
   end
   
   def body
-    @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]))
+    else
+      @body = @parser.parse(@form.content)
+    end
+    @body
   end
   
   def cc

data/app/views/admin/forms/_fields.html.haml

@@ -29,14 +29,14 @@
             #form_body.page{'data-caption'=>'body'}
               = render '/admin/forms/filters'
               = form_form.text_area :body, :class => 'textarea large', :style => 'width: 100%'
+            #form_config.page{'data-caption'=>'config'}
+              = form_form.text_area :config, :class => 'textarea large', :style => 'width: 100%'
             #form_content.page{'data-caption'=>'content'}
               = render '/admin/forms/filters'
               = form_form.text_area :content, :class => 'textarea large', :style => 'width: 100%'
-            #form_config.page{'data-caption'=>'config'}
-              %p
-                %span.reference_links
-                  Available 
-              = form_form.text_area :config, :class => 'textarea large', :style => 'width: 100%'
+            #form_content.page{'data-caption'=>'secondary'}
+              = render '/admin/forms/filters'
+              = form_form.text_area :secondary, :class => 'textarea large', :style => 'width: 100%'
       
   .form_bottom          
     - render_region :form_bottom do |form_bottom|

data/db/migrate/20101012230144_add_another_content_field.rb

@@ -0,0 +1,9 @@
+class AddAnotherContentField < ActiveRecord::Migration
+  def self.up
+    add_column :forms, :secondary, :text
+  end
+
+  def self.down
+    remove_column :forms, :secondary
+  end
+end

data/lib/forms/controllers/application_controller.rb

@@ -6,14 +6,16 @@ module Forms
         base.class_eval do
           def current_response
             return @current_response if defined?(@current_response)
-            @current_response = find_response
+            @current_response = find_or_create_response if request.session[:form_response]
           end
           
           def find_response
             response = nil
             
-            if request.session[:form_response]
+            begin
               response = Response.find(request.session[:form_response])
+            rescue
+              response = nil
             end
                         
             response

data/lib/forms/models/extension.rb

@@ -3,14 +3,14 @@ module Forms
     module Extension
       def self.included(base)
         base.class_eval do 
-          def initialize(form, page)
+          def initialize(form, page, config)
             @form   = form
             @page   = page
             
             @data   = Forms::Config.deep_symbolize_keys(@page.data)
             
             # Sets the config to be the current environment config: checkout:
-            @config = @form[:extensions][self.class.to_s.underscore.gsub('form_', '').to_sym]
+            @config = config
           end
           
           def current_user

data/lib/forms/tags/core.rb

@@ -157,7 +157,23 @@ module Forms
       }
       tag 'form:read' do |tag|
         Forms::Tags::Helpers.require!(tag,'form:read','name')
-        data = Forms::Tags::Responses.retrieve(tag.locals.page.data, tag.attr['name'])
+        tag.locals.form_data ||= tag.locals.page.data
+        
+        tag.locals.form_data = Forms::Tags::Responses.retrieve(tag.locals.form_data, tag.attr['name'])
+        
+        tag.expand.present? ? tag.expand : tag.locals.form_data
+      end
+      
+      tag 'form:read:each' do |tag|
+        result = ''
+        
+        fields = tag.locals.form_data
+        fields.each do |index,data|
+          tag.locals.form_data = data
+          result << tag.expand
+        end
+        
+        result
       end
       
       desc %{
@@ -196,6 +212,40 @@ module Forms
         
         result = Forms::Tags::Responses.retrieve(tag.locals.response.result, tag.attr['name']).to_s
       end
+      
+      desc %{
+        Renders the numeric index value of an arbitrary array name incrementing this
+        value after every call.
+        *Usage:* _The following would render '0012'
+        <pre><code><r:index [array="widgets"] /><r:index array="snippets" /><r:index [array="widgets"] /><r:index [array="widgets"] /></code></pre>
+      }
+      tag 'index' do |tag|
+        key = tag.attr['array'] ||= 'array'
+
+        if tag.globals.indexes.present? # If the global indexes array exists
+          if tag.globals.indexes[key].nil? # Set the value of that index to zero if not present
+            tag.globals.indexes[key] = 0
+          end
+        else
+          tag.globals.indexes = { key => 0 } # Create the indexes array and that index
+        end
+
+        index = tag.globals.indexes[key] # Store the current value for return
+        tag.globals.indexes[key] += 1 # Increment the index value on the global object
+
+        index # Return the stored index
+      end
+
+      desc %{
+        Resets the counter on an array
+        *Usage:* _The following with render '010'
+        <pre><code><r:index [array="widgets"] /><r:index [array="widgets"] /><r:reset [array="widgets"] /><r:index [array="widgets"] /></code></pre>
+      }
+      tag 'reset' do |tag|
+        key = tag.attr['array'] ||= 'array'
+        tag.globals.indexes[key] = 0
+        nil
+      end
     end
   end
 end

data/lib/forms/tags/responses.rb

@@ -6,7 +6,6 @@ module Forms
         
         def current(tag, request)
           response = nil
-          
           if tag.locals.response.present?
             response = tag.locals.response
           elsif tag.locals.page.request.present?

data/radiant-forms-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-forms-extension}
-  s.version = "3.2.0.beta.1"
+  s.version = "3.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dirkkelly"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-10-23}
   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 = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "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",
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
      "radiant-forms-extension.gemspec",
      "spec/controllers/forms_controller_spec.rb",
      "spec/datasets/forms.rb",
-     "spec/lib/forms/tags_spec.rb",
+     "spec/lib/forms/tags/core_spec.rb",
      "spec/models/form_spec.rb",
      "spec/models/response_spec.rb",
      "spec/spec.opts",
@@ -72,7 +73,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/controllers/forms_controller_spec.rb",
      "spec/datasets/forms.rb",
-     "spec/lib/forms/tags_spec.rb",
+     "spec/lib/forms/tags/core_spec.rb",
      "spec/models/form_spec.rb",
      "spec/models/response_spec.rb",
      "spec/spec_helper.rb"

data/spec/controllers/forms_controller_spec.rb

@@ -53,7 +53,7 @@ describe FormsController do
       context 'configuration exists' do
         
         it 'should assign the configuration settings' do
-          assigns(:form)[:extensions][:test][:config].should == 'test'
+          assigns(:form)[:extensions][:test][:extension].should == 'test'
         end
         
       end

data/spec/datasets/forms.rb

@@ -19,9 +19,10 @@ class FormsDataset < Dataset::Base
       :title        => "test_form",
       :body         => "<r:text name='request[test]' />",
       :content      => "<r:form:read name='request[test]' />",
+      :secondary    => "<r:form:read name='request[test]' />",
       :config       => <<-CONFIG
 test:
-  config: test
+  extension: test
 CONFIG
     }
     create_record :form, :test, attributes

data/spec/lib/forms/{tags_spec.rb → tags/core_spec.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec/spec_helper'
 
-describe Forms::Tags do
+describe Forms::Tags::Core do
   dataset :pages, :forms
   
   context 'form output' do

data/spec/models/form_spec.rb

@@ -31,6 +31,10 @@ describe Form do
       @form.content.is_a?(String).should == true
     end
     
+    it 'should have an secondary string' do
+      @form.secondary.is_a?(String).should == true
+    end
+    
     it 'should have a config string' do
       @form.config.is_a?(String).should == true
     end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-forms-extension
 version: !ruby/object:Gem::Version 
-  hash: 62196449
-  prerelease: true
+  hash: 13
+  prerelease: false
   segments: 
   - 3
   - 2
-  - 0
-  - beta
   - 1
-  version: 3.2.0.beta.1
+  version: 3.2.1
 platform: ruby
 authors: 
 - dirkkelly
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +08:00
+date: 2010-10-23 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +55,7 @@ files:
 - 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
@@ -72,7 +71,7 @@ files:
 - radiant-forms-extension.gemspec
 - spec/controllers/forms_controller_spec.rb
 - spec/datasets/forms.rb
-- spec/lib/forms/tags_spec.rb
+- spec/lib/forms/tags/core_spec.rb
 - spec/models/form_spec.rb
 - spec/models/response_spec.rb
 - spec/spec.opts
@@ -98,14 +97,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -116,7 +113,7 @@ summary: Forms Extension for Radiant CMS
 test_files: 
 - spec/controllers/forms_controller_spec.rb
 - spec/datasets/forms.rb
-- spec/lib/forms/tags_spec.rb
+- spec/lib/forms/tags/core_spec.rb
 - spec/models/form_spec.rb
 - spec/models/response_spec.rb
 - spec/spec_helper.rb