refinerycms-inquiries 2.0.3 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f114529cf10c2021be3716ce6f9cc8e50c75a621
+  data.tar.gz: dc9e45204e308791b9f071815c990add3a12670a
+SHA512:
+  metadata.gz: efd97df61475b46d4abbc14ff1cf085e8b1e81835d4fc5c0129c3a31b2f74f1ac6dedc658a91d53df3fac44ed9a794ecbcbd6d9401641fb29552c27d0c36679f
+  data.tar.gz: fc7caa590ec372433a099f6aea1531a36c21e1fbdd157210e469634beda91b742707f4dfa8e82946d5b2219cfa2fcfc968a85311aa6391fd4902b554b86e6016

data/.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 Gemfile.lock
-spec/dummy
+spec/dummy
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile

data/.travis.yml

@@ -1,8 +1,8 @@
-before_install:
-  - gem install bundler
+language: ruby
+bundler_args: --without development
 before_script:
   - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app > /dev/null"
+  - "bundle exec rake refinery:testing:dummy_app"
 script:
   - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
@@ -12,11 +12,19 @@ notifications:
     skip_join: true
     channels:
       - "irc.freenode.org#refinerycms"
+  campfire:
+    on_success: always
+    on_failure: always
+    rooms:
+      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
 env:
   - DB=postgresql
   - DB=mysql
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
 rvm:
-  - 1.8.7
+  - 2.0.0
   - 1.9.3
-  - rbx
-  - jruby
+  - rbx-19mode
+  - jruby-19mode

data/Gemfile

@@ -1,64 +1,34 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
 
-group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.0'
-  gem 'guard-rspec', '~> 0.6.0'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
-
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
+group :test do
+  gem 'refinerycms-testing', '~> 2.1.0'
+  gem 'capybara-email', '~> 2.1.2'
+end
 
-  platforms :ruby do
-    gem 'spork', '~> 0.9.0.rc'
-    gem 'guard-spork'
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
 end
 
+gem 'jruby-openssl', :platform => :jruby
+
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
@@ -66,4 +36,7 @@ group :assets do
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/controllers/refinery/inquiries/admin/inquiries_controller.rb

@@ -41,7 +41,7 @@ module Refinery
         end
 
         def get_spam_count
-          @spam_count = Refinery::Inquiries::Inquiry.count(:conditions => {:spam => true})
+          @spam_count = Refinery::Inquiries::Inquiry.where(:spam => true).count
         end
 
       end

data/app/controllers/refinery/inquiries/inquiries_controller.rb

@@ -16,7 +16,7 @@ module Refinery
         @inquiry = ::Refinery::Inquiries::Inquiry.new(params[:inquiry])
 
         if @inquiry.save
-          if @inquiry.ham?
+          if @inquiry.ham? || Refinery::Inquiries.send_notifications_for_inquiries_marked_as_spam
             begin
               ::Refinery::Inquiries::InquiryMailer.notification(@inquiry, request).deliver
             rescue

data/app/helpers/refinery/inquiries/inquiries_helper.rb

@@ -1,6 +1,6 @@
 module Refinery
   module Inquiries
-  	module InquiriesHelper
-  	end
+    module InquiriesHelper
+    end
   end
 end

data/app/mailers/refinery/inquiries/inquiry_mailer.rb

@@ -6,15 +6,22 @@ module Refinery
         @inquiry = inquiry
         mail :subject   => Refinery::Inquiries::Setting.confirmation_subject(Globalize.locale),
              :to        => inquiry.email,
-             :from      => "\"#{Refinery::Core.site_name}\" <no-reply@#{request.domain}>",
+             :from      => ::I18n.t('from_name',
+                                    :scope => 'refinery.inquiries.config',
+                                    :site_name => Refinery::Core.site_name,
+                                    :name => @inquiry.name) + " <#{Refinery::Inquiries.from_name}@#{request.domain}>",
              :reply_to  => Refinery::Inquiries::Setting.notification_recipients.split(',').first
       end
 
       def notification(inquiry, request)
         @inquiry = inquiry
-        mail :subject => Refinery::Inquiries::Setting.notification_subject,
-             :to      => Refinery::Inquiries::Setting.notification_recipients,
-             :from    => "\"#{Refinery::Core.site_name}\" <no-reply@#{request.domain}>"
+        mail :subject   => Refinery::Inquiries::Setting.notification_subject,
+             :to        => Refinery::Inquiries::Setting.notification_recipients,
+             :from      => ::I18n.t('from_name',
+                                    :scope => 'refinery.inquiries.config',
+                                    :site_name => Refinery::Core.site_name,
+                                    :name => @inquiry.name) + " <#{Refinery::Inquiries.from_name}@#{request.domain}>",
+             :reply_to  => inquiry.email
       end
 
     end

data/app/models/refinery/inquiries/inquiry.rb

@@ -1,3 +1,6 @@
+require 'refinery/core/base_model'
+require 'filters_spam'
+
 module Refinery
   module Inquiries
     class Inquiry < Refinery::Core::BaseModel
@@ -9,10 +12,8 @@ module Refinery
                    :extra_spam_words => %w()
 
       validates :name, :presence => true
+      validates :email, :format => { :with =>  /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i }
       validates :message, :presence => true
-      validates :email, :format=> { :with =>  /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
-
-      acts_as_indexed :fields => [:name, :email, :message, :phone]
 
       default_scope :order => 'created_at DESC'
 
@@ -24,4 +25,4 @@ module Refinery
 
     end
   end
-end
+end

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

@@ -1,14 +1,16 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
     <%= link_to inquiry.name, refinery.inquiries_admin_inquiry_path(inquiry) %> <%= t('.said') %>
-    <span class="preview"><%= truncate(strip_tags(inquiry.message), :length => 60) -%></span>
+    <span class="preview"><%= truncate(strip_tags(sanitize(inquiry.message)), :length => 60) -%></span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('delete.png'), 
                 refinery.inquiries_admin_inquiry_path(inquiry),
                 :class => "cancel confirm-delete",
                 :title => t('refinery.inquiries.admin.inquiries.delete'),
-                :confirm => t('refinery.admin.delete.message', :title => inquiry.name),
+                :data => {
+                  :confirm => t('refinery.admin.delete.message', :title => inquiry.name)
+                },
                 :method => :delete -%>
 
     <%= link_to refinery_icon_tag('zoom.png'), refinery.inquiries_admin_inquiry_path(inquiry),

data/app/views/refinery/inquiries/admin/inquiries/_submenu.html.erb

@@ -1,7 +1,7 @@
 <div id='actions'>
   <ul>
     <li>
-      <%= render :partial => "/refinery/admin/search", :locals => {:url => request.path} %>
+      <%= render "/refinery/admin/search", :url => request.path.gsub("//", "/") %>
     </li>
     <li <%= "class='selected'" if params[:action] == "index" %>>
       <%= link_to t('.inbox'), refinery.inquiries_admin_inquiries_path, :class => "email_icon" %>

data/app/views/refinery/inquiries/admin/inquiries/index.html.erb

@@ -1,7 +1,7 @@
-<%= render :partial => "submenu" %>
+<%= render "submenu" %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('refinery.admin.search.results_for', :query => params[:search]) %></h2>
+    <%= render 'refinery/admin/search_header', :url => request.path.gsub("//", "/") %>
     <% if @inquiries.any? %>
       <%= will_paginate @inquiries %>
       <ul>

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

@@ -20,7 +20,9 @@
                   refinery.inquiries_admin_inquiry_path(@inquiry),
                   :class => 'delete_icon no-tooltip confirm-delete',
                   :title => t('refinery.inquiries.admin.inquiries.delete'),
-                  :confirm => t('refinery.admin.delete.message', :title => @inquiry.name),
+                  :data => {
+                    :confirm => t('refinery.admin.delete.message', :title => @inquiry.name)
+                  },
                   :method => :delete %>
     </li>
   </ul>

data/app/views/refinery/inquiries/admin/settings/_confirmation_email_form.html.erb

@@ -23,7 +23,7 @@
         <%= "#{Refinery::Core.site_name} &lt;no-reply@#{request.domain}&gt;".html_safe %>
       </td>
     </tr>
-    <% (defined?(Refinery::I18n) && Refinery::I18n.frontend_locales || [::I18n.locale]).each do |locale| %>
+    <% Refinery::I18n.frontend_locales.each do |locale| %>
       <tr>
         <td>
           <label class='stripped'><%= t('.subject') %> (<%= locale.to_s %>)</label>

data/app/views/refinery/inquiries/admin/settings/edit.html.erb

@@ -1,5 +1,5 @@
 <% if @setting.name.to_s.titleize == "Inquiry Notification Recipients" %>
-  <%= render :partial => "notification_recipients_form", :locals => {:edit => true} -%>
+  <%= render "notification_recipients_form", :edit => true -%>
 <% else %>
-  <%= render :partial => "confirmation_email_form", :locals => {:edit => true} -%>
+  <%= render "confirmation_email_form", :edit => true -%>
 <% end %>

data/app/views/refinery/inquiries/inquiries/new.html.erb

@@ -1,4 +1,6 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
+  
   <div class='inquiries'>
     <%= form_for [refinery, :inquiries, @inquiry] do |f| %>
       <%= render :partial => "/refinery/admin/error_messages",
@@ -8,19 +10,27 @@
                  } %>
       <div class="field">
         <%= f.required_label :name, :class => 'placeholder-fallback' %>
-        <%= f.text_field :name, :class => 'text', :required => 'required', :placeholder => t('name', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') %>
+        <%= f.text_field :name, :class => 'text', :required => 'required',
+          :placeholder => t('name', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
       </div>
       <div class="field">
         <%= f.required_label :email, :class => 'placeholder-fallback' %>
-        <%= f.email_field :email, :class => 'text email', :required => 'required', :placeholder => t('email', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') %>
-      </div>
-      <div class="field">
-        <%= f.label :phone, :class => 'placeholder-fallback' %>
-        <%= f.text_field :phone, :class => 'text phone', :placeholder => t('phone', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') %>
+        <%= f.email_field :email, :class => 'text email', :required => 'required',
+          :placeholder => t('email', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
       </div>
+
+      <% if Refinery::Inquiries.show_phone_number_field %>
+        <div class="field">
+          <%= f.label :phone, :class => 'placeholder-fallback' %>
+          <%= f.text_field :phone, :class => 'text phone',
+            :placeholder => t('phone', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
+        </div>
+      <% end %>
+
       <div class='field message_field'>
         <%= f.required_label :message, :class => 'placeholder-fallback' %>
-        <%= f.text_area :message, :rows => 8, :required => 'required', :placeholder => t('message', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') %>
+        <%= f.text_area :message, :rows => 8, :required => 'required',
+          :placeholder => t('message', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
       </div>
       <div class="actions">
         <%= f.submit t('.send') %>
@@ -29,4 +39,4 @@
     <% end %>
   </div>
 <% end %>
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/app/views/refinery/inquiries/inquiries/thank_you.html.erb

@@ -1 +1 @@
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/app/views/refinery/inquiries/inquiry_mailer/confirmation.text.erb

@@ -1 +1 @@
-<%=raw Refinery::Inquiries::Setting.confirmation_message(Globalize.locale).gsub("%name%", @inquiry.name) %>
+<%=raw Refinery::Inquiries::Setting.confirmation_message(Globalize.locale).gsub("%name%", @inquiry.name) -%>

data/app/views/refinery/inquiries/inquiry_mailer/notification.text.erb

@@ -8,11 +8,11 @@
 <%=raw t('.email') %>: <%= @inquiry.email %>
 <%=raw t('.phone') %>: <%= @inquiry.phone %>
 <%=raw t('.message') %>:
-<%=strip_tags(@inquiry.message) %>
+<%=raw strip_tags(@inquiry.message) %>
 
 <%=raw t('.inquiry_ends') %>
 
 <%=raw t('.closing_line') %>,
 <%=raw Refinery::Core.site_name %>
 
-<%=raw t('.ps') %>
+<%=raw t('.ps') -%>

data/config/locales/bg.yml

@@ -5,6 +5,8 @@ bg:
         title: Запитвания
         description: Осигурява форма за контакт и съхранение на запитвания
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Изпращане на съобщение

data/config/locales/cs.yml

@@ -5,6 +5,8 @@ cs:
         title: Dotazy
         description: Zajišťuje kontaktní formulář a uchovává zaslané dotazy.
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Odeslat zprávu

data/config/locales/da.yml

@@ -4,6 +4,8 @@ da:
       refinerycms_inquiries:
         title: Henvendelser
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           header_message: "Der er et mindre problem"
@@ -22,7 +24,6 @@ da:
             closed: "Henvendelsen '%{inquiry}' er lukket"
             reopened: "Henvendelsen '%{inquiry}' er genåbnet"
           index:
-            search_results_for: "Søgeresultat for '%{query}'"
             no_inquiries: Du har endnu ikke modtaget nogen henvendelser.
           show:
             details: Detaljer

data/config/locales/de.yml

@@ -5,6 +5,8 @@ de:
         title: Kontaktanfragen
         description: Stellt ein Kontaktformular zur Verfügung und speichert Kontaktanfragen
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Nachricht senden

data/config/locales/en-GB.yml

@@ -5,6 +5,8 @@ en-GB:
         title: Enquiries
         description: Provides a contact form and stores enquiries
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Send message

data/config/locales/en.yml

@@ -5,6 +5,8 @@ en:
         title: Inquiries
         description: Provides a contact form and stores inquiries
     inquiries:
+      config:
+        from_name: "%{name} [%{site_name}]"
       inquiries:
         new:
           send: Send message