contactus 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3213c8e94234c29cb803843ccb8da865c6d3e39b
-  data.tar.gz: a53bfaf1530e4cbc21891206bd05ab8871fbc6f5
+  metadata.gz: 70aec52d5123a3d894063298a18d971b006fb423
+  data.tar.gz: 9fc13d0fe72851560716962940d035a1c5133800
 SHA512:
-  metadata.gz: 8d0a46381c07ace550f26f4036e06812034a1c2b3170180c16f3692087003a3bb9b35d836165fbd5df6ead8b74411f1104ac4668b23e9f757e57d336c374cd09
-  data.tar.gz: 5fff18731845e27020ebe2cf00fbbba615c2e853ed8cf3db440950721f31833ff7580920da555aca2b2ee5c7972924c11fe97363fb3292e0d302e3a04df49b34
+  metadata.gz: fb439587e6c0620203035e5beae70535fc1d452016b9f3d98f9da4a72cdc8fe6772d1c5a2ccb0a1f726d144a63cf4c50bf8555f9b8d2b9a96ed2802ddedc906b
+  data.tar.gz: 8be86be57f330bb026b77f91a717f5279bafc346e51b5eefea39e282e327ad204b6d934cfcac778f4633e95daf4f8c824a4eb94b545570d47ba0ffef74c5223c

data/README.rdoc

@@ -33,4 +33,7 @@ There will be a initializer file called contactus.rb, where you can configure th
       #config.extra_fields = %w(city phone)
 
       # Configure extra required fields
-      #config.required_extra_fields = %w(country address)
+      #config.required_extra_fields = %w(country address)
+
+      # From address email, if this variable is not used the contact email will be used as default
+      #config.mailer_from  = 'from@example.com'

data/app/models/contactus/contact_form.rb

@@ -30,7 +30,7 @@ module Contactus
       {
         :subject => I18n.t('.contactus.contact_forms.subject'),
         :to => Contactus.mailer_to,
-        :from => %("#{name}" <#{email}>)
+        :from => from_email
       }      
     end
 
@@ -38,6 +38,10 @@ module Contactus
       (Contactus.mailer_cc)? { :cc => Contactus.mailer_cc } : {}
     end
 
+    def from_email
+      Contactus.mailer_from || %("#{name}" <#{email}>)
+    end
+
   end
 
 end

data/lib/contactus.rb

@@ -2,6 +2,9 @@ require "contactus/engine"
 
 module Contactus
 
+  # From address email.
+  mattr_accessor :mailer_from
+
   # Address to send the email.
   mattr_accessor :mailer_to
 

data/lib/contactus/version.rb

@@ -1,3 +1,3 @@
 module Contactus
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/templates/contactus.rb

@@ -14,4 +14,7 @@ Contactus.setup do |config|
   # Configure extra required fields
   #config.required_extra_fields = %w(country address)
 
+  # From address email, if this variable is commented the contact email will be used as default
+  #config.mailer_from  = 'from@example.com'
+
 end

data/spec/dummy/log/test.log

@@ -7163,3 +7163,146 @@ Completed 200 OK in 4ms (Views: 3.1ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (1.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.3ms)  begin transaction
+Started GET "/contact" for 127.0.0.1 at 2013-10-21 11:12:05 -0500
+Processing by Contactus::ContactFormsController#new as HTML
+  Rendered /Users/joselo/code/contactus/app/views/contactus/contact_forms/new.html.haml within layouts/application (574.1ms)
+Completed 200 OK in 652ms (Views: 651.1ms | ActiveRecord: 0.0ms)
+Started POST "/contactus/contact_forms" for 127.0.0.1 at 2013-10-21 11:12:06 -0500
+Processing by Contactus::ContactFormsController#create as HTML
+  Parameters: {"utf8"=>"✓", "contactus_contact_form"=>{"name"=>"", "city"=>"", "email"=>"", "message"=>"", "nickname"=>""}, "commit"=>"Enviar"}
+  Rendered /Users/joselo/code/contactus/app/views/contactus/contact_forms/new.html.haml within layouts/application (7.3ms)
+Completed 200 OK in 11ms (Views: 8.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Started GET "/contact" for 127.0.0.1 at 2013-10-21 11:12:06 -0500
+Processing by Contactus::ContactFormsController#new as HTML
+  Rendered /Users/joselo/code/contactus/app/views/contactus/contact_forms/new.html.haml within layouts/application (9.0ms)
+Completed 200 OK in 10ms (Views: 9.9ms | ActiveRecord: 0.0ms)
+Started POST "/contactus/contact_forms" for 127.0.0.1 at 2013-10-21 11:12:06 -0500
+Processing by Contactus::ContactFormsController#create as HTML
+  Parameters: {"utf8"=>"✓", "contactus_contact_form"=>{"name"=>"Bill Hicks", "city"=>"", "email"=>"beelzebozo@example.com", "message"=>"If you think you’re free, try going somewhere without fucking money, okay?", "nickname"=>""}, "commit"=>"Enviar"}
+  Rendered /Users/joselo/.rvm/gems/ruby-2.0.0-p195@contactus/gems/mail_form-1.5.0/lib/mail_form/views/mail_form/contact.erb (2.4ms)
+
+Sent mail to webmaster@example.com (45.5ms)
+Date: Mon, 21 Oct 2013 11:12:07 -0500
+From: Bill Hicks <beelzebozo@example.com>
+To: webmaster@example.com
+Message-ID: <52655257826c9_97523fd7f945e6cc756f@Joses-MacBook-Pro.local.mail>
+Subject: Alguien se a puesto en contacto.
+Mime-Version: 1.0
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<h4 style=3D"text-decoration:underline">Alguien se a puesto en contacto.<=
+/h4>
+
+
+  <p><b>Nombres y Apellidos:</b>
+  Bill Hicks</p>
+
+  <p><b>Correo electr=C3=B3nico:</b>
+  beelzebozo@example.com</p>
+
+  <p><b>Comentarios:</b>
+  If you think you=E2=80=99re free, try going somewhere without fucking m=
+oney, okay?</p>
+
+  <br /><h4 style=3D"text-decoration:underline">Informaci=C3=B3n t=C3=A9c=
+nica sobre el usuario</h4>
+
+
+    <p><b>Direcci=C3=B3n IP:</b>
+    127.0.0.1</p>
+
+    <p><b>Navegador:</b>
+    nil</p>
+
+    <p><b>Session:</b>
+    #&lt;ActionDispatch::Request::Session:0x7faff39d71a0 not yet loaded&g=
+t;</p>
+  <br />
+
+  Rendered /Users/joselo/code/contactus/app/views/contactus/contact_forms/create.html.haml within layouts/application (2.9ms)
+Completed 200 OK in 1020ms (Views: 18.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Started GET "/contact" for 127.0.0.1 at 2013-10-21 11:12:07 -0500
+Processing by Contactus::ContactFormsController#new as HTML
+  Rendered /Users/joselo/code/contactus/app/views/contactus/contact_forms/new.html.haml within layouts/application (6.0ms)
+Completed 200 OK in 7ms (Views: 6.8ms | ActiveRecord: 0.0ms)
+Started POST "/contactus/contact_forms" for 127.0.0.1 at 2013-10-21 11:12:07 -0500
+Processing by Contactus::ContactFormsController#create as HTML
+  Parameters: {"utf8"=>"✓", "contactus_contact_form"=>{"name"=>"Bill Hicks", "city"=>"", "email"=>"beelzebozo@example.com", "message"=>"If you think you’re free, try going somewhere without fucking money, okay?", "nickname"=>"Hey there"}, "commit"=>"Enviar"}
+Redirected to http://www.example.com/
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+Started GET "/" for 127.0.0.1 at 2013-10-21 11:12:07 -0500
+Processing by WelcomeController#index as HTML
+  Rendered welcome/index.html.haml within layouts/application (0.7ms)
+Completed 200 OK in 3ms (Views: 2.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction

data/spec/models/contactus/contact_form_spec.rb

@@ -34,10 +34,11 @@ module Contactus
 
       end
 
-      context 'with cc' do
+      context 'with custom variables' do
 
         before do
           Contactus.mailer_cc = "cc@example.com"
+          Contactus.mailer_from = "from@example.com"
           @contact_form = FactoryGirl.build(:contact_form)
         end
 
@@ -45,6 +46,10 @@ module Contactus
           @contact_form.headers[:cc].should == Contactus.mailer_cc
         end
 
+        it 'should assing the from' do
+          @contact_form.headers[:from].should == Contactus.mailer_from
+        end
+
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contactus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jose Carrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails