fat_free_crm 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da1fdcaaf08df0256e5075214129f236ce36d156c24cd8ae4a282f3430b1ecb
-  data.tar.gz: 255b0d61c8eb6d84bb94de174d075531c92c6b8dfb32826c6e304beafe578dc5
+  metadata.gz: 325977901a3011b43c20379a5e03317660a3cd2b702e36ceb7aa255ec0f6ff17
+  data.tar.gz: 6badcc5bfcc41d304fe646a7ea07d1c4fce631b3a60efd08285752fe645e3572
 SHA512:
-  metadata.gz: 95f133e5f454aad954dbb23ccb2da2fce1aa8dd5d6c9d9461b266b91f2339c4fed7db6b23ecb8199eab96473b183f5b492e55e60e0a60fcad574870e0f730ae2
-  data.tar.gz: f83fa46bbe3312262e9845690c8f40ce7625a4b6f67ed018a1e39fab3b10af381fe0a305b7a585f52abdfd5638ba7526be704571e0096b94544296a3ed917f77
+  metadata.gz: 58f6a285322ca7ae834bbf2eeeaf0073a2c501f9dd71117b890c9d7a1403dd3b2e5f725e97d2b3814836f854595eb77f322e09a27a94202fb65ca7b28078cd47
+  data.tar.gz: 004b7dadb4c2c77e4863010b59a87dc89500142bc52fe0d90f81e71532d964b287f1bd97365bdd9460898249c0278e0ca389eba9edba1260c3410d0131302d0b

data/app/assets/config/fat_free_crm.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/app/assets/config/manifest.js

@@ -1,3 +1 @@
-//= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
+//= link fat_free_crm

data/app/controllers/admin/field_groups_controller.rb

@@ -22,8 +22,6 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   def edit
     @field_group = FieldGroup.find(params[:id])
 
-    @previous = FieldGroup.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
-
     respond_with(@field_group)
   end
 

data/app/controllers/admin/tags_controller.rb

@@ -28,7 +28,7 @@ class Admin::TagsController < Admin::ApplicationController
   # GET /admin/tags/1/edit                                                AJAX
   #----------------------------------------------------------------------------
   def edit
-    @previous = Tag.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Tag.find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
   end
 
   # POST /admin/tags

data/app/controllers/admin/users_controller.rb

@@ -35,7 +35,7 @@ class Admin::UsersController < Admin::ApplicationController
   # GET /admin/users/1/edit                                                AJAX
   #----------------------------------------------------------------------------
   def edit
-    @previous = User.find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = User.find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@user)
   end

data/app/controllers/application_controller.rb

@@ -268,4 +268,15 @@ class ApplicationController < ActionController::Base
       raise "Unknown resource"
     end
   end
+
+  # In a number of places, we pass ?previous=(id) or ?previous=crm.find_form...
+  # This method centralises all of the places we can pass in a previous param
+  # and extracts an int ID, or nil
+  def detect_previous_id
+    return unless params[:previous]
+    return if params[:previous].start_with?("crm")
+
+    params[:previous].to_i
+  end
+  ActiveSupport.run_load_hooks(:fat_free_crm_application_controller, self)
 end

data/app/controllers/comments_controller.rb

@@ -99,4 +99,6 @@ class CommentsController < ApplicationController
   def extract_commentable_name(params)
     params.keys.detect { |x| x =~ /_id$/ }.try(:sub, /_id$/, '')
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_comments_controller, self)
 end

data/app/controllers/emails_controller.rb

@@ -15,4 +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/accounts_controller.rb

@@ -45,7 +45,7 @@ class AccountsController < EntitiesController
   # GET /accounts/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   def edit
-    @previous = Account.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Account.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@account)
   end
@@ -160,4 +160,6 @@ class AccountsController < EntitiesController
     @account_category_total[:all] = Account.my(current_user).count
     @account_category_total[:other] = @account_category_total[:all] - categorized
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_accounts_controller, self)
 end

data/app/controllers/entities/campaigns_controller.rb

@@ -84,7 +84,7 @@ class CampaignsController < EntitiesController
   # GET /campaigns/1/edit                                                  AJAX
   #----------------------------------------------------------------------------
   def edit
-    @previous = Campaign.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Campaign.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@campaign)
   end
@@ -204,4 +204,6 @@ class CampaignsController < EntitiesController
     end
     @campaign_status_total[:other] += @campaign_status_total[:all]
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_campaigns_controller, self)
 end

data/app/controllers/entities/contacts_controller.rb

@@ -51,7 +51,7 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   def edit
     @account = @contact.account || Account.new(user: current_user)
-    @previous = Contact.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Contact.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@contact)
   end
@@ -164,4 +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/entities/leads_controller.rb

@@ -52,7 +52,7 @@ class LeadsController < EntitiesController
   def edit
     get_campaigns
 
-    @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Lead.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@lead)
   end
@@ -108,7 +108,7 @@ class LeadsController < EntitiesController
     @accounts = Account.my(current_user).order('name')
     @opportunity = Opportunity.new(user: current_user, access: "Lead", stage: "prospecting", campaign: @lead.campaign, source: @lead.source)
 
-    @previous = Lead.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Lead.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@lead)
   end
@@ -268,4 +268,6 @@ class LeadsController < EntitiesController
       get_data_for_sidebar(:campaign)
     end
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_leads_controller, self)
 end

data/app/controllers/entities/opportunities_controller.rb

@@ -57,7 +57,7 @@ class OpportunitiesController < EntitiesController
     @account  = @opportunity.account || Account.new(user: current_user)
     @accounts = Account.my(current_user).order('name')
 
-    @previous = Opportunity.my(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Opportunity.my(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@opportunity)
   end
@@ -227,4 +227,6 @@ class OpportunitiesController < EntitiesController
     current_user.pref[:opportunities_sort_by]  = Opportunity.sort_by_map[params[:sort_by]] if params[:sort_by]
     session[:opportunities_filter] = params[:stage] if params[:stage]
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_opportunities_controller, self)
 end

data/app/controllers/entities_controller.rb

@@ -245,4 +245,6 @@ class EntitiesController < ApplicationController
       Account.new(user: user)
     end
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_entities_controller, self)
 end

data/app/controllers/home_controller.rb

@@ -165,4 +165,6 @@ class HomeController < ApplicationController
       %w[zero one two].index(words.first).send(words.last) if %w[one two].include?(words.first) && %w[hour day days week weeks month].include?(words.last)
     end
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_home_controller, self)
 end

data/app/controllers/lists_controller.rb

@@ -39,4 +39,6 @@ class ListsController < ApplicationController
       :user_id
     )
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_lists_controller, self)
 end

data/app/controllers/tasks_controller.rb

@@ -58,7 +58,7 @@ class TasksController < ApplicationController
     @category = Setting.unroll(:task_category)
     @asset = @task.asset if @task.asset_id?
 
-    @previous = Task.tracked_by(current_user).find_by_id(Regexp.last_match[1]) || Regexp.last_match[1].to_i if params[:previous].to_s =~ /(\d+)\z/
+    @previous = Task.tracked_by(current_user).find_by_id(detect_previous_id) || detect_previous_id if detect_previous_id
 
     respond_with(@task)
   end
@@ -224,4 +224,6 @@ class TasksController < ApplicationController
     views = Task::ALLOWED_VIEWS
     views.include?(view) ? view : views.first
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_tasks_controller, self)
 end

data/app/controllers/users_controller.rb

@@ -143,4 +143,6 @@ class UsersController < ApplicationController
       .permit(:image)
       .merge(entity: @user, user_id: @user.id)
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_users_controller, self)
 end

data/app/models/fields/custom_field.rb

@@ -124,7 +124,7 @@ class CustomField < Field
   #------------------------------------------------------------------------------
   def add_column
     self.name = generate_column_name if name.blank?
-    klass.connection.add_column(table_name, name, column_type, column_options)
+    klass.connection.add_column(table_name, name, column_type, **column_options)
     klass.reset_column_information
     klass.serialize_custom_fields!
   end
@@ -142,7 +142,7 @@ class CustomField < Field
   #------------------------------------------------------------------------------
   def update_column
     if errors.empty? && db_transition_safety(as_was) == :safe
-      klass.connection.change_column(table_name, name, column_type, column_options)
+      klass.connection.change_column(table_name, name, column_type, **column_options)
       klass.reset_column_information
       klass.serialize_custom_fields!
     end

data/app/models/observers/entity_observer.rb

@@ -19,7 +19,7 @@ class EntityObserver < ActiveRecord::Observer
   private
 
   def send_notification_to_assignee(item)
-    UserMailer.assigned_entity_notification(item, current_user).deliver_now if item.assignee.present? && current_user.present? && can_send_email?
+    UserMailer.assigned_entity_notification(item, current_user).deliver_later if item.assignee.present? && current_user.present? && can_send_email?
   end
 
   # Need to have a host set before email can be sent

data/app/models/polymorphic/comment.rb

@@ -54,7 +54,7 @@ class Comment < ActiveRecord::Base
   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_now
+        SubscriptionMailer.comment_notification(subscriber, self).deliver_later
       end
     end
   end

data/app/models/setting.rb

@@ -58,13 +58,11 @@ class Setting < ActiveRecord::Base
       return cache[name] if cache.key?(name)
 
       # Check database
-      if database_and_table_exists?
-        if setting = find_by_name(name.to_s)
-          return cache[name] = setting.value unless setting.value.nil?
-        end
+      if database_and_table_exists? && (setting = find_by_name(name.to_s))&.value.present?
+        return cache[name] = setting.value
       end
       # Check YAML settings
-      return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
+      cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end
 
     # Set setting value
@@ -73,6 +71,7 @@ class Setting < ActiveRecord::Base
       raise ArgumentError, "name cannot be blank" if name.blank?
 
       return nil unless database_and_table_exists?
+
       setting = find_by_name(name.to_s) || new(name: name.to_s)
       setting.value = value
       setting.save

data/app/models/users/user.rb

@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
   has_many :opportunities
   has_many :assigned_opportunities, class_name: 'Opportunity', foreign_key: 'assigned_to'
   has_many :permissions, dependent: :destroy
-  has_many :preferences, dependent: :destroy
+  has_many :preferences, class_name: 'Preference', dependent: :destroy
   has_many :lists
   has_and_belongs_to_many :groups
 

data/bin/bundle

@@ -1,5 +1,111 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+
+      bundler_version = Regexp.last_match(1)
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?

data/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"

data/bin/rake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

data/bin/setup

@@ -1,38 +1,35 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 FileUtils.chdir APP_ROOT do
-  # This script is a way to setup or update your development environment automatically.
-  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  # system('bin/yarn')
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end

data/config/application.rb

@@ -30,11 +30,15 @@ require 'fat_free_crm/gem_ext/rails/engine'
 module FatFreeCRM
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.0
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # Models are organized in sub-directories
     config.autoload_paths += Dir[Rails.root.join("app/models/**")] +
@@ -78,6 +82,7 @@ module FatFreeCRM
     config.active_record.use_yaml_unsafe_load = false
     config.active_record.yaml_column_permitted_classes = [
       ::ActiveRecord::Type::Time::Value,
+      ::ActiveSupport::HashWithIndifferentAccess, # for Field#settings serialization see app/models/fields/field.rb
       ::ActiveSupport::TimeWithZone,
       ::ActiveSupport::TimeZone,
       ::BigDecimal,

data/config/boot.rb

@@ -6,9 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'bootsnap/setup'
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.

data/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: fat_free_crm_production

data/config/database.yml

@@ -0,0 +1,26 @@
+---
+development: &development
+  adapter: postgresql
+  database: fat_free_crm_development
+  username: postgres
+  password:
+  host:     localhost
+  port:     5432
+  schema_search_path: public
+  min_messages: warning
+
+# 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
+
+production:
+  <<: *development
+  database: fat_free_crm_production
+
+staging:
+  <<: *development
+  database: fat_free_crm_staging
+

data/config/environment.rb

@@ -5,8 +5,9 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-# Load the rails application
-require_relative 'application'
 
-# Initialize the rails application
+# Load the Rails application.
+require_relative "application"
+
+# Initialize the Rails application.
 Rails.application.initialize!