fat_free_crm 0.22.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ed29c049db6b4f6c31a7c1f5a3a083c1ab92a87d1475ae0808777a8d5c87c9d
-  data.tar.gz: ea1c36a463eafd3c50db26e072a447e74a8d07095a9bd19d0149096f681dc36b
+  metadata.gz: 583c16095787930cb44e9c376e303f5bb44d96d2acd85a2b87574d302afb23ab
+  data.tar.gz: 72ca4114ddd58c79a7259abc6bd96d07a2d7b34d2e6315ccbc78661091fc522e
 SHA512:
-  metadata.gz: 31bf4871e24767881af295b9b686a62b5c7de6d56894d67f13af38d6721f8728b36d3a0535b05a9b7f14ebbc65d5648ee4dd9924ded07fcf3308fe04835ea428
-  data.tar.gz: 71240615f55f2e0ac3527223d240470d28c3ada768a5f7240c4aea3a1b976ced11e10a2d4335cd733971ba526719f06ff44b7a15ca41127bb63aea7dbc5dd4ab
+  metadata.gz: 3bb966d52f44f40cc2e439286cfd7f596c21ac4afb7b445131d87b654ab8eff66b2c15ec87b188b34fcfa4b531addb73db195ca92ec1b0c56d1ef8ecfde5eb4f
+  data.tar.gz: 076fd28ff58929818419f1960ad37e990ba3044b64ac80f6132f896bf5acb6f07c6ce4fc89e7c19a450813051286d15c81fdef00fd6840c91e476c14d77c0256

data/app/assets/javascripts/crm_textarea_autocomplete.js.coffee

@@ -17,17 +17,14 @@
             
             # Only autocomplete if search term starts with '@'
             return []  unless text.indexOf("@") is 0
-            words = []
-            i = 0
-
-            while i < _ffcrm_users.length
-              name_query = text.replace("@", "").toLowerCase()
-              words.push _ffcrm_users[i]  unless _ffcrm_users[i].toLowerCase().indexOf(name_query) is -1
-              i++
-            cb words, text.replace("@", "")
+            $.ajax
+              url: "/users/auto_complete"
+              data:
+                term: text.replace("@", "")
+              success: (response) ->
+                cb response, text.replace("@", "")
 
           selected: (text, data) ->
             username_regEx = new RegExp("\\((@[^)]+)\\)")
             text.match(username_regEx)[1]
-
 ) jQuery

data/app/controllers/admin/fields_controller.rb

@@ -42,7 +42,7 @@ class Admin::FieldsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def create
     as = field_params["as"]
-    klass= Field.lookup_class(as).safe_constantize
+    klass = Field.lookup_class(as).safe_constantize
     @field =
       if as.match?(/pair/)
         klass.create_pair("pair" => pair_params, "field" => field_params).first
@@ -117,7 +117,7 @@ class Admin::FieldsController < Admin::ApplicationController
   end
 
   def pair_params
-    params.require(:pair).permit("0": [:hint, :required, :disabled, :id], "1": [:hint, :required, :disabled, :id])
+    params.require(:pair).permit("0": %i[hint required disabled id], "1": %i[hint required disabled id])
   end
 
   def setup_current_tab

data/app/controllers/application_controller.rb

@@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base
   # See http://blog.nvisium.com/2014/09/understanding-protectfromforgery.html for more details.
   #----------------------------------------------------------------------------
   def handle_unverified_request
-    raise ActionController::InvalidAuthenticityToken
+    raise ActionController::InvalidAuthenticityToken unless ENV.fetch('CODESPACE_NAME', nil) && Rails.env.development?
   end
 
   #

data/app/controllers/emails_controller.rb

@@ -15,6 +15,6 @@ class EmailsController < ApplicationController
     @email.destroy
     respond_with(@email)
   end
-  
+
   ActiveSupport.run_load_hooks(:fat_free_crm_emails_controller, self)
 end

data/app/controllers/entities/contacts_controller.rb

@@ -164,6 +164,6 @@ class ContactsController < EntitiesController
       redirect_to contacts_path
     end
   end
-  
+
   ActiveSupport.run_load_hooks(:fat_free_crm_contacts_controller, self)
 end

data/app/controllers/users_controller.rb

@@ -63,9 +63,7 @@ class UsersController < ApplicationController
         end
       end
       responds_to_parent do
-        # Without return RSpec2 screams bloody murder about rendering twice:
-        # within the block and after yield in responds_to_parent.
-        render && (return if Rails.env.test?)
+        render
       end
     end
   end
@@ -111,6 +109,20 @@ class UsersController < ApplicationController
     @unassigned_opportunities = Opportunity.my(current_user).unassigned.pipeline.order(:stage).includes(:account, :user, :tags)
   end
 
+  def auto_complete
+    @query = params[:term] || ''
+    @users = User.my(current_user).text_search(@query).limit(10).order(:first_name, :last_name)
+
+    respond_to do |format|
+      format.json do
+        results = @users.map do |a|
+          helpers.j(a.full_name + " (@" + a.username + ")")
+        end
+        render json: results
+      end
+    end
+  end
+
   protected
 
   def user_params

data/app/helpers/application_helper.rb

@@ -155,7 +155,7 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def link_to_email(email, length = nil, &_block)
     name = (length ? truncate(email, length: length) : email)
-    bcc = Setting&.email_dropbox
+    bcc = Setting.email_dropbox
     mailto = if bcc && bcc[:address].present?
                "#{email}?bcc=#{bcc[:address]}"
              else

data/app/helpers/leads_helper.rb

@@ -69,7 +69,7 @@ module LeadsHelper
   #----------------------------------------------------------------------------
   def lead_summary(lead)
     summary = []
-    summary << (lead.status ? t(lead.status) : t(:other))
+    summary << t(lead.status || :other)
 
     if lead.company? && lead.title?
       summary << t(:works_at, job_title: lead.title, company: lead.company)

data/app/helpers/opportunities_helper.rb

@@ -17,7 +17,7 @@ module OpportunitiesHelper
   def opportunity_summary(opportunity)
     summary = []
     amount = []
-    summary << (opportunity.stage ? t(opportunity.stage) : t(:other))
+    summary << t(opportunity.stage || :other)
     summary << number_to_currency(opportunity.weighted_amount, precision: 0)
     unless %w[won lost].include?(opportunity.stage)
       amount << number_to_currency(opportunity.amount.to_f, precision: 0)

data/app/models/entities/account.rb

@@ -41,7 +41,7 @@ class Account < ActiveRecord::Base
   has_many :addresses, dependent: :destroy, as: :addressable, class_name: "Address" # advanced search uses this
   has_many :emails, as: :mediator
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   accepts_nested_attributes_for :billing_address,  allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
   accepts_nested_attributes_for :shipping_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }

data/app/models/entities/campaign.rb

@@ -39,7 +39,7 @@ class Campaign < ActiveRecord::Base
   has_many :opportunities, -> { order "id DESC" }
   has_many :emails, as: :mediator
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   scope :state, lambda { |filters|
     where('status IN (?)' + (filters.delete('other') ? ' OR status IS NULL' : ''), filters)
@@ -103,7 +103,7 @@ class Campaign < ActiveRecord::Base
   # Make sure end date > start date.
   #----------------------------------------------------------------------------
   def start_and_end_dates
-    errors.add(:ends_on, :dates_not_in_sequence) if (starts_on && ends_on) && (starts_on > ends_on)
+    errors.add(:ends_on, :dates_not_in_sequence) if starts_on && ends_on && (starts_on > ends_on)
   end
 
   # Make sure at least one user has been selected if the campaign is being shared.

data/app/models/entities/contact.rb

@@ -57,7 +57,7 @@ class Contact < ActiveRecord::Base
   has_ransackable_associations %w[account opportunities tags activities emails addresses comments tasks]
   ransack_can_autocomplete
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   accepts_nested_attributes_for :business_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
 

data/app/models/entities/lead.rb

@@ -48,7 +48,7 @@ class Lead < ActiveRecord::Base
   has_many :addresses, dependent: :destroy, as: :addressable, class_name: "Address" # advanced search uses this
   has_many :emails, as: :mediator
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   accepts_nested_attributes_for :business_address, allow_destroy: true, reject_if: proc { |attributes| Address.reject_address(attributes) }
 

data/app/models/entities/opportunity.rb

@@ -38,7 +38,7 @@ class Opportunity < ActiveRecord::Base
   has_many :tasks, as: :asset, dependent: :destroy # , :order => 'created_at DESC'
   has_many :emails, as: :mediator
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   scope :state, lambda { |filters|
     where('stage IN (?)' + (filters.delete('other') ? ' OR stage IS NULL' : ''), filters)

data/app/models/fields/field.rb

@@ -31,7 +31,7 @@
 class Field < ActiveRecord::Base
   acts_as_list
 
-  serialize :collection, Array
+  serialize :collection, type: Array
   serialize :settings, HashWithIndifferentAccess
 
   belongs_to :field_group, optional: true

data/app/models/observers/lead_observer.rb

@@ -16,7 +16,8 @@ class LeadObserver < ActiveRecord::Observer
 
   def after_update(item)
     original = @@leads.delete(item.id)
-    return log_activity(item, :reject) if original&.status != "rejected" && item.status == "rejected"
+
+    log_activity(item, :reject) if original&.status != "rejected" && item.status == "rejected"
   end
 
   private

data/app/models/observers/task_observer.rb

@@ -19,7 +19,8 @@ class TaskObserver < ActiveRecord::Observer
     if original
       return log_activity(item, :complete)   if item.completed_at && original.completed_at.nil?
       return log_activity(item, :reassign)   if item.assigned_to != original.assigned_to
-      return log_activity(item, :reschedule) if item.bucket != original.bucket
+
+      log_activity(item, :reschedule) if item.bucket != original.bucket
     end
   end
 

data/app/models/polymorphic/address.rb

@@ -54,7 +54,8 @@ class Address < ActiveRecord::Base
     exists = attributes['id'].present?
     empty = %w[street1 street2 city state zipcode country full_address].map { |name| attributes[name].blank? }.all?
     attributes[:_destroy] = 1 if exists && empty
-    (!exists && empty)
+
+    !exists && empty
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_address, self)

data/app/models/polymorphic/comment.rb

@@ -52,10 +52,9 @@ class Comment < ActiveRecord::Base
 
   # Notify subscribed users when a comment is added, unless user created this comment
   def notify_subscribers
-    commentable.subscribed_users.reject { |user_id| user_id == user.id }.each do |subscriber_id|
-      if subscriber = User.find_by_id(subscriber_id)
-        SubscriptionMailer.comment_notification(subscriber, self).deliver_later
-      end
+    users_to_notify = User.where(id: commentable.subscribed_users.reject { |user_id| user_id == user.id })
+    users_to_notify.select(&:emailable?).each do |subscriber|
+      SubscriptionMailer.comment_notification(subscriber, self).deliver_later
     end
   end
 

data/app/models/polymorphic/task.rb

@@ -39,7 +39,7 @@ class Task < ActiveRecord::Base
   belongs_to :completor, class_name: "User", foreign_key: :completed_by, optional: true # TODO: Is this really optional?
   belongs_to :asset, polymorphic: true, optional: true # TODO: Is this really optional?
 
-  serialize :subscribed_users, Array
+  serialize :subscribed_users, type: Array
 
   # Tasks created by the user for herself, or assigned to her by others. That's
   # what gets shown on Tasks/Pending and Tasks/Completed pages.
@@ -103,7 +103,7 @@ class Task < ActiveRecord::Base
   scope :completed_last_month, -> { where('completed_at >= ? AND completed_at < ?', (Time.zone.now.beginning_of_month.utc - 1.day).beginning_of_month.utc, Time.zone.now.beginning_of_month.utc) }
 
   scope :text_search, lambda { |query|
-    query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
+    query = query.gsub(/[^\w\s\-.'\p{L}]/u, '').strip
     where('upper(name) LIKE upper(?)', "%#{query}%")
   }
 

data/app/models/users/user.rb

@@ -73,7 +73,7 @@ class User < ActiveRecord::Base
   scope :by_name, -> { order('first_name, last_name, email') }
 
   scope :text_search, lambda { |query|
-    query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
+    query = query.gsub(/[^\w\s\-.'\p{L}]/u, '').strip
     where('upper(username) LIKE upper(:s) OR upper(email) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', s: "%#{query}%")
   }
 
@@ -134,6 +134,12 @@ class User < ActiveRecord::Base
     end
   end
 
+  # Send emails to active users only
+  #----------------------------------------------------------------------------
+  def emailable?
+    confirmed? && !awaits_approval? && !suspended? && email.present?
+  end
+
   #----------------------------------------------------------------------------
   def preference
     @preference ||= preferences.build

data/app/views/layouts/application.html.haml

@@ -26,9 +26,7 @@
     - if current_user.present?
       :javascript
         #{yield :javascript}
-        var _ffcrm_users = [
-        #{raw User.all.map{|u| "'#{j u.full_name} (@#{j u.username})'" }.join(",\n")}
-        ];
+
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">

data/config/application.rb

@@ -85,6 +85,8 @@ module FatFreeCRM
       ::ActiveSupport::HashWithIndifferentAccess, # for Field#settings serialization see app/models/fields/field.rb
       ::ActiveSupport::TimeWithZone,
       ::ActiveSupport::TimeZone,
+      ::ActsAsTaggableOn::TagList,
+      ::ActsAsTaggableOn::DefaultParser,
       ::BigDecimal,
       ::Date,
       ::Symbol,

data/config/database.yml

@@ -1,25 +1,23 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
 ---
 development: &development
-  adapter: postgresql
-  database: fat_free_crm_development
-  username: postgres
-  password: postgres
-  host:     localhost
-  port:     5432
-  schema_search_path: public
-  min_messages: warning
+  adapter: sqlite3
+  database: db/fat_free_crm_development.sqlite3
+  pool: 5
+  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *development
-  database: fat_free_crm_test
+  database: db/fat_free_crm_test.sqlite3
 
 production:
   <<: *development
-  database: fat_free_crm_production
+  database: db/fat_free_crm_production.sqlite3
 
 staging:
   <<: *development
-  database: fat_free_crm_staging
+  database: db/fat_free_crm_staging.sqlite3

data/config/environments/development.rb

@@ -83,5 +83,20 @@ if defined?(FatFreeCRM::Application)
     # Checks for improperly declared sprockets dependencies.
     # Raises helpful error messages.
     config.assets.raise_runtime_errors = true
+
+    # Are we running in a GitHub Codespace?
+    if ENV.fetch('CODESPACE_NAME', nil)
+      config.host = "#{ENV.fetch('CODESPACE_NAME', nil)}-3000.app.github.dev:443"
+      config.hosts << ".preview.app.github.dev"
+      config.hosts << ".app.github.dev"
+
+      config.force_ssl = true
+      config.action_dispatch.cookies_same_site_protection = :lax
+
+      config.action_dispatch.trusted_proxies = [
+        # Trust all IPs (safe in dev only)
+        IPAddr.new("0.0.0.0/0"), IPAddr.new("::/0")
+      ]
+    end
   end
 end

data/config/initializers/application_controller_renderer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do

data/config/initializers/backtrace_silencers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/config/initializers/content_security_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy.

data/config/initializers/devise.rb

@@ -16,6 +16,7 @@ Devise.setup do |config|
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
   # config.secret_key = SecureRandom.hex(64)
+  config.secret_key = Rails.application.secret_key_base
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/config/initializers/inflections.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/config/initializers/permissions_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Define an application-wide HTTP permissions policy. For further
 # information see https://developers.google.com/web/updates/2018/06/feature-policy
 #

data/config/routes.rb

@@ -23,6 +23,7 @@ Rails.application.routes.draw do
     resources :users, only: %i[index show] do
       collection do
         get :opportunities_overview
+        match :auto_complete, via: %i[get post]
       end
     end
   end
@@ -159,9 +160,6 @@ Rails.application.routes.draw do
       patch :change_password
       post :redraw
     end
-    collection do
-      match :auto_complete, via: %i[get post]
-    end
   end
 
   namespace :admin do

data/db/migrate/20230422234321_optionally_create_action_text_tables.action_text.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# This migration comes from action_text (originally 20180528164100)
+class OptionallyCreateActionTextTables < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :action_text_rich_texts, id: primary_key_type, if_not_exists: true do |t|
+      t.string     :name, null: false
+      t.text       :body, size: :long
+      t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+      t.timestamps
+
+      t.index %i[record_type record_id name], name: "index_action_text_rich_texts_uniqueness", unique: true
+    end
+  end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
+end

data/db/migrate/20230526211831_create_active_storage_tables.active_storage.rb

@@ -6,7 +6,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
     # Use Active Record's configured type for primary and foreign keys
     primary_key_type, foreign_key_type = primary_and_foreign_key_types
 
-    create_table :active_storage_blobs, id: primary_key_type do |t|
+    create_table :active_storage_blobs, id: primary_key_type, if_not_exists: true do |t|
       t.string   :key,          null: false
       t.string   :filename,     null: false
       t.string   :content_type
@@ -19,7 +19,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.index [:key], unique: true
     end
 
-    create_table :active_storage_attachments, id: primary_key_type do |t|
+    create_table :active_storage_attachments, id: primary_key_type, if_not_exists: true do |t|
       t.string     :name,     null: false
       t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
       t.references :blob,     null: false, type: foreign_key_type
@@ -30,7 +30,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.foreign_key :active_storage_blobs, column: :blob_id
     end
 
-    create_table :active_storage_variant_records, id: primary_key_type do |t|
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
       t.belongs_to :blob, null: false, index: false, type: foreign_key_type
       t.string :variation_digest, null: false
 

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -4,19 +4,16 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
   require 'open-uri'
 
   def up
-    get_blob_id = case ENV['CI'] && ENV['DB']
-                  when 'sqlite'
-                    'LAST_INSERT_ROWID()'
-                  when 'mysql'
-                    'LAST_INSERT_ID()'
-                  when 'postgres'
-                    'LASTVAL()'
-                  else
-                    'LASTVAL()'
-                  end
-
     ActiveRecord::Base.connection.raw_connection.then do |conn|
+      get_blob_id = case ENV['CI'] && ENV['DB']
+                    when 'mysql'
+                      'LAST_INSERT_ID()'
+                    else
+                      'LASTVAL()'
+                    end
+      get_blob_id = 'LAST_INSERT_ROWID()' if conn.is_a?(SQLite3::Database)
       if conn.is_a?(::PG::Connection)
+        get_blob_id = 'LASTVAL()'
         conn.prepare('active_storage_blobs', <<-SQL)
           INSERT INTO active_storage_blobs (
             key, filename, content_type, metadata, byte_size, checksum, created_at
@@ -29,13 +26,13 @@ class ConvertToActiveStorage < ActiveRecord::Migration[5.2]
           ) VALUES ($1, $2, $3, #{get_blob_id}, $4)
         SQL
       else
-        conn.raw_connection.prepare(<<-SQL)
+        conn.prepare(<<-SQL)
           INSERT INTO active_storage_blobs (
             `key`, filename, content_type, metadata, byte_size, checksum, created_at
           ) VALUES (?, ?, ?, '{}', ?, ?, ?)
         SQL
 
-        conn.raw_connection.prepare(<<-SQL)
+        conn.prepare(<<-SQL)
           INSERT INTO active_storage_attachments (
             name, record_type, record_id, blob_id, created_at
           ) VALUES (?, ?, ?, #{get_blob_id}, ?)

data/db/schema.rb

@@ -11,9 +11,6 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
   create_table "account_contacts", force: :cascade do |t|
     t.integer "account_id"
     t.integer "contact_id"
@@ -55,6 +52,16 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
     t.index ["user_id", "name", "deleted_at"], name: "index_accounts_on_user_id_and_name_and_deleted_at", unique: true
   end
 
+  create_table "action_text_rich_texts", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "body"
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
+  end
+
   create_table "active_storage_attachments", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -247,12 +254,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
     t.text "collection"
     t.boolean "disabled"
     t.boolean "required"
-    t.integer "maxlength"
+    t.integer "maxlength", limit: 4
     t.datetime "created_at", precision: nil
     t.datetime "updated_at", precision: nil
     t.integer "pair_id"
     t.text "settings"
-    t.integer "minlength", default: 0
+    t.integer "minlength", limit: 4, default: 0
     t.string "pattern"
     t.string "autofocus"
     t.string "autocomplete"
@@ -417,7 +424,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
 
   create_table "users", force: :cascade do |t|
     t.string "username", limit: 32, default: "", null: false
-    t.string "email", limit: 254, default: "", null: false
+    t.string "email", limit: 254
     t.string "first_name", limit: 32
     t.string "last_name", limit: 32
     t.string "title", limit: 64
@@ -448,8 +455,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
     t.datetime "remember_created_at", precision: nil
     t.string "authentication_token"
     t.string "confirmation_token", limit: 255
-    t.datetime "confirmed_at", precision: nil
-    t.datetime "confirmation_sent_at", precision: nil
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
     t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email"
@@ -461,7 +468,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_26_212613) do
   create_table "versions", force: :cascade do |t|
     t.string "item_type", null: false
     t.integer "item_id", null: false
-    t.string "event", limit: 512, null: false
+    t.string "event", limit: 512
     t.string "whodunnit"
     t.text "object"
     t.datetime "created_at", precision: nil

data/db/seeds.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #

data/lib/fat_free_crm/callback.rb

@@ -108,7 +108,6 @@ module FatFreeCRM
     #--------------------------------------------------------------------------
     module Helper
       def hook(method, caller, context = {}, &block)
-
         # In a view template context, hooks are able to replace, append or prepend content.
         if caller.is_a?(ActionView::Base)
           hooks = FatFreeCRM::Callback.view_hook(method, caller, context)

data/lib/fat_free_crm/core_ext/string.rb

@@ -36,7 +36,7 @@ class String
   # A query with 4 words will generate 6 permutations
   def name_permutations
     parts = split(" ")
-    Array.new((parts.size - 1)) do |i|
+    Array.new(parts.size - 1) do |i|
       # ["A", "B", "C", "D"]  =>  [["A B C", "D"], ["A B", "C D"], ["A", "B C D"]]
       [parts[(0..i)].join(" "), parts[(i + 1)..-1].join(" ")]
     end.each_with_object([]) do |perm, arr|

data/lib/fat_free_crm/mail_processor/base.rb

@@ -104,10 +104,8 @@ module FatFreeCRM
               discard(uid)
             end
           rescue Exception => e
-            if %w[test development].include?(Rails.env)
-              warn e
-              warn e.backtrace
-            end
+            warn e
+            warn e.backtrace
             log "error processing email: #{e.inspect}", email
             discard(uid)
           end
@@ -181,12 +179,10 @@ module FatFreeCRM
       # Centralized logging.
       #--------------------------------------------------------------------------------------
       def log(message, email = nil)
-        unless %w[test cucumber].include?(Rails.env)
-          klass = self.class.to_s.split("::").last
-          klass << " [Dry Run]" if @dry_run
-          puts "[#{Time.now.rfc822}] #{klass}: #{message}"
-          puts "[#{Time.now.rfc822}] #{klass}: From: #{email.from}, Subject: #{email.subject} (#{email.message_id})" if email
-        end
+        klass = self.class.to_s.split("::").last
+        klass << " [Dry Run]" if @dry_run
+        Rails.logger.info("[#{Time.now.rfc822}] #{klass}: #{message}")
+        Rails.logger.info("[#{Time.now.rfc822}] #{klass}: From: #{email.from}, Subject: #{email.subject} (#{email.message_id})") if email
       end
 
       # Returns the plain-text version of an email, or strips html tags

data/lib/fat_free_crm/version.rb

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

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Michael Dvorkin
 - Stephen Kenworthy
 - Daniel O'Connor
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.3.0
@@ -28,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.3.0
@@ -1090,6 +1089,8 @@ files:
 - db/demo/settings.yml
 - db/demo/tasks.yml
 - db/demo/users.yml
+- db/fat_free_crm_development.sqlite3
+- db/fat_free_crm_test.sqlite3
 - db/migrate/20100928030598_create_sessions.rb
 - db/migrate/20100928030599_create_users.rb
 - db/migrate/20100928030600_create_openid_tables.rb
@@ -1162,6 +1163,7 @@ files:
 - db/migrate/20180107082701_authlogic_to_devise.rb
 - db/migrate/20200806004152_add_pattern_to_fields.rb
 - db/migrate/20200806004459_add_html5_to_fields.rb
+- db/migrate/20230422234321_optionally_create_action_text_tables.action_text.rb
 - db/migrate/20230526211831_create_active_storage_tables.active_storage.rb
 - db/migrate/20230526212613_convert_to_active_storage.rb
 - db/schema.rb
@@ -1314,7 +1316,6 @@ homepage: http://fatfreecrm.com
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1329,8 +1330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Fat Free CRM
 test_files: []