email_form_generator 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,12 @@
+== 1.0.4 / 2009-07-03
+ * Tests updated for Rails 2.3x
+ * Fixed broken generator.
+ * Fixed horrible formatting
+ * Changed variables in the config file
+ * added the default url options to the mailer
+ * changed method name of mailer to be more specific so you could easily make your own changes and use the mailer the way you want it.
+== 1.0.3 / 2009-05-25
+ * Some minor internal changes relating to templates
 == 1.0.2 / 2009-02-13
  * minor changes to the config file that originally was included
 == 1.0.1 / 2008-05-21

data/README.rdoc

@@ -56,17 +56,17 @@ When the generator runs, it creates a configuration file called email.yml.  You
         authentication: none
         username:
         password: 
-        contact_recipient: admin@yourdomain.com
+        site_admin_email: admin@yourdomain.com
     production:
       web_host: http://localhost:3000
       email:
         delivery_method: sendmail
-        contact_recipient: admin@yourdomain.com
+        site_admin_email: admin@yourdomain.com
     test:
       web_host: http://localhost:3000
       email:
         delivery_method: test
-        contact_recipient: admin@yourdomain.com
+        site_admin_email: admin@yourdomain.com
  
 This file is read by config/initializers/email_config.rb, where it configures ActionMailer's settings. It should work fine out of the box for most environments.
 

data/email_form_generator.rb

@@ -60,7 +60,7 @@ class EmailFormGenerator < Rails::Generator::NamedBase
       # mailer template
       m.template(
           "view_form.html.erb",
-          File.join('app/views', controller_class_path, file_name + "_mailer", "form.html.erb")
+          File.join('app/views', controller_class_path, file_name + "_mailer", file_name + ".html.erb")
         )
         
         
@@ -107,7 +107,7 @@ class EmailFormGenerator < Rails::Generator::NamedBase
   protected
     
     def ran_before?
-    options[:rspec] || (File.exist?('app/models/tableless.rb')
+    options[:rspec] || (File.exist?('app/models/tableless.rb'))
     end
     
     # Override with your own usage banner.

data/templates/config.rb

@@ -22,4 +22,4 @@ else
 
 end
 WEB_HOST = c[RAILS_ENV]['email']['web_host']
-CONTACT_RECIPIENT = c[RAILS_ENV]['email']['contact_recipient']
+SITE_ADMIN_EMAIL = c[RAILS_ENV]['email']['site_admin_email']

data/templates/config.yml

@@ -8,14 +8,14 @@ development:
     authentication: none
     username:
     password: 
-    contact_recipient: admin@yourdomain.com
+    site_admin_email: admin@yourdomain.com
 production:
   web_host: http://localhost:3000  
   email:
     delivery_method: sendmail
-    contact_recipient: admin@yourdomain.com
+    site_admin_email: admin@yourdomain.com
 test:
   web_host: http://localhost:3000
   email:
     delivery_method: test
-    contact_recipient: admin@yourdomain.com
+    site_admin_email: admin@yourdomain.com

data/templates/controller.rb

@@ -1,34 +1,30 @@
 class <%= controller_class_name %>Controller < ApplicationController
 
  
-# GET /<%= table_name %>/new
-# GET /<%= table_name %>/new.xml
-def new
-@<%= file_name %> = <%= class_name %>.new
- 
-respond_to do |format|
-format.html # new.html.erb
-format.xml { render :xml => @<%= file_name %> }
-end
-end
+  # GET /<%= table_name %>/new
+  # GET /<%= table_name %>/new.xml
+  def new
+    @<%= file_name %> = <%= class_name %>.new
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml { render :xml => @<%= file_name %> }
+    end
+  end
  
-
 # POST /<%= table_name %>
 # POST /<%= table_name %>.xml
   def create
     @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
- 
-respond_to do |format|
-if @<%= file_name %>.deliver
+    respond_to do |format|
+      if @<%= file_name %>.deliver
         flash[:notice] = 'The message was sent successfully.'
         format.html { render :action=>"success" }
-format.xml { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
-else
-format.html { render :action => "new" }
+        format.xml { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
+      else
+        format.html { render :action => "new" }
         format.xml { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
       end
     end
   end
  
- 
 end

data/templates/functional_test.rb

@@ -1,25 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require '<%= controller_file_name %>_controller'
-
-# requires mocha gem - gem install mocha
-require 'mocha'
-
-# Re-raise errors caught by the controller.
-class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
-
 
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = false
     ActionMailer::Base.deliveries = []
-    
   end
 
   def test_should_display_form
@@ -28,8 +14,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     assert_response :success
   end
   
-  
   def test_should_show_success_when_created
+    <%=class_name %>.any_instance.expects(:deliver).returns(true)
     post :create, {:<%= file_name %> => {}  }
     assert_response :success
     assert_template "success"
@@ -37,11 +23,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
 
   def test_should_fail_to_send_and_show_form_again
     <%=class_name %>.any_instance.expects(:deliver).returns(false)
-    
     post :create
     assert_response :success
     assert_template "new"
   end
-
- 
 end

data/templates/mailer.rb

@@ -1,17 +1,16 @@
 class <%= class_name %>Mailer < ActionMailer::Base
-  def form(<%= file_name %>)
+  default_url_options[:host] = WEB_HOST
+  
+  def <%=singular_name %>(<%= file_name %>)
     setup_email(<%= file_name %>)
     @subject    += 'Message from the site'
-    @recipients  = CONTACT_RECIPIENT
-
+    @recipients  = SITE_ADMIN_EMAIL
   end
   
-
-  
   protected
     def setup_email(<%= file_name %>)
       @from        = "ADMINEMAIL"
-      @subject     = "[YOURSITE] "
+      @subject     = "[YOURSITE]"
       @sent_on     = Time.now
       @body[:<%= file_name %>] = <%= file_name %>
     end

data/templates/mailer_test.rb

@@ -12,14 +12,14 @@ class <%= class_name %>MailerTest < Test::Unit::TestCase
 
   end
 
-  def test_deliver_form
+  def test_deliver_<%=singular_name %>
     @f = <%=class_name %>.new
     
     <% attributes.each do |attribute| %>
        @f.<%=attribute.name %> = "foo"
     <% end %>
     
-    <%=class_name%>Mailer::deliver_form(@f)
+    <%=class_name%>Mailer::deliver_<%=singular_name %>(@f)
     assert_equal 1, ActionMailer::Base.deliveries.length
     
   end

data/templates/model.rb

@@ -1,13 +1,16 @@
 class <%= class_name %> < Tableless
   <% for attribute in attributes -%>
-  <%= "column :#{attribute.name}, :#{attribute.type}" %>
+  <%= "column :#{attribute.name}, :#{attribute.type}" %>  
   <% end -%>
   
+  <% for attribute in attributes -%>
+  <%= "validates_presence_of :#{attribute.name}" %>
+  <% end -%>
   
   def deliver
     if valid?
       begin
-        <%= class_name %>Mailer::deliver_form(self)
+        <%= class_name %>Mailer::deliver_<%=singular_name %>(self)
       rescue
          @errors.add_to_base "Your message could not be sent due to configuration issues with the server."
          return false

data/templates/unit_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
+class <%= class_name %>Test < ActiveSupport::TestCase
 
   def test_should_deliver_message
     
@@ -15,12 +15,12 @@ class <%= class_name %>Test < Test::Unit::TestCase
   
   # modify this test in such a way as to cause the 
   # validations to fail, if you have any.
-  def test_should_not_deliver_message
-    
-    @f = <%=class_name %>.new
-    assert ! @f.deliver
-    
-  end
+  # def test_should_not_deliver_message
+  #   
+  #   @f = <%=class_name %>.new
+  #   assert ! @f.deliver
+  #   
+  # end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: email_form_generator
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Brian Hogan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -05:00
+date: 2009-07-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency