fat_free_crm 0.16.4 → 0.17.1

data/.travis.yml

@@ -1,23 +1,32 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
-  # - 2.4.0
+  - 2.3.6
+  - 2.4.2
 
 env:
   global:
     - BROWSER=chrome
   matrix:
-    - DB=mysql
-    - DB=postgres
-    - DB=sqlite
+    - DB=postgres TEST_SUITE=rubocop
+    - DB=postgres TEST_SUITE="rake spec:features"
+    - DB=postgres TEST_SUITE="rake spec:models"
+    - DB=postgres TEST_SUITE="rake spec:mailers"
+    - DB=postgres TEST_SUITE="rake spec:controllers"
+    - DB=postgres TEST_SUITE="rake spec:helpers"
+    - DB=postgres TEST_SUITE="rake spec:lib"
+    - DB=postgres TEST_SUITE="rake spec:routing"
+    - DB=postgres TEST_SUITE="rake spec:views"
+    - DB=mysql TEST_SUITE="rake spec:models"
+    - DB=sqlite TEST_SUITE="rake spec:models"
 
 matrix:
-  exclude:
-    - rvm: 2.3.3
-      env: DB=mysql
-    - rvm: 2.3.3
-      env: DB=sqlite
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.3.6
+      env: DB=sqlite TEST_SUITE="rake spec:models"
+    - rvm: 2.4.2
+      env: DB=sqlite TEST_SUITE="rake spec:models"
 
 addons:
   chrome: stable
@@ -37,17 +46,8 @@ before_script:
   - "RAILS_ENV=test bundle exec rake spec:preparedb"
 
 # Run specs
-script: 
-  - "RAILS_ENV=test bundle exec rake spec:models"
-  - "RAILS_ENV=test bundle exec rake spec:mailers"
-  - "RAILS_ENV=test bundle exec rake spec:controllers"
-  - "RAILS_ENV=test bundle exec rake spec:helpers"
-  - "RAILS_ENV=test bundle exec rake spec:lib"
-  - "RAILS_ENV=test bundle exec rake spec:mailers"
-  - "RAILS_ENV=test bundle exec rake spec:routing"
-  - "RAILS_ENV=test bundle exec rake spec:views"
-  - "RAILS_ENV=test bundle exec rake spec:features"
-  - "RAILS_ENV=test bundle exec rubocop"
+script:
+  - "RAILS_ENV=test bundle exec $TEST_SUITE"
 
 notifications:
   webhooks:

data/CHANGELOG.md

@@ -4,19 +4,49 @@ It does not matter how slowly you go as long as you do not stop.
 First they ignore you, then they laugh at you, then they fight you,
 then you win. –- Mahatma Gandhi
 
-Sat Oct 27, 2018 (0.16.4)
+Sat Jan 20, 2018 (0.17.1)
 ---------------------------------------------------------------------
+ - #709 Revert accidental minimum ruby version 2.4 changes (#665)
 
-#### Fixed XSS flaw in tags_helper
-Credit Antonin Steinhauser (steinhause) for discovery and responsible disclosure.
 
-Wed Jan 24, 2018 (0.16.3)
+Sat Jan 20, 2018 (0.17.0)
 ---------------------------------------------------------------------
-CVE-2017-0889
 
-Mon Jan 22, 2018 (0.16.2)
----------------------------------------------------------------------
-Fix #687
+### Important changes
+#### Select2 for select boxes
+This release replaces [Chozen](https://harvesthq.github.io/chosen/) with [Select2](https://select2.org/) consistently across the app.
+This may break plugins which rely on Chozen. To fix any issues please
+migrate to Select2 or add Chozen to your plugins.
+
+#### Counter caches
+To improve performance, a number of [counter caches](http://guides.rubyonrails.org/association_basics.html#options-for-belongs-to-counter-cache) have been added.
+
+Users with large amounts of records may find certain [database migrations](https://github.com/fatfreecrm/fat_free_crm/blob/master/db/migrate/20180102075234_add_account_counter_caches.rb) taking a large amount of time, as each record is cached upfront.
+
+#### Minimum ruby version is now Ruby 2.3
+See #647 #654 Adopt min ruby version of 2.3.0 and apply safe navigiation rubocop rules
+
+#### Other changes
+ - #691 Wording
+ - #688 Preparation for Devise
+ - #686 Bundle update
+ - #683 Rubocop: Refactoring
+ - #680 Alternative build setup
+ - #682 Rubocop: Hashrockets
+ - #693 Update Japanese translations
+ - #697 Minor security improvements
+ - #703 #696 Replace Chozen with select2
+ - #678 Find an account by name when name is in params (fixes #397) 
+ - #673 Improve JS escaping 
+ - #671 Devise Readiness (+ thread-safety): Refactor User.my scope 
+ - #670 Fix #563 invalid default custom field minlength 
+ - #668 Rubocop fixes for xls/rss builder classes 
+ - #667 Rubocop: Autocorrect various assignment-if statements, case statements, etc. 
+ - #666 Various rubocop corrected items 
+ - #661 Bundle Update on 2018-01-06 
+ - #655 Upgrade rubocop
+
+ - #658 Upgrade Bootsnap gem, fixing an issue with windows
 
 Sat Jan 6, 2018 (0.16.1)
 ---------------------------------------------------------------------
@@ -31,7 +61,10 @@ Fri Jan 5, 2018 (0.16.0)
 
 Thu Dec 14, 2017 (0.15.0)
 ---------------------------------------------------------------------
-This release upgrades to rails 5.0.0
+This release upgrades to rails 5.0.0.
+
+Be aware of https://github.com/rails/sprockets/issues/426 if you were using FFCRM as an engine.
+
  - #500 - Upgrade rails
  - #554 - Upgrade authlogic
  - #614 - Rails5 warnings

data/Capfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load DSL and Setup Up Stages
 require 'capistrano/setup'
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Uncomment the database that you have configured in config/database.yml
@@ -49,6 +51,7 @@ group :development do
     gem 'rb-inotify', require: false
     gem 'rb-fsevent', require: false
     gem 'rb-fchange', require: false
+    gem 'brakeman', require: false
   end
 end
 
@@ -60,7 +63,7 @@ group :development, :test do
   gem 'byebug'
   gem 'pry-rails' unless ENV["CI"]
   gem 'factory_girl_rails', '~> 4.7.0' # 4.8.0+ stubbed models are not allowed to access the database - User#destroyed?()
-  gem 'rubocop', '~> 0.50.0' # Pinned because upgrades require regenerating rubocop_todo.yml
+  gem 'rubocop', '~> 0.52.0' # Pinned because upgrades require regenerating rubocop_todo.yml
   gem 'rainbow'
 end
 

data/Gemfile.lock

@@ -63,8 +63,9 @@ GEM
       activesupport (>= 3.2, < 5.2)
       request_store (~> 1.0)
       scrypt (>= 1.2, < 4.0)
-    bootsnap (1.1.7)
+    bootsnap (1.1.8)
       msgpack (~> 1.0)
+    brakeman (4.1.1)
     builder (3.2.3)
     byebug (9.1.0)
     cancancan (2.1.2)
@@ -82,13 +83,13 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.16.1)
+    capybara (2.17.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (1.1.0)
@@ -107,7 +108,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    countries (2.1.2)
+    countries (2.1.3)
       i18n_data (~> 0.8.0)
       money (~> 6.9)
       sixarm_ruby_unaccent (~> 1.1)
@@ -129,20 +130,20 @@ GEM
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    ffaker (2.7.0)
+    ffaker (2.8.0)
     ffi (1.9.18)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    font-awesome-rails (4.7.0.2)
+    font-awesome-rails (4.7.0.3)
       railties (>= 3.2, < 5.2)
     formatador (0.2.5)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -161,7 +162,7 @@ GEM
       tilt
     headless (2.3.1)
     htmlentities (4.3.4)
-    i18n (0.9.3)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     io-like (0.3.0)
@@ -198,7 +199,7 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    nio4r (2.1.0)
+    nio4r (2.2.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
@@ -207,7 +208,7 @@ GEM
     paper_trail (6.0.2)
       activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
-    paperclip (5.2.0)
+    paperclip (5.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
@@ -217,7 +218,7 @@ GEM
     parser (2.4.0.2)
       ast (~> 2.3)
     pg (0.21.0)
-    polyamorous (1.3.1)
+    polyamorous (1.3.2)
       activerecord (>= 3.0)
     powerpack (0.1.1)
     premailer (1.11.1)
@@ -275,8 +276,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.3.0)
     ransack (1.8.4)
       actionpack (>= 3.0)
@@ -295,7 +295,8 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ref (2.0.0)
-    request_store (1.3.2)
+    request_store (1.4.0)
+      rack (>= 1.4)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -308,7 +309,7 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -325,17 +326,17 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.50.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
-    sass (3.5.4)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -381,7 +382,7 @@ GEM
     timecop (0.9.1)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (4.0.2)
+    uglifier (4.1.3)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     unicode_utils (1.4.0)
@@ -389,8 +390,8 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
     zeus (0.15.14)
       method_source (>= 0.6.7)
 
@@ -405,6 +406,7 @@ DEPENDENCIES
   acts_as_list
   authlogic (>= 3.4.4)
   bootsnap
+  brakeman
   byebug
   cancancan
   capistrano
@@ -456,7 +458,7 @@ DEPENDENCIES
   responds_to_parent
   rspec-activemodel-mocks
   rspec-rails
-  rubocop (~> 0.50.0)
+  rubocop (~> 0.52.0)
   sass
   sass-rails
   select2-rails
@@ -472,4 +474,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.16.1
+   1.16.0

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 

data/README.md

@@ -64,19 +64,19 @@ Visit our website at http://www.fatfreecrm.com/
 
 Please view one of the following installation guides:
 
-### [Setup Linux or Mac OS](http://guides.fatfreecrm.com/Setup-Linux-or-Mac-OS.html)
+### [Setup Linux or Mac OS](http://guides.fatfreecrm.com/Setup-Linux-or-Mac-OS)
 
 Installing Fat Free CRM on Linux or Mac OS X
 
-### [Setup Heroku](http://guides.fatfreecrm.com/Setup-Heroku.html)
+### [Setup Heroku](http://guides.fatfreecrm.com/Setup-Heroku)
 
 Setting up a Heroku instance for Fat Free CRM
 
-### [Setup Microsoft Windows](http://guides.fatfreecrm.com/Setup-Microsoft-Windows.html)
+### [Setup Microsoft Windows](http://guides.fatfreecrm.com/Setup-Microsoft-Windows)
 
 Installing Fat Free CRM on Microsoft Windows
 
-### [Running Fat Free CRM as a Rails Engine](http://guides.fatfreecrm.com/Running-as-a-Rails-Engine.html)
+### [Running Fat Free CRM as a Rails Engine](http://guides.fatfreecrm.com/Running-as-a-Rails-Engine)
 
 Run the Fat Free CRM gem within a separate Rails application.
 This is the best way to deploy Fat Free CRM if you need to add plugins or make any customizations. Note that it is not yet simple to 'bolt' Fat Free CRM into your existing rails project, but we're heading in that direction.
@@ -84,7 +84,7 @@ This is the best way to deploy Fat Free CRM if you need to add plugins or make a
 
 ## Upgrading from previous versions of Fat Free CRM
 
-Please read the [Release Notes](https://github.com/fatfreecrm/fat_free_crm/blob/master/CHANGELOG) document for more detailed information on upgrading from previous versions.
+Please read the [Release Notes](https://github.com/fatfreecrm/fat_free_crm/blob/master/CHANGELOG.md) document for more detailed information on upgrading from previous versions.
 
 
 ## Resources

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/Vagrantfile

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "ubuntu/xenial64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+
+  config.vm.provision "shell", inline: <<-SHELL
+    apt-get update
+    git clone https://github.com/fatfreecrm/fat_free_crm.git
+    cd fat_free_crm
+    cp config/database.postgres.yml config/database.yml
+    apt-get install -y nginx-full postgresql ruby-all-dev ruby-bundler libmagick++-dev libxml2 libxml2-dev libxslt1.1 libxslt1-dev libyaml-dev libpq-dev libsqlite3-dev
+    bundle install
+    echo "ALTER USER postgres PASSWORD '123456';" | sudo -u postgres psql
+    sed -i 's/  username:/  username: postgres/g' 'config/database.yml'
+    sed -i 's/  password:/  password: '123456'/g' 'config/database.yml'
+    rake db:setup
+    rake ffcrm:setup:admin USERNAME=admin PASSWORD=password EMAIL=admin@example.com
+    rm -rf /etc/nginx/sites-available/default
+    echo "server {" > /etc/nginx/sites-available/default
+    echo "  listen 80;" >> /etc/nginx/sites-available/default
+    echo "  location / {" >> /etc/nginx/sites-available/default
+    echo "    proxy_pass http://localhost:3000;" >> /etc/nginx/sites-available/default
+    echo "  }" >> /etc/nginx/sites-available/default
+    echo "}" >> /etc/nginx/sites-available/default
+    sudo systemctl stop nginx
+    sudo systemctl start nginx
+    rails s
+  SHELL
+end