tkh_content 0.1.8 → 0.1.9

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 
 
+## 0.1.9
+
+* Removed inline editor. Will add another one soon
+* Created a contact form
+
+
+## 0.1.8
+
+* Some debugging
+
+
 ## 0.1.7
 
 * Added tags to blog

data/README.md

@@ -62,7 +62,7 @@ Start your server!
 ## Usage
 
 
-The section is located at:
+The main section is located at:
 
     /pages
 

data/app/controllers/contacts_controller.rb

@@ -0,0 +1,54 @@
+class ContactsController < ApplicationController
+  
+  before_filter :authenticate,            :except => 'create'
+  before_filter :authenticate_with_admin, :except => 'create'
+  
+  def index
+    @contacts = Contact.by_recent.paginate(:page => params[:page], :per_page => 35)
+    switch_to_admin_layout
+  end
+
+  def create
+    @contact = Contact.new(params[:contact])
+    saved = @contact.save
+    sent_email = send_message_to_admin(@contact)
+    
+    if saved && sent_email == 'success'
+      redirect_to root_path, notice: "Your message has been sent. Thank you very much!"
+    elsif saved && sent_email == 'exception'
+      flash[:error] = 'There was a problem sending this message'
+      redirect_to :back
+    elsif saved && sent_email == 'invalid'
+      flash[:error] = 'There was a problem sending this message. Your email address does not seem to be valid!'
+      redirect_to :back
+    else
+      flash[:error] = 'Something went wrong. Your message did not reach the intended recipient.'
+      redirect_to :back
+    end
+  end
+  
+  def valid_email?(string)
+    (!string.blank? && string =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) ? true : false
+  end
+  # helper_method :valid_email?
+  
+  private
+  
+  def send_message_to_admin(contact)
+    # check email validity
+    if valid_email?(contact.sender_email)    
+      # Actually send the email to the student
+      begin
+        ContactMailer.message_from_contact_form(contact).deliver
+        return 'success'
+      rescue Exception => e
+        # AdminMailer.rescued_exceptions(e, "Some exception occurred while trying to send a student his confirmation for registering in a course. The email was never sent!").deliver
+        return 'exception'
+      end
+    else # for invalid or blank emails
+      return 'invalid'
+    end
+  end
+  
+  
+end

data/app/mailers/contact_mailer.rb

@@ -0,0 +1,18 @@
+class ContactMailer < ActionMailer::Base
+  
+  # default :from => "info@yoga.lu"
+
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.user_mailer.password_reset.subject
+  #
+  def message_from_contact_form(contact)  
+    @contact = contact
+    # FIXME - only the email addresses show up. not the names :-(
+    # TODO - what do to if contact_email is not set?
+    recipient = "#{Setting.first.company_name} <#{Setting.first.contact_email}>"
+    from = "#{@contact.sender_name} <#{@contact.sender_email}>"
+    mail to: recipient,  from: from , subject: 'Message from the contact form'
+  end
+end

data/app/models/contact.rb

@@ -0,0 +1,16 @@
+# this is needed for now to make mass assignment security compatible with the translation of globalize3
+Globalize::ActiveRecord::Translation.class_eval do
+  attr_accessible :locale
+end
+
+class Contact < ActiveRecord::Base
+  
+  attr_accessible :sender_name, :sender_email, :body
+  
+  validates_presence_of :sender_name
+  validates :sender_email, :presence => true, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :on => :create }
+  validates_presence_of :body
+
+  scope :by_recent, order('updated_at desc')
+  
+end

data/app/views/contact_mailer/message_from_contact_form.text.erb

@@ -0,0 +1,9 @@
+Here is the message <%= @contact.sender_name %> sent via the contact form on the web site:
+
+-----------------------------------
+
+<%= @contact.body %>
+
+-----------------------------------
+
+Their email address is: <%= @contact.sender_email %>

data/app/views/contacts/_form.html.erb

@@ -0,0 +1,14 @@
+<%= simple_form_for Contact.new, :html => { class: 'form-horizontal' } do |f| %>
+	<%= f.error_notification %>
+	
+  <div class="form-inputs">
+		<%= f.input :sender_name %>
+		<%= f.input :sender_email %>
+		<%= f.input :body, :input_html => { :rows => 10 } %>
+	</div>
+	
+  <div class="form-actions">
+    <%= f.button :submit, :class => 'btn btn-primary', label: 'send your message' %>
+  </div>
+
+<% end %>

data/app/views/contacts/index.html.erb

@@ -0,0 +1,29 @@
+<h1><%= t 'contacts.index.title' %></h1>
+
+<table class='table table-striped'>
+	<thead>
+  <tr>
+	    <th><%= t 'activerecord.attributes.contacts.sender_name' %></th>
+	    <th><%= t 'activerecord.attributes.contacts.sender_email' %></th>
+			<th><%= t 'activerecord.attributes.contacts.body' %></th>
+			<th><%= t 'contacts.sent' %></th>
+	    <th>Actions</th>
+	  </tr>
+	</thead>
+	
+	<tbody>
+		<% @contacts.each do |contact| %>
+		  <tr>
+		    <td><%= contact.sender_name %></td>
+				<td><%= mail_to contact.sender_email, contact.sender_name, subject: 'Response to your message' %></td>
+		    <td><%= truncate contact.body, length: 55, separator: ' ...' %></td>
+				<td><%= l contact.created_at, :format => :default %></td>
+		    <td>Reply to email: <%= mail_to contact.sender_email, contact.sender_name, subject: 'Response to your message' %></td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= will_paginate @contacts %>
+
+<%= render 'shared/admin_sidebar' %>

data/app/views/pages/_form.html.erb

@@ -14,7 +14,7 @@
 																	 					source: Page.not_for_blog.by_title.map(&:title).to_json } 
 																	} %>
 	  <%= f.input :description, :input_html => { :rows => 3 } %>
-		<%= f.input :body, :input_html => { :rows => 25, :id => 'editable' } %>
+		<%= f.input :body, :input_html => { :rows => 35 } %>
 	</div>
 	
   <div class="form-actions">

data/app/views/pages/index.html.erb

@@ -2,7 +2,7 @@
 
 <table class='table table-striped'>
 	<thead>
-  <tr>
+  	<tr>
 	    <th><%= t 'activerecord.attributes.pages.title' %></th>
 	    <th><%= t 'activerecord.attributes.pages.description' %></th>
 			<th><%= t 'pages.author'.capitalize %></th>

data/app/views/pages/show.html.erb

@@ -5,5 +5,8 @@
 
 <%= raw @page.body %>
 
+<!-- remove this once DSL has been created -->
+<%= render 'contacts/form' if params[:id].to_i == 5 %>
+
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

data/config/routes.rb

@@ -9,5 +9,6 @@ Rails.application.routes.draw do
     end
     get 'blog' => 'blog#index', as: :blog
     get 'tags/:tag', to: 'blog#index', as: :tag
+    resources :contacts
   end
 end

data/lib/generators/tkh_content/create_or_update_locales/templates/de.yml

@@ -14,6 +14,11 @@ de:
         description: "Beschreibung"
         body: "Haupttext"
         for_the_blog: 'Für den Blog'
+      
+      contacts:
+        sender_name: "sender name"
+        sender_email: 'sender email'
+        body: 'message'
 
   pages:
     author: 'Autor'
@@ -28,4 +33,11 @@ de:
       warning: 'Beim Speichern der Seite ist ein Problem aufgetreten'
     destroy:
       notice: 'Die Seite wurde gelöscht'
-      root_warning: "Du kannst diese Seite nicht löschen, da es die Root-Seite ist. Du kannst sie nur bearbeiten."
+      root_warning: "Du kannst diese Seite nicht löschen, da es die Root-Seite ist. Du kannst sie nur bearbeiten."
+
+  contacts:
+    sent: 'Sent at'
+    
+    create:
+      notice: 'Your message has been sent'
+      warning: 'There was a problem sending your message.'

data/lib/generators/tkh_content/create_or_update_locales/templates/en.yml

@@ -1,5 +1,19 @@
 en:
   
+  activerecord: 
+    attributes:
+      pages:
+        title: "title"
+        short_title: 'short title'
+        description: "description"
+        body: "body text"
+        for_the_blog: 'for the blog'
+        
+      contacts:
+        sender_name: "sender name"
+        sender_email: 'sender email'
+        body: 'message'
+  
   are_you_sure: 'are you sure?'
   delete: 'delete'
   edit: 'edit'
@@ -20,3 +34,10 @@ en:
     destroy:
       notice: 'The page was deleted'
       root_warning: "You cannot delete this page as this is the root page of the site. You should only modify it."
+  
+  contacts:
+    sent: 'Sent at'
+      
+    create:
+      notice: 'Your message has been sent'
+      warning: 'There was a problem sending your message.'

data/lib/generators/tkh_content/create_or_update_locales/templates/es.yml

@@ -14,6 +14,11 @@ es:
         description: "descripción"
         body: "parte principal"
         for_the_blog: 'contraseña'
+        
+      contacts:
+        sender_name: "nombre del remitente"
+        sender_email: 'correo electrónico del remitente'
+        body: 'mensaje'
 
   pages:
     author: 'autor'
@@ -30,4 +35,9 @@ es:
       notice: 'la página se ha eliminado'
       root_warning: "No se puede eliminar la página, ya que es la bienvenida principal. Por favor, cámbialo."
           
-  
+  contacts:
+    sent: 'Enviado a las'
+    
+    create:
+      notice: 'Tu mensaje ha sido enviado.'
+      warning: 'Hubo un problema al enviar su mensaje.'

data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml

@@ -14,6 +14,11 @@ fr:
         description: "description"
         body: "texte principal"
         for_the_blog: 'pour le blog'
+
+      contacts:
+        sender_name: "nom de l'auteur"
+        sender_email: "email de l'auteur"
+        body: 'contenu du message'
   
   pages:
     author: 'auteur'
@@ -22,10 +27,17 @@ fr:
     
     create:
       notice: 'La page a été créée.'
-      warning: "Il y'a eu un probleme et la page n'a pas été sauvegardée"
+      warning: "Il y'a eu un probleme et la page n'a pas été sauvegardée."
     update:
-      notice: 'Les changements de cette page ont été sauvegardés'
-      warning: "Il y'a eu un probleme et les changements de cette page n'ont pas été sauvegardés"
+      notice: 'Les changements de cette page ont été sauvegardés.'
+      warning: "Il y'a eu un probleme et les changements de cette page n'ont pas été sauvegardés."
     destroy:
-      notice: 'La page a été supprimée'
-      root_warning: "Vous ne pouvez pas supprimer cette page parce que c'est la page principale de bienvenue. Veuillez la modifier."
+      notice: 'La page a été supprimée.'
+      root_warning: "Vous ne pouvez pas supprimer cette page parce que c'est la page principale de bienvenue. Veuillez la modifier."
+
+  contacts:
+    sent: 'Envoyé le'
+        
+    create:
+      notice: 'Votre message a bien été envoyé.'
+      warning: "Il y'a eu un probleme en envoyant votre message."

data/lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -22,6 +22,7 @@ module TkhContent
         migration_template "add_parent_id_to_pages.rb", "db/migrate/add_parent_id_to_pages.rb"
         migration_template "create_tags.rb", "db/migrate/create_tags.rb"
         migration_template "create_taggings.rb", "db/migrate/create_taggings.rb"
+        migration_template "create_contacts.rb", "db/migrate/create_contacts.rb"
       end
  
     end

data/lib/generators/tkh_content/create_or_update_migrations/templates/create_contacts.rb

@@ -0,0 +1,19 @@
+class CreateContacts < ActiveRecord::Migration
+  
+  def self.up
+    create_table :contacts do |t|
+      t.string :sender_name
+      t.string :sender_email
+      t.text :body
+      
+      t.timestamps
+    end
+    add_index :contacts, :updated_at
+  end
+  
+  def self.down
+    drop_table :contacts
+    remove_index :pages, :updated_at
+  end
+  
+end

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tkh_inline_editor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -163,13 +147,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/blog_controller.rb
+- app/controllers/contacts_controller.rb
 - app/controllers/pages_controller.rb
 - app/helpers/blog_helper.rb
+- app/mailers/contact_mailer.rb
+- app/models/contact.rb
 - app/models/page.rb
 - app/models/tag.rb
 - app/models/tagging.rb
 - app/views/blog/index.html.erb
 - app/views/blog/index.rss.builder
+- app/views/contact_mailer/message_from_contact_form.text.erb
+- app/views/contacts/_form.html.erb
+- app/views/contacts/index.html.erb
 - app/views/pages/_form.html.erb
 - app/views/pages/edit.html.erb
 - app/views/pages/index.html.erb
@@ -187,6 +177,7 @@ files:
 - lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/create_contacts.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_taggings.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_tags.rb
@@ -241,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3856383533934555499
+      hash: -3307999387978065360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -250,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3856383533934555499
+      hash: -3307999387978065360
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23