refinerycms-inquiries 2.0.0 → 2.0.1

data/Gemfile

@@ -5,9 +5,8 @@ gemspec
 gem 'refinerycms', '~> 2.0.0'
 
 group :development, :test do
-  require 'rbconfig'
-
   gem 'refinerycms-testing', '~> 2.0.0'
+  gem 'guard-rspec', '~> 0.6.0'
 
   platforms :jruby do
     gem 'activerecord-jdbcsqlite3-adapter'
@@ -29,13 +28,14 @@ group :development, :test do
   end
 
   platforms :ruby do
-    gem 'spork', '0.9.0.rc9'
+    gem 'spork', '~> 0.9.0.rc'
     gem 'guard-spork'
 
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
         gem 'rb-fsevent', '>= 0.3.9'
-        gem 'growl',      '~> 1.0.3'
+        gem 'ruby_gntp'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'
@@ -47,8 +47,9 @@ group :development, :test do
 
   platforms :jruby do
     unless ENV['TRAVIS']
+      require 'rbconfig'
       if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'growl',      '~> 1.0.3'
+        gem 'ruby_gntp'
       end
       if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => "--format Fuubar --color --drb" do
+guard 'rspec', :version => 2, :cli => "--color" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }

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

@@ -1,53 +1,43 @@
 module Refinery
   module Inquiries
     module Admin
-      class SettingsController < ::Refinery::AdminController
+      class SettingsController < Refinery::AdminController
 
-        crudify :'refinery/setting',
-                :title_attribute => "name",
-                :order => 'name ASC',
-                :redirect_to_url => 'refinery.inquiries_admin_inquiries_path'
+        before_filter :check_setting, :only => [:edit, :update]
+        after_filter :save_subject_for_confirmation, :save_message_for_confirmation, :only => :update
 
-        before_filter :set_url_override?, :only => [:edit, :update]
-        after_filter :save_subject_for_confirmation?, :only => :update
-        after_filter :save_message_for_confirmation?, :only => :update
-        around_filter :rewrite_flash?, :only => :update
+        def edit
+          @setting = Refinery::Setting.find(params[:id])
+        end
 
-        protected
+        def update
+          @setting = Refinery::Setting.find(params[:id])
 
-        def rewrite_flash?
-          yield
+          if @setting.update_attributes(params[:setting])
+            flash[:notice] = t('refinery.crudify.updated', :what => @setting.name.gsub("inquiry_", "").titleize)
 
-          flash[:notice] = flash[:notice].to_s.gsub(/(\'.*\')/) {|m| m.titleize}.gsub('Inquiry ', '')
+            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
         end
 
-        def save_subject_for_confirmation?
-          Refinery::Inquiries::Setting.confirmation_subject = params[:subject] if params.keys.include?('subject')
-        end
+      protected
 
-        def save_message_for_confirmation?
-          Refinery::Inquiries::Setting.confirmation_message = params[:message] if params.keys.include?('message')
-        end
+        def check_setting
+          setting = params[:id].gsub("inquiry_", "")
 
-        def set_url_override?
-          @url_override = refinery.inquiries_admin_setting_path(@setting, :dialog => from_dialog?)
+          Refinery::Inquiries::Setting.send(setting) if Refinery::Inquiries::Setting.respond_to?(setting)
         end
 
-        def find_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] = Refinery::Setting.find(params[:id]).name.to_s
-            end
-          rescue
-          end
-
-          # prime the setting first, if it's valid.
-          if Refinery::Inquiries::Setting.methods.map(&:to_sym).include?(params[:id].to_s.gsub('inquiry_', '').to_sym)
-            Refinery::Inquiries::Setting.send(params[:id].to_s.gsub('inquiry_', '').to_sym)
-          end
+        def save_subject_for_confirmation
+          Refinery::Inquiries::Setting.confirmation_subject = params[:subject] if params.keys.include?('subject')
+        end
 
-          @setting = Refinery::Setting.find_by_name(params[:id])
+        def save_message_for_confirmation
+          Refinery::Inquiries::Setting.confirmation_message = params[:message] if params.keys.include?('message')
         end
 
       end

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

@@ -1,4 +1,4 @@
-<%= form_for @setting, :url => (@url_override || @url) do |f| %>
+<%= form_for @setting, :url => refinery.inquiries_admin_setting_path(@setting) do |f| %>
 
   <p>
     <%= t('.explanation') %>

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

@@ -1,4 +1,4 @@
-<%= form_for @setting, :url => (@url_override || @url) do |f| %>
+<%= form_for @setting, :url => refinery.inquiries_admin_setting_path(@setting) do |f| %>
 
   <div class='field'>
     <span class='label_with_help'>

data/config/locales/nl.yml

@@ -2,7 +2,8 @@ nl:
   refinery:
     plugins:
       refinerycms_inquiries:
-        title: Contact aanvragen
+        title: Contactaanvragen
+        description: Contactformulier en beheer van vragen
     inquiries:
       inquiries:
         new:
@@ -20,10 +21,10 @@ nl:
             inbox: Inbox
             spam: Spam
             update_notified: Wijzig wie op de hoogte wordt gesteld van vragen
-            edit_confirmation_email: Bewerk bevestigings email
+            edit_confirmation_email: Bewerk bevestigings-e-mail
           index:
             no_inquiries: Je hebt nog geen vragen ontvangen.
-            no_spam: Jeej! Je hebt geen spam.
+            no_spam: Hoera! Je hebt geen spam.
           show:
             details: Details
             age: Leeftijd
@@ -34,44 +35,43 @@ nl:
             inquiry: Vraag
             to: Aan
             from: Van
-            click_to_email: Klik hier om een e-mail te sturen
+            click_to_email: Klik hier om een e-mail te sturen naar dit adres
             phone: Telefoonnummer
             date: Datum
             message: Bericht
         settings:
           notification_recipients_form:
             inquiry_settings_value_name: Stuur notificaties naar
-            explanation: "Iedere keer wanneer iemand het vraag formulier invult op uw website, stuurt Refinery een email waarin staat dat er een nieuwe vraag ontvangen is."
-            hint: "Vul hierboven een email adres in. Wilt u naar meerdere adressen notificaties sturen? Vul dan meerdere email adressen in gescheiden door comma's"
+            hint: "Wilt u naar meerdere adressen notificaties sturen? Vul dan meerdere e-mailadressen in gescheiden door komma's"
             example: "Bijvoorbeeld: ik@domein.com, vrienden@msn.com, collegas@werk.com"
           confirmation_email_form:
             to: Aan
             from: Van
             subject: Onderwerp
             click_to_edit_subject: Klik hier om het onderwerp bewerken
-            explanation: "Iedere keer wanneer iemand het vraag formulier invult op uw website, stuurt Refinery een email naar die persoon waarin staat dat de vraag ontvangen is."
-            below_edit_email_sent: Hieronder kun je de email die verzonden wordt bewerken.
+            explanation: "Telkens wanneer iemand het contactformulier invult op je website, stuurt Refinery een bevestiging naar de verzender."
+            below_edit_email_sent: Hieronder kun je de e-mail die verzonden wordt bewerken.
             the_customer_making_inquiry: De persoon die de heeft vraag gesteld
             message: Bericht
-            note: "Notitie: plaats de tekst %name% overal in je email waar je de naam van de vragende persoon wilt invoegen"
+            note: "N.B.: plaats de tekst %name% overal in de e-mail waar je de naam van de vragende persoon wilt invoegen"
       inquiry_mailer:
         notification:
           greeting: Hallo
-          you_recieved_new_inquiry: Je hebt een nieuwe vraag via de website ontvangen.
-          inquiry_starts: --- begin van de vraag---
-          inquiry_ends: --- einde van de vraag---
+          you_recieved_new_inquiry: Je hebt een nieuwe vraag ontvangen via je website.
+          inquiry_starts: --- begin van de vraag ---
+          inquiry_ends: --- einde van de vraag ---
           from: Van
-          email: Email
+          email: E-mail
           phone: Telefoon
           message: Bericht
-          closing_line: Vriendelijke groeten,
-          ps: P.S. Alle vragen woren opgeslagen in de "vragen" sectie van uw website.All your inquiries are stored in the "Inquiries" section of Refinery.
-    activerecord:
+          closing_line: Met vriendelijk groet,
+          ps: P.S. Alle vragen woren opgeslagen in de sectie "Contactaanvragen" van Refinery.
+  activerecord:
     models:
       refinery/inquiry: Vraag
     attributes:
       refinery/inquiry:
         name: Naam
-        email: 'Email'
+        email: 'E-mail'
         phone: Telefoon
         message: Bericht

data/db/seeds.rb

@@ -14,11 +14,13 @@ if defined?(::Refinery::Page)
     })
     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>"
+      :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>",
+      :position => 0
     })
     contact_us_page.parts.create({
       :title => "Side Body",
-      :body => ""
+      :body => "",
+      :position => 1
     })
   end
 
@@ -32,7 +34,8 @@ if defined?(::Refinery::Page)
     })
     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>"
+      :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>",
+      :position => 0
     })
   end
 
@@ -44,7 +47,12 @@ if defined?(::Refinery::Page)
     })
     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>"
+      :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>",
+      :position => 0
     })
   end
 end
+
+(Refinery::Inquiries::Setting.methods.sort - ActiveRecord::Base.methods).each do |setting|
+  Refinery::Inquiries::Setting.send(setting) unless setting.to_s =~ /=$/
+end

data/readme.md

@@ -17,10 +17,11 @@ Then type the following at command line inside your Refinery CMS application's r
 To install the migrations, run:
 
     rails generate refinery:inquiries
-
-Next migrate your database and you're done:
-
     rake db:migrate
+    
+Add pages to the database and you're done:
+
+    rake db:seed
 
 ## About
 

data/refinerycms-inquiries.gemspec

@@ -1,6 +1,8 @@
+# Encoding: UTF-8
+
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{2.0.0}
+  s.version           = %q{2.0.1}
   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.}
@@ -15,7 +17,4 @@ Gem::Specification.new do |s|
   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/requests/refinery/inquiries/admin/inquiries_spec.rb

@@ -101,37 +101,47 @@ module Refinery
           end
         end
 
-=begin
-      describe "update who gets notified" do
-        it "sets receiver", :js => true do
-          visit refinery.inquiries_admin_inquiries_path
+        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"
+            click_link "Update who gets notified"
 
-          within_frame "dialog_iframe" do
-            fill_in "Send notifications to", :with => "phil@refinerycms.com"
-            click_button "Save"
-          end
+            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.")
+            page.should have_content("Notification Recipients was successfully updated.")
+          end
         end
-      end
 
-      describe "updating confirmation email copy" do
-        it "sets message", :js => true do
-          visit refinery.inquiries_admin_inquiries_path
+        describe "updating confirmation email copy" do
+          before do
+            Rails.cache.clear
+            Refinery::Inquiries::Setting.confirmation_body
+          end
 
-          click_link "Edit confirmation email"
+          it "sets message", :js => true do
+            visit refinery.inquiries_admin_inquiries_path
 
-          within_frame "dialog_iframe" do
-            fill_in "Message", :with => "Thanks %name%! We'll never get back to you!"
-            click_button "Save"
-          end
+            click_link "Edit confirmation email"
+
+            within_frame "dialog_iframe" do
+              fill_in "subject__en", :with => "subject"
+              fill_in "message__en", :with => "message"
+              click_button "Save"
+            end
 
-          page.should have_content("'Confirmation Body' was successfully updated.")
+            page.should have_content("Confirmation Body was successfully updated.")
+          end
         end
-      end
-=end
+
       end
     end
   end

metadata

@@ -1,96 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-inquiries
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 2.0.1
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
 platform: ruby
-authors: 
+authors:
 - Philip Arndt
-- "U\xC4\xA3is Ozols"
+- Uģis Ozols
 - David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: refinerycms-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: refinerycms-settings
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: refinerycms-settings
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: filters_spam
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: filters_spam
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: refinerycms-testing
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    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.
+      - !ruby/object:Gem::Version
+        version: '0.2'
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -155,38 +132,29 @@ files:
 - tasks/rspec.rake
 homepage: http://refinerycms.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 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