fat_free_crm 0.20.1 → 0.22.0

data/app/models/polymorphic/avatar.rb

@@ -21,39 +21,10 @@
 #
 
 class Avatar < ActiveRecord::Base
-  STYLES = { large: "75x75#", medium: "50x50#", small: "25x25#", thumb: "16x16#" }.freeze
-
   belongs_to :user
   belongs_to :entity, polymorphic: true
 
-  # We want to store avatars in separate directories based on entity type
-  # (i.e. /avatar/User/, /avatars/Lead/, etc.), so we are adding :entity_type
-  # interpolation to the Paperclip::Interpolations module.  Also, Paperclip
-  # doesn't seem to care preserving styles hash so we must use STYLES.dup.
-  #----------------------------------------------------------------------------
-  Paperclip::Interpolations.module_eval do
-    def entity_type(attachment, _style_name = nil)
-      attachment.instance.entity_type
-    end
-  end
-  has_attached_file :image, styles: STYLES.dup, url: "/avatars/:entity_type/:id/:style_:filename", default_url: "/assets/avatar.jpg"
-  validates_attachment :image, presence: true,
-                               content_type: { content_type: ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'] }
-
-  # Convert STYLE symbols to 'w x h' format for Gravatar and Rails
-  # e.g. Avatar.size_from_style(:size => :large) -> '75x75'
-  # Allow options to contain :width and :height override keys
-  #----------------------------------------------------------------------------
-  def self.size_from_style!(options)
-    if options[:width] && options[:height]
-      options[:size] = %i[width height].map { |d| options[d] }.join("x")
-      options.delete(:width)
-      options.delete(:height)
-    elsif Avatar::STYLES.keys.include?(options[:size])
-      options[:size] = Avatar::STYLES[options[:size]].sub(/\#\z/, '')
-    end
-    options
-  end
+  has_one_attached :image
 
   ActiveSupport.run_load_hooks(:fat_free_crm_avatar, self)
 end

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/polymorphic/task.rb

@@ -31,6 +31,7 @@ class Task < ActiveRecord::Base
   include ActiveModel::Serializers::Xml
 
   attr_accessor :calendar
+
   ALLOWED_VIEWS = %w[pending assigned completed]
 
   belongs_to :user

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/app/views/home/index.xls.builder

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 xml.Worksheet 'ss:Name' => I18n.t(:tab_dashboard) do
   xml.Table do
     unless @activities.empty?

data/app/views/shared/_address.html.haml

@@ -41,4 +41,4 @@
           = address_field(a, :zipcode, "width:80px;")
         %td= spacer
         %td
-          = a.country_select(:country, priority_countries, { include_blank: "" }, {:"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2'})
+          = a.country_select(:country, priority_countries: priority_countries, include_blank: "", :"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2')

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

@@ -12,6 +12,7 @@ require 'rails/all'
 
 # Pick the frameworks you want:
 require "active_record/railtie"
+require "active_storage/engine"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "sprockets/railtie"
@@ -29,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/**")] +
@@ -72,6 +77,19 @@ module FatFreeCRM
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += %i[password encrypted_password password_salt password_confirmation]
+
+    # Enable support for loading via Psych, required by PaperTrail
+    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,
+      ::Date,
+      ::Symbol,
+      ::Time
+    ]
   end
 end
 

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!

data/config/environments/development.rb

@@ -7,35 +7,59 @@
 #------------------------------------------------------------------------------
 if defined?(FatFreeCRM::Application)
   FatFreeCRM::Application.configure do
-    # Settings specified here will take precedence over those in config/application.rb
-    config.eager_load = false
+    # Settings specified here will take precedence over those in config/application.rb.
 
-    # In the development environment your application's code is reloaded on
-    # every request. This slows down response time but is perfect for development
+    # In the development environment your application's code is reloaded any time
+    # it changes. This slows down response time but is perfect for development
     # since you don't have to restart the web server when you make code changes.
     config.cache_classes = false
 
-    config.assets.quiet = true
+    # Do not eager load code on boot.
+    config.eager_load = false
+
+    # Show full error reports.
+    config.consider_all_requests_local = true
+
+    # Enable server timing
+    config.server_timing = true
+
+    # Enable/disable caching. By default caching is disabled.
+    # Run rails dev:cache to toggle caching.
+    if Rails.root.join("tmp/caching-dev.txt").exist?
+      config.action_controller.perform_caching = true
+      config.action_controller.enable_fragment_cache_logging = true
+
+      config.cache_store = :memory_store
+      config.public_file_server.headers = {
+        "Cache-Control" => "public, max-age=#{2.days.to_i}"
+      }
+    else
+      config.action_controller.perform_caching = false
 
-    # Show full error reports and disable caching
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
+      config.cache_store = :null_store
+    end
+
+    # Store uploaded files on the local file system (see config/storage.yml for options).
+    config.active_storage.service = :local
 
     config.action_mailer.delivery_method = :file
     config.action_mailer.default_url_options = { host: 'localhost:3000' }
 
-    # Don't care if the mailer can't send
+    # Don't care if the mailer can't send.
     config.action_mailer.raise_delivery_errors = false
 
-    # Print deprecation notices to the Rails logger
+    # Print deprecation notices to the Rails logger.
     config.active_support.deprecation = :log
 
     # Only use best-standards-support built into browsers
     # config.action_dispatch.best_standards_support = :builtin
 
-    # Raise an error on page load if there are pending migrations
+    # Raise an error on page load if there are pending migrations.
     config.active_record.migration_error = :page_load
 
+    # Highlight code that triggered database queries in logs.
+    config.active_record.verbose_query_logs = true
+
     # Expands the lines which load the assets
     config.assets.debug = true
 
@@ -43,6 +67,18 @@ if defined?(FatFreeCRM::Application)
     # yet still be able to expire them through the digest params.
     config.assets.digest = true
 
+    # Suppress logger output for asset requests.
+    config.assets.quiet = true
+
+    # Raises error for missing translations.
+    # config.i18n.raise_on_missing_translations = true
+
+    # Annotate rendered view with file names.
+    # config.action_view.annotate_rendered_view_with_filenames = true
+
+    # Uncomment if you wish to allow Action Cable access from any origin.
+    # config.action_cable.disable_request_forgery_protection = true
+
     # Adds additional error checking when serving assets at runtime.
     # Checks for improperly declared sprockets dependencies.
     # Raises helpful error messages.

data/config/environments/production.rb

@@ -7,15 +7,19 @@
 #------------------------------------------------------------------------------
 if defined?(FatFreeCRM::Application)
   FatFreeCRM::Application.configure do
-    # Settings specified here will take precedence over those in config/application.rb
-    config.eager_load = true
+    # Settings specified here will take precedence over those in config/application.rb.
 
-    # Code is not reloaded between requests
+    # Code is not reloaded between requests.
     config.cache_classes = true
 
-    # Full error reports are enabled, since this is an internal application.
+    # Eager load code on boot. This eager loads most of Rails and
+    # your application in memory, allowing both threaded web servers
+    # and those relying on copy on write to perform better.
+    # Rake tasks automatically ignore this option for performance.
+    config.eager_load = true
+
+    # Full error reports are disabled and caching is turned on.
     config.consider_all_requests_local       = false
-    # Caching is turned on
     config.action_controller.perform_caching = true
 
     # Disable Rails's static asset server (Apache or nginx will already do this)
@@ -24,29 +28,27 @@ if defined?(FatFreeCRM::Application)
     # Compress JavaScripts and CSS
     config.assets.compress = true
 
-    # Don't fallback to assets pipeline if a precompiled asset is missed
+    # Do not fallback to assets pipeline if a precompiled asset is missed.
     config.assets.compile = false
 
     # Generate digests for assets URLs
     config.assets.digest = true
 
-    # Defaults to Rails.root.join("public/assets")
-    # config.assets.manifest = YOUR_PATH
-
-    # Specifies the header that your server uses for sending files
-    # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+    # Specifies the header that your server uses for sending files.
+    # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+    # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
     # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
     # config.force_ssl = true
 
-    # See everything in the log (default is :info)
+    # Include generic and useful information about system operation, but avoid logging too much
+    # information to avoid inadvertent exposure of personally identifiable information (PII).
     config.log_level = :info
 
     # Use a different logger for distributed setups
     # config.logger = SyslogLogger.new
 
-    # Use a different cache store in production
+    # Use a different cache store in production.
     # config.cache_store = :mem_cache_store
 
     # Enable serving of images, stylesheets, and JavaScripts from an asset server
@@ -56,7 +58,7 @@ if defined?(FatFreeCRM::Application)
     # config.assets.precompile += %w( search.js )
 
     # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found)
+    # the I18n.default_locale when a translation cannot be found).
     config.i18n.fallbacks = true
 
     # Send deprecation notices to registered listeners

data/config/environments/test.rb

@@ -7,29 +7,33 @@
 #------------------------------------------------------------------------------
 if defined?(FatFreeCRM::Application)
   FatFreeCRM::Application.configure do
+    # Settings specified here will take precedence over those in config/application.rb.
+
     # The test environment is used exclusively to run your application's
     # test suite.  You never need to work with it otherwise.  Remember that
     # your test database is "scratch space" for the test suite and is wiped
     # and recreated between test runs.  Don't rely on the data there!
+    # Turn false under Spring and add config.action_view.cache_template_loading = true.
     config.cache_classes = true
 
-    # Do not eager load code on boot. This avoids loading your whole application
-    # just for the purpose of running a single test. If you are using a tool that
-    # preloads Rails for running tests, you may have to set it to true.
-    config.eager_load = false
+    # Eager loading loads your whole application. When running a single test locally,
+    # this probably isn't necessary. It's a good idea to do in a continuous integration
+    # system, or in some way before deploying your code.
+    config.eager_load = ENV["CI"].present?
 
-    # Configure static file server for tests with Cache-Control for performance.
+    # Configure public file server for tests with Cache-Control for performance.
     config.public_file_server.enabled = true
     config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
-    # Show full error reports and disable caching
+    # Show full error reports and disable caching.
     config.consider_all_requests_local       = true
     config.action_controller.perform_caching = false
+    config.cache_store = :null_store
 
-    # Raise exceptions instead of rendering exception templates
+    # Raise exceptions instead of rendering exception templates.
     config.action_dispatch.show_exceptions = false
 
-    # Disable request forgery protection in test environment
+    # Disable request forgery protection in test environment.
     config.action_controller.allow_forgery_protection = false
 
     # Tell Action Mailer not to deliver emails to the real world.
@@ -43,7 +47,7 @@ if defined?(FatFreeCRM::Application)
     # Randomize the order test cases are executed.
     config.active_support.test_order = :random
 
-    # Print deprecation notices to the stderr
+    # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 
     # Store uploaded files on the local file system in a temporary directory
@@ -52,6 +56,12 @@ if defined?(FatFreeCRM::Application)
     config.action_mailer.perform_caching = false
     # Raises error for missing translations
     # config.action_view.raise_on_missing_translations = true
+
+    # Raises error for missing translations.
+    # config.i18n.raise_on_missing_translations = true
+
+    # Annotate rendered view with file names.
+    # config.action_view.annotate_rendered_view_with_filenames = true
   end
 
   # Optionally load 'awesome_print' for debugging in development mode.

data/config/initializers/action_mailer.rb

@@ -10,6 +10,7 @@
 #   ActionMailer is setup in test mode later on
 #
 unless Rails.env.test?
+  require './app/models/setting'
 
   smtp_settings = Setting.smtp || {}