@@ -23,6 +23,7 @@ The following tags are available to help you build the form: <r:mailer:radio name="" /> <r:mailer:radiogroup name=""> ... </r:mailer:radiogroup> <r:mailer:select name=""> ... </r:mailer:select> + <r:mailer:date_select name=""/> <r:mailer:textarea name=""> ... </r:mailer:textarea> <r:mailer:option name="" /> README.rdoc @@ -34,4 +34,4 @@ class MailController < ApplicationController [(string.empty? ? {} : YAML::load(string).symbolize_keys), page] end -end \ No newline at end of file +end app/controllers/mail_controller.rb @@ -1,5 +1,6 @@ module MailerTags include Radiant::Taggable + include ActionView::Helpers::DateHelper def config @config ||= begin @@ -180,6 +181,30 @@ module MailerTags end end result + end + + desc %{ Uses @ActionView::Helpers::DateHelper.date_select@ to render three select tags for date selection. } + tag 'mailer:date_select' do |tag| + raise_error_if_name_missing "mailer:date_select", tag.attr + name = tag.attr.delete('name') + + options = {} + + tag.attr.each do |k, v| + if v =~ /(true|false)/ + options[k] = (v == 'true') + elsif v =~ /\d+/ + options[k] = v.to_i + elsif k == 'order' + options[k] = v.split(',').map(&:strip).map(&:to_sym) + else + options[k] = v + end + end + + options.symbolize_keys! + + date_select('mailer', name, options) end desc %{ @@ -195,7 +220,7 @@ module MailerTags element = tag.locals.page.last_mail.data end if name - element[name].is_a?(Array) ? element[name].to_sentence : element[name] + format_mailer_data(element, name) else element.to_hash.to_yaml.to_s end @@ -218,6 +243,28 @@ module MailerTags mail = tag.locals.page.last_mail || tag.globals.page.last_mail tag.expand if name && mail.data[name] && (eq.blank? || eq == mail.data[name]) end + + def format_mailer_data(element, name) + data = element[name] + if Array === data + data.to_sentence + elsif date = detect_date(element, name) + date + else + data + end + end + + def detect_date(mail, name) + date_components = mail.select { |key, value| key =~ Regexp.new("#{name}\\(\\di\\)") } + + if date_components.length == 3 + date_values = date_components.sort { |a, b| a[0] <=> b[0] }.map { |v| v[1].to_i } + return Date.new(*date_values) + else + return nil + end + end def prior_value(tag, tag_name=tag.attr['name']) if mail = tag.locals.page.last_mail lib/mailer_tags.rb @@ -176,6 +176,40 @@ describe "MailerTags" do pages(:mail_form).should render("<r:mailer:select name='foo' required='true'/>").as(%Q{<select size="1" id="foo" name="mailer[foo]"></select><input type="hidden" name="mailer[required][foo]" value="true" />}) end end + + describe "<r:mailer:date_select>" do + # HACK: Quick way to get a tag rendered to string in the context of a page. + # How can this be made better? + def render_tag_in_mailer(content) + tag = Spec::Rails::Matchers::RenderTags.new + tag.send(:render_content_with_page, content, pages(:mail_form)) + end + + it "should render select tags for each date component" do + date_select = render_tag_in_mailer('<r:mailer:date_select name="foo" />') + date_select.should have_tag('select[name=?]', "mailer[foo(1i)]") + date_select.should have_tag('select[name=?]', "mailer[foo(2i)]") + date_select.should have_tag('select[name=?]', "mailer[foo(3i)]") + end + + it "should include blank options" do + date_select = render_tag_in_mailer('<r:mailer:date_select name="foo" include_blank="true" />') + date_select.should have_tag('select[name=?]', "mailer[foo(1i)]") do + with_tag('option[value=?]', '') + end + date_select.should have_tag('select[name=?]', "mailer[foo(2i)]") do + with_tag('option[value=?]', '') + end + date_select.should have_tag('select[name=?]', "mailer[foo(3i)]") do + with_tag('option[value=?]', '') + end + end + + it "should order select tags" do + date_select = render_tag_in_mailer('<r:mailer:date_select name="foo" order="day,year,month" />') + date_select.should have_tag('select[name=?]+select[name=?]+select[name=?]','mailer[foo(3i)]', 'mailer[foo(1i)]', 'mailer[foo(2i)]') + end + end describe "<r:mailer:textarea>" do it "should render a textarea tag" do @@ -236,6 +270,11 @@ describe "MailerTags" do it "should render nothing when the value is not present" do @page.should render('<r:mailer:get name="body" />').as('') end + + it "should render date when date params are detected" do + @page.last_mail = @mail = Mail.new(@page, @page.config, 'foo(1i)' => '2008', 'foo(2i)' => '10', 'foo(3i)' => '29') + @page.should render('<r:mailer:get name="foo" />').as('2008-10-29') + end end describe "<r:mailer:get_each>" do spec/lib/mailer_tags_spec.rb 12149cbe499a56fbc4ba3398003f54445d86c07c Jason Stirk jstirk@gmail.com http://github.com/radiant/radiant-mailer-extension/commit/52fe964b3bb20c310c88576c10f31c6c1da13b54 52fe964b3bb20c310c88576c10f31c6c1da13b54 2008-11-27T06:32:06-08:00 2008-11-27T06:32:06-08:00 Merged in changes from Aissac's tree. 5612937c49274c3af2882aa9e8dcd467020e1bf3 Jason Stirk jstirk@gmail.com