refinerycms-inquiries 2.0.3 → 2.1.0

data/config/locales/es.yml

@@ -4,6 +4,8 @@ es:
       refinerycms_inquiries:
         title: Consultas
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Enviar mensaje

data/config/locales/fr.yml

@@ -5,6 +5,8 @@ fr:
         title: Requêtes
         description: Fournit un formulaire de contact et gère les demandes de contacts.
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Envoyer un message

data/config/locales/it.yml

@@ -5,6 +5,8 @@ it:
         title: Richieste
         description: Fornisce un modulo di contatto e memorizza le richieste
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           header_message: si è verificato un problema
@@ -67,7 +69,7 @@ it:
           phone: Telefono
           message: Messaggio
           closing_line: Saluti
-        ps: P.S. Tutte le richiesta ricevute sono salvate nella sezione "Richieste" di Refinery così da poter esser viste in un secondo momento.
+          ps: P.S. Tutte le richiesta ricevute sono salvate nella sezione "Richieste" di Refinery così da poter esser viste in un secondo momento.
   activerecord:
     models:
       refinery/inquiries/inquiry: inquiry

data/config/locales/lt.yml

@@ -5,6 +5,8 @@ lt:
         title: Užklausos
         description: Suteikia kontaktų formą ir saugo užklausas
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Siųsti žinutę

data/config/locales/lv.yml

@@ -5,6 +5,8 @@ lv:
         title: Pieprasījumi
         description: Nodrošina kontaktformu un glabā pieprasījumus
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Sūtīt ziņu
@@ -42,7 +44,6 @@ lv:
         settings:
           notification_recipients_form:
             inquiry_settings_value_name: Sūtīt paziņojumu uz
-            explanation: Katru reizi, kad kāds ar tevi sazinās izmantojot kontaktformu, Refinery nosūta epastu par to, ka ir jauns pieprasījums.
             hint: Kad tiek iesniegts jauns pieprasījums, tad Refinery nosūtīs paziņojumu uz šo epastu.
             example: "Ievadi savu epasta(-u) adresi(-es) šādā formātā: janis.ozols@test.lv, juris@test.lv"
           confirmation_email_form:

data/config/locales/nb.yml

@@ -5,6 +5,8 @@ nb:
         title: Forespørsler
         description: Legger til et kontaktskjema og lagrer forespørsler
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Send melding

data/config/locales/nl.yml

@@ -5,6 +5,8 @@ nl:
         title: Contactaanvragen
         description: Contactformulier en beheer van vragen
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Verstuur uw vraag

data/config/locales/pl.yml

@@ -6,6 +6,8 @@ pl:
         description: Zapewnia formularz kontaktowy i przechowuje zapytania
         article: neutral
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Wyślij wiadomość

data/config/locales/pt-BR.yml

@@ -5,6 +5,8 @@ pt-BR:
         title: Contatos
         description: Gerenciar contatos
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Enviar mensagem

data/config/locales/ru.yml

@@ -5,6 +5,8 @@ ru:
         title: Запросы
         description: Предоставляет форму обратной связи и хранит запросы
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Отправить сообщение

data/config/locales/sk.yml

@@ -5,6 +5,8 @@ sk:
         title: Otázky
         description: Zabezpečuje kontaktný formulár a uchováva zaslané otázky.
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Odoslať správu

data/config/locales/sl.yml

@@ -5,6 +5,8 @@ sl:
         title: Povpraševanja
         description: Priskrbi kontaktni obrazec in shrani povpraševanja
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Pošlji sporočilo

data/config/locales/sv.yml

@@ -5,15 +5,17 @@ sv:
         title: Förfrågningar
         description: Tillhandahåller ett formulär och sparar förfrågningar
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Skicka meddelande
-          privacy_policy: Vi värderar ditt privatliv
+          privacy_policy: Vi respekterar ditt privatliv
       admin:
         inquiries:
-          delete: Ta bort den här förfrågningen för alltid
+          delete: Ta bort den här förfrågan för alltid
           inquiry:
-            read_inquiry: Läs förfrågningen
+            read_inquiry: Läs förfrågan
             said: said
             mark_as_spam: Märk som skräppost
             mark_as_ham: Flytta till inkorg
@@ -29,10 +31,10 @@ sv:
             details: Detaljer
             age: Ålder
             actions: Handlingar
-            back_to_all_inquiries: Tillbaka till alla Förfrågningar
+            back_to_all_inquiries: Tillbaka till alla förfrågningar
             spam: Skräppost
             spam_yes: 'ja'
-            inquiry: Förfrågning
+            inquiry: Förfrågan
             to: Till
             from: Från
             click_to_email: Klicka för att skicka e-post till den här adressen
@@ -65,7 +67,7 @@ sv:
           phone: Telefon
           message: Meddelande
           closing_line: Vänliga hälsningar
-          ps: P.S. Alla dina förfrågningar sparas i "Förfrågningar"-sektionen av Refinery. Där kan du visa dem senare.
+          ps: P.S. Alla dina förfrågningar sparas i sektionen "Förfrågningar" av Refinery. Där kan du visa dem senare.
   activerecord:
     models:
       refinery/inquiries/inquiry: förfrågning

data/config/locales/zh-CN.yml

@@ -5,6 +5,8 @@ zh-CN:
         title: 咨询
         description: 提供一个联系表单与保存咨询
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: 发送消息

data/config/routes.rb

@@ -9,7 +9,7 @@ Refinery::Core::Engine.routes.draw do
       get :thank_you, :on => :collection
     end
 
-    namespace :admin, :path => 'refinery' do
+    namespace :admin, :path => Refinery::Core.backend_route do
       resources :inquiries, :only => [:index, :show, :destroy] do
         get :spam, :on => :collection
         get :toggle_spam, :on => :member

data/db/seeds.rb

@@ -5,7 +5,9 @@
 end if defined?(::Refinery::User)
 
 if defined?(::Refinery::Page)
-  unless Refinery::Page.where(:link_url => '/contact').any?
+  contact_us_page = Refinery::Page.where(:link_url => '/contact').first
+
+  unless contact_us_page
     contact_us_page = ::Refinery::Page.create({
       :title => "Contact",
       :link_url => "/contact",

data/lib/generators/refinery/inquiries/templates/config/initializers/refinery/inquiries.rb.erb

@@ -1,4 +1,16 @@
 Refinery::Inquiries.configure do |config|
   # Configure whether to show privacy link
   # config.show_contact_privacy_link = <%= Refinery::Inquiries.show_contact_privacy_link.inspect %>
+
+  # Configure whether to show phone number field
+  # config.show_phone_number_field = <%= Refinery::Inquiries.show_phone_number_field.inspect %>
+
+  # Configure whether to show form field placeholders
+  # config.show_placeholders = <%= Refinery::Inquiries.show_placeholders.inspect %>
+
+  # Configure whether inquiries marked as spam should also send a notification mail
+  # config.send_notifications_for_inquiries_marked_as_spam = <%= Refinery::Inquiries.send_notifications_for_inquiries_marked_as_spam.inspect %>
+
+  # Configure name in 'from' email address
+  # config.from_name = <%= Refinery::Inquiries.from_name.inspect %>
 end

data/lib/refinery/inquiries.rb

@@ -1,6 +1,5 @@
 require 'refinerycms-core'
 require 'refinerycms-settings'
-require 'filters_spam'
 
 module Refinery
   autoload :InquiriesGenerator, 'generators/refinery/inquiries/inquiries_generator'

data/lib/refinery/inquiries/configuration.rb

@@ -3,7 +3,15 @@ module Refinery
     include ActiveSupport::Configurable
 
     config_accessor :show_contact_privacy_link
+    config_accessor :show_phone_number_field
+    config_accessor :show_placeholders
+    config_accessor :send_notifications_for_inquiries_marked_as_spam
+    config_accessor :from_name
 
     self.show_contact_privacy_link = true
+    self.show_phone_number_field = true
+    self.show_placeholders = true
+    self.send_notifications_for_inquiries_marked_as_spam = false
+    self.from_name = "no-reply"
   end
 end

data/license.md

@@ -1,17 +1,17 @@
 # MIT License
- 
-Copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
- 
+
+Copyright 2012 Uģis Ozols, Philip Arndt, and Rob Yurkowski
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
- 
+
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

data/readme.md

@@ -18,7 +18,7 @@ To install the migrations, run:
 
     rails generate refinery:inquiries
     rake db:migrate
-    
+
 Add pages to the database and you're done:
 
     rake db:seed
@@ -35,6 +35,10 @@ In summary you can:
 
 When inquiries come in, you and the customer are generally notified. As we implemented spam filtering through the [filters_spam plugin](https://github.com/resolve/filters_spam#readme) you will not get notified if an inquiry is marked as 'spam'.
 
+## How do I setup email to be sent from GMail, SendGrid or other service?
+
+Inquiries uses `actionmailer` under the hood so you can refer to [Rails Action Mailer guide](http://guides.rubyonrails.org/action_mailer_basics.html). For example to use GMail see [Action Mailer Configuration for GMail](http://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration-for-gmail) guide.
+
 ## How do I get Notified?
 
 Go into your 'Inquiries' tab in the Refinery admin area and click on "Update who gets notified"

data/refinerycms-inquiries.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{2.0.3}
-  s.date              = "#{Date.today.strftime("%Y-%m-%d")}"
+  s.version           = %q{2.1.0}
   s.summary           = %q{Inquiry handling functionality for the Refinery CMS project.}
   s.description       = %q{Inquiry handling functionality extracted from Refinery CMS to allow you to have a contact form and manage inquiries in the Refinery backend.}
   s.homepage          = %q{http://refinerycms.com}
   s.email             = %q{info@refinerycms.com}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones']
+  s.authors           = ['Uģis Ozols', 'Philip Arndt', 'Rob Yurkowski']
   s.require_paths     = %w(lib)
+  s.license           = %q{MIT}
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency  'refinerycms-core',     '~> 2.0.1'
-  s.add_dependency  'refinerycms-settings', '~> 2.0.1'
+  s.add_dependency  'refinerycms-core',     '~> 2.1.0'
+  s.add_dependency  'refinerycms-settings', '~> 2.1.0'
   s.add_dependency  'filters_spam',         '~> 0.2'
 end

data/spec/{requests → features}/refinery/inquiries/admin/inquiries_spec.rb

@@ -4,12 +4,13 @@ module Refinery
   module Inquiries
     module Admin
       describe Inquiry do
-        login_refinery_user
+        refinery_login_with :refinery_user
 
         let!(:inquiry) do
-          Factory(:inquiry, :name => "David Jones",
-                            :email => "dave@refinerycms.com",
-                            :message => "Hello, I really like your website.  Was it hard to build and maintain or could anyone do it?")    
+          FactoryGirl.create(:inquiry,
+            :name => "David Jones",
+            :email => "dave@refinerycms.com",
+            :message => "Hello, I really like your website. Was it hard to build and maintain or could anyone do it?")
         end
 
         context "when no" do
@@ -38,13 +39,13 @@ module Refinery
           specify "in the side pane" do
             within "#actions" do
               page.should have_content("Inbox")
-              page.should have_selector("a[href='/refinery/inquiries']")
+              page.should have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries']")
               page.should have_content("Spam")
-              page.should have_selector("a[href='/refinery/inquiries/spam']")
+              page.should have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries/spam']")
               page.should have_content("Update who gets notified")
-              page.should have_selector("a[href*='/refinery/inquiries/settings/inquiry_notification_recipients/edit']")
+              page.should have_selector("a[href*='/#{Refinery::Core.backend_route}/inquiries/settings/inquiry_notification_recipients/edit']")
               page.should have_content("Edit confirmation email")
-              page.should have_selector("a[href*='/refinery/inquiries/settings/inquiry_confirmation_body/edit']")
+              page.should have_selector("a[href*='/#{Refinery::Core.backend_route}/inquiries/settings/inquiry_confirmation_body/edit']")
             end
           end
         end
@@ -53,7 +54,7 @@ module Refinery
           it "shows inquiry list" do
             visit refinery.inquiries_admin_inquiries_path
 
-            page.should have_content("David Jones said Hello, I really like your website. Was it hard to build ...")
+            page.should have_content("David Jones said Hello, I really like your website. Was it hard to build a...")
           end
         end
 
@@ -68,9 +69,9 @@ module Refinery
             within "#actions" do
               page.should have_content("Age")
               page.should have_content("Back to all Inquiries")
-              page.should have_selector("a[href='/refinery/inquiries']")
+              page.should have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries']")
               page.should have_content("Remove this inquiry forever")
-              page.should have_selector("a[href='/refinery/inquiries/#{inquiry.id}']")
+              page.should have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries/#{inquiry.id}']")
             end
           end
         end
@@ -97,7 +98,7 @@ module Refinery
               click_link "Spam (1)"
             end
 
-            page.should have_content("David Jones said Hello, I really like your website. Was it hard to build ...")
+            page.should have_content("David Jones said Hello, I really like your website. Was it hard to build a...")
           end
         end
 

data/spec/features/refinery/inquiries/inquiries_spec.rb

@@ -0,0 +1,145 @@
+require "spec_helper"
+
+module Refinery
+  module Inquiries
+    describe "inquiries" do
+      before(:each) do
+        # load in seeds we use in migration
+        Refinery::Inquiries::Engine.load_seed
+      end
+
+      context "when valid data" do
+        it "is successful" do
+          visit refinery.inquiries_new_inquiry_path
+
+          fill_in "Name", :with => "Ugis Ozols"
+          fill_in "Email", :with => "ugis.ozols@refinerycms.com"
+          fill_in "Message", :with => "Hey, I'm testing!"
+          click_button "Send message"
+
+          page.current_path.should == refinery.thank_you_inquiries_inquiries_path
+          page.should have_content("Thank You")
+
+          within "#body_content" do
+            page.should have_content("We've received your inquiry and will get back to you with a response shortly.")
+            page.should have_content("Return to the home page")
+            page.should have_selector("a[href='/']")
+          end
+
+          Refinery::Inquiries::Inquiry.count.should == 1
+        end
+      end
+
+      context "when invalid data" do
+        let(:name_error_message) { "Name can't be blank" }
+        let(:email_error_message) { "Email is invalid" }
+        let(:message_error_message) { "Message can't be blank" }
+
+        it "is not successful" do
+          visit refinery.inquiries_new_inquiry_path
+
+          click_button "Send message"
+
+          page.current_path.should == refinery.inquiries_new_inquiry_path
+          page.should have_content("There were problems with the following fields")
+          page.should have_content(name_error_message)
+          page.should have_content(email_error_message)
+          page.should have_content(message_error_message)
+          page.should have_no_content("Phone can't be blank")
+
+          Refinery::Inquiries::Inquiry.count.should == 0
+        end
+
+        it "displays the error messages in the same order as the fields" do
+          visit refinery.inquiries_new_inquiry_path
+
+          click_button "Send message"
+
+          page.should have_content(/#{name_error_message}.+#{email_error_message}.+#{message_error_message}/m)
+        end
+      end
+
+      describe "privacy" do
+        context "when show contact privacy link setting set to false" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_contact_privacy_link).and_return(false)
+          end
+
+          it "won't show link" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_no_content("We value your privacy")
+            page.should have_no_selector("a[href='/pages/privacy-policy']")
+          end
+        end
+
+        context "when show contact privacy link setting set to true" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_contact_privacy_link).and_return(true)
+          end
+
+          it "shows the link" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_content("We value your privacy")
+            page.should have_selector("a[href='/pages/privacy-policy']")
+          end
+        end
+      end
+
+      describe "palceholders" do
+        context "when show placeholders setting set to false" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_placeholders).and_return(false)
+          end
+
+          it "won't show placeholders" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_no_selector("input[placeholder]")
+          end
+        end
+
+        context "when show placeholders setting set to true" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_placeholders).and_return(true)
+          end
+
+          it "shows the placeholders" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_selector("input[placeholder]")
+          end
+        end
+      end
+
+      describe "phone number" do
+        context "when show phone numbers setting set to false" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_phone_number_field).and_return(false)
+          end
+
+          it "won't show phone number" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_no_selector("label", :text => 'Phone')
+            page.should have_no_selector("#inquiry_phone")
+          end
+        end
+
+        context "when show phone numbers setting set to true" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_phone_number_field).and_return(true)
+          end
+
+          it "shows the phone number" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_selector("label", :text => 'Phone')
+            page.should have_selector("#inquiry_phone")
+          end
+        end
+      end
+    end
+  end
+end