refinerycms-inquiries 1.0.1 → 2.0.0

data/config/locales/zh-CN.yml

@@ -1,74 +1,76 @@
 zh-CN:
-  plugins:
-    refinery_inquiries:
-      title: 咨询
-      description: 提供一个联系表单与保存咨询
-  inquiries:
-    new:
-      send: 发送消息
-      privacy_policy: 我们珍视您的隐私
-  admin:
+  refinery:
+    plugins:
+      refinerycms_inquiries:
+        title: 咨询
+        description: 提供一个联系表单与保存咨询
     inquiries:
-      delete: 永久删除此咨询
-      inquiry:
-        read_inquiry: 阅读此咨询
-        said: 说
-        mark_as_spam: 标记为垃圾邮件
-        mark_as_ham: 移到收件箱
-      submenu:
-        inbox: 收件箱
-        spam: 垃圾邮件
-        update_notified: 更新通知名单
-        edit_confirmation_email: 编辑确认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: 信息
-    inquiry_settings:
-      notification_recipients_form:
-        inquiry_settings_value_name: 发送通知到
-        hint: 当收到新的咨询时，Refinery将会发一封email通知你.
-        example: "输入你的email地址如: jack@work.com, jill@office.com"
-      confirmation_email_form:
-        to: 到
-        from: 从
-        subject: 标题
-        click_to_edit_subject: 点击这里编辑标题
-        explanation: 每当有人在网站上联系你, Refinery发送出一封email去确认发送者的身份.
-        below_edit_email_sent: 你可以在下面编辑你要发出去的email.
-        the_customer_making_inquiry: 客户正在写咨询
-        message: 信息
-        note: "注意: 把你的客户名字在电子邮件出现的位置以文字 %name% 做替换"
-  inquiry_mailer:
-    notification:
-      greeting: 您好
-      you_recieved_new_inquiry: 你刚从你的网站收到一条新的咨询.
-      inquiry_starts: --- 咨询开始处 ---
-      inquiry_ends: --- 咨询结束处 ---
-      from: 表单
-      email: email
-      phone: 电话
-      message: 信息
-      closing_line: 谨致问候
-      ps: 附言 您所有的咨询被保存在“咨询”区域以便于你在日后查看.
-  activerecord:
+      inquiries:
+        new:
+          send: 发送消息
+          privacy_policy: 我们珍视您的隐私
+      admin:
+        inquiries:
+          delete: 永久删除此咨询
+          inquiry:
+            read_inquiry: 阅读此咨询
+            said: 说
+            mark_as_spam: 标记为垃圾邮件
+            mark_as_ham: 移到收件箱
+          submenu:
+            inbox: 收件箱
+            spam: 垃圾邮件
+            update_notified: 更新通知名单
+            edit_confirmation_email: 编辑确认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: 当收到新的咨询时，Refinery将会发一封email通知你.
+            example: "输入你的email地址如: jack@work.com, jill@office.com"
+          confirmation_email_form:
+            to: 到
+            from: 从
+            subject: 标题
+            click_to_edit_subject: 点击这里编辑标题
+            explanation: 每当有人在网站上联系你, Refinery发送出一封email去确认发送者的身份.
+            below_edit_email_sent: 你可以在下面编辑你要发出去的email.
+            the_customer_making_inquiry: 客户正在写咨询
+            message: 信息
+            note: "注意: 把你的客户名字在电子邮件出现的位置以文字 %name% 做替换"
+      inquiry_mailer:
+        notification:
+          greeting: 您好
+          you_recieved_new_inquiry: 你刚从你的网站收到一条新的咨询.
+          inquiry_starts: --- 咨询开始处 ---
+          inquiry_ends: --- 咨询结束处 ---
+          from: 表单
+          email: email
+          phone: 电话
+          message: 信息
+          closing_line: 谨致问候
+          ps: 附言 您所有的咨询被保存在“咨询”区域以便于你在日后查看.
+    activerecord:
     models:
-      inquiry: inquiry
+      refinery/inquiry: inquiry
     attributes:
-      inquiry:
+      refinery/inquiry:
         name: 姓名
         email: email
         phone: 联系电话

data/config/routes.rb

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

data/db/migrate/20101208082840_create_inquiries.rb

@@ -1,42 +1,24 @@
 class CreateInquiries < ActiveRecord::Migration
-  def self.up
-    unless ::Inquiry.table_exists?
-      create_table ::Inquiry.table_name, :force => true do |t|
-        t.string   "name"
-        t.string   "email"
-        t.string   "phone"
-        t.text     "message"
-        t.integer  "position"
-        t.boolean  "open",       :default => true
-        t.datetime "created_at"
-        t.datetime "updated_at"
-        t.boolean  "spam",       :default => false
+  def up
+    unless ::Refinery::Inquiries::Inquiry.table_exists?
+      create_table :refinery_inquiries_inquiries, :force => true do |t|
+        t.string   :name
+        t.string   :email
+        t.string   :phone
+        t.text     :message
+        t.boolean  :spam,     :default => false
+        t.timestamps
       end
 
-      add_index ::Inquiry.table_name, :id
+      add_index :refinery_inquiries_inquiries, :id
     end
-
-    # todo: remove at 1.0
-    create_table ::InquirySetting.table_name, :force => true do |t|
-      t.string   "name"
-      t.text     "value"
-      t.boolean  "destroyable"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end unless ::InquirySetting.table_exists?
-
-    ::Page.reset_column_information if defined?(::Page)
-
-    load(Rails.root.join('db', 'seeds', 'pages_for_inquiries.rb').to_s)
   end
 
-  def self.down
-     drop_table ::Inquiry.table_name
-     # todo: remove at 1.0
-     drop_table ::InquirySetting.table_name
-     
-     ::Page.delete_all({
+  def down
+     drop_table ::Refinery::Inquiries::Inquiry.table_name
+
+     ::Refinery::Page.delete_all({
        :link_url => ("/contact" || "/contact/thank_you")
-     }) if defined?(::Page)
+     }) if defined?(::Refinery::Page)
   end
-end
+end

data/db/seeds.rb

@@ -0,0 +1,50 @@
+::Refinery::User.all.each do |user|
+  if user.plugins.where(:name => 'refinery_inquiries').blank?
+    user.plugins.create(:name => "refinery_inquiries")
+  end
+end if defined?(::Refinery::User)
+
+if defined?(::Refinery::Page)
+  unless Refinery::Page.where(:link_url => '/contact').any?
+    contact_us_page = ::Refinery::Page.create({
+      :title => "Contact",
+      :link_url => "/contact",
+      :menu_match => "^/(inquiries|contact).*$",
+      :deletable => false
+    })
+    contact_us_page.parts.create({
+      :title => "Body",
+      :body => "<p>Get in touch with us. Just use the form below and we'll get back to you as soon as we can.</p>"
+    })
+    contact_us_page.parts.create({
+      :title => "Side Body",
+      :body => ""
+    })
+  end
+
+  unless Refinery::Page.where(:link_url => '/contact/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$",
+      :show_in_menu => false,
+      :deletable => false
+    })
+    thank_you_page.parts.create({
+      :title => "Body",
+      :body => "<p>We've received your inquiry and will get back to you with a response shortly.</p><p><a href='/'>Return to the home page</a></p>"
+    })
+  end
+
+  unless Refinery::Page.by_title('Privacy Policy').any?
+    privacy_policy_page = contact_us_page.children.create({
+      :title => "Privacy Policy",
+      :deletable => true,
+      :show_in_menu => false
+    })
+    privacy_policy_page.parts.create({
+      :title => "Body",
+      :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
+    })
+  end
+end

data/lib/generators/refinery/inquiries/inquiries_generator.rb

@@ -0,0 +1,19 @@
+module Refinery
+  class InquiriesGenerator < Rails::Generators::Base
+    def rake_db
+      rake("refinery_inquiries:install:migrations")
+      rake("refinery_settings:install:migrations")
+    end
+
+    def append_load_seed_data
+      create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
+      append_file 'db/seeds.rb', :verbose => true do
+        <<-EOH
+
+# Added by Refinery CMS Inquiries engine
+Refinery::Inquiries::Engine.load_seed
+        EOH
+      end
+    end
+  end
+end

data/lib/refinery/inquiries/configuration.rb

@@ -0,0 +1,9 @@
+module Refinery
+  module Inquiries
+    include ActiveSupport::Configurable
+
+    config_accessor :show_contact_privacy_link
+
+    self.show_contact_privacy_link = true
+  end
+end

data/lib/refinery/inquiries/engine.rb

@@ -0,0 +1,28 @@
+module Refinery
+  module Inquiries
+    class Engine < Rails::Engine
+      include Refinery::Engine
+
+      isolate_namespace Refinery::Inquiries
+
+      initializer "init plugin" 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
+      end
+
+      config.after_initialize do
+        Refinery.register_engine(Refinery::Inquiries)
+      end
+    end
+  end
+end

data/lib/refinery/inquiries.rb

@@ -0,0 +1,26 @@
+require 'refinerycms-core'
+require 'refinerycms-settings'
+require 'filters_spam'
+
+module Refinery
+  autoload :InquiriesGenerator, 'generators/refinery/inquiries/inquiries_generator'
+
+  module Inquiries
+    require 'refinery/inquiries/engine'
+    require 'refinery/inquiries/configuration'
+
+    autoload :Version, 'refinery/inquiries/version'
+
+    class << self
+      attr_writer :root
+
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join("spec/factories").to_s ]
+      end
+    end
+  end
+end

data/lib/refinerycms-inquiries.rb

@@ -1,23 +1 @@
-require File.expand_path('../inquiries', __FILE__)
-
-module Refinery
-  module Inquiries
-    class Engine < Rails::Engine
-      config.to_prepare do
-        require 'filters_spam'
-      end
-
-      config.after_initialize do
-        Refinery::Plugin.register do |plugin|
-          plugin.name = "refinery_inquiries"
-          plugin.directory = "inquiries"
-          plugin.menu_match = /(refinery|admin)\/inquir(ies|y_settings)$/
-          plugin.activity = {
-            :class => InquirySetting,
-            :title => 'name'
-          }
-        end
-      end
-    end
-  end
-end
+require 'refinery/inquiries'

data/readme.md

@@ -6,17 +6,17 @@
 
 Include the latest [gem](http://rubygems.org/gems/refinerycms-inquiries) into your Refinery CMS application's Gemfile:
 
-    gem 'refinerycms-inquiries', '~> 1.0.0'
+    gem 'refinerycms-inquiries', '~> 2.0.0'
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 
     bundle install
 
-#### Installation on Refinery 0.9.9 or above.
+#### Installation on Refinery 2.0.0 or above.
 
 To install the migrations, run:
 
-    rails generate refinerycms_inquiries
+    rails generate refinery:inquiries
 
 Next migrate your database and you're done:
 
@@ -40,4 +40,12 @@ Go into your 'Inquiries' tab in the Refinery admin area and click on "Update who
 
 ## How do I Edit the Automatic Confirmation Email
 
-Go into your 'Inquiries' tab in the Refinery admin area and click on "Edit confirmation email"
+Go into your 'Inquiries' tab in the Refinery admin area and click on "Edit confirmation email"
+
+## Help! How do I send emails from no-reply@domain.com.au instead of no-reply@com.au?
+
+Simply set the following in config/application.rb:
+
+```ruby
+config.action_dispatch.tld_length = 2
+```

data/refinerycms-inquiries.gemspec

@@ -1,96 +1,21 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{1.0.1}
-  s.date              = %q{2011-05-28}
+  s.version           = %q{2.0.0}
+  s.date              = "#{Date.today.strftime("%Y-%m-%d")}"
   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           = ["Resolve Digital"]
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones']
   s.require_paths     = %w(lib)
 
-  s.files             = [
-    'app',
-    'app/controllers',
-    'app/controllers/admin',
-    'app/controllers/admin/inquiries_controller.rb',
-    'app/controllers/admin/inquiry_settings_controller.rb',
-    'app/controllers/inquiries_controller.rb',
-    'app/helpers',
-    'app/helpers/inquiries_helper.rb',
-    'app/mailers',
-    'app/mailers/inquiry_mailer.rb',
-    'app/models',
-    'app/models/inquiry.rb',
-    'app/models/inquiry_setting.rb',
-    'app/views',
-    'app/views/admin',
-    'app/views/admin/inquiries',
-    'app/views/admin/inquiries/_inquiry.html.erb',
-    'app/views/admin/inquiries/_submenu.html.erb',
-    'app/views/admin/inquiries/index.html.erb',
-    'app/views/admin/inquiries/show.html.erb',
-    'app/views/admin/inquiry_settings',
-    'app/views/admin/inquiry_settings/_confirmation_email_form.html.erb',
-    'app/views/admin/inquiry_settings/_notification_recipients_form.html.erb',
-    'app/views/admin/inquiry_settings/edit.html.erb',
-    'app/views/inquiries',
-    'app/views/inquiries/new.html.erb',
-    'app/views/inquiries/thank_you.html.erb',
-    'app/views/inquiry_mailer',
-    'app/views/inquiry_mailer/confirmation.html.erb',
-    'app/views/inquiry_mailer/notification.html.erb',
-    'config',
-    'config/locales',
-    'config/locales/cs.yml',
-    'config/locales/da.yml',
-    'config/locales/de.yml',
-    'config/locales/en-GB.yml',
-    'config/locales/en.yml',
-    'config/locales/es.yml',
-    'config/locales/fr.yml',
-    'config/locales/it.yml',
-    'config/locales/lolcat.yml',
-    'config/locales/lt.yml',
-    'config/locales/lv.yml',
-    'config/locales/nb.yml',
-    'config/locales/nl.yml',
-    'config/locales/pl.yml',
-    'config/locales/pt-BR.yml',
-    'config/locales/ru.yml',
-    'config/locales/sk.yml',
-    'config/locales/sl.yml',
-    'config/locales/sv.yml',
-    'config/locales/zh-CN.yml',
-    'config/routes.rb',
-    'db',
-    'db/migrate',
-    'db/migrate/20101208082840_create_inquiries.rb',
-    'db/migrate/20101208082841_remove_position_and_open_from_inquiries.rb',
-    'db/seeds',
-    'db/seeds/pages_for_inquiries.rb',
-    'features',
-    'features/create_inquiries.feature',
-    'features/manage_inquiries.feature',
-    'features/step_definitions',
-    'features/step_definitions/inquiry_steps.rb',
-    'features/support',
-    'features/support/factories.rb',
-    'features/support/paths.rb',
-    'lib',
-    'lib/gemspec.rb',
-    'lib/generators',
-    'lib/generators/refinerycms_inquiries_generator.rb',
-    'lib/inquiries.rb',
-    'lib/refinerycms-inquiries.rb',
-    'license.md',
-    'readme.md',
-    'refinerycms-inquiries.gemspec',
-    'spec',
-    'spec/models',
-    'spec/models/inquiry_spec.rb'
-  ]
-  s.require_path = 'lib'
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency('filters_spam', '~> 0.2')
+  s.add_dependency  'refinerycms-core',     '~> 2.0.1'
+  s.add_dependency  'refinerycms-settings', '~> 2.0.1'
+  s.add_dependency  'filters_spam',         '~> 0.2'
+
+  # Development dependencies
+  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
 end

data/spec/factories/inquiry.rb

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

data/spec/models/refinery/inquiries/inquiry_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+module Refinery
+  module Inquiries
+    describe Inquiry do
+      describe "validations" do
+        subject do
+          Factory.build(:inquiry,
+                        :name => "Ugis Ozols",
+                        :email => "ugis.ozols@refinerycms.com",
+                        :message => "Hey, I'm testing!")
+        end
+
+        it { should be_valid }
+        its(:errors) { should be_empty }
+        its(:name) { should == "Ugis Ozols" }
+        its(:email) { should == "ugis.ozols@refinerycms.com" }
+        its(:message) { should == "Hey, I'm testing!" }
+      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 = Refinery::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) }
+          Refinery::Inquiries::Inquiry.last.toggle!(:spam)
+          Refinery::Inquiries::Inquiry.latest.length.should == 7
+        end
+
+        it "returns latest 7 inquiries including spam ones" do
+          4.times { Factory(:inquiry) }
+          3.times { Factory(:inquiry) }
+          Refinery::Inquiries::Inquiry.all[0..2].each { |inquiry| inquiry.toggle!(:spam) }
+          Refinery::Inquiries::Inquiry.latest(7, true).length.should == 7
+        end
+
+        it "returns latest n inquiries" do
+          4.times { Factory(:inquiry) }
+          Refinery::Inquiries::Inquiry.latest(3).length.should == 3
+        end
+      end
+    end
+  end
+end