refinerycms-inquiries 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f114529cf10c2021be3716ce6f9cc8e50c75a621
-  data.tar.gz: dc9e45204e308791b9f071815c990add3a12670a
+  metadata.gz: f72e5741f8019cc82253bc2479aa1e87ea3ebc96
+  data.tar.gz: 7062094890592ac5fa41531e7848f3d978610d75
 SHA512:
-  metadata.gz: efd97df61475b46d4abbc14ff1cf085e8b1e81835d4fc5c0129c3a31b2f74f1ac6dedc658a91d53df3fac44ed9a794ecbcbd6d9401641fb29552c27d0c36679f
-  data.tar.gz: fc7caa590ec372433a099f6aea1531a36c21e1fbdd157210e469634beda91b742707f4dfa8e82946d5b2219cfa2fcfc968a85311aa6391fd4902b554b86e6016
+  metadata.gz: ddcd85adb7c887f5be98bf117abaf28fe2e2ac1839efadb52dbb2093bf8fa6bbbf9cc033d09360c164be25f139a3fa2637fe5a7b4af1e63c01fa43e4c6e139da
+  data.tar.gz: c4412b554ae3000ad8f5f4832471b46750fd38ee9f3fc7d01df64f8164e3ed24f553981499714b9c5e0879255f839c4c1ed233d8250229fb088315556f2ea705

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without development
 before_script:
   - "sh -e /etc/init.d/xvfb start"
@@ -17,14 +19,11 @@ notifications:
     on_failure: always
     rooms:
       - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
+  webhooks:
+  - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 env:
   - DB=postgresql
   - DB=mysql
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
 rvm:
+  - 2.1
   - 2.0.0
-  - 1.9.3
-  - rbx-19mode
-  - jruby-19mode

data/Gemfile

@@ -2,39 +2,35 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.1.0'
-gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
+gem 'refinerycms', github: 'refinery/refinerycms'
+gem 'refinerycms-settings', github: 'refinery/refinerycms-settings'
 
 group :test do
-  gem 'refinerycms-testing', '~> 2.1.0'
-  gem 'capybara-email', '~> 2.1.2'
+  gem 'refinerycms-testing', github: 'refinery/refinerycms'
+  gem 'capybara-email', '~> 2.4.0'
+  gem 'poltergeist'
 end
 
 # Database Configuration
 unless ENV['TRAVIS']
-  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-  gem 'sqlite3', :platform => :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sqlite3', platform: :ruby
 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
+  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'jdbc-mysql', '= 5.1.13', platform: :jruby
+  gem 'mysql2', platform: :ruby
 end
 
 if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
-  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-  gem 'pg', :platform => :ruby
+  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'
-  gem 'coffee-rails'
-  gem 'uglifier'
-end
+gem 'sass-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0.0'
 
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)

data/Rakefile

@@ -13,7 +13,6 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)

data/app/assets/stylesheets/refinery/inquiries/inquiries.css.scss

@@ -4,6 +4,9 @@
     label {
       width: 150px;
       float: left;
+      &.required:after {
+        content:" *"
+      }
     }
     input {
       width: 200px;

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

@@ -9,9 +9,9 @@ module Refinery
 
         helper_method :group_by_date
 
-        before_filter :find_all_ham, :only => [:index]
-        before_filter :find_all_spam, :only => [:spam]
-        before_filter :get_spam_count, :only => [:index, :spam]
+        before_action :find_all_ham, :only => [:index]
+        before_action :find_all_spam, :only => [:spam]
+        before_action :get_spam_count, :only => [:index, :spam]
 
         def index
           @inquiries = @inquiries.with_query(params[:search]) if searching?
@@ -44,6 +44,12 @@ module Refinery
           @spam_count = Refinery::Inquiries::Inquiry.where(:spam => true).count
         end
 
+        private
+
+        def inquiry_params
+          params.require(:inquiry).permit(:name, :phone, :message, :email)
+        end
+
       end
     end
   end

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

@@ -3,41 +3,59 @@ module Refinery
     module Admin
       class SettingsController < Refinery::AdminController
 
-        before_filter :check_setting, :only => [:edit, :update]
-        after_filter :save_subject_for_confirmation, :save_message_for_confirmation, :only => :update
+        before_action :find_setting, :only => [:edit, :update]
+        after_action :save_subject_for_confirmation,
+          :save_message_for_confirmation, :save_notification_recipients, :only => :update
 
         def edit
-          @setting = Refinery::Setting.find(params[:id])
         end
 
         def update
-          @setting = Refinery::Setting.find(params[:id])
+          flash[:notice] = t('refinery.crudify.updated', :what => @setting.name.gsub("inquiry_", "").titleize)
 
-          if @setting.update_attributes(params[:setting])
-            flash[:notice] = t('refinery.crudify.updated', :what => @setting.name.gsub("inquiry_", "").titleize)
-
-            unless request.xhr? or from_dialog?
-              redirect_back_or_default(refinery.inquiries_admin_inquiries_path)
-            else
-              render :text => "<script type='text/javascript'>parent.window.location = '#{refinery.inquiries_admin_inquiries_path}';</script>"
-            end
+          unless request.xhr? or from_dialog?
+            redirect_back_or_default(refinery.inquiries_admin_inquiries_path)
+          else
+            render text: "<script type='text/javascript'>parent.window.location = '#{refinery.inquiries_admin_inquiries_path}';</script>"
           end
         end
 
       protected
 
-        def check_setting
+        def find_setting
           setting = params[:id].gsub("inquiry_", "")
 
-          Refinery::Inquiries::Setting.send(setting) if Refinery::Inquiries::Setting.respond_to?(setting)
+          if Refinery::Inquiries::Setting.respond_to?(setting)
+            Refinery::Inquiries::Setting.send(setting)
+          end
+
+          @setting = Refinery::Setting.friendly.find(params[:id])
+        end
+
+        def save_notification_recipients
+          if setting_params.include?('value')
+            Refinery::Inquiries::Setting.notification_recipients = setting_params[:value]
+          end
         end
 
         def save_subject_for_confirmation
-          Refinery::Inquiries::Setting.confirmation_subject = params[:subject] if params.keys.include?('subject')
+          if setting_params.include?('subject')
+            Refinery::Inquiries::Setting.confirmation_subject = setting_params[:subject]
+          end
         end
 
         def save_message_for_confirmation
-          Refinery::Inquiries::Setting.confirmation_message = params[:message] if params.keys.include?('message')
+          if setting_params.include?('message')
+            Refinery::Inquiries::Setting.confirmation_message = setting_params[:message]
+          end
+        end
+
+      private
+
+        def setting_params
+          params.require(:setting).permit(:value,
+            subject: Refinery::I18n.frontend_locales,
+            message: Refinery::I18n.frontend_locales)
         end
 
       end

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

@@ -2,44 +2,60 @@ module Refinery
   module Inquiries
     class InquiriesController < ::ApplicationController
 
-      before_filter :find_page, :only => [:create, :new]
+      before_action :find_page, only: [:create, :new]
+      before_action :find_thank_you_page, only: :thank_you
 
       def thank_you
-        @page = ::Refinery::Page.find_by_link_url("/contact/thank_you")
       end
 
       def new
-        @inquiry = ::Refinery::Inquiries::Inquiry.new
+        @inquiry = Inquiry.new
       end
 
       def create
-        @inquiry = ::Refinery::Inquiries::Inquiry.new(params[:inquiry])
+        @inquiry = Inquiry.new(inquiry_params)
 
         if @inquiry.save
-          if @inquiry.ham? || Refinery::Inquiries.send_notifications_for_inquiries_marked_as_spam
+          if @inquiry.ham? || Inquiries.send_notifications_for_inquiries_marked_as_spam
             begin
-              ::Refinery::Inquiries::InquiryMailer.notification(@inquiry, request).deliver
+              InquiryMailer.notification(@inquiry, request).deliver_now
             rescue
               logger.warn "There was an error delivering an inquiry notification.\n#{$!}\n"
             end
 
-            begin
-              ::Refinery::Inquiries::InquiryMailer.confirmation(@inquiry, request).deliver
-            rescue
-              logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
-            end if ::Refinery::Inquiries::Setting.send_confirmation?
+            if Setting.send_confirmation?
+              begin
+                InquiryMailer.confirmation(@inquiry, request).deliver_now
+              rescue
+                logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
+              end
+            end
           end
 
           redirect_to refinery.thank_you_inquiries_inquiries_path
         else
-          render :action => 'new'
+          render action: 'new'
         end
       end
 
       protected
 
       def find_page
-        @page = ::Refinery::Page.find_by_link_url("/contact")
+        @page = Page.find_by(link_url: Refinery::Inquiries.page_path_new)
+      end
+
+      def find_thank_you_page
+        @page = Page.find_by(link_url: Refinery::Inquiries.page_path_thank_you)
+      end
+
+      def inquiry_params
+        params.require(:inquiry).permit(permitted_inquiry_params)
+      end
+
+      private
+
+      def permitted_inquiry_params
+        [:name, :phone, :message, :email]
       end
 
     end

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

@@ -3,27 +3,37 @@ module Refinery
     class InquiryMailer < ActionMailer::Base
 
       def confirmation(inquiry, request)
-        @inquiry = inquiry
+        @inquiry, @request = inquiry, request
         mail :subject   => Refinery::Inquiries::Setting.confirmation_subject(Globalize.locale),
              :to        => inquiry.email,
-             :from      => ::I18n.t('from_name',
-                                    :scope => 'refinery.inquiries.config',
-                                    :site_name => Refinery::Core.site_name,
-                                    :name => @inquiry.name) + " <#{Refinery::Inquiries.from_name}@#{request.domain}>",
+             :from      => from_info,
              :reply_to  => Refinery::Inquiries::Setting.notification_recipients.split(',').first
       end
 
       def notification(inquiry, request)
-        @inquiry = inquiry
+        @inquiry, @request = inquiry, request
         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}>",
+             :from      => from_info,
              :reply_to  => inquiry.email
       end
 
+      private
+
+      def from_info
+        "\"#{from_name}\" <#{from_mail}>"
+      end
+
+      def from_name
+        ::I18n.t('from_name',
+                :scope => 'refinery.inquiries.config',
+                :site_name => Refinery::Core.site_name,
+                :name => @inquiry.name)
+      end
+
+      def from_mail
+        "#{Refinery::Inquiries.from_name}@#{@request.domain}"
+      end
     end
   end
 end

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

@@ -5,19 +5,21 @@ module Refinery
   module Inquiries
     class Inquiry < Refinery::Core::BaseModel
 
-      filters_spam :message_field => :message,
-                   :email_field => :email,
-                   :author_field => :name,
-                   :other_fields => [:phone],
-                   :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
+      if Inquiries.config.filter_spam
+        filters_spam message_field:    :message,
+                     email_field:      :email,
+                     author_field:     :name,
+                     other_fields:     [:phone],
+                     extra_spam_words: %w()
+      end
 
-      default_scope :order => 'created_at DESC'
+      validates :name, presence: true, length: { maximum: 255 }
+      validates :email, format: {
+        with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+      }, length: { maximum: 255 }
+      validates :message, presence: true
 
-      attr_accessible :name, :phone, :message, :email
+      default_scope { order('created_at DESC') }
 
       def self.latest(number = 7, include_spam = false)
         include_spam ? limit(number) : ham.limit(number)

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

@@ -1,61 +1,63 @@
+require 'refinery/setting'
+
 module Refinery
   module Inquiries
-    class Setting
+    class Setting < ::Refinery::Setting
 
       class << self
         def confirmation_body
-          Refinery::Setting.find_or_set(:inquiry_confirmation_body,
+          find_or_set(:inquiry_confirmation_body,
             "Thank you for your inquiry %name%,\n\nThis email is a receipt to confirm we have received your inquiry and we'll be in touch shortly.\n\nThanks."
           )
         end
 
         def confirmation_subject(locale='en')
-          Refinery::Setting.find_or_set("inquiry_confirmation_subject_#{locale}".to_sym,
-                                        "Thank you for your inquiry",
-                                        :scoping => "inquiries")
+          find_or_set(:"inquiry_confirmation_subject_#{locale}",
+            "Thank you for your inquiry",
+            scoping: "inquiries"
+          )
         end
 
-        def confirmation_subject=(value)
-          value.first.keys.each do |locale|
-            Refinery::Setting.set("inquiry_confirmation_subject_#{locale}".to_sym, {
-                                    :value => value.first[locale.to_sym],
-                                    :scoping => "inquiries"
-                                  })
+        def confirmation_subject=(locales_subjects)
+          locales_subjects.each do |locale, subject|
+            set(:"inquiry_confirmation_subject_#{locale}", {
+              value: subject,
+              scoping: "inquiries"
+            })
           end
         end
 
         def confirmation_message(locale='en')
-          Refinery::Setting.find_or_set("inquiry_confirmation_message_#{locale}".to_sym,
-                                        Refinery::Setting[:inquiry_confirmation_body],
-                                        :scoping => "inquiries")
+          find_or_set(:"inquiry_confirmation_message_#{locale}", confirmation_body, scoping: "inquiries")
         end
 
-
-        def confirmation_message=(value)
-          value.first.keys.each do |locale|
-            Refinery::Setting.set("inquiry_confirmation_message_#{locale}".to_sym, {
-                                    :value => value.first[locale.to_sym],
-                                    :scoping => "inquiries"
-                                  })
+        def confirmation_message=(locales_messages)
+          locales_messages.each do |locale, message|
+            set(:"inquiry_confirmation_message_#{locale}", {
+              value: message,
+              scoping: "inquiries"
+            })
           end
         end
 
         def notification_recipients
-          Refinery::Setting.find_or_set(:inquiry_notification_recipients,
-                                        ((Refinery::Role[:refinery].users.first.email rescue nil) if defined?(Refinery::Role)).to_s,
-                                        :scoping => "inquiries")
+          recipients = ((Role[:refinery].users.first.email rescue nil) if defined?(Role)).to_s
+          find_or_set(:inquiry_notification_recipients, recipients, scoping: "inquiries")
+        end
+
+        def notification_recipients=(recipients)
+          set(:inquiry_notification_recipients, {
+            value: recipients,
+            scoping: "inquiries"
+          })
         end
 
         def notification_subject
-          Refinery::Setting.find_or_set(:inquiry_notification_subject,
-                                        "New inquiry from your website",
-                                        :scoping => "inquiries")
+          find_or_set(:inquiry_notification_subject, "New inquiry from your website", scoping: "inquiries")
         end
-        
+
         def send_confirmation?
-          Refinery::Setting.find_or_set(:inquiry_send_confirmation, 
-                                        true,
-                                        :scoping => "inquiries")
+          find_or_set(:inquiry_send_confirmation, true, scoping: "inquiries")
         end
       end
     end