isaca-rails 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dde20172b97d248b8e2e00fb9c46eaf43cea9a6db696ea1b9c417b6ef81f8d2
-  data.tar.gz: 7a0b3892c71331f8ff528ee72106b5479d59e1656dd7d99556312677bccd68f2
+  metadata.gz: 7afe3c204bc4c58d289096a6bd76b3361f1aeb73ff76f7c6c16d7867183dcd3e
+  data.tar.gz: b627a1002caab316552a2f8084e4fb9a17527c1567496ae5c6d4c388a5155f3f
 SHA512:
-  metadata.gz: 8ab36a1da69542c74981be964c30384570c886ade06124a9cda4c7c89da06612c50127988262660e01f4f04f4fc7607a798cd285bdefd9dc2e2a5a19d3f152a6
-  data.tar.gz: 6708f386489b9c44282c17d29affb64b5a0a42076baaf1412a11fcaee1cba1607464b49e3cd44e826486891546527883ae39129bafb754cee4bba8365eb45cc3
+  metadata.gz: fb8446322b9a69b9318683bcc8891eb46a69a7b194ffdd071b136c21cd788fd7982366668a3aa48c0cc1ab3ae25ad74b30c84d5705ffc6d4ce44dff87a6dd53c
+  data.tar.gz: 507b7488b1eaa633c0087e2950ae60cb9a8af0dba73e5bd1ceeeff874e286ef74013474f7d3fb4971f1160da1e99259a63a34dd3f3adb3fb4f14579a94288477

data/app/controllers/isaca/rails/users_consent_controller.rb

@@ -8,8 +8,17 @@ class Isaca::Rails::UsersConsentController < Isaca::Rails::ApplicationController
   def create
     @form_object = UserConsent::Agreement::FormObject.new(agreement_params)
 
-    if @form_object.report_consent(current_isaca_user.imis_id)
-      flash.notice = t('isaca.rails.user_consent.consent_submitted')
+    if @form_object.valid?
+      response = Isaca::Request::ReportConsent.get(current_isaca_user.imis_id, current_isaca_user.email, {
+          marketing: agreement_params[:marketing_policy]
+      })
+
+      if response
+        flash.notice = t('isaca.rails.user_consent.consent_submitted')
+      else
+        flash.alert = t('isaca.rails.user_consent.consent_failed')
+      end
+
       redirect_after_sign_in_or(root_path)
     else
       render :show

data/app/models/user_consent/agreement/form_object.rb

@@ -1,25 +1,11 @@
 module UserConsent
   module Agreement
-    # Form object used for handling user consent
     class FormObject
       include ActiveModel::Model
 
       attr_accessor :privacy_policy, :marketing_policy
-      validates_acceptance_of :privacy_policy, allow_nil: false
-      validates_presence_of :marketing_policy
-
-
-      # Method used to report user consent of the privacy policy and marketing
-      #
-      # @param options [Hash] Optional. If not provided, marketing consent will default to NO [0].
-      #
-      # == Options
-      # [marketing] Consent for marketing. Acceptable values are 0 [for NO] and 1 [for YES].
-      #
-      # @return [Boolean] Whether or not the consent was successfully reported to ISACA
-      def report_consent(imis_id, options={})
-        Isaca::Request::ReportConsent.get(imis_id, options).success? if valid?
-      end
+      validates :privacy_policy, acceptance: {accept: %w(0 1)}, allow_nil: false
+      validates :marketing_policy, acceptance: {accept: %w(0 1)}, allow_nil: false
 
       # Defining this method allows us to use some ActiveModel patterns. For example, forms will be identified
       # as sign_in instead of session_sign_in_form_object.

data/config/locales/isaca-rails.en.yml

@@ -14,6 +14,7 @@ en:
       user_consent:
         consent_required: Your consent is required before proceeding.
         consent_submitted: You have successfully updated your privacy policy and marketing preferences.
+        consent_failed: An error occurred that prevented you from submitting your consent form.
       administrators:
         email_not_found: Could not find a record with the provided email.
         created: Administrator was successfully created.

data/lib/isaca/rails/version.rb

@@ -1,5 +1,5 @@
 module Isaca
   module Rails
-    VERSION = '0.4.7'
+    VERSION = '0.4.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Matthew Orahood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -303,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Summary of Isaca::Rails.