cmor_contact 0.0.22.pre → 0.0.24.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803ba5a0f92427e28777816d997dbaeb105f846b467ce3a2d30e860bdc65d746
-  data.tar.gz: c03ac052dbc9a261870a0a2535684a810de04a7e388a30e01cecdb0ad5292f10
+  metadata.gz: ea727270a88c7923f18f3f6a1354d2c9fc32c882eabc52ff93df201ac62435c7
+  data.tar.gz: 1078c68eab0268de613f5eb892a841ca6496b9b2aa7524e97f500597eebc543d
 SHA512:
-  metadata.gz: 9e0b764ad4b75264c589777cacbb9d7932353cd42a66701d41dd408970a1c5284f89d10eff9168b31c2b0fc8dc9a37eec8a4a01e66d6be83c88687d2901267f4
-  data.tar.gz: e1d55abe19034afa5b9a30ed19d3ac183bd0e974b7d7955a6d8aeaa6f98552d78affeccb7d4bbc94720793e1ce74dca572f6232da7bdab2ae71eab338dbda9f3
+  metadata.gz: d5336588ccc13ecfa76f5cde8f81adf8ff4aa715169b9335a6fa5d00a86aa3501c72d033b02bc859593ad003228aa9c954d30f6ac4bf7e80280de6d9b051410f
+  data.tar.gz: ca483a14745c5754753560f201d83ecc439e20a655027b43ac9b2114d001947e80128e124a5c816197e7ef1725b7649733aad2ba96fc0697dc0a85b733757dca

data/app/controllers/cmor/contact/contact_requests_controller.rb

@@ -46,7 +46,11 @@ module Cmor
       end
 
       def permitted_params
-        params.require(:contact_request).permit(:nickname, :name, :email, :phone, :message, :accept_terms_of_service)
+        # Allow only available attributes and add nickname for spam protection.
+        attrs = (
+          resource_class.attribute_names.map(&:to_sym) & [:nickname, :name, :email, :phone, :subject, :message, :accept_terms_of_service]
+        ) + [:nickname]
+        params.require(:contact_request).permit(attrs)
       end
 
       def after_create_url

data/app/models/cmor/contact/contact_request.rb

@@ -1,8 +1,28 @@
 module Cmor::Contact
   class ContactRequest < ApplicationRecord
+    module SubjectConcern
+      extend ActiveSupport::Concern
+
+      included do
+        validates :subject, presence: true
+      end
+    end
+
+    module PhoneConcern
+      extend ActiveSupport::Concern
+
+      included do
+        validates :phone, presence: true
+      end
+    end
+
+    Configuration.contact_request_include_modules.call.each do |mod|
+      include mod
+    end
+
     validates :name, presence: true
     validates :email, presence: true
-    validates :phone, presence: true
+    
     validates :ip_address, presence: true
     validates :message, presence: true
     validates :accept_terms_of_service, acceptance: true

data/app/views/cmor/contact/contact_requests/{_form.haml → _form.html.haml}

@@ -1,6 +1,7 @@
 = form.input :name
 = form.input :email
 = form.input :nickname, input_html: { style: 'display: none;' }, label_html: { style: 'display: none;' }
-= form.input :phone
+= form.input :phone if form.object.respond_to?(:phone)
+= form.input :subject if form.object.respond_to?(:subject)
 = form.input :message, as: :text
 = form.input :accept_terms_of_service

data/config/locales/de.yml

@@ -47,4 +47,5 @@ de:
         name: "Max Mustermann"
         email: "max.mustermann@example.com"
         message: "Meine Nachricht"
-        phone: "+49 69 12345678"
+        phone: "+49 69 12345678"
+        subject: "Meine Anfrage"

data/lib/cmor/contact/configuration.rb

@@ -51,6 +51,10 @@ module Cmor
       mattr_accessor :after_create_url do
         ->(controller) { controller.root_path }
       end
+
+      mattr_accessor :contact_request_include_modules do
+        ->() { [Cmor::Contact::ContactRequest::PhoneConcern] }
+      end
     end
   end
 end

data/lib/generators/cmor/contact/install/templates/initializer.rb

@@ -84,4 +84,15 @@ Cmor::Contact.configure do |config|
   # default: config.sender = ->(mail_form) { %("#{mail_form.name}" <#{mail_form.email}>) }
   # 
   config.sender = ->(mail_form) { %("#{mail_form.name}" <#{mail_form.email}>) }
+
+  # Modules listed here will be included in Cmor::Contact::ContactRequest.
+  #
+  # Available modules are:
+  #
+  # - Cmor::Contact::ContactRequest::PhoneConcern
+  # - Cmor::Contact::ContactRequest::SubjectConcern
+  #
+  # Default: config.contact_request_include_modules = ->() { [Cmor::Contact::ContactRequest::PhoneConcern] }
+  #
+  config.contact_request_include_modules = ->() { [Cmor::Contact::ContactRequest::PhoneConcern] }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_contact
 version: !ruby/object:Gem::Version
-  version: 0.0.22.pre
+  version: 0.0.24.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22.pre
+        version: 0.0.24.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22.pre
+        version: 0.0.24.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22.pre
+        version: 0.0.24.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.22.pre
+        version: 0.0.24.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -316,9 +316,9 @@ files:
 - app/models/cmor/contact/contact_request.rb
 - app/views/cmor/contact/contact_request_mailer/notify.html.haml
 - app/views/cmor/contact/contact_request_mailer/notify.text.erb
-- app/views/cmor/contact/contact_requests/_form.haml
+- app/views/cmor/contact/contact_requests/_form.html.haml
 - app/views/cmor/contact/contact_requests/_form_errors.haml
-- app/views/cmor/contact/contact_requests/new.haml
+- app/views/cmor/contact/contact_requests/new.html.haml
 - app/views/layouts/cmor/contact/application.html.erb
 - app/views/layouts/cmor/contact/mailer.html.erb
 - app/views/layouts/cmor/contact/mailer.text.erb