alchemy_cms 2.0.rc1 → 2.0.rc2

data/app/controllers/messages_controller.rb

@@ -1,7 +1,7 @@
 # == Sending Messages:
 # To send Messages via contact forms you can create your form fields in the config.yml
 # === Example:
-# Make an Element with this options inside your elements.yml file:
+# Make an Element with this options inside your @elements.yml file:
 #
 #   - name: contact
 #     display_name: Kontaktformular
@@ -16,7 +16,7 @@
 #       type: EssenceText
 #
 # The fields mail_to, mail_from, subject and success_page are recommended.
-# The MessagesController uses them to send your mails. So your customer has full controll of these values inside his contactform element.
+# The MessagesController uses them to send your mails. So your customer has full controll of these values inside his contactform @element.
 # 
 # Then make a page layout for your contact page in the page_layouts.yml file:
 # 
@@ -24,73 +24,90 @@
 #     display_name: Kontakt
 #     unique: true
 #     cache: false
-#     elements: [pageheading, heading, contact, bild, absatz, file_download]
+#     @elements: [pageheading, heading, contact, bild, absatz, file_download]
 #     autogenerate: [contact]
 #
 # Disabling the page caching is stronlgy recommended!
 #
-# The editor view for your element should have this layout:
+# The editor view for your @element should have this layout:
 # 
-#   <%= render_essence_editor_by_name(element, 'mail_from') %>
-#   <%= render_essence_editor_by_name(element, 'mail_to') %>
-#   <%= render_essence_editor_by_name(element, 'subject') %>
+#   <%= render_essence_editor_by_name(@element, 'mail_from') %>
+#   <%= render_essence_editor_by_name(@element, 'mail_to') %>
+#   <%= render_essence_editor_by_name(@element, 'subject') %>
 #   <p>
-#     Folgeseite: <%= page_selector(element, 'success_page') %>
+#     Folgeseite: <%= page_selector(@element, 'success_page') %>
 #   </p>
 # 
-# Please have a look at the vendor/plugins/alchemy/config/config.yml file for further Message settings.
+# Please have a look at the alchemy/config/config.yml file for further Message settings.
 
 class MessagesController < AlchemyController
   
+  before_filter :get_page, :except => :create
+  
   helper :pages
 
+  def index#:nodoc:
+    redirect_to show_page_path(:urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
+  end
+
   def new#:nodoc:
     @message = Message.new
-    @page = Page.find_by_page_layout(Alchemy::Config.get(:mailer)[:form_layout_name])
-    @root_page = Page.language_root_for(session[:language_id])
-    raise "Page for page_layout #{configuration(:mailer)[:page_layout_name]} not found" if @page.blank?
     render :template => '/pages/show', :layout => 'pages'
   end
 
-  def index#:nodoc:
-    @page = Page.find_by_page_layout(configuration(:mailer)[:page_layout_name])
-    raise "Page for page_layout #{configuration(:mailer)[:page_layout_name]} not found" if @page.blank?
-    redirect_to send("show_page#{multi_language? ? '_with_language' : '' }_path", :urlname => @page.urlname, :lang => multi_language? ? @page.language_code : nil)
-  end
-
   def create#:nodoc:
-    @message = Message.new(params[:mail])
-    @message.ip = request.remote_ip
-    element = Element.find_by_id(@message.contact_form_id)
-    @page = element.page
+    @message = Message.new(params[:message].merge(:ip => request.remote_ip))
+    @element = Element.find_by_id(@message.contact_form_id)
+    @page = @element.page
     @root_page = @page.get_language_root
-    if @message.save
-      if params[:mail_to].blank?
-        mail_to = element.ingredient("mail_to")
-      else
-        mail_to = Alchemy::Config.get(:mailer)[:mail_addresses].detect{ |c| c[0] == params[:mail_to] }[1]
-      end
-      mail_from = element.ingredient("mail_from") rescue configuration(:mailer)[:mail_from]
-      subject = element.ingredient("subject") rescue configuration(:mailer)[:subject]
-      
-      Messages.mail(@message, mail_to, mail_from, subject).deliver
-      
-      if element.ingredient("success_page")
-        if multi_language?
-          language = Language.find(session[:language_id])
-          redirect_to show_page_url(:urlname => element.ingredient("success_page"), :lang => language.code)
-        else
-          redirect_to show_page_url(:urlname => element.ingredient("success_page"))
-        end
-      elsif configuration(:mailer)[:forward_to_page] && configuration(:mailer)[:mail_success_page]
-        redirect_to :controller => 'pages', :action => 'show', :urlname => Page.find_by_urlname(configuration(:mailer)[:mail_success_page]).urlname
-      else
-        flash[:notice] = I18n.t('alchemy.contactform.messages.success')
-        redirect_to :controller => 'pages', :action => 'show', :urlname => Page.language_root_for(session[:language_id]).urlname
-      end
+    if @message.valid?
+      Messages.contact_form_mail(@message, mail_to, mail_from, subject).deliver
+      redirect_to_success_page
     else
       render :template => '/pages/show', :layout => 'pages'
     end
   end
 
+private
+
+  def mailer_config
+    Alchemy::Config.get(:mailer)
+  end
+
+  def mail_to
+    @element.ingredient("mail_to")
+  rescue
+    mailer_config[:mail_to]
+  end
+
+  def mail_from
+    @element.ingredient("mail_from")
+  rescue
+    mailer_config[:mail_from]
+  end
+
+  def subject
+    @element.ingredient("subject")
+  rescue
+    mailer_config[:subject]
+  end
+
+  def redirect_to_success_page
+    if @element.ingredient("success_page")
+      urlname = @element.ingredient("success_page")
+    elsif mailer_config[:forward_to_page] && mailer_config[:mail_success_page]
+      urlname = Page.find_by_urlname(mailer_config[:mail_success_page]).urlname
+    else
+      flash[:notice] = I18n.t('alchemy.contactform.messages.success')
+      urlname = Page.language_root_for(session[:language_id]).urlname
+    end
+    redirect_to show_page_path(:urlname => urlname, :lang => multi_language? ? session[:language_code] : nil)
+  end
+
+  def get_page
+    @page = Page.find_by_page_layout(mailer_config[:form_layout_name])
+    @root_page = @page.get_language_root
+    raise "Page for page_layout #{mailer_config[:page_layout_name]} not found" if @page.blank?
+  end
+
 end

data/app/mailers/messages.rb

@@ -2,12 +2,12 @@ class Messages < ActionMailer::Base
   
   default :from => Alchemy::Config.get(:mailer)[:mail_from]
   
-  def mail(mail_data, mail_to, mail_from, subject)
-    @mail_data = mail_data
+  def contact_form_mail(message, mail_to, mail_from, subject)
+    @message = message
     mail(
       :from => mail_from,
       :to => mail_to,
-      :reply_to => mail_data[:email],
+      :reply_to => message.email,
       :subject => subject
     )
   end

data/app/models/message.rb

@@ -31,23 +31,35 @@
 #         :message: blank_email
 
 class Message
-  
+
+  @@config = Alchemy::Config.get(:mailer)
+
+  extend ActiveModel::Naming
   include ActiveModel::Validations
-  
+  include ActiveModel::Conversion
+
   attr_accessor :contact_form_id, :ip
-  
-  Alchemy::Config.get(:mailer)[:fields].each do |field|
+  @@config[:fields].each do |field|
     attr_accessor field.to_sym
   end
-  
-  validate_fields = Alchemy::Config.get(:mailer)[:validate_fields]
-  validate_fields.each do |field|
-    validates_presence_of field[0], :message => I18n.t("alchemy.contactform.validations.#{field[1][:message].to_s}")
+
+  @@config[:validate_fields].each do |field|
+    validates_presence_of field[0], :message => '^' + I18n.t(field[1][:message].to_s, :scope => "alchemy.contactform.validations")
     if field[0].to_s.include?('email')
-      validates_format_of field[0], :with => Authlogic::Regex.email, :message => I18n.t('alchemy.contactform.validations.wrong_email_format'), :if => :email_is_filled
+      validates_format_of field[0], :with => Authlogic::Regex.email, :message => '^' + I18n.t('alchemy.contactform.validations.wrong_email_format'), :if => :email_is_filled
     end
   end
 
+  def initialize(attributes = {})
+    attributes.keys.each do |a|
+      send("#{a}=", attributes[a])
+    end
+  end
+
+  def persisted? #:nodoc:
+    false
+  end
+
 private
 
   def email_is_filled #:nodoc:

data/app/views/messages/contact_form_mail.html.erb

@@ -0,0 +1,14 @@
+<pre>
+<%= @message.message %>
+</pre>
+
+<p>
+	<%= @message.salutation %><br>
+	<%= @message.firstname %>&nbsp;<%= @message.lastname %><br>
+	<br>
+	<%= @message.address %><br>
+	<%= @message.zip %>&nbsp;<%= @message.city %><br>
+	<br>
+	<%= @message.phone %><br>
+	<%= @message.email %>
+</p>

data/app/views/messages/contact_form_mail.text.erb

@@ -0,0 +1,10 @@
+<%= @message.message %>
+
+--
+
+<%= @message.salutation %>
+<%= @message.firstname %> <%= @message.lastname %>
+<%= @message.address %>
+<%= @message.zip %> <%= @message.city %>
+<%= @message.phone %>
+<%= @message.email %>

data/config/alchemy/config.yml

@@ -94,6 +94,7 @@ default_language:
   :forward_to_page: false
   :mail_success_page: thanks
   :mail_from: your.mail@your-domain.com
+  :mail_to: your.mail@your-domain.com
   :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
   :validate_fields:
     :lastname:

data/config/routes.rb

@@ -2,6 +2,8 @@ Rails.application.routes.draw do
   
   root :to => 'pages#show'
   
+  resources :messages, :only => [:index, :new, :create]
+  
   match '/admin' => 'admin#index',
     :as => :admin
   match '/admin/login' => 'admin#login',
@@ -35,8 +37,7 @@ Rails.application.routes.draw do
   
   resources :user_sessions
   resources :elements, :only => :show
-  resources :mails
-  
+
   namespace :admin do 
   
     resources :users
@@ -119,7 +120,7 @@ Rails.application.routes.draw do
     
     resources :languages
     
-    # OHOHOH lovely Rails! Why, oh why I alwas have to hack thou?
+    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
     resource :clipboard, :only => :index, :controller => 'clipboard' do
       collection do
         get :index
@@ -129,7 +130,7 @@ Rails.application.routes.draw do
       end
     end
     
-    # OHOHOH lovely Rails! Why, oh why I alwas have to hack thou?
+    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
     resource :trash, :only => :index, :controller => 'trash' do
       collection do
         get :index

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.rc1"
+  VERSION = "2.0.rc2"
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: alchemy_cms
 version: !ruby/object:Gem::Version 
-  hash: 15424199
+  hash: 15424193
   prerelease: 4
   segments: 
   - 2
   - 0
   - rc
-  - 1
-  version: 2.0.rc1
+  - 2
+  version: 2.0.rc2
 platform: ruby
 authors: 
 - Thomas von Deyen
@@ -523,7 +523,8 @@ files:
 - app/views/layouts/login.html.erb
 - app/views/layouts/pages.html.erb
 - app/views/layouts/sitemap.xml.erb
-- app/views/messages/mail.text.erb
+- app/views/messages/contact_form_mail.html.erb
+- app/views/messages/contact_form_mail.text.erb
 - app/views/messages/new.html.erb
 - app/views/notifications/admin_user_created.text.erb
 - app/views/notifications/registered_user_created.text.erb

data/app/views/messages/mail.text.erb

@@ -1,10 +0,0 @@
-<%= @mail_data[:message] %>
-
---
-
-<%= @mail_data[:salutation] %>
-<%= @mail_data[:firstname] %> <%= @mail_data[:lastname] %>
-<%= @mail_data[:address] %>
-<%= @mail_data[:zip] %> <%= @mail_data[:city] %>
-<%= @mail_data[:phone] %>
-<%= @mail_data[:email] %>