mail_form 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+# Version 1.3
+
+* Removed deprecated methods in version 1.2.
+* Added persisted? header and a generator.
+
 # Version 1.2
 
 * No more class attributes, just define a headers method

data/Rakefile

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'

data/lib/generators/rails/mail_form_generator.rb

@@ -0,0 +1,17 @@
+module Rails
+  module Generators
+    class MailFormGenerator < Rails::Generators::NamedBase
+      def self.source_root
+        @_mail_form_source_root ||= File.expand_path("../templates", __FILE__)
+      end
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      check_class_collision
+
+      def create_model_file
+        template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+      end
+    end
+  end
+end

data/lib/generators/rails/templates/model.rb

@@ -0,0 +1,9 @@
+class <%= class_name %> < MailForm::Base
+<% attributes.each do |attribute| -%>
+  attribute :<%= attribute.name %>
+<% end -%>
+
+  def headers
+    { :to => "PLEASE-CHANGE-ME@example.org" }
+  end
+end

data/lib/mail_form/delivery.rb

@@ -15,42 +15,16 @@ module MailForm
       class_attribute :mail_appendable
       self.mail_appendable = []
 
-      before_create :not_spam?
-      after_create  :deliver!
-
-      attr_accessor :request
-      alias :deliver :create
-
-      extend Deprecated
-    end
-
-    module Deprecated
-      def subject(duck=nil, &block)
-        ActiveSupport::Deprecation.warn "subject is deprecated. Please define a headers method " << 
-          "in your instance which returns a hash with :subject as key instead.", caller
-      end
-
-      def sender(duck=nil, &block)
-        ActiveSupport::Deprecation.warn "from/sender is deprecated. Please define a headers method " << 
-          "in your instance which returns a hash with :from as key instead.", caller
+      if respond_to?(:before_deliver) && respond_to?(:after_deliver)
+        before_deliver :not_spam?
+        after_deliver  :deliver!
+      else # For ActiveRecord compatibility
+        before_create :not_spam?
+        after_create  :deliver!
+        alias :deliver :save
       end
-      alias :from :sender
 
-      def recipients(duck=nil, &block)
-        ActiveSupport::Deprecation.warn "to/recipients is deprecated. Please define a headers method " << 
-          "in your instance which returns a hash with :to as key instead.", caller
-      end
-      alias :to :recipients
-
-      def headers(hash)
-        ActiveSupport::Deprecation.warn "headers is deprecated. Please define a headers method " << 
-          "in your instance which returns the desired headers instead.", caller
-      end
-
-      def template(new_template)
-        ActiveSupport::Deprecation.warn "template is deprecated. Please define a headers method " << 
-          "in your instance which returns a hash with :template_name as key instead.", caller
-      end
+      attr_accessor :request
     end
 
     module ClassMethods
@@ -169,7 +143,7 @@ module MailForm
       !spam?
     end
 
-    # Deliver the resource without checking any condition.
+    # Deliver the resource without running any validation.
     def deliver!
       MailForm::Notifier.contact(self).deliver
     end

data/lib/mail_form/shim.rb

@@ -12,7 +12,7 @@ module MailForm
         include ActiveModel::Conversion
 
         extend MailForm::Shim::ClassMethods
-        define_model_callbacks :create
+        define_model_callbacks :deliver
       end
     end
 
@@ -43,19 +43,23 @@ module MailForm
       true
     end
 
+    def persisted?
+      false
+    end
+
     # Always return nil so when using form_for, the default method will be post.
     def id
       nil
     end
 
     # Create just check validity, and if so, trigger callbacks.
-    def create
+    def deliver
       if valid?
-        _run_create_callbacks { true }
+        _run_deliver_callbacks { true }
       else
         false
       end
     end
-    alias :save :create
+    alias :save :deliver
   end
 end

data/lib/mail_form/version.rb

@@ -1,3 +1,3 @@
 module MailForm
-  VERSION = "1.2.1".freeze
+  VERSION = "1.3.0".freeze
 end

data/test/mail_form_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test_helper'
 
 class MailFormNotifierTest < ActiveSupport::TestCase

data/test/resource_test.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'test_helper'
 
 class MailFormBaseTest < ActiveSupport::TestCase

data/test/test_helper.rb

@@ -26,7 +26,7 @@ class ContactForm < MailForm::Base
 
   attributes :created_at, :message, :validate => :callback
 
-  before_create :set_created_at
+  before_deliver :set_created_at
 
   def headers
     { :to => 'my.email@my.domain.com' }
@@ -55,14 +55,14 @@ end
 
 class FileForm < ContactForm
   attribute :file, :attachment => true, :validate => true
-  recipients :set_recipient
 
-  def set_recipient
-    if file
+  def headers
+    to = if file
       "contact_file@my.domain.com"
     else
       "contact@my.domain.com"
     end
+    { :to => to }
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 +02:00
+date: 2010-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- lib/generators/rails/mail_form_generator.rb
+- lib/generators/rails/templates/model.rb
 - lib/mail_form.rb
 - lib/mail_form/base.rb
 - lib/mail_form/delivery.rb