fat_free_crm 0.24.1 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355e27d31add131b594ac6284785c1853536a964d5734f65ab061d392a7f12e5
-  data.tar.gz: f2ced50b2fc1750144b57fe9a117c0cff51e27bf4f55ab7bf151e39106945967
+  metadata.gz: 12985fcc9a5bd872776d35ce530c83469607adbab241bc2750b1c7f3652c09f8
+  data.tar.gz: 1571d711121e35ca2990fccc54a936cbe10b3c15e260972f9274daf75f555f83
 SHA512:
-  metadata.gz: 5a428fd5c4f4700f7f4876cc363608733de6083bc081e9b47146fc0167ebc5a23254433c8e918e25f0f388dd1f078b52d1d0c1dd1f7abf6a33c30b8f6ad9807b
-  data.tar.gz: c293aed6006c339ecc4b4c314952d2350017f830e199346663ab95de2652fbc08d0c2b9cedd6a02288f44c3272de2ccf6f6feb0ccdcb1d9372b219bd26eb82ef
+  metadata.gz: d932db7ffc1acf32f243e3d7dd59deef7e6cbcf1f206e18b88b804b8972ef2cd0832ef20fef631039b6a52246b15c09942271b0e805a826e866dd119556bd97b
+  data.tar.gz: c751929fbf6656aebea0937e8482c9c284f9c3ca9186019461ba6074904182e3a6ffd0a604965732403b2c76bf04600f03e773e64ae318d890c48a6e596c49cf

data/config/initializers/action_mailer.rb

@@ -9,15 +9,15 @@
 # Configure ActionMailer unless running tests
 #   ActionMailer is setup in test mode later on
 #
-unless Rails.env.test?
-  require 'setting'
 
-  smtp_settings = Setting.smtp || {}
+Rails.application.config.after_initialize do
+  unless Rails.env.test?
+    smtp_settings = Setting.smtp || {}
 
-  Rails.application.config.action_mailer.smtp_settings = smtp_settings.symbolize_keys if smtp_settings["address"].present?
+    Rails.application.config.action_mailer.smtp_settings = smtp_settings.symbolize_keys if smtp_settings["address"].present?
 
-  if (host = Setting.host).present?
-    (Rails.application.routes.default_url_options ||= {})[:host] = host.gsub('http://', '')
+    if (host = Setting.host).present?
+      (Rails.application.routes.default_url_options ||= {})[:host] = host.gsub('http://', '')
+    end
   end
-
 end

data/config/initializers/custom_field_ransack_translations.rb

@@ -6,9 +6,9 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 # Load field names for custom fields, for Ransack search
-require 'setting'
-if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields)
-  Rails.application.config.after_initialize do
+
+Rails.application.config.after_initialize do
+  if ActiveRecord::Base.connection.table_exists?(:custom_fields)
     I18n.backend.load_translations
 
     translations = { ransack: { attributes: {} } }

data/config/initializers/relative_url_root.rb

@@ -7,4 +7,6 @@
 #------------------------------------------------------------------------------
 # Set relative url root for assets
 
-ActionController::Base.relative_url_root = Setting.base_url if Setting.base_url.present?
+Rails.application.config.after_initialize do
+  ActionController::Base.relative_url_root = Setting.base_url if Setting.base_url.present?
+end

data/config/initializers/secret_token.rb

@@ -22,6 +22,10 @@
 # We should setup a secret token if FFCRM is running in application mode but NOT in engine mode.
 # This functionality has been extracted to lib so it can be tested.
 if FatFreeCRM.application?
-  require 'fat_free_crm/secret_token_generator'
-  FatFreeCRM::SecretTokenGenerator.setup!
+
+  Rails.application.config.after_initialize do
+    require 'fat_free_crm/secret_token_generator'
+
+    FatFreeCRM::SecretTokenGenerator.setup!
+  end
 end

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -11,8 +11,8 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
                     else
                       'LASTVAL()'
                     end
-      get_blob_id = 'LAST_INSERT_ROWID()' if conn.is_a?(SQLite3::Database)
-      if conn.is_a?(::PG::Connection)
+      get_blob_id = 'LAST_INSERT_ROWID()' if Object.const_defined?("SQLite3") && conn.is_a?(SQLite3::Database)
+      if Object.const_defined?("PG") && conn.is_a?(::PG::Connection)
         get_blob_id = 'LASTVAL()'
         conn.prepare('active_storage_blobs', <<-SQL)
           INSERT INTO active_storage_blobs (

data/lib/fat_free_crm/version.rb

@@ -9,7 +9,7 @@ module FatFreeCRM
   module VERSION # :nodoc:
     MAJOR = 0
     MINOR = 24
-    TINY  = 1
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.3
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -228,19 +228,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: acts_as_commentable
+  name: acts_as_commentable2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -382,7 +382,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: responds_to_parent
+  name: responds_to_parent2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -1090,8 +1090,6 @@ files:
 - db/demo/tasks.yml
 - db/demo/users.yml
 - db/fat_free_crm_development.sqlite3
-- db/fat_free_crm_development.sqlite3-shm
-- db/fat_free_crm_development.sqlite3-wal
 - db/fat_free_crm_test.sqlite3
 - db/fat_free_crm_test.sqlite3-shm
 - db/fat_free_crm_test.sqlite3-wal