fat_free_crm 0.18.2 → 0.19.0

data/db/migrate/20100928030620_remove_uuid.rb

@@ -14,10 +14,9 @@ class RemoveUuid < ActiveRecord::Migration[4.2]
     raise ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs"
   end
 
-  private
-
   def self.uuid_configured?
     return @@uuid_configured if @@uuid_configured
+
     config = ActiveRecord::Base.connection.instance_variable_get("@config")
     @@uuid_configured = config[:uuid]
   end

data/db/migrate/20120316045804_activities_to_versions.rb

@@ -18,6 +18,7 @@ class ActivitiesToVersions < ActiveRecord::Migration[4.2]
     activities.each do |activity|
       # commented and email activities don't translate well so ignore them
       next unless event = events[activity['action']]
+
       attributes = {
         item_id: activity['subject_id'],
         item_type: activity['subject_type'],

data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb

@@ -15,6 +15,7 @@ class AddNotNullConstraintsForTimestampColumns < ActiveRecord::Migration[4.2]
     ActiveRecord::Base.connection.tables.each do |table|
       # If table has both timestamp columns, set not null constraints on both columns.
       next unless %i[created_at updated_at].all? { |column| column_exists?(table, column) }
+
       %i[created_at updated_at].each do |column|
         change_column table, column, :datetime, constraints
       end

data/db/migrate/20180107082701_authlogic_to_devise.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class AuthlogicToDevise < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :users, :unconfirmed_email, :string, limit: 254
+    add_column :users, :reset_password_token, :string
+    add_column :users, :reset_password_sent_at, :datetime
+    add_column :users, :remember_token, :string
+    add_column :users, :remember_created_at, :datetime
+    add_column :users, :authentication_token, :string
+    add_column :users, :confirmation_token, :string, limit: 255
+    add_column :users, :confirmed_at, :timestamp
+    add_column :users, :confirmation_sent_at, :timestamp
+    execute "UPDATE users SET confirmed_at = created_at, confirmation_sent_at = created_at"
+
+    rename_column :users, :password_hash, :encrypted_password
+
+    rename_column :users, :current_login_at, :current_sign_in_at
+    rename_column :users, :last_login_at, :last_sign_in_at
+    rename_column :users, :current_login_ip, :current_sign_in_ip
+    rename_column :users, :last_login_ip, :last_sign_in_ip
+    rename_column :users, :login_count, :sign_in_count
+
+    remove_column :users, :persistence_token
+    remove_column :users, :single_access_token
+    remove_column :users, :perishable_token
+
+    add_index :users, :reset_password_token, unique: true
+    add_index :users, :remember_token,       unique: true
+    add_index :users, :confirmation_token,   unique: true
+    add_index :users, :authentication_token, unique: true
+  end
+
+  def self.down
+    add_column :users, :perishable_token, :string
+    add_column :users, :single_access_token, :string
+    add_column :users, :persistence_token, :string
+
+    rename_column :users, :encrypted_password, :password_hash
+
+    rename_column :users, :current_sign_in_at, :current_login_at
+    rename_column :users, :last_sign_in_at, :last_login_at
+    rename_column :users, :current_sign_in_ip, :current_login_ip
+    rename_column :users, :last_sign_in_ip, :last_login_ip
+    rename_column :users, :sign_in_count, :login_count
+
+    remove_column :users, :confirmation_token
+    remove_column :users, :confirmed_at
+    remove_column :users, :confirmation_sent_at
+
+    remove_column :users, :unconfirmed_email
+    remove_column :users, :authentication_token
+    remove_column :users, :remember_created_at
+    remove_column :users, :remember_token
+    remove_column :users, :reset_password_sent_at
+    remove_column :users, :reset_password_token
+  end
+end

data/db/schema.rb

@@ -10,12 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180103223438) do
+ActiveRecord::Schema.define(version: 2018_01_07_082701) do
 
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
-  create_table "account_contacts", id: :serial, force: :cascade do |t|
+  create_table "account_contacts", force: :cascade do |t|
     t.integer "account_id"
     t.integer "contact_id"
     t.datetime "deleted_at"
@@ -24,7 +21,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["account_id", "contact_id"], name: "index_account_contacts_on_account_id_and_contact_id"
   end
 
-  create_table "account_opportunities", id: :serial, force: :cascade do |t|
+  create_table "account_opportunities", force: :cascade do |t|
     t.integer "account_id"
     t.integer "opportunity_id"
     t.datetime "deleted_at"
@@ -33,7 +30,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["account_id", "opportunity_id"], name: "index_account_opportunities_on_account_id_and_opportunity_id"
   end
 
-  create_table "accounts", id: :serial, force: :cascade do |t|
+  create_table "accounts", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.string "name", limit: 64, default: "", null: false
@@ -56,7 +53,7 @@ ActiveRecord::Schema.define(version: 20180103223438) 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", id: :serial, force: :cascade do |t|
+  create_table "activities", force: :cascade do |t|
     t.integer "user_id"
     t.string "subject_type"
     t.integer "subject_id"
@@ -69,7 +66,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id"], name: "index_activities_on_user_id"
   end
 
-  create_table "addresses", id: :serial, force: :cascade do |t|
+  create_table "addresses", force: :cascade do |t|
     t.string "street1"
     t.string "street2"
     t.string "city", limit: 64
@@ -86,7 +83,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["addressable_id", "addressable_type"], name: "index_addresses_on_addressable_id_and_addressable_type"
   end
 
-  create_table "avatars", id: :serial, force: :cascade do |t|
+  create_table "avatars", force: :cascade do |t|
     t.integer "user_id"
     t.string "entity_type"
     t.integer "entity_id"
@@ -97,7 +94,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.datetime "updated_at"
   end
 
-  create_table "campaigns", id: :serial, force: :cascade do |t|
+  create_table "campaigns", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.string "name", limit: 64, default: "", null: false
@@ -122,7 +119,7 @@ ActiveRecord::Schema.define(version: 20180103223438) 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", id: :serial, force: :cascade do |t|
+  create_table "comments", force: :cascade do |t|
     t.integer "user_id"
     t.string "commentable_type"
     t.integer "commentable_id"
@@ -134,7 +131,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.string "state", limit: 16, default: "Expanded", null: false
   end
 
-  create_table "contact_opportunities", id: :serial, force: :cascade do |t|
+  create_table "contact_opportunities", force: :cascade do |t|
     t.integer "contact_id"
     t.integer "opportunity_id"
     t.string "role", limit: 32
@@ -144,7 +141,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["contact_id", "opportunity_id"], name: "index_contact_opportunities_on_contact_id_and_opportunity_id"
   end
 
-  create_table "contacts", id: :serial, force: :cascade do |t|
+  create_table "contacts", force: :cascade do |t|
     t.integer "user_id"
     t.integer "lead_id"
     t.integer "assigned_to"
@@ -176,7 +173,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id", "last_name", "deleted_at"], name: "id_last_name_deleted", unique: true
   end
 
-  create_table "emails", id: :serial, force: :cascade do |t|
+  create_table "emails", force: :cascade do |t|
     t.string "imap_message_id", null: false
     t.integer "user_id"
     t.string "mediator_type"
@@ -197,7 +194,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["mediator_id", "mediator_type"], name: "index_emails_on_mediator_id_and_mediator_type"
   end
 
-  create_table "field_groups", id: :serial, force: :cascade do |t|
+  create_table "field_groups", force: :cascade do |t|
     t.string "name", limit: 64
     t.string "label", limit: 128
     t.integer "position"
@@ -208,7 +205,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.string "klass_name", limit: 32
   end
 
-  create_table "fields", id: :serial, force: :cascade do |t|
+  create_table "fields", force: :cascade do |t|
     t.string "type"
     t.integer "field_group_id"
     t.integer "position"
@@ -220,17 +217,17 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.text "collection"
     t.boolean "disabled"
     t.boolean "required"
-    t.integer "maxlength"
+    t.integer "maxlength", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer "pair_id"
     t.text "settings"
-    t.integer "minlength", default: 0
+    t.integer "minlength", limit: 4, default: 0
     t.index ["field_group_id"], name: "index_fields_on_field_group_id"
     t.index ["name"], name: "index_fields_on_name"
   end
 
-  create_table "groups", id: :serial, force: :cascade do |t|
+  create_table "groups", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -244,7 +241,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id"], name: "index_groups_users_on_user_id"
   end
 
-  create_table "leads", id: :serial, force: :cascade do |t|
+  create_table "leads", force: :cascade do |t|
     t.integer "user_id"
     t.integer "campaign_id"
     t.integer "assigned_to"
@@ -276,7 +273,7 @@ ActiveRecord::Schema.define(version: 20180103223438) 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", id: :serial, force: :cascade do |t|
+  create_table "lists", force: :cascade do |t|
     t.string "name"
     t.text "url"
     t.datetime "created_at"
@@ -285,7 +282,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id"], name: "index_lists_on_user_id"
   end
 
-  create_table "opportunities", id: :serial, force: :cascade do |t|
+  create_table "opportunities", force: :cascade do |t|
     t.integer "user_id"
     t.integer "campaign_id"
     t.integer "assigned_to"
@@ -306,7 +303,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id", "name", "deleted_at"], name: "id_name_deleted", unique: true
   end
 
-  create_table "permissions", id: :serial, force: :cascade do |t|
+  create_table "permissions", force: :cascade do |t|
     t.integer "user_id"
     t.string "asset_type"
     t.integer "asset_id"
@@ -318,7 +315,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id"], name: "index_permissions_on_user_id"
   end
 
-  create_table "preferences", id: :serial, force: :cascade do |t|
+  create_table "preferences", force: :cascade do |t|
     t.integer "user_id"
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
@@ -327,7 +324,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["user_id", "name"], name: "index_preferences_on_user_id_and_name"
   end
 
-  create_table "sessions", id: :serial, force: :cascade do |t|
+  create_table "sessions", force: :cascade do |t|
     t.string "session_id", null: false
     t.text "data"
     t.datetime "created_at"
@@ -336,7 +333,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "settings", id: :serial, force: :cascade do |t|
+  create_table "settings", force: :cascade do |t|
     t.string "name", limit: 32, default: "", null: false
     t.text "value"
     t.datetime "created_at"
@@ -344,7 +341,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["name"], name: "index_settings_on_name"
   end
 
-  create_table "taggings", id: :serial, force: :cascade do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer "tag_id"
     t.integer "taggable_id"
     t.integer "tagger_id"
@@ -356,13 +353,13 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
   end
 
-  create_table "tags", id: :serial, force: :cascade do |t|
+  create_table "tags", 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", id: :serial, force: :cascade do |t|
+  create_table "tasks", force: :cascade do |t|
     t.integer "user_id"
     t.integer "assigned_to"
     t.integer "completed_by"
@@ -383,7 +380,7 @@ ActiveRecord::Schema.define(version: 20180103223438) 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", id: :serial, force: :cascade do |t|
+  create_table "users", 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
@@ -397,28 +394,36 @@ ActiveRecord::Schema.define(version: 20180103223438) do
     t.string "yahoo", limit: 32
     t.string "google", limit: 32
     t.string "skype", limit: 32
-    t.string "password_hash", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
     t.string "password_salt", default: "", null: false
-    t.string "persistence_token", default: "", null: false
-    t.string "perishable_token", default: "", null: false
-    t.datetime "last_login_at"
-    t.datetime "current_login_at"
-    t.string "last_login_ip"
-    t.string "current_login_ip"
-    t.integer "login_count", default: 0, null: false
+    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at"
+    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.boolean "admin", default: false, null: false
     t.datetime "suspended_at"
-    t.string "single_access_token"
+    t.string "unconfirmed_email", limit: 254
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    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.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"
-    t.index ["perishable_token"], name: "index_users_on_perishable_token"
-    t.index ["persistence_token"], name: "index_users_on_persistence_token"
+    t.index ["remember_token"], name: "index_users_on_remember_token", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
     t.index ["username", "deleted_at"], name: "index_users_on_username_and_deleted_at", unique: true
   end
 
-  create_table "versions", id: :serial, force: :cascade do |t|
+  create_table "versions", force: :cascade do |t|
     t.string "item_type", null: false
     t.integer "item_id", null: false
     t.string "event", limit: 512, null: false

data/docker-compose.yml

@@ -5,13 +5,23 @@ services:
     links:
       - db
     ports:
+      - "3000:3000"
       - "80:80"
     volumes:
       - gems:/usr/local/rvm/gems
     environment:
       RAILS_ENV: 'production'
       PASSENGER_APP_ENV: 'production'
+      DB_DATABASE: 'fat_free_crm_production'
+      DB_USERNAME: 'postgres'
+      DB_PASSWORD: ''
+      DB_HOST: 'db'
+      DB_PORT: 5432
   db:
     image: postgres:9.5
+    restart: always
+    volumes:
+      - pgdata:/var/lib/postgresql/data
 volumes:
+  pgdata: {}
   gems: {}

data/fat_free_crm.gemspec

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path('../vendor/gems/globby-0.1.2/lib', __FILE__)
+$LOAD_PATH.push File.expand_path('vendor/gems/globby-0.1.2/lib', __dir__)
 require 'globby'
-rules = File.read("#{File.expand_path('..', __FILE__)}/.gitignore").split("\n")
+rules = File.read("#{File.expand_path(__dir__)}/.gitignore").split("\n")
 rules << '.git'
 files = Globby.reject(rules)
 
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'fat_free_crm/version'
 
 Gem::Specification.new do |gem|
   gem.name = 'fat_free_crm'
-  gem.authors = ['Michael Dvorkin', 'Ben Tillman', 'Nathan Broadbent', 'Stephen Kenworthy', "Daniel O'Connor"]
+  gem.authors = ['Michael Dvorkin', 'Stephen Kenworthy', "Daniel O'Connor"]
   gem.summary = 'Fat Free CRM'
   gem.description = 'An open source, Ruby on Rails customer relationship management platform'
   gem.homepage = 'http://fatfreecrm.com'
-  gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
+  gem.email = ['mike@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
   gem.files = files
   gem.version = FatFreeCRM::VERSION::STRING
   gem.required_ruby_version = '>= 2.4.0'
   gem.license = 'MIT'
 
-  gem.add_dependency 'rails', '~> 5.1.0'
+  gem.add_dependency 'rails', '~> 5.2.0'
   gem.add_dependency 'rails-i18n'
   gem.add_dependency 'rails-observers'
   gem.add_dependency 'activemodel-serializers-xml'
@@ -34,10 +34,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'simple_form'
   gem.add_dependency 'will_paginate'
   gem.add_dependency 'paperclip'
-  # Manually added paperclip gem dependency "cocaine" in order to fix load error: "no such file to load -- cocaine"
-  gem.add_dependency 'cocaine'
-  gem.add_dependency 'paper_trail',         '~> 6.0.0'
-  gem.add_dependency 'authlogic',           '>= 3.4.4'
+  gem.add_dependency 'paper_trail',         '~> 10.0.0'
+  gem.add_dependency 'devise',              '~> 4.6'
+  gem.add_dependency 'devise-encryptable',  '~> 0.2.0'
   gem.add_dependency 'acts_as_commentable'
   gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
   gem.add_dependency 'dynamic_form'
@@ -45,7 +44,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sass'
   gem.add_dependency 'acts_as_list'
   gem.add_dependency 'ffaker', '>= 2'
-  gem.add_dependency 'cancancan'
+  gem.add_dependency 'cancancan', '~> 3.0.0'
   gem.add_dependency 'font-awesome-rails'
   gem.add_dependency 'premailer'
   gem.add_dependency 'nokogiri'
@@ -58,7 +57,6 @@ Gem::Specification.new do |gem|
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
-  gem.add_dependency 'ransack_ui',          '~> 1.3', '>= 1.3.1'
-  gem.add_dependency 'ransack',             '~> 1.7', '>= 1.6.2'
+  gem.add_dependency 'ransack', '>= 1.6.2'
   gem.add_dependency 'email_reply_parser_ffcrm'
 end