fat_free_crm 0.20.1 → 0.21.0

data/db/migrate/20230526212613_convert_to_active_storage.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+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.prepare(<<-SQL)
+      INSERT INTO active_storage_blobs (
+        `key`, filename, content_type, metadata, byte_size, checksum, created_at
+      ) VALUES (?, ?, ?, '{}', ?, ?, ?)
+    SQL
+
+    ActiveRecord::Base.connection.raw_connection.prepare(<<-SQL)
+      INSERT INTO active_storage_attachments (
+        name, record_type, record_id, blob_id, created_at
+      ) VALUES (?, ?, ?, #{get_blob_id}, ?)
+    SQL
+
+    Rails.application.eager_load!
+    models = ActiveRecord::Base.descendants.reject { |model| model.abstract_class? || model == ActionMailbox::InboundEmail || model == ActionText::RichText }
+
+    transaction do
+      models.each do |model|
+        attachments = model.column_names.map do |c|
+          ::Regexp.last_match(1) if c =~ /(.+)_file_name$/
+        end.compact
+
+        next if attachments.blank?
+
+        model.find_each.each do |instance|
+          attachments.each do |attachment|
+            next if instance.send(attachment).path.blank?
+
+            ActiveRecord::Base.connection.execute_prepared(
+              'active_storage_blob_statement', [
+                key(instance, attachment),
+                instance.send("#{attachment}_file_name"),
+                instance.send("#{attachment}_content_type"),
+                instance.send("#{attachment}_file_size"),
+                checksum(instance.send(attachment)),
+                instance.updated_at.iso8601
+              ]
+            )
+
+            ActiveRecord::Base.connection.execute_prepared(
+              'active_storage_attachment_statement', [
+                attachment,
+                model.name,
+                instance.id,
+                instance.updated_at.iso8601
+              ]
+            )
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+  private
+
+  def key(_instance, _attachment)
+    SecureRandom.uuid
+    # Alternatively:
+    # instance.send("#{attachment}_file_name")
+  end
+
+  def checksum(attachment)
+    # local files stored on disk:
+    url = attachment.path
+    Digest::MD5.base64digest(File.read(url))
+
+    # remote files stored on another person's computer:
+    # url = attachment.url
+    # Digest::MD5.base64digest(Net::HTTP.get(URI(url)))
+  end
+end

data/db/schema.rb

@@ -2,17 +2,17 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_08_06_004459) do
+ActiveRecord::Schema.define(version: 2023_05_26_212613) do
 
-  create_table "account_contacts", force: :cascade do |t|
+  create_table "account_contacts", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "account_id"
     t.integer "contact_id"
     t.datetime "deleted_at"
@@ -21,7 +21,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["account_id", "contact_id"], name: "index_account_contacts_on_account_id_and_contact_id"
   end
 
-  create_table "account_opportunities", force: :cascade do |t|
+  create_table "account_opportunities", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "account_id"
     t.integer "opportunity_id"
     t.datetime "deleted_at"
@@ -30,7 +30,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["account_id", "opportunity_id"], name: "index_account_opportunities_on_account_id_and_opportunity_id"
   end
 
-  create_table "accounts", force: :cascade do |t|
+  create_table "accounts", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.string "name", limit: 64, default: "", null: false
@@ -53,7 +53,35 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "name", "deleted_at"], name: "index_accounts_on_user_id_and_name_and_deleted_at", unique: true
   end
 
-  create_table "activities", force: :cascade do |t|
+  create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum", null: false
+    t.datetime "created_at", null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
+
+  create_table "activities", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.string "subject_type"
     t.integer "subject_id"
@@ -66,7 +94,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id"], name: "index_activities_on_user_id"
   end
 
-  create_table "addresses", force: :cascade do |t|
+  create_table "addresses", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "street1"
     t.string "street2"
     t.string "city", limit: 64
@@ -83,7 +111,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["addressable_id", "addressable_type"], name: "index_addresses_on_addressable_id_and_addressable_type"
   end
 
-  create_table "avatars", force: :cascade do |t|
+  create_table "avatars", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.string "entity_type"
     t.integer "entity_id"
@@ -94,7 +122,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.datetime "updated_at"
   end
 
-  create_table "campaigns", force: :cascade do |t|
+  create_table "campaigns", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.string "name", limit: 64, default: "", null: false
@@ -119,7 +147,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "name", "deleted_at"], name: "index_campaigns_on_user_id_and_name_and_deleted_at", unique: true
   end
 
-  create_table "comments", force: :cascade do |t|
+  create_table "comments", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.string "commentable_type"
     t.integer "commentable_id"
@@ -131,7 +159,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "state", limit: 16, default: "Expanded", null: false
   end
 
-  create_table "contact_opportunities", force: :cascade do |t|
+  create_table "contact_opportunities", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "contact_id"
     t.integer "opportunity_id"
     t.string "role", limit: 32
@@ -141,7 +169,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["contact_id", "opportunity_id"], name: "index_contact_opportunities_on_contact_id_and_opportunity_id"
   end
 
-  create_table "contacts", force: :cascade do |t|
+  create_table "contacts", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "lead_id"
     t.integer "assigned_to"
@@ -173,7 +201,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "last_name", "deleted_at"], name: "id_last_name_deleted", unique: true
   end
 
-  create_table "emails", force: :cascade do |t|
+  create_table "emails", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "imap_message_id", null: false
     t.integer "user_id"
     t.string "mediator_type"
@@ -194,7 +222,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["mediator_id", "mediator_type"], name: "index_emails_on_mediator_id_and_mediator_type"
   end
 
-  create_table "field_groups", force: :cascade do |t|
+  create_table "field_groups", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 64
     t.string "label", limit: 128
     t.integer "position"
@@ -205,7 +233,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "klass_name", limit: 32
   end
 
-  create_table "fields", force: :cascade do |t|
+  create_table "fields", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "type"
     t.integer "field_group_id"
     t.integer "position"
@@ -217,12 +245,12 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.text "collection"
     t.boolean "disabled"
     t.boolean "required"
-    t.integer "maxlength", limit: 4
+    t.integer "maxlength"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer "pair_id"
     t.text "settings"
-    t.integer "minlength", limit: 4, default: 0
+    t.integer "minlength", default: 0
     t.string "pattern"
     t.string "autofocus"
     t.string "autocomplete"
@@ -232,13 +260,13 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["name"], name: "index_fields_on_name"
   end
 
-  create_table "groups", force: :cascade do |t|
+  create_table "groups", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "groups_users", id: false, force: :cascade do |t|
+  create_table "groups_users", id: false, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "group_id"
     t.integer "user_id"
     t.index ["group_id", "user_id"], name: "index_groups_users_on_group_id_and_user_id"
@@ -246,7 +274,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id"], name: "index_groups_users_on_user_id"
   end
 
-  create_table "leads", force: :cascade do |t|
+  create_table "leads", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "campaign_id"
     t.integer "assigned_to"
@@ -278,7 +306,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "last_name", "deleted_at"], name: "index_leads_on_user_id_and_last_name_and_deleted_at", unique: true
   end
 
-  create_table "lists", force: :cascade do |t|
+  create_table "lists", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.text "url"
     t.datetime "created_at"
@@ -287,7 +315,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id"], name: "index_lists_on_user_id"
   end
 
-  create_table "opportunities", force: :cascade do |t|
+  create_table "opportunities", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "campaign_id"
     t.integer "assigned_to"
@@ -308,7 +336,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "name", "deleted_at"], name: "id_name_deleted", unique: true
   end
 
-  create_table "permissions", force: :cascade do |t|
+  create_table "permissions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.string "asset_type"
     t.integer "asset_id"
@@ -320,7 +348,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id"], name: "index_permissions_on_user_id"
   end
 
-  create_table "preferences", force: :cascade do |t|
+  create_table "preferences", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
@@ -329,7 +357,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "name"], name: "index_preferences_on_user_id_and_name"
   end
 
-  create_table "sessions", force: :cascade do |t|
+  create_table "sessions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "session_id", null: false
     t.text "data"
     t.datetime "created_at"
@@ -338,7 +366,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "settings", force: :cascade do |t|
+  create_table "settings", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
     t.datetime "created_at"
@@ -346,7 +374,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["name"], name: "index_settings_on_name"
   end
 
-  create_table "taggings", force: :cascade do |t|
+  create_table "taggings", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "tag_id"
     t.integer "taggable_id"
     t.integer "tagger_id"
@@ -358,13 +386,13 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
   end
 
-  create_table "tags", force: :cascade do |t|
+  create_table "tags", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.integer "taggings_count", default: 0
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
-  create_table "tasks", force: :cascade do |t|
+  create_table "tasks", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.integer "completed_by"
@@ -385,7 +413,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["user_id", "name", "deleted_at"], name: "index_tasks_on_user_id_and_name_and_deleted_at", unique: true
   end
 
-  create_table "users", force: :cascade do |t|
+  create_table "users", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "username", limit: 32, default: "", null: false
     t.string "email", limit: 254, default: "", null: false
     t.string "first_name", limit: 32
@@ -417,9 +445,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "remember_token"
     t.datetime "remember_created_at"
     t.string "authentication_token"
-    t.string "confirmation_token", limit: 255
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.string "confirmation_token"
+    t.timestamp "confirmed_at"
+    t.timestamp "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"
@@ -428,7 +456,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["username", "deleted_at"], name: "index_users_on_username_and_deleted_at", unique: true
   end
 
-  create_table "versions", force: :cascade do |t|
+  create_table "versions", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "item_type", null: false
     t.integer "item_id", null: false
     t.string "event", limit: 512, null: false
@@ -446,4 +474,6 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.index ["whodunnit"], name: "index_versions_on_whodunnit"
   end
 
+  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
 end

data/db/seeds/fields.rb

@@ -12,9 +12,7 @@
     },
     {
       params: { label: 'Contact Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     }
   ],
   'Campaign' => [
@@ -28,29 +26,21 @@
     },
     {
       params: { label: 'Contact Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     }
   ],
   'Contact' => [
     {
       params: { label: 'General Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     },
     {
       params: { label: 'Extra Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     },
     {
       params: { label: 'Web presence', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     }
   ],
   'Lead' => [
@@ -64,9 +54,7 @@
     },
     {
       params: { label: 'Contact Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     }
   ],
   'Opportunity' => [
@@ -80,9 +68,7 @@
     },
     {
       params: { label: 'Contact Information', tooltip: '' },
-      fields: [
-
-      ]
+      fields: []
     }
   ]
 }.each_with_index do |(klass_name, groups), group_position|

data/lib/development_tasks/license.rake

@@ -12,16 +12,16 @@
 
 namespace :license do
   FILES = { ruby: [
-    "app/**/*.rb",
-    "app/**/*.coffee",
-    "lib/**/*.rake",
-    "lib/fat_free_crm/**/*.rb",
-    "lib/fat_free_crm.rb",
-    "spec/**/*.rb",
-    "spec/spec_helper.rb",
-    "config/**/*.rb",
-    "config/settings.default.yml"
-  ],
+              "app/**/*.rb",
+              "app/**/*.coffee",
+              "lib/**/*.rake",
+              "lib/fat_free_crm/**/*.rb",
+              "lib/fat_free_crm.rb",
+              "spec/**/*.rb",
+              "spec/spec_helper.rb",
+              "config/**/*.rb",
+              "config/settings.default.yml"
+            ],
             js: [
               "app/assets/javascripts/**/*.js",
               "app/assets/javascripts/**/*.js.erb",

data/lib/fat_free_crm/errors.rb

@@ -21,16 +21,8 @@ module FatFreeCRM
         end
       end
 
-      def each_with_explicit_error
-        keys.each do |attribute|
-          self[attribute].each do |error|
-            if error.start_with?('^')
-              yield :base, error[1..-1]   # Drop the attribute.
-            else
-              yield attribute, error      # This is default Rails3 behavior.
-            end
-          end
-        end
+      def each_with_explicit_error(&block)
+        @errors.each(&block)
       end
     end
   end

data/lib/fat_free_crm/exceptions.rb

@@ -7,6 +7,7 @@
 #------------------------------------------------------------------------------
 module FatFreeCRM
   class MissingSettings < StandardError; end
+
   class ObsoleteSettings < StandardError; end
 end
 

data/lib/fat_free_crm/fields.rb

@@ -24,11 +24,10 @@ module FatFreeCRM
 
     module SingletonMethods
       def field_groups
-        if ActiveRecord::Base.connection.data_source_exists? 'field_groups'
-          FieldGroup.where(klass_name: name).order(:position)
-        else
-          []
-        end
+        # catches cases where this code runs before database has been created or migrated
+        FieldGroup.where(klass_name: name).order(:position)
+      rescue ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
+        []
       end
 
       def fields

data/lib/fat_free_crm/gem_dependencies.rb

@@ -19,7 +19,6 @@ require 'acts_as_list'
 require 'acts-as-taggable-on'
 require 'responds_to_parent'
 require 'dynamic_form'
-require 'paperclip'
 require 'simple_form'
 require 'will_paginate'
 require 'devise'

data/lib/fat_free_crm/i18n.rb

@@ -14,7 +14,7 @@ module FatFreeCRM
       if args.size == 1
         super(args.first, default: args.first.to_s)
       elsif args.second.is_a?(Hash)
-        super(*args)
+        super(args.first, **args.second)
       elsif args.second.is_a?(Integer)
         super(args.first, count: args.second)
       else

data/lib/fat_free_crm/version.rb

@@ -6,10 +6,10 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module FatFreeCRM
-  module VERSION #:nodoc:
+  module VERSION # :nodoc:
     MAJOR = 0
-    MINOR = 20
-    TINY  = 1
+    MINOR = 21
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')