web47core 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa375c6bafd6b9e61b9944bbb5720b5d2653ce2a1f62b393c94cd0e77e8750a
-  data.tar.gz: 2d99bb9412b0238e93af0605437648c7e274112f8a310c61e46c4d6f4fb87217
+  metadata.gz: e480097cdfea5056f5b2a510cbfe10ff47e27166751a1dfb269c60f2ac6dee32
+  data.tar.gz: 43ef160463a3b082c7840d9f6dc003d2acff45cf981d6c8caa7a9fdf0a5392d6
 SHA512:
-  metadata.gz: 2196b166a60920eeb4059a465a5c7c1d95cfe57752b5dbe454c0c703417aa63dff8e0a1ee6e7c773bfe8c7b3233f4dc6ddbda1b9a68c057035cf549ed8ad21bd
-  data.tar.gz: 99b4df58e4996d70c3fe399d3892824cfaaf3d3380f20338f753bc2e80453480db6fecae99bdec2782bab128f0b26c2694a5c2660602ad84f9963321a61d03b0
+  metadata.gz: 4a13cce11223eb01510f2a98ba33c66c71ee0850e57bc6476e130dc5c2ceb1a98be8d09174e30ae93521aff9a029f14c57a2a3422779d30b4be2649c473918bf
+  data.tar.gz: 95d123e80b3ed0ef34d6573a572c8a896ae8bee252f60a6809bc1ac83fd8ca45b15e0be51e21207b0b837ad1bfb2947d72c4bbd04bf77bd8b77d3344a10e0299

data/README.md

@@ -10,22 +10,22 @@ Core components used commonly among all web apps for both App47 and RedMonocle
 
 ## Requirements
 
-*   Ruby 2.7.0
+*   Ruby 3.0.2
 
 ### Working with Bundler and RBENV
 
 This project manages [RBENV](https://github.com/rbenv/rbenv) and manages dependencies via [Bundler](http://gembundler.com/).
 
 You must first [install RBENV](https://github.com/rbenv/rbenv#installation).
-Then install Ruby 2.7.0 via RBENV
+Then install Ruby 3.0.2 via RBENV
 ``` shell script
-rbenv install 2.7.0
+rbenv install 3.0.2
 ```
 You'll now notice that this project (as well as other App47 ones) contains a .ruby-version file, which is executed upon opening the project's root directory in a terminal (and IDE's like RubyMine). The .ruby-version file simply states `2.7.0` which tells RBENV to ensure the Ruby version to use for this project is 2.7.0.
 
-Please note, your Ruby `2.7.0` version might need bundler installed:
+Please note, your Ruby `3.0.2` version might need bundler installed:
 ``` shell script
-gem install bundler -v 2.1.4
+gem install bundler -v 2.5.4
 ``` 
 
 To set up this project's dependencies, which are defined in the file, `Gemfile`, you should first run
@@ -188,7 +188,9 @@ The following routes should be added to the correct namespace for your applicait
     #
     # System configuration
     #
-    resource :system_configurations, only: %i[edit update show]
+    resource :system_configurations, only: %i[edit update show] do
+      get :sync
+    end
     #
     # Delayed jobs
     #

data/app/views/system_configurations/_show.html.haml

@@ -7,6 +7,7 @@
           .card-title=SystemConfiguration.environment.titleize
           .card-tray
             = edit_link_tag(SystemConfiguration, class_action_path(:edit))
+            = replay_link_tag(SystemConfiguration, class_action_path(:sync))
       .card
         .card-content.section-data-tables
           %table.highlight.striped.data-table
@@ -15,7 +16,7 @@
                 =table_header_tag :field
                 =table_header_tag :value
             %tbody
-              - SystemConfiguration.allowed_param_names.each do |field|
+              - SystemConfiguration.allowed_param_names.sort.each do |field|
                 %tr
                   %td=field
                   %td=mask_system_configuration(field)

data/lib/app/controllers/concerns/core_system_configuration_controller.rb

@@ -10,15 +10,26 @@ module CoreSystemConfigurationsController
   # Edit the system configuration
   #
   def edit
-    load_configuration
+    system_configuration
+  end
+
+  # @abstract Cause the system configuration to be synced with the switchboard server
+  def sync
+    raise 'System Configuration not configured to sync' unless SystemConfiguration.switchboard_configured?
+
+    Cron::SwitchboardSyncConfiguration.perform_later
+    flash[:info] = 'System Configuration Refreshing in the Background'
+    redirect_to index_path
+  rescue StandardError => error
+    log_controller_error error, true
+    redirect_to index_path
   end
 
   #
   # Update and log the system configuration changes
   #
   def update
-    # @system_configuration.update_attributes_and_log! @current_admin_user, system_configuration_params
-    SystemConfiguration.configuration.update! system_configuration_params
+    system_configuration.update! system_configuration_params
     if SystemConfiguration.switchboard_configured?
       flash[:info] = 'System Configuration Updated, sync job running in the background'
       Cron::SwitchboardSyncConfiguration.perform_later
@@ -28,7 +39,7 @@ module CoreSystemConfigurationsController
     redirect_to index_path
   rescue StandardError => error
     log_controller_error error
-    load_configuration
+    system_configuration
     render :edit
   end
 
@@ -44,7 +55,7 @@ module CoreSystemConfigurationsController
   #
   # Load the current system configuration
   #
-  def load_configuration
+  def system_configuration
     @system_configuration = SystemConfiguration.configuration
   end
 end

data/lib/app/models/concerns/aws_configuration.rb

@@ -15,6 +15,7 @@ module AwsConfiguration
       field :aws_access_key_id, type: String
       field :aws_secret_access_key, type: String
       field :aws_auto_scaling_group_name, type: String
+      field :aws_bucket_name, type: String
     end
   end
 
@@ -22,7 +23,7 @@ module AwsConfiguration
   # Make sure the password doesn't get blanked out on an update
   #
   def secure_fields
-    super + %i[aws_access_secret]
+    super + %i[aws_secret_access_key]
   end
 
   #
@@ -38,4 +39,28 @@ module AwsConfiguration
   def aws_auto_scaling_configured?
     aws_configured? && aws_auto_scaling_group_name.present?
   end
+
+  #
+  # AWS client.
+  #
+  def aws_ec2_client
+    return nil unless aws_configured?
+
+    @aws_ec2_client ||= Aws::EC2::Client.new(region: aws_region,
+                                             credentials: Aws::Credentials.new(aws_access_key_id,
+                                                                               aws_secret_access_key))
+  end
+
+  #
+  # S3 Client
+  #
+  def aws_s3_client
+    return nil unless aws_configured?
+
+    # We want this to remake itself each time because it is possible that the
+    # => user would change the access keys in between actions. Huh?
+    @aws_s3_client ||= Aws::S3::Client.new(region: aws_region,
+                                           access_key_id: aws_access_key_id,
+                                           secret_access_key: aws_secret_access_key)
+  end
 end

data/lib/app/models/concerns/cdn_url.rb

@@ -17,14 +17,9 @@
 #
 module CdnUrl
   extend ActiveSupport::Concern
-  #
-  # Constants
-  #
-  STYLE_S3_FILE_PATH = ':class/:attachment/:id/:style.:extension' unless defined? STYLE_S3_FILE_PATH
-  STYLE_FILE_PATH = 'public/system/:class/:attachment/:id/:style.:extension' unless defined? STYLE_FILE_PATH
-  STYLE_S3_FILE_URL = ':s3_domain_url' unless defined? STYLE_S3_FILE_URL
-  STYLE_FILE_URL = ':rails_root/public/system/:class/:attachment/:id/:style.:extension' unless defined? STYLE_FILE_URL
 
+  # @abstract Catch methods started with `cdn_` and respond to those requests if there is a 
+  # matching method ending in `_url`
   def method_missing(method, *args)
     if method.to_s.start_with? 'cdn_'
       url = if args.blank?

data/lib/app/models/concerns/google_sso_configuration.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+#
+# Google SSO Configuration
+#
+module GoogleSsoConfiguration
+  extend ActiveSupport::Concern
+
+  def self.included(base)
+    base.class_eval do
+      #
+      # Fields
+      #
+      field :google_client_id, type: String
+      field :google_client_secret, type: String
+    end
+  end
+
+  #
+  # Make sure the password doesn't get blanked out on an update
+  #
+  def secure_fields
+    super + %i[google_client_secret]
+  end
+
+  #
+  # Determine if AWS is configured
+  #
+  def google_sso_configured?
+    google_client_id.present? && google_client_secret.present?
+  end
+end

data/lib/app/models/concerns/standard_model.rb

@@ -69,7 +69,7 @@ module StandardModel
       names = field_names(filter_names)
       names += associations if include_relationships
       names.delete_if { |name| filter_names.include?(name) }
-    rescue StandardError => error
+    rescue StandardError
       attribute_names.delete_if { |name| filter_names.include?(name) }
     end
 

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/lib/web47core.rb

@@ -9,6 +9,7 @@ require 'app/models/concerns/cdn_url'
 require 'app/models/concerns/delayed_job_configuration'
 require 'app/models/concerns/email_able'
 require 'app/models/concerns/encrypted_password'
+require 'app/models/concerns/google_sso_configuration'
 require 'app/models/concerns/search_able'
 require 'app/models/concerns/role_able'
 require 'app/models/concerns/time_zone_able'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.5.2
+        version: 8.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.5.2
+        version: 8.1.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -646,6 +646,7 @@ files:
 - lib/app/models/concerns/delayed_job_configuration.rb
 - lib/app/models/concerns/email_able.rb
 - lib/app/models/concerns/encrypted_password.rb
+- lib/app/models/concerns/google_sso_configuration.rb
 - lib/app/models/concerns/role_able.rb
 - lib/app/models/concerns/search_able.rb
 - lib/app/models/concerns/secure_fields.rb