hyalin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af9ca218cc248b79ac34cbf8ad6fd240b8a7d5a
-  data.tar.gz: b73be750259323ac19526213d9be625020f62f7f
+  metadata.gz: 81722c7355161e2ee9187c20638c1f19b69ed343
+  data.tar.gz: c92171e1b04123b26b218f765ccc34f383945d1c
 SHA512:
-  metadata.gz: a7c5ade430147b218675dfc30708d87d6a3d7289208052a1d10d0977b6ea43693bdef02613c61e2f70f9e6b29c9a7a94062a17a56d099b32905c4a1049ce7da7
-  data.tar.gz: 8dc49731f737ada9179d1e09f53a16bd58c9389454ec0854228388a3457be6326110c9a87b70a528910b5cf246776ccd1b1ebc89c46af77f4805f238917d57ab
+  metadata.gz: e82a3198f262fe5de3949ef3c8a1ab6b39bc0165b0a3330dd4c049112d298df6878859c6a75602773982e3df88ba2538bd6519f4453e26040c5005daf6e46723
+  data.tar.gz: 1d00fabf57a407d7b52a4d76665c00354c5440f69cb0a520ab2a4e06f6a4240713eb1e91013baf8b4518a97b2792a950a6ceaf07d1e0ac3a6b7bfccc0092ecd5

data/README.md

@@ -1,13 +1,13 @@
 ## Hyalin (paper)
 
-A Rails 3+ Engine providing a basic contact form.
+A Rails 4+ Engine providing a basic contact form.
 
 ## Requirements
 
 Hyalin requires:
 
-* Ruby >= 1.9.3
-* Rails >= 3.0.0
+* Ruby >= 2.0.0
+* Rails >= 4.0.0
 
 It is also recommended to use SimpleForm in order to hook into your apps custom form builders.
 Heavily inspired on [jdutil/contact_us](https://github.com/jdutil/contact_us)

data/app/controllers/hyalin/messages_controller.rb

@@ -2,32 +2,21 @@ require_dependency "hyalin_controller"
 
 module Hyalin
   class MessagesController < HyalinController
+    respond_to :html, :json
 
     # GET /message/new
     # GET /message/new.json
     def new
       @message = Message.new
-
-      respond_to do |format|
-        format.html
-        format.json { render :json => @message }
-      end
+      respond_with @message
     end
 
     # POST /messages
     # POST /messages.json
     def create
-      @message = Message.new(params[:hyalin_message])
-
-      respond_to do |format|
-        if @message.save
-          format.html { redirect_to after_send_path, :notice => t('hyalin.messages.sent_success') }
-          format.json { render :json => @message, :status => :created, :location => @message      }
-        else
-          format.html { render_new_action }
-          format.json { render :json => {errors: @message.errors}, :status => :unprocessable_entity }
-        end
-      end
+      @message = Message.new params[:message]
+      @message.save
+      respond_with @message, location: after_send_path, notice: t('hyalin.messages.sent_success')
     end
 
     private

data/app/mailers/hyalin/postman.rb

@@ -1,16 +1,21 @@
 class Hyalin::Postman < ActionMailer::Base
-  default :from     => Hyalin.mailer_from,
-          :subject  => I18n.t('hyalin.mailer.hyalin_mail.subject'),
-          :to       => Hyalin.mailer_to
+  default from:    Hyalin.mailer_from,
+          subject: -> { generate_default_subject },
+          to:      Hyalin.mailer_to
 
   # TODO Create Hyalin.mailer_layout
-  layout 'hyalin/postman'
+  # layout 'hyalin/postman'
 
-  def hyalin_email message
+  def contact_email message
     @message = message
 
-    mail :from     => message.email,
-         :reply_to => message.email,
-         :subject  => message.subject
+    mail from:     message.email,
+         reply_to: message.email
+  end
+
+  private
+
+  def generate_default_subject
+    t 'hyalin.postman.contact_email.subject', name: @message.name || @message.email
   end
 end

data/app/models/hyalin/message.rb

@@ -14,12 +14,12 @@ module Hyalin
     # messages
 
     if Hyalin.persist_messages
-      validate :persisted?, :message => 'Can\'t update hyalin messages!'
+      validate :persisted?, :message => 'Can\'t update contact messages!'
     end
 
     def save
       if self.valid?
-        Hyalin::Postman.hyalin_email(self).deliver
+        Hyalin::Postman.contact_email(self).deliver
         super if Hyalin.persist_messages
         return true
 

data/app/views/hyalin/postman/contact_email.html.erb

@@ -0,0 +1,7 @@
+<p>
+  <%= @message.body %>
+</p>
+<hr />
+<p>
+  <%= t('.sent_by_name', email: @message.email, name: @message.name, phone: @message.phone) %>
+</p>

data/app/views/hyalin/postman/contact_email.text.plain.erb

@@ -0,0 +1,6 @@
+<%= @message.body %>
+
+----------
+
+<%= t('.sent_by_name', email: @message.email, name: @message.name, phone: @message.phone) %>
+

data/config/locales/hyalin.en.yml

@@ -1,12 +1,34 @@
 en:
+  mongoid:
+    models:
+      hyalin/message:
+        one: Contact Message
+        other: Contact Messages
+    attributes:
+      timestamps: &timestamps
+        created_at: Created At
+        updated_at: Updated At
+      hyalin/message:
+        <<: *timestamps
+        name: Name
+        body: Message
+        email: Email
+        phone: Phone
+        subject: Subject
+
   hyalin:
+    postman:
+      contact_email:
+        subject: 'Contact: %{name}'
+        sent_by_name: "Sent by %{name} from %{email} (%{phone})"
     messages:
       sent_success: Message delivered!
       new: &hyalin-message
         title: Contact Us
         submit: Send Message
+        message: Message
+        submit: Send Message
       new_simple_form:
         <<: *hyalin-message
-    hyalin_email:
-      postman:
-        sent_by_name: 'Sent By:'
+
+

data/config/locales/hyalin.pt-BR.yml

@@ -1,5 +1,5 @@
 pt-BR:
-  activerecord:
+  mongoid:
     models:
       hyalin/message:
         one: Mensagem de Contato
@@ -12,10 +12,15 @@ pt-BR:
         <<: *timestamps
         name: Nome
         body: Mensagem
+        email: Email
+        phone: Telefone
+        subject: Assunto
+
   hyalin:
     postman:
-      hyalin_email:
-        sent_by_name: 'Enviado por:'
+      contact_email:
+        subject: 'Contato: %{name}'
+        sent_by_name: 'Enviado por %{name} de %{email} (%{phone})'
     messages:
       sent_success: Mensagem enviada!
       new: &hyalin-message

data/lib/hyalin/version.rb

@@ -1,3 +1,3 @@
 module Hyalin
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/dummy/config/locales/hyalin.en.yml

@@ -3,7 +3,7 @@ en:
     messages:
       sent_success: Message delivered!
       new: &hyalin-message
-        title: Hyalin Us
+        title: Contact Us
         submit: Send Message
       new_simple_form:
         <<: *hyalin-message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyalin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Heitor Salazar
@@ -93,13 +93,12 @@ files:
 - app/assets/stylesheets/hyalin/messages.css
 - app/controllers/hyalin/messages_controller.rb
 - app/controllers/hyalin_controller.rb
-- app/helpers/hyalin/application_helper.rb
-- app/helpers/hyalin/messages_helper.rb
 - app/mailers/hyalin/postman.rb
 - app/models/hyalin/message.rb
 - app/views/hyalin/messages/new.html.erb
 - app/views/hyalin/messages/show.html.erb
 - app/views/hyalin/postman/contact_email.html.erb
+- app/views/hyalin/postman/contact_email.text.plain.erb
 - config/locales/contact.en.yml~
 - config/locales/contact.pt-BR.yml~
 - config/locales/hyalin.en.yml

data/app/helpers/hyalin/application_helper.rb

@@ -1,4 +0,0 @@
-module Hyalin
-  module ApplicationHelper
-  end
-end

data/app/helpers/hyalin/messages_helper.rb

@@ -1,4 +0,0 @@
-module Hyalin
-  module MessagesHelper
-  end
-end