fat_free_crm 0.18.2 → 0.19.0

data/lib/development_tasks/license.rake

@@ -44,8 +44,8 @@ namespace :license do
                css: "/*\n" + LICENSE_RB.gsub(/^#/, ' *').sub(/---\n/, "---\n */\n") }
 
   REGEXPS  = { ruby: /^# Copyright \(c\).*?\n(?:#.*\n)*?#-{10}-*\n/,
-               js: /^\/\/ Copyright \(c\).*?\n(?:\/\/.*\n)*?\/\/-{10}-*\n/,
-               css: /^\/\*\n \* Copyright \(c\).*?\n(?: \*.*\n)*? \*-{10}-*\n \*\/\n/ }
+               js: %r{^// Copyright \(c\).*?\n(?://.*\n)*?//-{10}-*\n},
+               css: %r{^/\*\n \* Copyright \(c\).*?\n(?: \*.*\n)*? \*-{10}-*\n \*/\n} }
 
   def expand_globs(globs)
     globs.map { |f| Dir.glob(f) }.flatten.uniq

data/lib/fat_free_crm/callback.rb

@@ -143,5 +143,5 @@ module FatFreeCRM
   end
 end
 
-ActionView::Base.send(:include, FatFreeCRM::Callback::Helper)
-ActionController::Base.send(:include, FatFreeCRM::Callback::Helper)
+ActionView::Base.include FatFreeCRM::Callback::Helper
+ActionController::Base.include FatFreeCRM::Callback::Helper

data/lib/fat_free_crm/comment_extensions.rb

@@ -13,9 +13,7 @@ module FatFreeCRM
 
     module ClassMethods
       def uses_comment_extensions
-        unless included_modules.include?(InstanceMethods)
-          include FatFreeCRM::CommentExtensions::InstanceMethods
-        end
+        include FatFreeCRM::CommentExtensions::InstanceMethods unless included_modules.include?(InstanceMethods)
       end
     end
 
@@ -27,4 +25,4 @@ module FatFreeCRM
   end
 end
 
-ActiveRecord::Base.send(:include, FatFreeCRM::CommentExtensions)
+ActiveRecord::Base.include FatFreeCRM::CommentExtensions

data/lib/fat_free_crm/core_ext/string.rb

@@ -21,7 +21,7 @@ class String
   end
 
   def to_url
-    match?(/^https?:\/\//) ? self : "http://#{self}"
+    match?(%r{^https?://}) ? self : "http://#{self}"
   end
 
   def true?

data/lib/fat_free_crm/engine.rb

@@ -14,7 +14,7 @@ module FatFreeCRM
                                         task_observer entity_observer]
 
     initializer "model_core.factories", after: "factory_bot.set_factory_paths" do
-      FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryBot)
+      FactoryBot.definition_file_paths << File.expand_path('../../spec/factories', __dir__) if defined?(FactoryBot)
     end
 
     initializer :append_migrations do |app|

data/lib/fat_free_crm/errors.rb

@@ -36,4 +36,4 @@ module FatFreeCRM
   end
 end
 
-ActiveModel::Errors.send(:include, FatFreeCRM::ActiveModel::Errors)
+ActiveModel::Errors.include FatFreeCRM::ActiveModel::Errors

data/lib/fat_free_crm/export_csv.rb

@@ -14,6 +14,7 @@ module FatFreeCRM
     #----------------------------------------------------------------------------
     def self.from_array(items = [])
       return '' if items.empty?
+
       # Infer column types from the first item in the array
       klass = items.first.class
       columns = klass.columns.map(&:name).reject { |column| column =~ /password|token/ }

data/lib/fat_free_crm/exportable.rb

@@ -48,4 +48,4 @@ module FatFreeCRM
   end
 end
 
-ActiveRecord::Base.send(:include, FatFreeCRM::Exportable)
+ActiveRecord::Base.include FatFreeCRM::Exportable

data/lib/fat_free_crm/fields.rb

@@ -92,4 +92,4 @@ module FatFreeCRM
   end
 end
 
-ActiveRecord::Base.send(:include, FatFreeCRM::Fields)
+ActiveRecord::Base.include FatFreeCRM::Fields

data/lib/fat_free_crm/gem_dependencies.rb

@@ -22,7 +22,7 @@ require 'dynamic_form'
 require 'paperclip'
 require 'simple_form'
 require 'will_paginate'
-require 'authlogic'
+require 'devise'
 require 'ransack'
 require 'ransack_ui'
 require 'paper_trail'

data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb

@@ -13,9 +13,7 @@ module SimpleForm
       def simple_form_for(record, options = {}, &block)
         options[:builder] ||= SimpleForm::FormBuilder
         options[:html] ||= {}
-        unless options[:html].key?(:novalidate)
-          options[:html][:novalidate] = !SimpleForm.browser_validations
-        end
+        options[:html][:novalidate] = !SimpleForm.browser_validations unless options[:html].key?(:novalidate)
 
         with_simple_form_field_error_proc do
           form_for(record, options, &block)

data/lib/fat_free_crm/i18n.rb

@@ -40,5 +40,5 @@ module FatFreeCRM
   end
 end
 
-ActionView::Base.send(:include, FatFreeCRM::I18n)
-ActionController::Base.send(:include, FatFreeCRM::I18n)
+ActionView::Base.include FatFreeCRM::I18n
+ActionController::Base.include FatFreeCRM::I18n

data/lib/fat_free_crm/mail_processor/base.rb

@@ -50,9 +50,7 @@ module FatFreeCRM
 
       #--------------------------------------------------------------------------------------
       def run(dry_run = false)
-        if @dry_run = dry_run
-          log "Not discarding or archiving any new messages..."
-        end
+        log "Not discarding or archiving any new messages..." if @dry_run = dry_run
         connect! || (return nil)
         with_new_emails do |uid, email|
           # Subclasses must define a #process method that takes arguments: uid, email
@@ -127,9 +125,7 @@ module FatFreeCRM
         if @dry_run
           log "Not discarding message"
         else
-          if @settings[:move_invalid_to_folder]
-            @imap.uid_copy(uid, @settings[:move_invalid_to_folder])
-          end
+          @imap.uid_copy(uid, @settings[:move_invalid_to_folder]) if @settings[:move_invalid_to_folder]
           @imap.uid_store(uid, "+FLAGS", [:Deleted])
         end
         @discarded += 1
@@ -141,9 +137,7 @@ module FatFreeCRM
         if @dry_run
           log "Not archiving message"
         else
-          if @settings[:move_to_folder]
-            @imap.uid_copy(uid, @settings[:move_to_folder])
-          end
+          @imap.uid_copy(uid, @settings[:move_to_folder]) if @settings[:move_to_folder]
           @imap.uid_store(uid, "+FLAGS", [:Seen])
         end
         @archived += 1
@@ -171,7 +165,7 @@ module FatFreeCRM
           email: email_address.downcase
         )
           # Set the PaperTrail user for versions (if user is found)
-          PaperTrail.whodunnit = @sender.id.to_s
+          PaperTrail.request.whodunnit = @sender.id.to_s
         end
       end
 

data/lib/fat_free_crm/mail_processor/dropbox.rb

@@ -54,9 +54,7 @@ module FatFreeCRM
       #--------------------------------------------------------------------------------------
       def with_explicit_keyword(email)
         first_line = plain_text_body(email).split("\n").first
-        if first_line =~ /(#{KEYWORDS.join('|')})[^a-zA-Z0-9]+(.+)$/i
-          yield Regexp.last_match[1].capitalize, Regexp.last_match[2].strip
-        end
+        yield Regexp.last_match[1].capitalize, Regexp.last_match[2].strip if first_line =~ /(#{KEYWORDS.join('|')})[^a-zA-Z0-9]+(.+)$/i
       end
 
       # Checks the email to detect assets on to/bcc addresses
@@ -68,9 +66,7 @@ module FatFreeCRM
 
         # Ignore the dropbox email address, and any address aliases
         ignored_addresses = [@settings[:address]]
-        if @settings[:address_aliases].is_a?(Array)
-          ignored_addresses += @settings[:address_aliases]
-        end
+        ignored_addresses += @settings[:address_aliases] if @settings[:address_aliases].is_a?(Array)
         recipients -= ignored_addresses
 
         # Process each recipient until email has been attached
@@ -83,9 +79,7 @@ module FatFreeCRM
       # Checks the email to detect valid email address in body (first email), detect forwarded emails
       #----------------------------------------------------------------------------------------
       def with_forwarded_recipient(email, _options = {})
-        if plain_text_body(email) =~ /\b([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})\b/
-          yield Regexp.last_match[1]
-        end
+        yield Regexp.last_match[1] if plain_text_body(email) =~ /\b([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})\b/
       end
 
       # Process pipe_separated_data or explicit keyword.
@@ -132,9 +126,7 @@ module FatFreeCRM
           asset = klass.where(["(lower(email) = ?)", recipient.downcase]).first
 
           # Leads and Contacts have an alt_email: try it if lookup by primary email has failed.
-          if !asset && klass.column_names.include?("alt_email")
-            asset = klass.where(["(lower(alt_email) = ?)", recipient.downcase]).first
-          end
+          asset = klass.where(["(lower(alt_email) = ?)", recipient.downcase]).first if !asset && klass.column_names.include?("alt_email")
 
           if asset && sender_has_permissions_for?(asset)
             attach(email, asset)
@@ -176,9 +168,7 @@ module FatFreeCRM
         )
         asset.touch
 
-        if asset.is_a?(Lead) && asset.status == "new"
-          asset.update_attribute(:status, "contacted")
-        end
+        asset.update_attribute(:status, "contacted") if asset.is_a?(Lead) && asset.status == "new"
 
         if @settings[:attach_to_account] && asset.respond_to?(:account) && asset.account
           Email.create(

data/lib/fat_free_crm/permissions.rb

@@ -34,7 +34,7 @@ module FatFreeCRM
       # Save shared permissions to the model, if any.
       #--------------------------------------------------------------------------
       %w[group user].each do |model|
-        class_eval %{
+        class_eval(%{
           def #{model}_ids=(value)
             if access != 'Shared'
               remove_permissions
@@ -53,7 +53,7 @@ module FatFreeCRM
           def #{model}_ids
             permissions.map(&:#{model}_id).compact
           end
-        }
+        }, __FILE__, __LINE__ - 19)
       end
 
       # Remove all shared permissions if no longer shared
@@ -73,7 +73,10 @@ module FatFreeCRM
                                   []
                                 end
 
-        permissions_to_remove.each { |p| permissions.delete(p); p.destroy }
+        permissions_to_remove.each do |p|
+          permissions.delete(p)
+          p.destroy
+        end
       end
 
       # Save the model copying other model's permissions.
@@ -91,4 +94,4 @@ module FatFreeCRM
   end
 end
 
-ActiveRecord::Base.send(:include, FatFreeCRM::Permissions)
+ActiveRecord::Base.include FatFreeCRM::Permissions

data/lib/fat_free_crm/sortable.rb

@@ -42,4 +42,4 @@ module FatFreeCRM
   end
 end
 
-ActiveRecord::Base.send(:include, FatFreeCRM::Sortable)
+ActiveRecord::Base.include FatFreeCRM::Sortable

data/lib/fat_free_crm/tabs.rb

@@ -14,11 +14,11 @@ module FatFreeCRM
     #----------------------------------------------------------------------------
     class << self
       def main
-        @@main ||= (Setting[:tabs] && Setting[:tabs].dup)
+        @@main ||= (Setting[:tabs]&.dup)
       end
 
       def admin
-        @@admin ||= (Setting[:admin_tabs] && Setting[:admin_tabs].dup)
+        @@admin ||= (Setting[:admin_tabs]&.dup)
       end
     end
   end

data/lib/fat_free_crm/version.rb

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

data/lib/gravatar_image_tag.rb

@@ -14,7 +14,7 @@ module GravatarImageTag
   end
 
   class Configuration
-    attr_accessor :default_image, :filetype, :rating, :size, :secure
+    attr_accessor :default_image, :filetype, :rating, :size
    end
 
   def self.included(base)
@@ -25,6 +25,7 @@ module GravatarImageTag
   module InstanceMethods
     def gravatar_image_tag(email, options = {})
       raise ArgumentError, "Options must be a hash, got #{options.inspect}" unless options.is_a? Hash
+
       options[:alt] ||= 'Gravatar'
       image_tag(GravatarImageTag.gravatar_url(email, options.delete(:gravatar)), options)
     end
@@ -36,16 +37,13 @@ module GravatarImageTag
       default:     GravatarImageTag.configuration.default_image,
       filetype:    GravatarImageTag.configuration.filetype,
       rating:      GravatarImageTag.configuration.rating,
-      secure:      GravatarImageTag.configuration.secure,
       size:        GravatarImageTag.configuration.size
     }.merge(overrides).delete_if { |_key, value| value.nil? }
-    "#{gravatar_url_base(gravatar_params.delete(:secure))}/#{gravatar_id(email, gravatar_params.delete(:filetype))}#{url_params(gravatar_params)}"
+    "#{gravatar_url_base}/#{gravatar_id(email, gravatar_params.delete(:filetype))}#{url_params(gravatar_params)}"
   end
 
-  private
-
-  def self.gravatar_url_base(secure = false)
-    'http' + (!!secure ? 's://secure.' : '://') + 'gravatar.com/avatar'
+  def self.gravatar_url_base
+    'https://gravatar.com/avatar'
   end
 
   def self.gravatar_id(email, filetype = nil)
@@ -54,8 +52,9 @@ module GravatarImageTag
 
   def self.url_params(gravatar_params)
     return nil if gravatar_params.keys.empty?
+
     "?#{gravatar_params.map { |key, value| "#{key}=#{URI.escape(value.is_a?(String) ? value : value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.join('&')}"
   end
 end
 
-ActionView::Base.send(:include, GravatarImageTag) if defined?(ActionView::Base)
+ActionView::Base.include GravatarImageTag if defined?(ActionView::Base)

data/lib/missing_translation_detector.rb

@@ -39,6 +39,7 @@ class MissingTranslationDetector
 
     keys.each do |key|
       return true if !h.is_a?(Hash) || !h.key?(key)
+
       h = h[key]
     end
 

data/lib/tasks/ffcrm/missing_translations.rake

@@ -22,6 +22,7 @@ namespace :ffcrm do
         detector.detect
 
         next unless detector.missing_translations?
+
         puts
         puts "Detected missing translations within \"config/locales/#{locale_file_names.last}.yml\":"
         puts

data/lib/tasks/ffcrm/setup.rake

@@ -44,7 +44,12 @@ namespace :ffcrm do
 
           password ||= "manager"
           print "Password [#{password}]: "
-          echo = ->(toggle) { return if RUBY_PLATFORM.match?(/mswin/); system(toggle ? "stty echo && echo" : "stty -echo") }
+          echo = lambda { |toggle|
+            return if RUBY_PLATFORM.match?(/mswin/)
+
+            system(toggle ? "stty echo && echo" : "stty -echo")
+          }
+
           begin
             echo.call(false)
             reply = STDIN.gets.strip
@@ -69,6 +74,7 @@ namespace :ffcrm do
             break unless reply.blank?
           end
           break if reply.match?(/y(?:es)*/i)
+
           redo if reply.match?(/no*/i)
           puts "No admin user was created."
           exit
@@ -76,7 +82,10 @@ namespace :ffcrm do
       end
       User.reset_column_information # Reload the class since we've added new fields in migrations.
       user = User.find_by_username(username) || User.new
+      user.skip_confirmation!
+      user.confirm
       user.update_attributes(username: username, password: password, email: email)
+      user.update_attribute(:confirmed_at, Time.now.utc) # Skip confirmation
       user.update_attribute(:admin, true) # Mass assignments don't work for :admin because of the attr_protected
       user.update_attribute(:suspended_at, nil) # Mass assignments don't work for :suspended_at because of the attr_protected
       puts "Admin user has been created."

data/lib/tasks/ffcrm/update_data.rake

@@ -114,7 +114,7 @@ in a console and continue. This is strongly discouraged. You have been warned!
         %w[Guam GQ GU],
         %w[Guernsey GK GG],
         %w[Guinea GV GN],
-        ["Guinea-Bissau", "PU", "GW"],
+        %w[Guinea-Bissau PU GW],
         %w[Haiti HA HT],
         ["Holy See (Vatican City State)", "VT", "VA"],
         %w[Honduras HO HN],
@@ -184,7 +184,7 @@ in a console and continue. This is strongly discouraged. You have been warned!
         %w[Sweden SW SE],
         %w[Switzerland SZ CH],
         %w[Tajikistan TI TJ],
-        ["Timor-Leste", "TT", "TL"],
+        %w[Timor-Leste TT TL],
         %w[Togo TO TG],
         %w[Tokelau TL TK],
         %w[Tonga TN TO],

data/script/rails

@@ -3,6 +3,6 @@
 
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
+require File.expand_path('../config/boot', __dir__)
 require 'rails/commands'

data/spec/controllers/admin/users_controller_spec.rb

@@ -50,17 +50,6 @@ describe Admin::UsersController do
     end
   end
 
-  # GET /admin/users/new
-  # GET /admin/users/new.xml                                               AJAX
-  #----------------------------------------------------------------------------
-  describe "GET new" do
-    it "assigns a new user as @user and renders [new] template" do
-      get :new, xhr: true
-      expect(assigns[:user]).to be_new_record
-      expect(response).to render_template("admin/users/new")
-    end
-  end
-
   # GET /admin/users/1/edit                                                AJAX
   #----------------------------------------------------------------------------
   describe "GET edit" do
@@ -102,51 +91,6 @@ describe Admin::UsersController do
     end
   end
 
-  # POST /admin/users
-  # POST /admin/users.xml                                                  AJAX
-  #----------------------------------------------------------------------------
-  describe "POST create" do
-    describe "with valid params" do
-      before(:each) do
-        @username = "none"
-        @email = @username + "@example.com"
-        @password = "secret"
-      end
-
-      it "assigns a newly created user as @user and renders [create] template" do
-        @user = build(:user, username: @username, email: @email)
-        allow(User).to receive(:new).and_return(@user)
-
-        post :create, params: { user: { username: @username, email: @email, password: @password, password_confirmation: @password } }, xhr: true
-        expect(assigns[:user]).to eq(@user)
-        expect(response).to render_template("admin/users/create")
-      end
-
-      it "creates admin user when requested so" do
-        post :create, params: { user: { username: @username, email: @email, admin: "1", password: @password, password_confirmation: @password } }, xhr: true
-        expect(assigns[:user].admin).to eq(true)
-        expect(response).to render_template("admin/users/create")
-      end
-
-      it "doesn't create admin user unless requested so" do
-        post :create, params: { user: { username: @username, email: @email, admin: "0", password: @password, password_confirmation: @password } }, xhr: true
-        expect(assigns[:user].admin).to eq(false)
-        expect(response).to render_template("admin/users/create")
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved user as @user and re-renders [create] template" do
-        @user = build(:user, username: "", email: "")
-        allow(User).to receive(:new).and_return(@user)
-
-        post :create, params: { user: {} }, xhr: true
-        expect(assigns[:user]).to eq(@user)
-        expect(response).to render_template("admin/users/create")
-      end
-    end
-  end
-
   # PUT /admin/users/1
   # PUT /admin/users/1.xml                                                 AJAX
   #----------------------------------------------------------------------------