web47core 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53f1926c9087f4e9cc6f6037b29401e8b5ec7a7b29bb827228a5865b486db87
-  data.tar.gz: de8d77e1e2fb118dd40ae5f263ed08b711e370a3ce64f6ebf27d6c5898758162
+  metadata.gz: 9f1bb05a864b2fba4e1d35563c71958ade83637d8881843a26430027e8c3878f
+  data.tar.gz: 4e39e3f4064f9d81fb4636f20eae6326e7d84e5a206adb57ba9fb6c601723efe
 SHA512:
-  metadata.gz: f84fb47a7f6a366b40a4e6d1e3155268caa889ed606b2f5e5d0d629b9992ddc16d2c49814292b36bc448a36788c6480a7a9acf6f476eaef770c2fec66e89cd56
-  data.tar.gz: 8682ac4e3c691e4bec4c2f2ec8313a4dd8c034c5d926cc76f7ea735c0e56d7eff838b40b68e38405be9d4d5bfc1f16fd1dfee65395d7a4fe17b432a644881d03
+  metadata.gz: 1d2855e00108d8d40c7a4fb6d976ae621d7eb8be6ba1530f0260457d032a7227dc695fce39796af5d101ef0a0ddb1a5adc11c46f4a4e825ccee7724ddcc54855
+  data.tar.gz: 71b746532f35a9439b2b3816ec6e64c26079e4e72bcad370c6726407492543231c8962c1a0229e4bcb16b60bf9197bea5c1995cf8dddc2efadc81386eb9b338c

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

@@ -16,6 +16,7 @@ module CoreSystemConfiguration
   #
   def self.included(base)
     base.class_eval do
+      attr_accessor :configuration
       #
       # Fields
       #
@@ -73,27 +74,12 @@ module CoreSystemConfiguration
   end
 
   module ClassMethods
-    #
-    # Fetch the system configuration based on environment name. First try the rails cache
-    # if not there, then go to the database.
-    #
-    # Also, if an argument error is thrown, then just fetch from the database.
-    #
     def configuration
-      cache_key = "SystemConfiguration::#{Rails.env}"
-
-      begin
-        config = Rails.cache.fetch(cache_key, expires_in: 90.seconds) do
-          SystemConfiguration.find_by(environment: Rails.env)
-        end
-      rescue StandardError
-        # This seems to happen in testing relative to Country, when it does, remove
-        # ourselves from the cache and return the DB entry.
-        Rails.cache.delete cache_key
-        config = SystemConfiguration.find_or_create_by!(environment: Rails.env)
-      end
+      @configuration ||= SystemConfiguration.find_or_create_by!(environment: Rails.env)
+    end
 
-      config.nil? ? SystemConfiguration.create(environment: Rails.env) : config
+    def reset
+      @configuration = nil
     end
 
     def smtp_configuration
@@ -110,19 +96,21 @@ module CoreSystemConfiguration
     #
     # NOTE: Currently ignored Codacy issue: When using 'method_missing', fall back on 'super'
     #
-    # rubocop:disable Style/MethodMissingSuper
     def method_missing(method, *args, &_block)
-      configuration.send method, *args
+      if configuration.respond_to?(method)
+        configuration.send(method, *args)
+      else
+        super
+      end
     end
 
-    def respond_to?(method_name, _include_private = false)
-      SystemConfiguration.fields.include?(method_name)
+    def respond_to?(method_name, include_private = false)
+      configuration.respond_to?(method_name, include_private) || super
     end
 
-    def respond_to_missing?(method_name, _include_private = false)
-      SystemConfiguration.fields.include?(method_name)
+    def respond_to_missing?(method_name, include_private = false)
+      configuration.respond_to?(method_name, include_private) || super
     end
-    # rubocop:enable Style/MethodMissingSuper
   end
 
   #
@@ -203,7 +191,7 @@ module CoreSystemConfiguration
     config = SystemConfiguration.configuration
     path = if config.zendesk_configured? && user.present?
              time_now = Time.now.to_i
-             jti = "#{time_now}/#{rand(36**64).to_s(36)}"
+             jti = "#{time_now}/#{rand(36 ** 64).to_s(36)}"
              payload = { jwt: JWT.encode({ iat: time_now, # Seconds since epoch, determine when this token is stale
                                            jti: jti, # Unique token identifier, helps prevent replay attacks
                                            name: user.name,
@@ -262,12 +250,12 @@ module CoreSystemConfiguration
     slack_api_url.present?
   end
 
-  private
+  # private
 
   #
   # Clear the cache when the object is saved
   #
-  def clear_cache
-    Rails.cache.delete "SystemConfiguration::#{Rails.env}"
-  end
+  # def clear_cache
+  #   Rails.cache.delete "SystemConfiguration::#{Rails.env}"
+  # end
 end

data/lib/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport