refinerycms-inquiries 1.0.1 → 2.0.0

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

@@ -0,0 +1,138 @@
+require "spec_helper"
+
+module Refinery
+  module Inquiries
+    module Admin
+      describe Inquiry do
+        login_refinery_user
+
+        let!(:inquiry) do
+          Factory(:inquiry, :name => "David Jones",
+                            :email => "dave@refinerycms.com",
+                            :message => "Hello, I really like your website.  Was it hard to build and maintain or could anyone do it?")    
+        end
+
+        context "when no" do
+          before(:each) { 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.")
+            end
+          end
+
+          context "spam inquiries" do
+            it "shows message" do
+              visit refinery.spam_inquiries_admin_inquiries_path
+
+              page.should have_content("Hooray! You don't have any spam.")
+            end
+          end
+        end
+
+        describe "action links" do
+          before(:each) { 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/inquiries']")
+              page.should have_content("Spam")
+              page.should have_selector("a[href='/refinery/inquiries/spam']")
+              page.should have_content("Update who gets notified")
+              page.should have_selector("a[href*='/refinery/inquiries/settings/inquiry_notification_recipients/edit']")
+              page.should have_content("Edit confirmation email")
+              page.should have_selector("a[href*='/refinery/inquiries/settings/inquiry_confirmation_body/edit']")
+            end
+          end
+        end
+
+        describe "index" do
+          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 ...")
+          end
+        end
+
+        describe "show" do
+          it "shows inquiry details" do
+            visit refinery.inquiries_admin_inquiries_path
+
+            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?")
+            within "#actions" do
+              page.should have_content("Age")
+              page.should have_content("Back to all Inquiries")
+              page.should have_selector("a[href='/refinery/inquiries']")
+              page.should have_content("Remove this inquiry forever")
+              page.should have_selector("a[href='/refinery/inquiries/#{inquiry.id}']")
+            end
+          end
+        end
+
+        describe "destroy" do
+          it "removes inquiry" do
+            visit refinery.inquiries_admin_inquiries_path
+
+            click_link "Remove this inquiry forever"
+
+            page.should have_content("'#{inquiry.name}' was successfully removed.")
+            Refinery::Inquiries::Inquiry.count.should == 0
+          end
+        end
+
+        describe "spam" do
+          it "moves inquiry to spam" do
+            visit refinery.inquiries_admin_inquiries_path
+
+            click_link "Mark as spam"
+
+            within "#actions" do
+              page.should 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 ...")
+          end
+        end
+
+=begin
+      describe "update who gets notified" do
+        it "sets receiver", :js => true do
+          visit refinery.inquiries_admin_inquiries_path
+
+          click_link "Update who gets notified"
+
+          within_frame "dialog_iframe" do
+            fill_in "Send notifications to", :with => "phil@refinerycms.com"
+            click_button "Save"
+          end
+
+          page.should have_content("'Notification Recipients' was successfully updated.")
+        end
+      end
+
+      describe "updating confirmation email copy" do
+        it "sets message", :js => true do
+          visit refinery.inquiries_admin_inquiries_path
+
+          click_link "Edit confirmation email"
+
+          within_frame "dialog_iframe" do
+            fill_in "Message", :with => "Thanks %name%! We'll never get back to you!"
+            click_button "Save"
+          end
+
+          page.should have_content("'Confirmation Body' was successfully updated.")
+        end
+      end
+=end
+      end
+    end
+  end
+end

data/spec/requests/refinery/inquiries/inquiries_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+module Refinery
+  module Inquiries
+    describe "inquiries" do
+      before(:each) do
+        Factory(:refinery_user)
+
+        # load in seeds we use in migration
+        Refinery::Inquiries::Engine.load_seed
+      end
+
+      context "when valid data" do
+        it "is successful" do
+          visit refinery.inquiries_new_inquiry_path
+
+          fill_in "Name", :with => "Ugis Ozols"
+          fill_in "Email", :with => "ugis.ozols@refinerycms.com"
+          fill_in "Message", :with => "Hey, I'm testing!"
+          click_button "Send message"
+
+          page.current_path.should == refinery.thank_you_inquiries_inquiries_path
+          page.should have_content("Thank You")
+
+          within "#body_content" do
+            page.should have_content("We've received your inquiry and will get back to you with a response shortly.")
+            page.should have_content("Return to the home page")
+            page.should have_selector("a[href='/']")
+          end
+
+          Refinery::Inquiries::Inquiry.count.should == 1
+        end
+      end
+
+      context "when invalid data" do
+        it "is not successful" do
+          visit refinery.inquiries_new_inquiry_path
+
+          click_button "Send message"
+
+          page.current_path.should == refinery.inquiries_new_inquiry_path
+          page.should have_content("There were problems with the following fields")
+          page.should have_content("Name can't be blank")
+          page.should have_content("Email is invalid")
+          page.should have_content("Message can't be blank")
+          page.should have_no_content("Phone can't be blank")
+
+          Refinery::Inquiries::Inquiry.count.should == 0
+        end
+      end
+
+      describe "privacy" do
+        context "when show contact privacy link setting set to false" do
+          before(:each) do
+            Refinery::Inquiries.stub(:show_contact_privacy_link).and_return(false)
+          end
+
+          it "won't show link" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_no_content("We value your privacy")
+            page.should have_no_selector("a[href='/pages/privacy-policy']")
+          end
+        end
+
+        context "when show contact privacy link setting set to true" do
+          before(:each) do
+            Refinery::Inquiries.config.stub(:show_contact_privacy_link).and_return(true)
+          end
+
+          it "shows the link" do
+            visit refinery.inquiries_new_inquiry_path
+
+            page.should have_content("We value your privacy")
+            page.should have_selector("a[href='/pages/privacy-policy']")
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,56 @@
+require 'rubygems'
+
+def setup_environment
+  # Configure Rails Environment
+  ENV["RAILS_ENV"] ||= 'test'
+
+  require File.expand_path("../dummy/config/environment", __FILE__)
+
+  require 'rspec/rails'
+  require 'capybara/rspec'
+  require 'factory_girl_rails'
+
+  Rails.backtrace_cleaner.remove_silencers!
+
+  RSpec.configure do |config|
+    config.mock_with :rspec
+    config.treat_symbols_as_metadata_keys_with_true_values = true
+    config.filter_run :focus => true
+    config.run_all_when_everything_filtered = true
+  end
+
+  # set javascript driver for capybara
+  Capybara.javascript_driver = :selenium
+end
+
+def each_run
+  ActiveSupport::Dependencies.clear
+
+  FactoryGirl.reload
+
+  # Requires supporting files with custom matchers and macros, etc,
+  # in ./support/ and its subdirectories including factories.
+  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+  }.flatten.sort.each do |support_file|
+    require support_file
+  end
+end
+
+# If spork is available in the Gemfile it'll be used but we don't force it.
+unless (begin; require 'spork'; rescue LoadError; nil end).nil?
+  Spork.prefork do
+    # Loading more in this block will cause your tests to run faster. However,
+    # if you change any configuration or code from libraries loaded here, you'll
+    # need to restart spork for it take effect.
+    setup_environment
+  end
+
+  Spork.each_run do
+    # This code will be run each time you run your specs.
+    each_run
+  end
+else
+  setup_environment
+  each_run
+end

data/tasks/rspec.rake

@@ -0,0 +1,4 @@
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

metadata

@@ -1,29 +1,87 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 1.0.1
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-- Resolve Digital
+- Philip Arndt
+- "U\xC4\xA3is Ozols"
+- David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 +12:00
-default_executable: 
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: filters_spam
+  name: refinerycms-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.2"
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: refinerycms-settings
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: filters_spam
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: refinerycms-testing
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id004
 description: Inquiry handling functionality extracted from Refinery CMS to allow you to have a contact form and manage inquiries in the Refinery backend.
 email: info@refinerycms.com
 executables: []
@@ -33,24 +91,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/controllers/admin/inquiries_controller.rb
-- app/controllers/admin/inquiry_settings_controller.rb
-- app/controllers/inquiries_controller.rb
-- app/helpers/inquiries_helper.rb
-- app/mailers/inquiry_mailer.rb
-- app/models/inquiry.rb
-- app/models/inquiry_setting.rb
-- 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/_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/new.html.erb
-- app/views/inquiries/thank_you.html.erb
-- app/views/inquiry_mailer/confirmation.html.erb
-- app/views/inquiry_mailer/notification.html.erb
+- .gitignore
+- .travis.yml
+- Gemfile
+- Guardfile
+- Rakefile
+- app/assets/stylesheets/refinery/inquiries/inquiries.css.scss
+- app/controllers/refinery/inquiries/admin/inquiries_controller.rb
+- app/controllers/refinery/inquiries/admin/settings_controller.rb
+- app/controllers/refinery/inquiries/inquiries_controller.rb
+- app/helpers/refinery/inquiries/inquiries_helper.rb
+- app/mailers/refinery/inquiries/inquiry_mailer.rb
+- app/models/refinery/inquiries/inquiry.rb
+- app/models/refinery/inquiries/setting.rb
+- app/views/refinery/inquiries/admin/inquiries/_inquiry.html.erb
+- app/views/refinery/inquiries/admin/inquiries/_submenu.html.erb
+- app/views/refinery/inquiries/admin/inquiries/index.html.erb
+- app/views/refinery/inquiries/admin/inquiries/show.html.erb
+- app/views/refinery/inquiries/admin/settings/_confirmation_email_form.html.erb
+- app/views/refinery/inquiries/admin/settings/_notification_recipients_form.html.erb
+- app/views/refinery/inquiries/admin/settings/edit.html.erb
+- app/views/refinery/inquiries/inquiries/new.html.erb
+- app/views/refinery/inquiries/inquiries/thank_you.html.erb
+- app/views/refinery/inquiries/inquiry_mailer/confirmation.text.erb
+- app/views/refinery/inquiries/inquiry_mailer/notification.text.erb
+- config/locales/bg.yml
 - config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml
@@ -73,22 +138,21 @@ files:
 - config/locales/zh-CN.yml
 - config/routes.rb
 - db/migrate/20101208082840_create_inquiries.rb
-- db/migrate/20101208082841_remove_position_and_open_from_inquiries.rb
-- db/seeds/pages_for_inquiries.rb
-- 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/generators/refinerycms_inquiries_generator.rb
-- lib/inquiries.rb
+- db/seeds.rb
+- lib/generators/refinery/inquiries/inquiries_generator.rb
+- lib/refinery/inquiries.rb
+- lib/refinery/inquiries/configuration.rb
+- lib/refinery/inquiries/engine.rb
 - lib/refinerycms-inquiries.rb
 - license.md
 - readme.md
 - refinerycms-inquiries.gemspec
-- spec/models/inquiry_spec.rb
-has_rdoc: true
+- spec/factories/inquiry.rb
+- spec/models/refinery/inquiries/inquiry_spec.rb
+- spec/requests/refinery/inquiries/admin/inquiries_spec.rb
+- spec/requests/refinery/inquiries/inquiries_spec.rb
+- spec/spec_helper.rb
+- tasks/rspec.rake
 homepage: http://refinerycms.com
 licenses: []
 
@@ -102,19 +166,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Inquiry handling functionality for the Refinery CMS project.
-test_files: []
-
+test_files: 
+- spec/factories/inquiry.rb
+- spec/models/refinery/inquiries/inquiry_spec.rb
+- spec/requests/refinery/inquiries/admin/inquiries_spec.rb
+- spec/requests/refinery/inquiries/inquiries_spec.rb
+- spec/spec_helper.rb
+has_rdoc: 

data/app/controllers/admin/inquiries_controller.rb

@@ -1,41 +0,0 @@
-class Admin::InquiriesController < Admin::BaseController
-
-  crudify :inquiry, :title_attribute => "name", :order => "created_at DESC"
-  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]
-
-  def index
-    @inquiries = @inquiries.with_query(params[:search]) if searching?
-    @inquiries = @inquiries.paginate({:page => params[:page]})
-  end
-
-  def spam
-    self.index
-    render :action => 'index'
-  end
-
-  def toggle_spam
-    find_inquiry
-    @inquiry.toggle!(:spam)
-
-    redirect_to :back
-  end
-
-protected
-
-  def find_all_ham
-    @inquiries = Inquiry.ham
-  end
-
-  def find_all_spam
-    @inquiries = Inquiry.spam
-  end
-
-  def get_spam_count
-    @spam_count = Inquiry.count(:conditions => {:spam => true})
-  end
-
-end

data/app/controllers/admin/inquiry_settings_controller.rb

@@ -1,43 +0,0 @@
-class Admin::InquirySettingsController < Admin::BaseController
-
-  crudify :refinery_setting,
-          :title_attribute => "name",
-          :order => 'name ASC',
-          :redirect_to_url => "admin_inquiries_url"
-
-  before_filter :set_url_override?, :only => [:edit, :update]
-  after_filter :save_subject_for_confirmation?, :only => :update
-  around_filter :rewrite_flash?, :only => :update
-
-protected
-  def rewrite_flash?
-    yield
-
-    flash[:notice] = flash[:notice].to_s.gsub(/(\'.*\')/) {|m| m.titleize}.gsub('Inquiry ', '')
-  end
-
-  def save_subject_for_confirmation?
-    InquirySetting.confirmation_subject = params[:subject] if params.keys.include?('subject')
-  end
-
-  def set_url_override?
-    @url_override = admin_inquiry_setting_url(@refinery_setting, :dialog => from_dialog?)
-  end
-
-  def find_refinery_setting
-    # ensure that we're dealing with the name of the setting, not the id.
-    begin
-      if params[:id].to_i.to_s == params[:id]
-        params[:id] = RefinerySetting.find(params[:id]).name.to_s
-      end
-    rescue
-    end
-
-    # prime the setting first, if it's valid.
-    if InquirySetting.methods.map(&:to_sym).include?(params[:id].to_s.gsub('inquiry_', '').to_sym)
-      InquirySetting.send(params[:id].to_s.gsub('inquiry_', '').to_sym)
-    end
-    @refinery_setting = RefinerySetting.find_by_name(params[:id])
-  end
-
-end

data/app/controllers/inquiries_controller.rb

@@ -1,43 +0,0 @@
-class InquiriesController < ApplicationController
-
-  before_filter :find_page, :only => [:create, :new]
-
-  def thank_you
-    @page = Page.find_by_link_url("/contact/thank_you", :include => [:parts, :slugs])
-  end
-
-  def new
-    @inquiry = Inquiry.new
-  end
-
-  def create
-    @inquiry = Inquiry.new(params[:inquiry])
-
-    if @inquiry.save
-      if @inquiry.ham?
-        begin
-          InquiryMailer.notification(@inquiry, request).deliver
-        rescue
-          logger.warn "There was an error delivering an inquiry notification.\n#{$!}\n"
-        end
-
-        begin
-          InquiryMailer.confirmation(@inquiry, request).deliver
-        rescue
-          logger.warn "There was an error delivering an inquiry confirmation:\n#{$!}\n"
-        end
-      end
-
-      redirect_to thank_you_inquiries_url
-    else
-      render :action => 'new'
-    end
-  end
-
-protected
-
-  def find_page
-    @page = Page.find_by_link_url('/contact', :include => [:parts, :slugs])
-  end
-
-end

data/app/helpers/inquiries_helper.rb

@@ -1,2 +0,0 @@
-module InquiriesHelper
-end

data/app/mailers/inquiry_mailer.rb

@@ -1,20 +0,0 @@
-class InquiryMailer < ActionMailer::Base
-
-  def confirmation(inquiry, request)
-    subject     InquirySetting.confirmation_subject
-    recipients  inquiry.email
-    from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
-    reply_to    InquirySetting.notification_recipients.split(',').first
-    sent_on     Time.now
-    @inquiry =  inquiry
-  end
-
-  def notification(inquiry, request)
-    subject     InquirySetting.notification_subject
-    recipients  InquirySetting.notification_recipients
-    from        "\"#{RefinerySetting[:site_name]}\" <no-reply@#{request.domain(RefinerySetting.find_or_set(:tld_length, 1))}>"
-    sent_on     Time.now
-    @inquiry =  inquiry
-  end
-
-end

data/app/models/inquiry.rb

@@ -1,21 +0,0 @@
-class Inquiry < ActiveRecord::Base
-
-  filters_spam :message_field => :message,
-               :email_field => :email,
-               :author_field => :name,
-               :other_fields => [:phone],
-               :extra_spam_words => %w()
-
-  validates :name, :presence => true
-  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' # previously scope :newest
-
-  def self.latest(number = 7, include_spam = false)
-    include_spam ? limit(number) : ham.limit(number)
-  end
-
-end