web47core 3.0.6 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbf563d268d3c25ec2ba1540e27d5f77a9f4fed603af60fe3df228c9602b7fe
-  data.tar.gz: f9d437cf587ee5a8f1bb94dd60fa72c0fa85c41631fa227bbf9126a115290a8e
+  metadata.gz: f759927404c37d2d4f513dbe6b08c02862507ede8891616c60768c4e8ef499d0
+  data.tar.gz: 83f86c5af7d98984438f593ebe2302ff713d45f861512b94a161102d517fc6c4
 SHA512:
-  metadata.gz: 2b4d177b124ca3ac3b7deabd7806cb5709650b73bef53291d48ba633df57f5a78168d8b3e41d513f7b888c6e974fb43f800fa47b531ece5206ba23a0fc5ea868
-  data.tar.gz: e3a6bd746aaf41640d07646e4241d22d64206cd3f083b002081cd95977fdba93634c732981b259c8c82b4feeed2b29343a0190d743b6cf657f8fef1b000401cb
+  metadata.gz: d7b4e3b27b3fdfd671cc6c13dda7124add31753bd1daffe5e26d09a53b0981cce749ee50682b46b290e54d906681b900629d69745e18bad1a90d108f507b6662
+  data.tar.gz: 82270b9fc47c61a4f24b80abaa3fffef06d881b674d3a5156fb36e41ae82cddbeab8c6a4aa94e17cb38b357974cd101dc2d71237a6ebd86e7ed61b801a3243cf

data/README.md

@@ -10,20 +10,20 @@ Core components used commonly among all web apps for both App47 and RedMonocle
 
 ## Requirements
 
-*   Ruby 3.0.2
+*   Ruby 3.2.3
 
 ### 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 3.0.2 via RBENV
+Then install Ruby 3.2.3 via RBENV
 ``` shell script
-rbenv install 3.0.2
+rbenv install 3.2.3
 ```
 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 `3.0.2` version might need bundler installed:
+Please note, your Ruby `3.2.3` version might need bundler installed:
 ``` shell script
 gem install bundler -v 2.5.4
 ``` 

data/app/controllers/status_controller.rb

@@ -17,7 +17,7 @@ class StatusController < ActionController::Base
 
     respond_to do |format|
       format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
-      format.json { render json: components.to_json, status: db_status(components)  }
+      format.json { render json: components.to_json, status: db_status(components) }
       format.text { render plain: components.flatten, status: db_status(components) }
     end
   end
@@ -102,7 +102,7 @@ class StatusController < ActionController::Base
               else
                 0
               end
-    report_success "#{count} Jobs", count: count, job_age: job_age
+    report_success("#{count} Jobs", { count: count, job_age: job_age })
   rescue StandardError => error
     report_error(error)
   end

data/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative "../config/boot"
+require "rake"
+Rake.application.run

data/bin/setup

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require "fileutils"
+
+# path to your application root.
+APP_ROOT = File.expand_path("..", __dir__)
+
+def system!(*args)
+  system(*args, exception: true)
+end
+
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
+
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! "bin/rails log:clear tmp:clear"
+
+  puts "\n== Restarting application server =="
+  system! "bin/rails restart"
+end

data/config/application.rb

@@ -0,0 +1,61 @@
+# require File.expand_path('../../config/environment', __FILE__)
+# Load the Rails application.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+
+require 'rails'
+
+%w[
+  action_controller/railtie
+  action_view/railtie
+  action_mailer/railtie
+  active_job/railtie
+  action_cable/engine
+  rails/test_unit/railtie
+  sprockets/railtie
+].each do |railtie|
+  require railtie
+rescue LoadError => error
+  puts 'Unable to load libraries'
+  puts error.message
+end
+
+require 'haml'
+require 'mail'
+require 'cancancan'
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module WebCore
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+    # Configure redis cache
+    config.eager_load = false
+    config.cache_store = :redis_cache_store, { url: 'redis://127.0.0.1:6379/11' }
+    config.autoload_paths += %W[#{config.root}/lib]
+    config.generators do |g|
+      g.template_engine :haml
+      g.orm :mongoid
+      g.test_framework :shoulda
+      g.fallbacks[:shoulda] = :test_unit
+      g.fixture_replacement :factory_bot
+    end
+    config.active_job.queue_adapter = :delayed_job
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = 'utf-8'
+    config.logger = Logger.new($stdout)
+    config.logger.level = Logger::DEBUG
+  end
+end
+
+Delayed::Worker.delay_jobs = false
+
+# Initialize the Rails application.
+Rails.application.initialize!
+Rails.application.config.filter_parameters += %w[password password_confirmation]

data/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/lib/app/jobs/application_job.rb

@@ -36,7 +36,7 @@ class ApplicationJob < ActiveJob::Base
   #
   def self.valid_environment?
     my_environments = valid_environments
-    (my_environments.empty? || my_environments.include?(Rails.env))
+    my_environments.empty? || my_environments.include?(Rails.env)
   end
 
   #

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

@@ -20,7 +20,7 @@ module ApiTokenable
       index({ api_token: 1 }, background: true)
 
       def cycle_api_token
-        self.set api_token: SecureRandom.urlsafe_base64
+        set api_token: SecureRandom.urlsafe_base64
         api_token
       end
 

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

@@ -1,9 +1,3 @@
-begin
-  require 'email_format'
-rescue LoadError
-  raise "You need to add gem 'email_format' to your Gemfile if you wish to use it."
-end
-
 #
 # Objects that emails can be sent too...
 #
@@ -21,7 +15,7 @@ module EmailAble
       #
       # Validations
       #
-      validates :email, email_format: { strict: true }, allow_blank: true
+      validates :email, email_format: { strict: true, allow_blank: true }
       #
       # Callbacks
       #
@@ -91,7 +85,7 @@ module EmailAble
   private
 
   #
-  # Make sure emails are always downcased
+  # Make sure emails are always down cased
   #
   def downcase_email
     self.email = email.strip.downcase if email.present?

data/lib/app/validators/email_format_validator.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Verify the email is a valid email format based on RFC8222
+class EmailFormatValidator < ActiveModel::EachValidator
+  #
+  # RFC822, obsolete and more lax in most cases
+  #
+  # CTL         =  <any ASCII control           ; (  0- 37,  0.- 31.)
+  # SPACE       =  <ASCII SP, space>            ; (     40,      32.)
+  # specials    =  "(" / ")" / "<" / ">" / "@"  ; Must be in quoted-
+  #             /  "," / ";" / ":" / "\" / <">  ;  string, to use
+  #             /  "." / "[" / "]"              ;  within a word.
+  # atom        =  1*<any CHAR except specials, SPACE and CTLs>
+  #
+  # qtext       =  <any CHAR excepting <">,     ; => may be folded "\" & CR, and including linear-white-space>
+  # quoted-pair =  "\" CHAR                     ; may quote any char
+  # quoted-string = <"> *(qtext/quoted-pair) <">; Regular qtext or quoted chars.
+  # word        =  atom / quoted-string
+  #
+  # local-part  =  word *("." word)             ; uninterpreted
+  #
+  # domain-ref  =  atom                         ; symbolic reference
+  # sub-domain  =  domain-ref / domain-literal
+  # domain      =  sub-domain *("." sub-domain)
+  #
+  # addr-spec   =  local-part "@" domain        ; global address
+  #
+
+  ctl = '\x00-\x1f'
+  space = ' '
+  specials = '\(\)\<\>\@\,\;\:\\\"\.\[\]'
+  atom = "[^#{ctl}#{space}#{specials}]+?"
+  dot_atom = "#{atom}(?:\.#{atom})*" # in common use, allowed by RFC2822
+
+  qtext = '[^\"\`]+'
+  quoted_pair = '\\.'
+  quoted_string = "\"(?:#{qtext}|#{quoted_pair})+?\""
+  word = "(?:#{dot_atom}|#{quoted_string})"
+
+  local_part = word # ignore word[.word]
+
+  domain_ref = dot_atom
+  domain_literal = "\[#{atom}(?:[\.\:]#{atom})*\]" # only used for IPv4/IPv6 addresses
+  sub_domain = "(?:#{domain_ref}|#{domain_literal})"
+  domain = sub_domain
+
+  addr_spec = "#{local_part}\@#{domain}"
+
+  addr_ws = "\s*(#{addr_spec})\s*"
+  addr_list = "^#{addr_ws}(?:,#{addr_ws})*$"
+
+  EMAIL_ADDRESS_REGEX = /#{addr_list}/
+
+  def validate_each(record, attribute, value)
+    return if valid_email?(value, options[:strict])
+    record.errors.add(attribute, message: options[:message] || 'is invalid')
+  end
+
+  def valid_email?(email, strict = false)
+    if strict
+      !!(email =~ EMAIL_ADDRESS_REGEX)
+    else
+      !!(email =~ /^[\S&&[^@]]+@[\S&&[^@]]+$/)
+    end
+  end
+end

data/lib/web47core/version.rb

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

data/lib/web47core.rb

@@ -72,7 +72,6 @@ require 'app/models/user_audit_log'
 require 'app/models/user_action_audit_log'
 require 'app/models/user_model_audit_log'
 #
-#
 # Controllers
 #
 require 'web47core/engine'
@@ -84,3 +83,7 @@ require 'app/controllers/concerns/core_cron_controller'
 require 'app/controllers/concerns/core_delayed_jobs_controller'
 require 'app/controllers/concerns/core_delayed_job_metrics_controller'
 require 'app/controllers/concerns/core_delayed_job_workers_controller'
+#
+# Validators
+#
+require 'app/validators/email_format_validator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.2.2
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: email_format
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.7
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.7
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -336,16 +322,16 @@ dependencies:
   name: codacy-coverage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -473,7 +459,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -487,7 +473,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -504,16 +490,30 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -548,6 +548,9 @@ email:
 executables:
 - cron_server
 - delayed_job
+- rails
+- rake
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -602,6 +605,11 @@ files:
 - app/views/system_configurations/show.html.haml
 - bin/cron_server
 - bin/delayed_job
+- bin/rails
+- bin/rake
+- bin/setup
+- config/application.rb
+- config/boot.rb
 - config/brakeman.ignore
 - config/brakeman.yml
 - config/locales/en.yml
@@ -676,6 +684,7 @@ files:
 - lib/app/models/user_action_audit_log.rb
 - lib/app/models/user_audit_log.rb
 - lib/app/models/user_model_audit_log.rb
+- lib/app/validators/email_format_validator.rb
 - lib/templates/email/notification_failure.liquid
 - lib/templates/email/notification_failure.subject.liquid
 - lib/templates/slack/error_message.liquid
@@ -696,14 +705,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.0.2
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: App47 Web Core Library.