tkh_content 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7bc55b0d8bb4d7f10dffc54da9c7faf6be9ee4
-  data.tar.gz: 19a5f636495315ef82a0a20600d9dcc1321a4ac8
+  metadata.gz: 7c8668b344e4cf0d8c448d884e7a9d2d4c32ac89
+  data.tar.gz: babab662e689ff46d44bb8528e5d51695567795b
 SHA512:
-  metadata.gz: ed228f74e5ebc4fd9f7d3ce1713a7425d4ec75a0adc1b6d1f5accab8beb39b69de72971975b893d43f0df248a2abc62bd14000986e8953e96b750ad90c8c8967
-  data.tar.gz: f53acd8c17e22e8fa959ccf1a5230f104fb350bbe6940307009c719c0a980209e59fe9dc6bc10a10dc641f5f5728b8609b0a133b59d217ef5cbb828465f949f1
+  metadata.gz: 4df7228acc84cc82e5c467fb44e5d61ea8a82af26284cf99056fc8bc3fc35ee3e348382d9d914ed2b35f987176cfe4a99c769248c0ffb1e4bf66458960d0ac03
+  data.tar.gz: 54daaf9f771ec5dff5695892da94b6a8bc1ba20eb91f19bf5b4fd313075b6466f3ed59c5afbd7e19c5b4ab17b5d274e821d795cb7c7398e68954426a610b81bc

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.10.4
+
+* Deleted the contact form resource. Exported it to the tkh_mailing_list gem.
+
+
 ## 0.10.3
 
 * Debugged page_parent_id attribute in page model

data/config/routes.rb

@@ -12,8 +12,6 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :contacts
-
     resources :comments do
       collection do
         get :pending

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

@@ -4,8 +4,6 @@ de:
     models:
       comment: 'Kommentar'
       comments: 'Kommentare'
-      contact: 'Kontakt'
-      contacts: 'Kontakte'
       page: 'Seite'
       pages: 'Seiten'
       tag: 'Tag'
@@ -23,11 +21,6 @@ de:
       tags:
         name: "name"
 
-      contacts:
-        sender_name: "Absender-Name"
-        sender_email: 'Absender-Email'
-        body: 'Nachricht'
-
       comments:
         author: 'Verfasser'
         body: "Haupttext"
@@ -73,20 +66,6 @@ de:
     hint:
       name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
 
-  contacts:
-    messages_from_forms: 'Nachrichten vom Kontaktformular'
-    send_message: 'Nachricht senden'
-    sent: 'Gesendet am'
-    create:
-      did_not_reach: 'Etwas ist schief gegangen. Deine Nachricht hat den gewünschten Adressaten nicht erreicht.'
-      invalid_email: 'Deine Emai-Adresse scheint ungültig zu sein!'
-      notice: 'Die Nachricht wurde gesendet.'
-      warning: 'Beim Versenden der Nachricht gab es ein Problem.'
-    mailer:
-      intro: 'Hier ist die Nachricht vom Kontaktformular der Webseite:'
-      sender_name: "Absendername:"
-      sender_email: "Absender-Email:"
-      message: 'Nachricht'
 
   comments:
     login_needed: 'Du must angemeldet sein, um einen Kommentar zu verfassen'

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

@@ -4,8 +4,6 @@ en:
     models:
       comment: 'comment'
       comments: 'comments'
-      contact: 'contact'
-      contacts: 'contacts'
       page: 'page'
       pages: 'pages'
       tag: 'tag'
@@ -23,11 +21,6 @@ en:
       tags:
         name: "name"
 
-      contacts:
-        sender_name: "sender name"
-        sender_email: 'sender email'
-        body: 'message'
-
       comments:
         author: 'author'
         body: "body text"
@@ -73,21 +66,6 @@ en:
     hint:
       name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
 
-  contacts:
-    messages_from_forms: 'messages from contact form'
-    send_message: 'send message'
-    sent: 'Sent at'
-    create:
-      did_not_reach: 'Something went wrong. Your message did not reach the intended recipient.'
-      invalid_email: 'Your email address does not seem to be valid!'
-      notice: 'Thank you. We have received your message.'
-      warning: 'There was a problem sending your message.'
-    mailer:
-      intro: 'Here is the message sent via the contact form on the web site:'
-      sender_name: "Sender's name:"
-      sender_email: "Sender's email:"
-      message: 'Message:'
-
   comments:
     login_needed: 'You need to be logged in to leave a comment'
     sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'

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

@@ -4,8 +4,6 @@ es:
     models:
       comment: 'comment'
       comments: 'comments'
-      contact: 'contact'
-      contacts: 'contacts'
       page: 'page'
       pages: 'pages'
       tag: 'tag'
@@ -23,11 +21,6 @@ es:
       tags:
         name: "name"
 
-      contacts:
-        sender_name: "nombre del remitente"
-        sender_email: 'correo electrónico del remitente'
-        body: 'mensaje'
-
       comments:
         author: 'author'
         body: "body text"
@@ -73,21 +66,6 @@ es:
     hint:
       name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
 
-  contacts:
-    messages_from_forms: 'mensajes del formulario de contacto'
-    send_message: 'enviar el mensaje'
-    sent: 'Enviado a las'
-    create:
-      did_not_reach: 'Something went wrong. Your message did not reach the intended recipient.'
-      invalid_email: 'Your email address does not seem to be valid!'
-      notice: 'Tu mensaje ha sido enviado.'
-      warning: 'Hubo un problema al enviar su mensaje.'
-    mailer:
-      intro: 'Here is the message sent via the contact form on the web site:'
-      sender_name: "Sender's name:"
-      sender_email: "Sender's email:"
-      message: 'Message:'
-
   comments:
     login_needed: 'You need to be logged in to leave a comment'
     sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'

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

@@ -4,8 +4,6 @@ fr:
     models:
       comment: 'commentaire'
       comments: 'commentaires'
-      contact: 'contact'
-      contacts: 'les contacts'
       page: 'page'
       pages: 'les pages'
       tag: 'étiquette'
@@ -23,11 +21,6 @@ fr:
       tags:
         name: "nom"
 
-      contacts:
-        sender_name: "votre nom"
-        sender_email: "votre adresse email"
-        body: 'contenu du message'
-
       comments:
         author: 'auteur'
         body: "texte"
@@ -73,20 +66,6 @@ fr:
     hint:
       name: 'Pas de majuscules, que des minuscules. Entre les mots multiples, utilisez un tiret ( - ), pas avec un espace.'
 
-  contacts:
-    messages_from_forms: 'messages du formulaire de contact'
-    send_message: 'envoyez le message'
-    sent: 'Envoyé le'
-    create:
-      did_not_reach: "Il y a eu un problem. Le message n'a pas été acheminé a sa destination."
-      invalid_email: 'Votre adresse courriel ne semble pas bonne !'
-      notice: 'Merci. Nous avons bien reçu votre message.'
-      warning: "Il y'a eu un probleme en envoyant votre message."
-    mailer:
-      intro: 'Voici le message envoyé par un visiteur avec le formulaire de contact sur le site web :'
-      sender_name: "Nom de l'auteur :"
-      sender_email: "Adresse courriel de l'auteur :"
-      message: 'Message :'
 
   comments:
     login_needed: 'Vous devez être identifié pour fournir un commentaire'

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

@@ -23,7 +23,6 @@ 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"
         migration_template "add_various_indices_to_pages.rb", "db/migrate/add_various_indices_to_pages.rb"
         migration_template "create_comments.rb", "db/migrate/create_comments.rb"
         migration_template "make_comments_polymorphic.rb", "db/migrate/make_comments_polymorphic.rb"

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,14 +164,11 @@ files:
 - app/assets/javascripts/ckeditor/config.js.coffee
 - app/controllers/blog_controller.rb
 - app/controllers/comments_controller.rb
-- app/controllers/contacts_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/tags_controller.rb
 - app/helpers/blog_helper.rb
 - app/helpers/pages_helper.rb
-- app/mailers/contact_mailer.rb
 - app/models/comment.rb
-- app/models/contact.rb
 - app/models/page.rb
 - app/models/tag.rb
 - app/models/tagging.rb
@@ -195,11 +192,6 @@ files:
 - app/views/comments/for_feed.atom.builder
 - app/views/comments/index.html.erb
 - app/views/comments/pending.html.erb
-- app/views/contact_mailer/message_from_contact_form.text.erb
-- app/views/contacts/_form.html.erb
-- app/views/contacts/_tab_admin_menu.html.erb
-- app/views/contacts/index.html.erb
-- app/views/contacts/show.html.erb
 - app/views/pages/_admin_context_menu.html.erb
 - app/views/pages/_blog_post_meta.html.erb
 - app/views/pages/_draft_notice.html.erb
@@ -230,7 +222,6 @@ files:
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_short_title_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_various_indices_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_comments.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
@@ -287,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine running pages and blog posts.

data/app/controllers/contacts_controller.rb

@@ -1,65 +0,0 @@
-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 show
-    @contact = Contact.find(params[:id])
-    switch_to_admin_layout
-  end
-
-  def create
-    @contact = Contact.new(contact_params)
-    saved = @contact.save
-    sent_email = send_message_to_admin(@contact)
-
-    if saved && sent_email == 'success'
-      redirect_to root_path, notice: t("contacts.create.notice")
-    elsif saved && sent_email == 'exception'
-      flash[:error] = t("contacts.create.warning")
-      redirect_to :back
-    elsif saved && sent_email == 'invalid'
-      flash[:error] =  "#{t("contacts.create.warning")} #{t('contacts.create.invalid_email')}"
-      redirect_to :back
-    else
-      flash[:error] = t('contacts.create.did_not_reach')
-      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 to site admin a message from contact form").deliver
-        @exception = e
-        return 'exception'
-      end
-    else # for invalid or blank emails
-      return 'invalid'
-    end
-  end
-
-  # Never trust parameters from the scary internet, only allow the white list through.
-  def contact_params
-    params.require(:contact).permit(:sender_name, :sender_email, :body)
-  end
-
-
-end

data/app/mailers/contact_mailer.rb

@@ -1,21 +0,0 @@
-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.try(:company_name)} <#{Setting.first.try(:contact_email)}>"
-    reply_to = "#{@contact.sender_name} <#{@contact.sender_email}>"
-    mail  to: recipient,
-          from: "#{Setting.first.site_name} <deploy@mailcenter.tenthousandhours.eu>",
-          reply_to: reply_to,
-          subject: "Message from #{@contact.sender_name} via #{Setting.first.try(:site_name)} web site"
-  end
-end

data/app/models/contact.rb

@@ -1,15 +0,0 @@
-# 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
-
-  validates_presence_of :sender_name
-  validates_presence_of :sender_email
-  # validates :sender_email, :presence => true, :format => { :with => /\A([\A@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/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

@@ -1,12 +0,0 @@
-<%= t('contacts.mailer.intro') %>
-
-- <%= t('contacts.mailer.sender_name') %> <%= @contact.sender_name %>
-- <%= t('contacts.mailer.sender_email') %> <%= @contact.sender_email %>
-
-<%= t('contacts.mailer.message') %>
-
------------------------------------
-
-<%= @contact.body %>
-
------------------------------------

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

@@ -1,9 +0,0 @@
-<%= simple_form_for Contact.new do |f| %>
-	<%= f.error_notification %>
-
-		<%= f.input :sender_name, label: t('activerecord.attributes.contacts.sender_name') %>
-		<%= f.input :sender_email, label: t('activerecord.attributes.contacts.sender_email') %>
-		<%= f.input :body, label: t('activerecord.attributes.contacts.body'), :input_html => { :rows => 10 } %>
-
-    <%= f.button :submit, t('contacts.send_message'), :class => 'btn btn-primary' %>
-<% end %>

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

@@ -1,4 +0,0 @@
-<ul class="nav nav-tabs" id="admin-menu-tab">
-	<%= content_tag :li, link_to(t('list'), contacts_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
-	<%= content_tag :li, link_to(t('view'), contacts_path), ({ class: 'active' }) if controller.action_name.to_s == 'show' %>
-</ul>

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

@@ -1,31 +0,0 @@
-<h1><%= t 'activerecord.models.contacts' %></h1>
-
-<%= render 'tab_admin_menu' %>
-
-<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><%= t('actions') %></th>
-	  </tr>
-	</thead>
-	
-	<tbody>
-		<% @contacts.each do |contact| %>
-		  <tr>
-		    <td><%= contact.sender_name %></td>
-				<td><%= link_to contact.sender_email, "mailto:#{contact.sender_email}" %></td>
-		    <td><%= truncate contact.body, length: 85, separator: ' ...' %></td>
-				<td><%= l contact.created_at, :format => :tkh_default %></td>
-		    <td><%= link_to t('view'), contact %></td>
-		  </tr>
-		<% end %>
-	</tbody>
-</table>
-
-<%= will_paginate @contacts %>
-
-<%= render 'shared/admin_sidebar' %>

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

@@ -1,18 +0,0 @@
-<h1><%= t('activerecord.models.contacts') %></h1>
-
-<%= render 'tab_admin_menu' %>
-
-<h2><%= "#{t('contacts.sent')}#{t('colon')} #{ l(@contact.created_at, :format => :tkh_default) }" %></h2>
-
-<p>
-	<%= "#{t('activerecord.attributes.contacts.sender_name').capitalize}#{t('colon')} #{@contact.sender_name}" %><br />
-	<%= "#{t('activerecord.attributes.contacts.sender_email')}#{t('colon')} #{link_to(@contact.sender_email, "mailto:#{@contact.sender_email}")}".capitalize.html_safe %>
-</p>
-<h3><%= t('activerecord.attributes.contacts.body').capitalize %></h3>
-<p><%= sanitize @contact.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></p>
-
-<hr>
-
-<p><%= link_to t('list'), contacts_path, class: 'btn' %></p>
-
-<%= render 'shared/admin_sidebar' %>

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

@@ -1,19 +0,0 @@
-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 :contacts, :updated_at
-  end
-  
-end