fat_free_crm 0.20.1 → 0.22.0

data/db/schema.rb

@@ -2,31 +2,33 @@
 # 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[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"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     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|
     t.integer "account_id"
     t.integer "opportunity_id"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["account_id", "opportunity_id"], name: "index_account_opportunities_on_account_id_and_opportunity_id"
   end
 
@@ -39,9 +41,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "toll_free_phone", limit: 32
     t.string "phone", limit: 32
     t.string "fax", limit: 32
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "email", limit: 254
     t.string "background_info"
     t.integer "rating", default: 0, null: false
@@ -53,6 +55,34 @@ 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 "active_storage_attachments", 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", precision: nil, 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", 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", precision: nil, null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", 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", force: :cascade do |t|
     t.integer "user_id"
     t.string "subject_type"
@@ -60,8 +90,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "action", limit: 32, default: "created"
     t.string "info", default: ""
     t.boolean "private", default: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["created_at"], name: "index_activities_on_created_at"
     t.index ["user_id"], name: "index_activities_on_user_id"
   end
@@ -77,9 +107,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "address_type", limit: 16
     t.string "addressable_type"
     t.integer "addressable_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "deleted_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "deleted_at", precision: nil
     t.index ["addressable_id", "addressable_type"], name: "index_addresses_on_addressable_id_and_addressable_type"
   end
 
@@ -90,8 +120,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.integer "image_file_size"
     t.string "image_file_name"
     t.string "image_content_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "campaigns", force: :cascade do |t|
@@ -110,9 +140,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.date "starts_on"
     t.date "ends_on"
     t.text "objectives"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "background_info"
     t.text "subscribed_users"
     t.index ["assigned_to"], name: "index_campaigns_on_assigned_to"
@@ -126,8 +156,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.boolean "private"
     t.string "title", default: ""
     t.text "comment"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "state", limit: 16, default: "Expanded", null: false
   end
 
@@ -135,9 +165,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.integer "contact_id"
     t.integer "opportunity_id"
     t.string "role", limit: 32
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["contact_id", "opportunity_id"], name: "index_contact_opportunities_on_contact_id_and_opportunity_id"
   end
 
@@ -163,9 +193,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "twitter", limit: 128
     t.date "born_on"
     t.boolean "do_not_call", default: false, null: false
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "background_info"
     t.string "skype", limit: 128
     t.text "subscribed_users"
@@ -185,11 +215,11 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "subject"
     t.text "body"
     t.text "header"
-    t.datetime "sent_at"
-    t.datetime "received_at"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "sent_at", precision: nil
+    t.datetime "received_at", precision: nil
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "state", limit: 16, default: "Expanded", null: false
     t.index ["mediator_id", "mediator_type"], name: "index_emails_on_mediator_id_and_mediator_type"
   end
@@ -199,8 +229,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "label", limit: 128
     t.integer "position"
     t.string "hint"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "tag_id"
     t.string "klass_name", limit: 32
   end
@@ -217,12 +247,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.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "maxlength"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     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"
@@ -234,8 +264,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
 
   create_table "groups", force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
   end
 
   create_table "groups_users", id: false, force: :cascade do |t|
@@ -268,9 +298,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "twitter", limit: 128
     t.integer "rating", default: 0, null: false
     t.boolean "do_not_call", default: false, null: false
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "background_info"
     t.string "skype", limit: 128
     t.text "subscribed_users"
@@ -281,8 +311,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
   create_table "lists", force: :cascade do |t|
     t.string "name"
     t.text "url"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "user_id"
     t.index ["user_id"], name: "index_lists_on_user_id"
   end
@@ -299,9 +329,9 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.decimal "amount", precision: 12, scale: 2
     t.decimal "discount", precision: 12, scale: 2
     t.date "closes_on"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "background_info"
     t.text "subscribed_users"
     t.index ["assigned_to"], name: "index_opportunities_on_assigned_to"
@@ -312,8 +342,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.integer "user_id"
     t.string "asset_type"
     t.integer "asset_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "group_id"
     t.index ["asset_id", "asset_type"], name: "index_permissions_on_asset_id_and_asset_type"
     t.index ["group_id"], name: "index_permissions_on_group_id"
@@ -324,16 +354,16 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.integer "user_id"
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["user_id", "name"], name: "index_preferences_on_user_id_and_name"
   end
 
   create_table "sessions", force: :cascade do |t|
     t.string "session_id", null: false
     t.text "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["session_id"], name: "index_sessions_on_session_id"
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
@@ -341,8 +371,8 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
   create_table "settings", force: :cascade do |t|
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.index ["name"], name: "index_settings_on_name"
   end
 
@@ -353,7 +383,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "tagger_type"
     t.string "taggable_type", limit: 50
     t.string "context", limit: 50
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["tag_id", "taggable_id", "taggable_type", "context"], name: "taggings_idx", unique: true
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
   end
@@ -374,11 +404,11 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "priority", limit: 32
     t.string "category", limit: 32
     t.string "bucket", limit: 32
-    t.datetime "due_at"
-    t.datetime "completed_at"
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "due_at", precision: nil
+    t.datetime "completed_at", precision: nil
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "background_info"
     t.text "subscribed_users"
     t.index ["assigned_to"], name: "index_tasks_on_assigned_to"
@@ -401,25 +431,25 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "skype", limit: 32
     t.string "encrypted_password", default: "", null: false
     t.string "password_salt", default: "", null: false
-    t.datetime "last_sign_in_at"
-    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at", precision: nil
+    t.datetime "current_sign_in_at", precision: nil
     t.string "last_sign_in_ip"
     t.string "current_sign_in_ip"
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "deleted_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "deleted_at", precision: nil
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.boolean "admin", default: false, null: false
-    t.datetime "suspended_at"
+    t.datetime "suspended_at", precision: nil
     t.string "unconfirmed_email", limit: 254
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
+    t.datetime "reset_password_sent_at", precision: nil
     t.string "remember_token"
-    t.datetime "remember_created_at"
+    t.datetime "remember_created_at", precision: nil
     t.string "authentication_token"
     t.string "confirmation_token", limit: 255
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     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"
@@ -434,7 +464,7 @@ ActiveRecord::Schema.define(version: 2020_08_06_004459) do
     t.string "event", limit: 512, null: false
     t.string "whodunnit"
     t.text "object"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.text "object_changes"
     t.integer "related_id"
     t.string "related_type"
@@ -446,4 +476,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/callback.rb

@@ -108,10 +108,9 @@ module FatFreeCRM
     #--------------------------------------------------------------------------
     module Helper
       def hook(method, caller, context = {}, &block)
-        is_view_hook = caller.is_haml?
 
-        # If a block was given, hooks are able to replace, append or prepend view content.
-        if is_view_hook
+        # 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)
           # Add content to the view in the following order:
           # -- before

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/mail_processor/dropbox.rb

@@ -258,7 +258,7 @@ module FatFreeCRM
       def notify(email, mediator_links)
         DropboxMailer.create_dropbox_notification(
           @sender, @settings[:address], email, mediator_links
-        ).deliver_now
+        ).deliver_later
       end
     end
   end

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 = 22
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')