refinerycms-inquiries 0.9.9.2 → 0.9.9.3

data/app/controllers/admin/inquiry_settings_controller.rb

@@ -5,10 +5,9 @@ class Admin::InquirySettingsController < Admin::BaseController
           :order => 'name ASC',
           :redirect_to_url => "admin_inquiries_url"
 
-  before_filter :redirect_back_to_inquiries?, :only => [:index]
   before_filter :set_url_override?, :only => [:edit, :update]
-  after_filter :save_subject_for_confirmation?, :only => [:create, :update]
-  around_filter :rewrite_flash?, :only => [:create, :update]
+  after_filter :save_subject_for_confirmation?, :only => :update
+  around_filter :rewrite_flash?, :only => :update
 
 protected
   def rewrite_flash?
@@ -21,10 +20,6 @@ protected
     InquirySetting.confirmation_subject = params[:subject] if params.keys.include?('subject')
   end
 
-  def redirect_back_to_inquiries?
-    redirect_to admin_inquiries_url
-  end
-
   def set_url_override?
     @url_override = admin_inquiry_setting_url(@refinery_setting, :dialog => from_dialog?)
   end

data/app/controllers/inquiries_controller.rb

@@ -2,10 +2,6 @@ class InquiriesController < ApplicationController
 
   before_filter :find_page, :only => [:create, :new]
 
-  def index
-    redirect_to :action => "new"
-  end
-
   def thank_you
     @page = Page.find_by_link_url("/contact/thank_you", :include => [:parts, :slugs])
   end

data/app/models/inquiry.rb

@@ -15,11 +15,7 @@ class Inquiry < ActiveRecord::Base
   default_scope :order => 'created_at DESC' # previously scope :newest
 
   def self.latest(number = 7, include_spam = false)
-    unless include_spam
-      ham.limit(number)
-    else
-      limit(number)
-    end
+    include_spam ? limit(number) : ham.limit(number)
   end
 
 end

data/app/models/inquiry_setting.rb

@@ -22,7 +22,7 @@ class InquirySetting < ActiveRecord::Base
 
   def self.notification_recipients
     RefinerySetting.find_or_set(:inquiry_notification_recipients,
-                                (defined?(Role) ? Role[:refinery].users.first.email : '' rescue ''))
+                                ((Role[:refinery].users.first.email rescue nil) if defined?(Role)).to_s)
   end
 
   def self.notification_subject

data/app/views/admin/inquiries/_inquiry.html.erb

@@ -5,10 +5,10 @@
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
+              { :method => :delete, 
+                :confirm => t('shared.admin.delete.message', :title => inquiry.name) },
                 :class => "cancel confirm-delete",
-                :title => t('admin.inquiries.delete'),
-                :'data-confirm' => t('shared.admin.delete.message', :title => inquiry.name),
-                :'data-method' => "delete" -%>
+                :title => t('admin.inquiries.delete') -%>
 
     <%= link_to refinery_icon_tag('zoom.png'), admin_inquiry_url(inquiry),
                 :title => t('.read_inquiry') -%>

data/app/views/admin/inquiries/show.html.erb

@@ -65,9 +65,7 @@
         <strong><%= t('.message') %></strong>
       </td>
       <td>
-        <p style='margin-top: 0px'>
-          <%= @inquiry.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
-        </p>
+        <%= simple_format @inquiry.message, :style => 'margin-top: 0' %>
       </td>
     </tr>
   </table>

data/app/views/admin/inquiries/spam.html.erb

@@ -12,7 +12,7 @@
   <% else %>
     <% if @grouped_inquiries.any? -%>
       <% @grouped_inquiries.each do |container| %>
-        <h3><%= l((inquiry_group = container.last).first.created_at) %></h3>
+        <h3><%= l((inquiry_group = container.last).first.created_at, :format => :short) %></h3>
         <ul>
           <%= render :partial => 'inquiry', :collection => inquiry_group %>
         </ul>

data/config/locales/en.yml

@@ -41,7 +41,6 @@ en:
     inquiry_settings:
       notification_recipients_form:
         inquiry_settings_value_name: Send notifications to
-        explanation: Every time someone contacts you on your website, Refinery sends out an email to say there is a new inquiry.
         hint: When a new inquiry is submitted, Refinery will send an email notification to you.
         example: "Enter your email address(es) like: jack@work.com, jill@office.com"
       confirmation_email_form:

data/config/locales/it.yml

@@ -1,67 +1,80 @@
 it:
   plugins:
     refinery_inquiries:
-      title: Richieste di informazioni
-  activerecord:
-    models:
-      inquiry: Inchiesta
-    attributes:
-      inquiry:
-        to: A
-        from: Da
-        click_to_email: Clicca per questo indirizzo e-mail
-        phone: Telefono
-        date: Data
-        message: Messaggio
+      title: Richiesta di informazioni
+      description: Fornisce un modulo di contatto e memorizza le richieste
   inquiries:
     new:
-      header_message: "Un problema si è verificato"
+      header_message: "si è verificato un problema"
       message: "I seguenti problemi devono essere corretti:"
       send: Invia messaggio
       privacy_policy: "Noi diamo valore alla tua privacy"
   admin:
     inquiries:
       inquiry:
-        move_inquiry_to_closed: Spostare questa inchiesta chiusa
-        move_inquiry_to_open: Spostare questa indagine per aprire
-        read_inquiry: Leggi l'inchiesta
+        move_inquiry_to_closed: Spostare questa richiesta in stato chiuso
+        move_inquiry_to_open: Spostare questa richiesta in stato aperto
+        read_inquiry: Leggi la domanda
         remove_inquiry: "Sei sicuro di voler cancellare la richiesta di '%{name}'?"
-        title: Rimuovere questa indagine per sempre.
+        title: Rimuovere per sempre questa richiesta.
       toggle_status:
-        closed: "Inchiesta '%{inquiry}' è chiuso"
-        reopened: "Inchiesta '%{inquiry}' si riapre"
+        closed: "La richiesta '%{inquiry}' è chiusa"
+        reopened: "La richiesta '%{inquiry}' si riapre"
       index:
-        no_inquiries: Non hai ancora ricevuto alcuna richiesta in.
+        no_inquiries: Non hai ancora ricevuto alcuna richiesta.
       show:
         details: Dettagli
-        click_to_email: Clicca per e-mail
+        click_to_email: Clicca per inviare una e-mail a questo indirizzo
         status: Stato
         open: Aperto
         closed: Chiuso
         age: Età
         actions: Azioni
         back_to_all_inquiries: Torna a tutte le richieste
-        inquiry: Inchiesta
+        inquiry: Richiesta
       submenu:
-        update_notified: Aggiornamento chi viene notificata
+        update_notified: Aggiornare destinatario notifica
         edit_confirmation_email: Modifica email di conferma
     inquiry_settings:
       update:
-        updated: "'%{setting}' stato aggiornato con successo."
+        updated: "'%{setting}' è stato aggiornato con successo."
       notification_recipients_form:
         inquiry_settings_value_name: Invia a notifiche
-        explanation: "Ogni volta che qualcuno ti contatti sul suo sito web, Refinery invia una mail a dire che c'è una nuova indagine."
-        hint: "Inserisci un indirizzo email di cui sopra. Vuoi la notifica di andare a più di una persona? Inserisci più indirizzi email separati da virgole."
+        explanation: "Ogni volta che qualcuno ti contatta sul tuo sito web, Refinery invia una mail per avvisare che è presente una nuova richiesta."
+        hint: "Inserisci un indirizzo email per l'invio della notifica. Vuoi inviare la notifica a più di una persona? Inserisci più indirizzi email separati da virgole."
         example: "E.g. me@domain.com, friend@msn.com, workmate@work.com"
       confirmation_email_form:
         to: A
         from: Da
-        subject: Soggetto
+        subject: Oggetto
         click_to_edit_subject: Clicca qui per modificare l'oggetto
-        explanation: "Ogni volta che qualcuno ti contatti sul suo sito web, Refinery invia una e-mail per confermare la richiesta con la persona che ha reso."
+        explanation: "Ogni volta che qualcuno ti contatti sul tuo sito web, Refinery invia una e-mail alla persona che ti contattato per confermare la richiesta."
         below_edit_email_sent: Qui di seguito è possibile modificare l'e-mail che viene inviata.
-        the_customer_making_inquiry: Il cliente rendendo l'indagine
+        the_customer_making_inquiry: Chi effettua la richiesta
         message: Messaggio
-        note: "Nota: inserire il testo %name% dove desideri che il nome del cliente a comparire nella e-mail"
+        note: "Nota: inserire nella email il testo %name% dove si vuole che compiaia il nome di chi invia la richiesta"
       subject_form:
-        subject_value_name: Soggetto
+        subject_value_name: Oggetto
+  inquiry_mailer:
+      notification:
+        greeting: Ciao a tutti
+        you_recieved_new_inquiry: Hai appena ricevuto una nuova richiesta sul tuo sito.
+        inquiry_starts: --- inizio della richiesta ---
+        inquiry_ends: --- fine della richiesta ---
+        from: Da
+        email: Email
+        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.
+  activerecord:
+      models:
+        inquiry: Domanda
+      attributes:
+        inquiry:
+          to: A
+          from: Da
+          click_to_email: Clicca per inviare una e-mail a questo indirizzo
+          phone: Telefono
+          date: Data
+          message: Messaggio

data/config/locales/lv.yml

@@ -2,6 +2,7 @@ lv:
   plugins:
     refinery_inquiries:
       title: Pieprasījumi
+      description: Nodrošina kontaktformu un glabā pieprasījumus
   inquiries:
     new:
       send: Sūtīt ziņu

data/config/locales/ru.yml

@@ -1,79 +1,76 @@
 ru:
   plugins:
     refinery_inquiries:
-      title: "Запросы"
-  activerecord:
-    models:
-      inquiry: "Запрос"
-      inquiry_setting: "Настройки запроса"
-    attributes:
-      inquiry:
-        to: "Кому"
-        from: "От"
-        click_to_email: "Нажмите, чтобы отправить по этому адресу"
-        phone: "Телефон"
-        date: "Дата"
-        message: "Сообщение"
+      title: Запросы
+      description: Предоставляет форму обратной связи и хранит запросы
   inquiries:
     new:
-      header_message: "Упс. Возникла небольшая проблемка."
-      message: "Нужно исправить следующие ошибки:"
-      send: "Отправить сообщение"
-      privacy_policy: "Мы относимся с уважением к вашим личным данным"
+      send: Отправить сообщение
+      privacy_policy: Мы относимся с уважением к вашим личным данным
   admin:
     inquiries:
+      delete: Удалить этот запрос навсегда
       inquiry:
-        move_inquiry_to_closed: "Переместить этот запрос в закрытые"
-        move_inquiry_to_open: "Переместить этот запрос в открытые"
-        read_inquiry: "Прочитать запрос"
-        remove_inquiry: "Вы уверены, что хотите удалить запрос от '{{name}}'?"
-        title: "Удалить этот запрос навсегда"
-        said: "пишет"
-        mark_as_spam: "Пометить как спам"
-        mark_as_ham: "Переместить во Входящие"
-      toggle_status:
-        closed: "Запрос '{{inquiry}}' закрыт"
-        reopened: "Запрос '{{inquiry}}' открыт заново"
+        read_inquiry: Прочитать запрос
+        said: пишет
+        mark_as_spam: Пометить как спам
+        mark_as_ham: Переместить во входящие
       submenu:
-        inbox: "Входящие"
-        spam: "Спам"
+        inbox: Входящие
+        spam: Спам
         update_notified: Изменить получателей уведомлений
-        edit_confirmation_email: "Редактировать письмо-подтверждение"
+        edit_confirmation_email: Редактировать письмо-подтверждение
       index:
-        search_results_for: "Найти результаты для {{query}}"
         no_inquiries: "Вы еще не получили ни одного запроса."
       spam:
-        no_spam: "Ура! Вы не получили спам."
+        no_spam: "Ура, спама нет!"
       show:
-        details: "Подробности"
-        click_to_email: "Нажмите, чтобы отправить"
-        status: "Статус"
-        open: "Открыт"
-        closed: "Закрыт"
-        age: "Срок"
-        actions: "Действия"
-        back_to_all_inquiries: "Назад ко всем запросам"
-        spam: "Спам"
-        spam_yes: 'да'
-        inquiry: "Запрос"
-        title: "Удалить этот запрос навсегда"
+        details: Подробности
+        age: Срок
+        actions: Действия
+        back_to_all_inquiries: Назад ко всем запросам
+        spam: Спам
+        spam_yes: да
+        inquiry: Запрос
+        to: Кому
+        from: От
+        click_to_email: Нажмите, чтобы отправить письмо
+        phone: Телефон
+        date: Дата
+        message: Сообщение
     inquiry_settings:
-      update:
-        updated: "'{{setting}}' были успешно обновлены."
       notification_recipients_form:
-        inquiry_settings_value_name: "Отправить уведомления"
-        explanation: "Каждый раз, когда кто-то связывается с вами посредством вашего сайта, Refinery CMS отправляет уведомление на электронную почту."
+        inquiry_settings_value_name: Отправлять уведомления
         hint: "Когда поступит новый запрос, Refinery CMS отправит вам уведомление на электронную почту."
-        example: "Введите адрес(а) электронной почты через запятую: anna@mail.ru, ivanov@yandex.ru"
+        example: "Введите один или несколько адресов электронной почты через запятую: anna@mail.ru, ivanov@yandex.ru"
       confirmation_email_form:
-        to: "Кому"
-        from: "От"
-        subject: "Тема сообщения"
-        click_to_edit_subject: "Редактировать тему сообщения"
+        to: Кому
+        from: От
+        subject: Тема сообщения
+        click_to_edit_subject: Редактировать тему сообщения
         explanation: "Каждый раз, когда кто-то связывается с вами посредством вашего сайта, Refinery CMS отправляет ему письмо, подтверждающее принятие запроса."
         below_edit_email_sent: Ниже вы можете отредактировать отсылаемое письмо
         the_customer_making_inquiry: "Клиент, делающий запрос"
-        message: "Сообщение"
-        note: "Примечание: поместите текст %name% там, где вы хотите, чтобы появилось имя клиента."
-      subject_form:
-        subject_value_name: "Тема сообщения"
+        message: Сообщение
+        note: "Примечание. Поместите текст %name% там, где вы хотите, чтобы появилось имя клиента."
+  inquiry_mailer:
+    notification:
+      greeting: Здравствуйте
+      you_recieved_new_inquiry: Вы только что получили новый запрос со своего сайта
+      inquiry_starts: --- начало запроса ---
+      inquiry_ends: --- конец запроса ---
+      from: От
+      email: Эл. почта
+      phone: Телефон
+      message: Сообщение
+      closing_line: С наилучшими пожеланиями
+      ps: Все запросы вы можете увидеть в соответствующем разделе Refinery.
+  activerecord:
+    models:
+      inquiry: Запрос
+    attributes:
+      inquiry:
+        name: Имя
+        email: Эл. почта
+        phone: Телефон
+        message: Сообщение

data/config/routes.rb

@@ -1,13 +1,16 @@
 Refinery::Application.routes.draw do
   get '/contact', :to => 'inquiries#new', :as => 'new_inquiry'
-  resources :contact, :as => :inquiries, :controller => 'inquiries' do
+  resources :contact,
+            :only => :create,
+            :as => :inquiries,
+            :controller => 'inquiries' do
     collection do
       get :thank_you
     end
   end
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :inquiries do
+    resources :inquiries, :only => [:index, :show, :destroy] do
       collection do
         get :spam
       end
@@ -15,6 +18,6 @@ Refinery::Application.routes.draw do
         get :toggle_spam
       end
     end
-    resources :inquiry_settings
+    resources :inquiry_settings, :only => [:edit, :update]
   end
 end

data/features/support/factories.rb

@@ -0,0 +1,7 @@
+require 'factory_girl'
+
+Factory.define :inquiry do |i|
+  i.name "Refinery"
+  i.email "refinery@cms.com"
+  i.message "Hello..."
+end

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.2'
+version = '0.9.9.3'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem$/

data/readme.md

@@ -6,7 +6,7 @@
 
 Include the latest [gem](http://rubygems.org/gems/refinerycms-inquiries) into your Refinery CMS application's Gemfile:
 
-    gem "refinerycms-inquiries", '~> 0.9.9.2'
+    gem "refinerycms-inquiries", '~> 0.9.9.3'
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 

data/refinerycms-inquiries.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{0.9.9.2}
-  s.date              = %q{2010-10-13}
+  s.version           = %q{0.9.9.3}
+  s.date              = %q{2010-11-01}
   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}
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
     'features/step_definitions',
     'features/step_definitions/inquiry_steps.rb',
     'features/support',
+    'features/support/factories.rb',
     'features/support/paths.rb',
     'lib',
     'lib/gemspec.rb',
@@ -71,7 +72,10 @@ Gem::Specification.new do |s|
     'lib/refinerycms-inquiries.rb',
     'license.md',
     'readme.md',
-    'refinerycms-inquiries.gemspec'
+    'refinerycms-inquiries.gemspec',
+    'spec',
+    'spec/models',
+    'spec/models/inquiry_spec.rb'
   ]
   s.require_path = 'lib'
 

data/spec/models/inquiry_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+Dir[File.expand_path('../../../features/support/factories.rb', __FILE__)].each {|f| require f}
+
+describe Inquiry do
+  describe "validations" do
+    before(:each) do
+      @attr = {
+        :name => "rspec",
+        :email => "rspec@refinery.com",
+        :message => "test"
+      }
+    end
+
+    it "rejects empty name" do
+      Inquiry.new(@attr.merge(:name => "")).should_not be_valid
+    end
+
+    it "rejects empty message" do
+      Inquiry.new(@attr.merge(:message => "")).should_not be_valid
+    end
+
+    it "rejects invalid email format" do
+      ["", "@refinerycms.com", "refinery@cms", "refinery@cms.123"].each do |email|
+        Inquiry.new(@attr.merge(:email => email)).should_not be_valid
+      end
+    end
+  end
+
+  describe "default scope" do
+    it "orders by created_at in desc" do
+      inquiry1 = Factory(:inquiry, :created_at => 1.hour.ago)
+      inquiry2 = Factory(:inquiry, :created_at => 2.hours.ago)
+      inquiries = Inquiry.all
+      inquiries.first.should == inquiry1
+      inquiries.second.should == inquiry2
+    end
+  end
+
+  describe ".latest" do
+    it "returns latest 7 non-spam inquiries by default" do
+      8.times { Factory(:inquiry) }
+      Inquiry.last.toggle!(:spam)
+      Inquiry.latest.count.should == 7
+    end
+
+    it "returns latest 7 inquiries including spam ones" do
+      4.times { Factory(:inquiry) }
+      3.times { Factory(:inquiry) }
+      Inquiry.all[0..2].each { |inquiry| inquiry.toggle!(:spam) }
+      Inquiry.latest(7, true).count.should == 7
+    end
+
+    it "returns latest n inquiries" do
+      4.times { Factory(:inquiry) }
+      Inquiry.latest(3).count.should == 3
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
   - 9
-  - 2
-  version: 0.9.9.2
+  - 3
+  version: 0.9.9.3
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +13:00
+date: 2010-11-01 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - features/create_inquiries.feature
 - features/manage_inquiries.feature
 - features/step_definitions/inquiry_steps.rb
+- features/support/factories.rb
 - features/support/paths.rb
 - lib/gemspec.rb
 - lib/inquiries.rb
@@ -87,6 +88,7 @@ files:
 - license.md
 - readme.md
 - refinerycms-inquiries.gemspec
+- spec/models/inquiry_spec.rb
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []