refinerycms-inquiries 2.1.0 → 3.0.0

data/config/locales/zh-CN.yml

@@ -6,9 +6,9 @@ zh-CN:
         description: 提供一个联系表单与保存咨询
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: 发送消息
           privacy_policy: 我们珍视您的隐私
       admin:

data/config/locales/zh-TW.yml

@@ -0,0 +1,79 @@
+zh-TW:
+  refinery:
+    plugins:
+      refinerycms_inquiries:
+        title: 咨詢
+        description: 提供一個連絡表格及咨詢記錄
+    inquiries:
+      config:
+        from_name: "%{name} - %{site_name}"
+      inquiries:
+        form:
+          send: 發送消息
+          privacy_policy: 我们珍惜您的私隐
+      admin:
+        inquiries:
+          delete: 永久删除此咨詢
+          inquiry:
+            read_inquiry: 閱讀此咨詢
+            said: 說
+            mark_as_spam: 標記為垃圾郵件
+            mark_as_ham: 移到收件箱
+          submenu:
+            inbox: 收件箱
+            spam: 垃圾郵件
+            update_notified: 更新通知名單
+            edit_confirmation_email: 編輯確認電郵
+          index:
+            no_inquiries: 你還没有收到任何的咨詢。
+            no_spam: 沒有垃圾郵件。
+          show:
+            details: 詳細
+            age: 時間
+            actions: 操作
+            back_to_all_inquiries: 返回所有的咨詢
+            spam: 垃圾郵件
+            spam_yes: '是'
+            inquiry: 咨詢
+            to: 收件人
+            from: 發件人
+            click_to_email: 點擊發送到這個地址
+            phone: 電話
+            date: 日期
+            message: 信息
+        settings:
+          notification_recipients_form:
+            inquiry_settings_value_name: 發送通知到
+            hint: 當收到新的咨詢時，系統將會發一封電郵通知你。
+            example: "輸入你的電郵地址如: jack@work.com, jill@office.com"
+          confirmation_email_form:
+            to: 到
+            from: 從
+            subject: 標題
+            click_to_edit_subject: 點擊這裡編輯標題
+            explanation: 每當有人在網站聯系你，系統發送出一封電郵去確認發送者的身份.
+            below_edit_email_sent: 你可以在下面编輯你要發送去的電郵。
+            the_customer_making_inquiry: 客户正在寫咨詢
+            message: 信息
+            note: "注意: 把你的客户名字在電郵出現的位置以文字 %name% 做替換"
+      inquiry_mailer:
+        notification:
+          greeting: 您好
+          you_recieved_new_inquiry: 你剛從你的網站收到一條新的咨詢.
+          inquiry_starts: --- 咨詢開始處 ---
+          inquiry_ends: --- 咨詢結束處 ---
+          from: 表單
+          email: 電郵
+          phone: 電話
+          message: 信息
+          closing_line: 謹致問候
+          ps: 附言 您所有的咨詢被保存在“咨詢”區域以便你在日後查看。
+  activerecord:
+    models:
+      refinery/inquiries/inquiry: inquiry
+    attributes:
+      refinery/inquiries/inquiry:
+        name: 姓名
+        email: 電郵
+        phone: 連絡電話
+        message: 留言信息

data/config/routes.rb

@@ -1,14 +1,18 @@
 Refinery::Core::Engine.routes.draw do
+  # Frontend routes
   namespace :inquiries, :path => '' do
-    get '/contact', :to => 'inquiries#new', :as => 'new_inquiry'
+    get Refinery::Inquiries.page_path_new, :to => 'inquiries#new', :as => 'new_inquiry'
 
-    resources :contact,
-                :only => :create,
-                :as => :inquiries,
-                :controller => 'inquiries' do
-      get :thank_you, :on => :collection
+    resources :contact, :path => Refinery::Inquiries.post_path, :only => [:create],
+              :as => :inquiries, :controller => 'inquiries'
+
+    resources :contact, :path => '', :only => [], :as => :inquiries, :controller => 'inquiries' do
+      get :thank_you, :path => Refinery::Inquiries.page_path_thank_you, :on => :collection
     end
+  end
 
+  # Admin routes
+  namespace :inquiries, :path => '' do
     namespace :admin, :path => Refinery::Core.backend_route do
       resources :inquiries, :only => [:index, :show, :destroy] do
         get :spam, :on => :collection
@@ -20,4 +24,4 @@ Refinery::Core::Engine.routes.draw do
       end
     end
   end
-end
+end

data/db/migrate/20101208082840_create_inquiries.rb

@@ -17,8 +17,9 @@ class CreateInquiries < ActiveRecord::Migration
   def down
      drop_table ::Refinery::Inquiries::Inquiry.table_name
 
-     ::Refinery::Page.delete_all({
-       :link_url => ("/contact" || "/contact/thank_you")
-     }) if defined?(::Refinery::Page)
+     if defined?(::Refinery::Page)
+       ::Refinery::Page.delete_all(:link_url => Refinery::Inquiries.page_path_new)
+       ::Refinery::Page.delete_all(:link_url => Refinery::Inquiries.page_path_thank_you)
+     end
   end
 end

data/db/seeds.rb

@@ -1,17 +1,15 @@
 ::Refinery::User.all.each do |user|
-  if user.plugins.where(:name => 'refinery_inquiries').blank?
-    user.plugins.create(:name => "refinery_inquiries")
-  end
+  user.plugins.where(:name => 'refinery_inquiries').first_or_create!
 end if defined?(::Refinery::User)
 
 if defined?(::Refinery::Page)
-  contact_us_page = Refinery::Page.where(:link_url => '/contact').first
+  contact_us_page = Refinery::Page.find_by(:link_url => Refinery::Inquiries.page_path_new)
 
   unless contact_us_page
     contact_us_page = ::Refinery::Page.create({
       :title => "Contact",
-      :link_url => "/contact",
-      :menu_match => "^/(inquiries|contact).*$",
+      :link_url => Refinery::Inquiries.page_path_new,
+      :menu_match => "^(/inquiries.*)|#{Refinery::Inquiries.page_path_new}$",
       :deletable => false
     })
     contact_us_page.parts.create({
@@ -26,11 +24,11 @@ if defined?(::Refinery::Page)
     })
   end
 
-  unless Refinery::Page.where(:link_url => '/contact/thank_you').any?
+  unless Refinery::Page.where(:link_url => Refinery::Inquiries.page_path_thank_you).any?
     thank_you_page = contact_us_page.children.create({
       :title => "Thank You",
-      :link_url => "/contact/thank_you",
-      :menu_match => "^/(inquiries|contact)/thank_you$",
+      :link_url => Refinery::Inquiries.page_path_thank_you,
+      :menu_match => "^(/inquiries/thank_you)|#{Refinery::Inquiries.page_path_thank_you}$",
       :show_in_menu => false,
       :deletable => false
     })
@@ -55,6 +53,6 @@ if defined?(::Refinery::Page)
   end
 end
 
-(Refinery::Inquiries::Setting.methods.sort - ActiveRecord::Base.methods).each do |setting|
-  Refinery::Inquiries::Setting.send(setting) unless setting.to_s =~ /=$/
+(Refinery::Inquiries::Setting.methods.sort - Refinery::Setting.methods).each do |setting|
+  Refinery::Inquiries::Setting.send(setting) if setting.to_s !~ /=\z/
 end

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

@@ -13,4 +13,12 @@ Refinery::Inquiries.configure do |config|
 
   # Configure name in 'from' email address
   # config.from_name = <%= Refinery::Inquiries.from_name.inspect %>
+
+  # Configure the URLs to use for the inquiry functionality.
+  # config.post_path           = <%= Refinery::Inquiries.post_path.inspect %>
+  # config.page_path_new       = <%= Refinery::Inquiries.page_path_new.inspect %>
+  # config.page_path_thank_you = <%= Refinery::Inquiries.page_path_thank_you.inspect %>
+
+  # Toggle the spam filter
+  # config.filter_spam = <%= Refinery::Inquiries.filter_spam.inspect %>
 end

data/lib/refinery/inquiries/configuration.rb

@@ -7,11 +7,17 @@ module Refinery
     config_accessor :show_placeholders
     config_accessor :send_notifications_for_inquiries_marked_as_spam
     config_accessor :from_name
+    config_accessor :post_path, :page_path_new, :page_path_thank_you
+    config_accessor :filter_spam
 
     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"
+    self.post_path = "/contact"
+    self.page_path_new = "/contact"
+    self.page_path_thank_you = "/contact/thank_you"
+    self.filter_spam = true
   end
 end

data/lib/refinery/inquiries/engine.rb

@@ -5,19 +5,15 @@ module Refinery
 
       isolate_namespace Refinery::Inquiries
 
-      initializer "init plugin" do
+      before_inclusion do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = "refinerycms_inquiries"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.inquiries_admin_inquiries_path }
           plugin.menu_match = %r{refinery/inquiries(/.+?)?$}
-          plugin.activity = {
-            :class_name => :'refinery/inquiries/inquiry',
-            :title => 'name',
-            :url_prefix => nil,
-            :url => 'refinery.inquiries_admin_inquiries_path'
-          }
         end
+
+        Rails.application.config.assets.precompile += %w(refinery/inquiries/*)
       end
 
       config.after_initialize do

data/readme.md

@@ -2,11 +2,25 @@
 
 ![Refinery Inquiries](http://refinerycms.com/system/images/BAhbBlsHOgZmSSIqMjAxMS8wNS8wMS8wNF81MF8wMV81MDlfaW5xdWlyaWVzLnBuZwY6BkVU/inquiries.png)
 
+## About
+
+__Add a simple contact form to Refinery that notifies you and the customer when an inquiry is made.__
+
+In summary you can:
+
+* Collect and manage inquiries
+* Specify who is notified when a new inquiry comes in
+* Customise an auto responder email that is sent to the person making the inquiry
+
+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'.  This feature is optional, and can be disabled in `config/initializers/refinery/inquiries.rb` by setting `config.filter_spam = false`.
+
 ### Gem Installation using Bundler (The very best way)
 
 Include the latest [gem](http://rubygems.org/gems/refinerycms-inquiries) into your Refinery CMS application's Gemfile:
 
-    gem 'refinerycms-inquiries', '~> 2.0.0'
+```ruby
+gem 'refinerycms-inquiries', '~> 3.0.0'
+```
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 
@@ -23,19 +37,18 @@ Add pages to the database and you're done:
 
     rake db:seed
 
-## About
-
-__Add a simple contact form to Refinery that notifies you and the customer when an inquiry is made.__
+#### Optionally include the stylesheet.
 
-In summary you can:
+Next, you can include the stylesheet that improves the form's display a bit,
+and also adds an asterisk to each `required` label: `Name *` instead of `Name`.
 
-* Collect and manage inquiries
-* Specify who is notified when a new inquiry comes in
-* Customise an auto responder email that is sent to the person making the inquiry
+To do this, include it in your `application.css` manifest file and insert:
 
-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'.
+```css
+//= require refinery/inquiries/inquiries
+```
 
-## How do I setup email to be sent from GMail, SendGrid or other service?
+## How do I set up 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.
 

data/refinerycms-inquiries.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{2.1.0}
+  s.version           = %q{3.0.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}
@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency  'refinerycms-core',     '~> 2.1.0'
-  s.add_dependency  'refinerycms-settings', '~> 2.1.0'
+  s.add_dependency  'refinerycms-core',     '~> 3.0.0'
+  s.add_dependency  'refinerycms-settings', '~> 3.0.0'
   s.add_dependency  'filters_spam',         '~> 0.2'
+  s.add_dependency  'actionmailer',        '~> 4.2.4'
 end

data/spec/factories/inquiry.rb

@@ -1,7 +1,9 @@
+require "factory_girl"
+
 FactoryGirl.define do
-  factory :inquiry, :class => Refinery::Inquiries::Inquiry do
+  factory :inquiry, class: "Refinery::Inquiries::Inquiry" do
     name "Refinery"
-    email "refinery@cms.com"
+    email "refinery@example.com"
     message "Hello..."
   end
 end

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

@@ -3,8 +3,8 @@ require "spec_helper"
 module Refinery
   module Inquiries
     module Admin
-      describe Inquiry do
-        refinery_login_with :refinery_user
+      describe Inquiry, :type => :feature do
+        refinery_login
 
         let!(:inquiry) do
           FactoryGirl.create(:inquiry,
@@ -14,13 +14,13 @@ module Refinery
         end
 
         context "when no" do
-          before(:each) { Refinery::Inquiries::Inquiry.destroy_all }
+          before { Refinery::Inquiries::Inquiry.destroy_all }
 
           context "inquiries" do
             it "shows message" do
               visit refinery.inquiries_admin_inquiries_path
 
-              page.should have_content("You have not received any inquiries yet.")
+              expect(page).to have_content("You have not received any inquiries yet.")
             end
           end
 
@@ -28,24 +28,24 @@ module Refinery
             it "shows message" do
               visit refinery.spam_inquiries_admin_inquiries_path
 
-              page.should have_content("Hooray! You don't have any spam.")
+              expect(page).to have_content("Hooray! You don't have any spam.")
             end
           end
         end
 
         describe "action links" do
-          before(:each) { visit refinery.inquiries_admin_inquiries_path }
+          before { visit refinery.inquiries_admin_inquiries_path }
 
           specify "in the side pane" do
             within "#actions" do
-              page.should have_content("Inbox")
-              page.should have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries']")
-              page.should have_content("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::Core.backend_route}/inquiries/settings/inquiry_notification_recipients/edit']")
-              page.should have_content("Edit confirmation email")
-              page.should have_selector("a[href*='/#{Refinery::Core.backend_route}/inquiries/settings/inquiry_confirmation_body/edit']")
+              expect(page).to have_content("Inbox")
+              expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries']")
+              expect(page).to have_content("Spam")
+              expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries/spam']")
+              expect(page).to have_content("Update who gets notified")
+              expect(page).to have_selector("a[href*='/#{Refinery::Core.backend_route}/inquiries/settings/inquiry_notification_recipients/edit']")
+              expect(page).to have_content("Edit confirmation email")
+              expect(page).to have_selector("a[href*='/#{Refinery::Core.backend_route}/inquiries/settings/inquiry_confirmation_body/edit']")
             end
           end
         end
@@ -54,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 a...")
+            expect(page).to have_content("David Jones said Hello, I really like your website. Was it hard to build a...")
           end
         end
 
@@ -64,14 +64,14 @@ module Refinery
 
             click_link "Read the inquiry"
 
-            page.should have_content("From David Jones [dave@refinerycms.com]")
-            page.should have_content("Hello, I really like your website. Was it hard to build and maintain or could anyone do it?")
+            expect(page).to have_content("From David Jones [dave@refinerycms.com]")
+            expect(page).to have_content("Hello, I really like your website. Was it hard to build and maintain or could anyone do it?")
             within "#actions" do
-              page.should have_content("Age")
-              page.should have_content("Back to all 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::Core.backend_route}/inquiries/#{inquiry.id}']")
+              expect(page).to have_content("Age")
+              expect(page).to have_content("Back to all Inquiries")
+              expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries']")
+              expect(page).to have_content("Remove this inquiry forever")
+              expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/inquiries/#{inquiry.id}']")
             end
           end
         end
@@ -82,8 +82,8 @@ module Refinery
 
             click_link "Remove this inquiry forever"
 
-            page.should have_content("'#{inquiry.name}' was successfully removed.")
-            Refinery::Inquiries::Inquiry.count.should == 0
+            expect(page).to have_content("'#{inquiry.name}' was successfully removed.")
+            expect(Refinery::Inquiries::Inquiry.count).to eq(0)
           end
         end
 
@@ -94,52 +94,41 @@ module Refinery
             click_link "Mark as spam"
 
             within "#actions" do
-              page.should have_content("Spam (1)")
+              expect(page).to have_content("Spam (1)")
               click_link "Spam (1)"
             end
 
-            page.should have_content("David Jones said Hello, I really like your website. Was it hard to build a...")
+            expect(page).to have_content("David Jones said Hello, I really like your website. Was it hard to build a...")
           end
         end
 
         describe "update who gets notified" do
-          before do
-            Rails.cache.clear
-            Refinery::Inquiries::Setting.notification_recipients
-          end
-
           it "sets receiver", :js => true do
             visit refinery.inquiries_admin_inquiries_path
-
-            click_link "Update who gets notified"
+            find("#update_notified").trigger('click')
 
             within_frame "dialog_iframe" do
               fill_in "setting_value", :with => "phil@refinerycms.com"
               click_button "submit_button"
             end
 
-            page.should have_content("Notification Recipients was successfully updated.")
+            expect(page).to have_content("Notification Recipients was successfully updated.")
           end
         end
 
         describe "updating confirmation email copy" do
-          before do
-            Rails.cache.clear
-            Refinery::Inquiries::Setting.confirmation_body
-          end
-
           it "sets message", :js => true do
             visit refinery.inquiries_admin_inquiries_path
 
-            click_link "Edit confirmation email"
+            find("#edit_confirmation_email").trigger('click')
 
             within_frame "dialog_iframe" do
-              fill_in "subject__en", :with => "subject"
-              fill_in "message__en", :with => "message"
+              fill_in "setting[subject[en]]", :with => "subject"
+              fill_in "setting[message[en]]", :with => "message"
               click_button "Save"
             end
 
-            page.should have_content("Confirmation Body was successfully updated.")
+            expect(page).to have_content("Confirmation Body was successfully updated.")
           end
         end