radiant-mailer-extension 1.0.3 → 1.0.4

data/Rakefile

@@ -1,45 +1,109 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "radiant-mailer-extension"
-    gem.summary = %Q{Enables form mail on a page.}
-    gem.description = %Q{An extension for Radiant CMS that allows you to create 'contact us' and other mail-bound forms.}
-    gem.email = "radiant@radiantcms.org"
-    gem.homepage = "http://github.com/radiant/radiant-mailer-extension"
-    gem.authors = ["Nathaniel Talbott", "Sean Cribbs", "Matt McCray"]
-    gem.add_development_dependency "rspec"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+# Determine where the RSpec plugin is by loading the boot
+unless defined? RADIANT_ROOT
+  ENV["RAILS_ENV"] = "test"
+  case
+  when ENV["RADIANT_ENV_FILE"]
+    require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
+  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+require 'rake'
+require 'rdoc/task'
+require 'rake/testtask'
+
+rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
+$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'cucumber'
+require 'cucumber/rake/task'
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+# Cleanup the RADIANT_ROOT constant so specs will load the environment
+Object.send(:remove_const, :RADIANT_ROOT)
+
+extension_root = File.expand_path(File.dirname(__FILE__))
+
+task :default => [:spec, :features]
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-task :spec => :check_dependencies
+task :features => 'spec:integration'
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec', '--rails']
+  end
+  
+  desc "Print Specdoc for all specs"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-task :default => :spec
+  [:models, :controllers, :views, :helpers].each do |sub|
+    desc "Run the specs under spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub) do |t|
+      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+  
+  desc "Run the Cucumber features"
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
+    t.profile = "default"
+  end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
+    ::CodeStatistics::TEST_TYPES << "Model specs"
+    ::CodeStatistics::TEST_TYPES << "View specs"
+    ::CodeStatistics::TEST_TYPES << "Controller specs"
+    ::CodeStatistics::TEST_TYPES << "Helper specs"
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  end
 
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+end
+
+desc 'Generate documentation for the mailer extension.'
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "radiant-mailer-extension #{version}"
-  rdoc.rdoc_files.include('README*')
+  rdoc.title    = 'MailerExtension'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+# Load any custom rakefiles for extension
+Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }

data/app/models/mail.rb

@@ -24,7 +24,7 @@ class Mail
   end
   
   def self.config_error_messages(config)
-    config_errors(config).collect do |field, message|
+    config_errors(config).sort.collect do |field, message|
       "'#{field}' #{message}"
     end.to_sentence
   end
@@ -199,4 +199,4 @@ The following information was posted:
   def disallow_link_fields
     @config[:disallow_links] if @config.has_key?(:disallow_links)
   end
-end
+end

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress features --tags ~@proposed,~@in_progress

data/lib/mailer_tags.rb

@@ -99,6 +99,7 @@ module MailerTags
     }
   }
 </script>)
+    results.flatten.join
   end
 
   desc %{
@@ -108,7 +109,7 @@ module MailerTags
     tag.expand if tag.locals.page.last_mail && tag.locals.page.last_mail.sent?
   end
 
-  %w(checkbox date datetime datetime-local email hidden month number radio range tel text time url week).each do |type|
+  %w(checkbox date datetime datetime-local email file hidden month number radio range tel text time url week).each do |type|
     desc %{
       Renders a #{type} input tag for a mailer form. The 'name' attribute is required.}
     tag "mailer:#{type}" do |tag|
@@ -131,6 +132,7 @@ module MailerTags
     else
       result = [%(<input onclick="showSubmitPlaceholder();" type="submit" value="#{value}" #{mailer_attrs(tag)} />)]
     end
+    result.flatten.join
   end
 
   desc %{
@@ -138,11 +140,13 @@ module MailerTags
     div will be shown when a user submits a mailer form.
   }
   tag "mailer:submit_placeholder" do |tag|
+    results = []
     if part(:submit_placeholder)
-      results = %Q(<div id="submit-placeholder-part" style="display:none">)
+      results << %Q(<div id="submit-placeholder-part" style="display:none">)
       results << render_part(:submit_placeholder)
       results << %Q(</div>)
     end
+    results.flatten.join
   end
 
   desc %{
@@ -228,7 +232,7 @@ module MailerTags
           result << tag.expand
         end
     end
-    result
+    result.flatten.join
   end
   
   desc %{ 
@@ -364,7 +368,7 @@ module MailerTags
       'tabindex' => nil,
       'title' => nil,
       'width' => nil}.merge(extras)
-    result = attrs.collect do |k,v|
+    result = attrs.sort.collect do |k,v|
       v = (tag.attr[k] || v)
       if k == 'class' && tag.attr['required'].present?
         v = [v, 'required', tag.attr['required']].compact.join(' ')
@@ -378,10 +382,10 @@ module MailerTags
 
   def add_required(result, tag)
     result << %(<input type="hidden" name="mailer[required][#{tag.attr['name']}]" value="#{tag.attr['required']}" />) if tag.attr['required']
-    result
+    result.flatten.join
   end
 
   def raise_error_if_name_missing(tag_name, tag_attr)
     raise "`#{tag_name}' tag requires a `name' attribute" if tag_attr['name'].blank?
   end
-end
+end

data/lib/radiant-mailer-extension.rb

@@ -1,5 +1,5 @@
 module RadiantMailerExtension
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   SUMMARY = %q{Form mailing for Radiant CMS}
   DESCRIPTION = %q{Provides support for email forms and generic mailing functionality.}
   URL = "https://github.com/radiant/radiant-mailer-extension"

data/lib/tasks/mailer_extension_tasks.rake

@@ -7,8 +7,10 @@ namespace :radiant do
         require 'radiant/extension_migrator'
         if ENV["VERSION"]
           MailerExtension.migrator.migrate(ENV["VERSION"].to_i)
+          Rake::Task['db:schema:dump'].invoke
         else
           MailerExtension.migrator.migrate
+          Rake::Task['db:schema:dump'].invoke
         end
       end
     end

data/radiant-mailer-extension.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "radiant-mailer-extension"
+
 Gem::Specification.new do |s|
-  s.name = %q{radiant-mailer-extension}
-  
+  s.name        = "radiant-mailer-extension"
   s.version     = RadiantMailerExtension::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = RadiantMailerExtension::AUTHORS
@@ -11,7 +11,12 @@ Gem::Specification.new do |s|
   s.homepage    = RadiantMailerExtension::URL
   s.summary     = RadiantMailerExtension::SUMMARY
   s.description = RadiantMailerExtension::DESCRIPTION
-    
+
+  # Define gem dependencies here.
+  # Don't include a dependency on radiant itself: it causes problems when radiant is in vendor/radiant.
+  # s.add_dependency "something", "~> 1.0.0"
+  # s.add_dependency "radiant-some-extension", "~> 1.0.0"
+
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
   else
@@ -21,10 +26,4 @@ Gem::Specification.new do |s|
   s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
   # s.executables   = Dir['bin/*'] - ignores
   s.require_paths = ["lib"]
-  
-  s.post_install_message = %{
-  Add this to your radiant project with:
-    config.gem 'radiant-mailer-extension', :version => '~>#{RadiantMailerExtension::VERSION}'
-  }
 end
-

data/spec/controllers/mail_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe MailController do
   dataset :mailer_page
@@ -45,4 +45,4 @@ describe MailController do
       response.redirect_url.should match(%r{/first})
     end
   end
-end
+end

data/spec/lib/mailer_process_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path('../../spec_helper', __FILE__)
 require 'site_controller'
 SiteController.class_eval { def rescue_action(e) raise e; end }
 
@@ -77,4 +77,4 @@ describe SiteController, "receiving a mailer request", :type => :controller do
     post :show_page, :url => @page.path, :mailer => {:foo => 'bar'}
     response.redirect_url.should match(%r{/foo/bar})
   end
-end
+end

data/spec/lib/mailer_tags_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "MailerTags" do
   dataset :mailer_page
@@ -206,7 +206,7 @@ describe "MailerTags" do
 
   describe "<r:mailer:select>" do
     it "should render a select tag" do
-      pages(:mail_form).should render('<r:mailer:select name="foo" />').as('<select size="1" id="foo" name="mailer[foo]"></select>')
+      pages(:mail_form).should render('<r:mailer:select name="foo" />').as('<select id="foo" size="1" name="mailer[foo]"></select>')
     end
 
     it "should raise an error if the name attribute is not specified" do
@@ -214,25 +214,25 @@ describe "MailerTags" do
     end
 
     it "should render its contents within the select tag" do
-      pages(:mail_form).should render('<r:mailer:select name="foo">bar</r:mailer:select>').as('<select size="1" id="foo" name="mailer[foo]">bar</select>')
+      pages(:mail_form).should render('<r:mailer:select name="foo">bar</r:mailer:select>').as('<select id="foo" size="1" name="mailer[foo]">bar</select>')
     end
 
     it "should render nested <r:mailer:option> tags as option tags" do
-      pages(:mail_form).should render('<r:mailer:select name="foo"><r:option value="bar">bar</r:option></r:mailer:select>').as('<select size="1" id="foo" name="mailer[foo]"><option value="bar" >bar</option></select>')
+      pages(:mail_form).should render('<r:mailer:select name="foo"><r:option value="bar">bar</r:option></r:mailer:select>').as('<select id="foo" size="1" name="mailer[foo]"><option value="bar" >bar</option></select>')
     end
 
     it "should select the specified option tag on a new form" do
-      pages(:mail_form).should render('<r:mailer:select name="foo"><r:option value="bar" selected="selected">bar</r:option><r:option value="baz">baz</r:option></r:mailer:select>').as('<select size="1" id="foo" name="mailer[foo]"><option value="bar" selected="selected" >bar</option><option value="baz" >baz</option></select>')
+      pages(:mail_form).should render('<r:mailer:select name="foo"><r:option value="bar" selected="selected">bar</r:option><r:option value="baz">baz</r:option></r:mailer:select>').as('<select id="foo" size="1" name="mailer[foo]"><option value="bar" selected="selected" >bar</option><option value="baz" >baz</option></select>')
     end
 
     it "should select the option tag with previously posted value" do
       @page = pages(:mail_form)
       @page.last_mail = @mail = Mail.new(@page, config(@page), 'foo' => 'baz')
-      @page.should render('<r:mailer:select name="foo"><r:option value="bar" selected="selected">bar</r:option><r:option value="baz">baz</r:option></r:mailer:select>').as('<select size="1" id="foo" name="mailer[foo]"><option value="bar" >bar</option><option value="baz" selected="selected" >baz</option></select>')
+      @page.should render('<r:mailer:select name="foo"><r:option value="bar" selected="selected">bar</r:option><r:option value="baz">baz</r:option></r:mailer:select>').as('<select id="foo" size="1" name="mailer[foo]"><option value="bar" >bar</option><option value="baz" selected="selected" >baz</option></select>')
     end
     
     it "should add a 'required' hidden field when the required attribute is specified" do
-      pages(:mail_form).should render("<r:mailer:select name='foo' required='true'/>").as(%Q{<select size="1" class="required true" id="foo" name="mailer[foo]"></select><input type="hidden" name="mailer[required][foo]" value="true" />})
+      pages(:mail_form).should render("<r:mailer:select name='foo' required='true'/>").as(%Q{<select class="required true" id="foo" size="1" name="mailer[foo]"></select><input type="hidden" name="mailer[required][foo]" value="true" />})
     end
   end
   
@@ -272,7 +272,7 @@ describe "MailerTags" do
 
   describe "<r:mailer:textarea>" do
     it "should render a textarea tag" do
-      pages(:mail_form).should render('<r:mailer:textarea name="body" />').as('<textarea id="body" rows="5" cols="35" name="mailer[body]"></textarea>')
+      pages(:mail_form).should render('<r:mailer:textarea name="body" />').as('<textarea cols="35" id="body" rows="5" name="mailer[body]"></textarea>')
     end
 
     it "should raise an error if the name attribute is not specified" do
@@ -280,11 +280,11 @@ describe "MailerTags" do
     end
 
     it "should render its contents as the contents of the textarea tag" do
-      pages(:mail_form).should render('<r:mailer:textarea name="body">Hello, world!</r:mailer:textarea>').as('<textarea id="body" rows="5" cols="35" name="mailer[body]">Hello, world!</textarea>')
+      pages(:mail_form).should render('<r:mailer:textarea name="body">Hello, world!</r:mailer:textarea>').as('<textarea cols="35" id="body" rows="5" name="mailer[body]">Hello, world!</textarea>')
     end
     
     it "should add a 'required' hidden field when the required attribute is specified" do
-      pages(:mail_form).should render("<r:mailer:textarea name='body' required='true'/>").as(%Q{<textarea class="required true" id="body" rows="5" cols="35" name="mailer[body]"></textarea><input type="hidden" name="mailer[required][body]" value="true" />})
+      pages(:mail_form).should render("<r:mailer:textarea name='body' required='true'/>").as(%Q{<textarea class="required true" cols="35" id="body" rows="5" name="mailer[body]"></textarea><input type="hidden" name="mailer[required][body]" value="true" />})
     end
   end
   
@@ -418,4 +418,4 @@ describe "MailerTags" do
     string = page.render_part(:mailer)
     string.empty? ? {} : YAML::load(string).symbolize_keys
   end
-end
+end

data/spec/models/mail_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Mail do
   dataset :mailer_page
@@ -372,4 +372,4 @@ describe Mail do
       @mail.send.should be_true
     end
   end
-end
+end

data/spec/models/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Mailer" do
   before :each do
@@ -103,4 +103,4 @@ describe "Mailer" do
     do_deliver :charset => 'iso8859-1'
     @deliveries.first.charset.should == 'iso8859-1'
   end
-end
+end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-mailer-extension
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nathaniel Talbott
 - Sean Cribbs
 - Matt McCray
@@ -19,25 +14,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-16 00:00:00 +02:00
-default_executable: 
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Provides support for email forms and generic mailing functionality.
-email: 
+email:
 - radiant@radiantcms.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/mail_controller.rb
 - app/models/mail.rb
 - app/models/mailer.rb
 - config/routes.rb
+- cucumber.yml
 - db/migrate/001_revert_mailer_page_class_to_page.rb
 - features/datasets/mailer_page_dataset.rb
 - features/fixtures/attachment.txt
@@ -64,42 +54,31 @@ files:
 - spec/models/mailer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- VERSION
-has_rdoc: true
 homepage: https://github.com/radiant/radiant-mailer-extension
 licenses: []
-
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-mailer-extension', :version => '~>1.0.3'\n  "
+post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Form mailing for Radiant CMS
-test_files: 
+test_files:
 - spec/controllers/mail_controller_spec.rb
 - spec/datasets/mailer_page_dataset.rb
 - spec/lib/mailer_process_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.2