reduced_fat_crm 0.14.0 → 0.15.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf418a06d326ec4f3182788c478e590d2d822c9e
-  data.tar.gz: 70cf393c0bbe3ef0d73524019b7dfe7a3246c472
+  metadata.gz: c9b347dcbd3bd31648dadd1747a66f701aad5de8
+  data.tar.gz: c29623d3e0b17db29710070459964844a6d231fc
 SHA512:
-  metadata.gz: 331326c122b1851d29014ec08d0f481851a2e6d2f9ffcd7c18546e39a23fadc9217d3baebe55cf503e59a72ad80e406c58223813cb04431fef8b49fd5ef1e6f2
-  data.tar.gz: 8d7e332a4d0a68b6fba3812e8637e226db1f56f96ad59835ae8b1e7962ed456baca142fc3f3119b4cd5a3ce9f3f262ec760003ba82e60d850aa3b602628bdef6
+  metadata.gz: 00e18dd9aac8eb099d0db51aea44d7091697ecdc53abcf74179d6f94345de7c1724612a2df6be30d3f2e66f5647f0008ea50c96eea762ff229399d8fb42feedd
+  data.tar.gz: 2b9f998e571f85360167a5fe4f6b807d84238c4b7a941a96df3420247f5a943110c2dd8dfff9e7eccbe3ebc79f70725b8d3d5fc437631b37daad2e2a000c3905

data/.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2
   - 2.3.3
+  # - 2.4.0
 env:
   - DB=mysql
   - DB=postgres
@@ -10,9 +10,9 @@ env:
 
 matrix:
   exclude:
-    - rvm: 2.2
+    - rvm: 2.3.3
       env: DB=mysql
-    - rvm: 2.2
+    - rvm: 2.3.3
       env: DB=sqlite
 
 bundler_args: --path=vendor/bundle --without heroku
@@ -27,10 +27,20 @@ before_script:
   - sh -c "cp config/database.$DB.yml config/database.yml"
   - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database fat_free_crm_test;' -U postgres; fi"
   - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql -e 'create database fat_free_crm_test;'; fi"
-  - sh -c "RAILS_ENV=test bundle exec rake db:schema:load"
+  - "RAILS_ENV=test bundle exec rake spec:preparedb"
 
 # Run specs
-script: "RAILS_ENV=test bundle exec rake"
+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"
+
 
 notifications:
   webhooks:

data/{CHANGELOG → CHANGELOG.md}

@@ -4,6 +4,18 @@ 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
 
+Wed, Dec 7, 2016 (0.15.0-beta)
+---------------------------------------------------------------------
+This release is aimed at getting as many dependencies as possible up to date without significant refactoring.
+
+ - Refactoring: Tests prefer build, build_record over ```FactoryGirl.create``` where possible
+ - Refactoring: View tests minimize DB interaction greatly
+ - Refactoring: ```@user.check_if_needs_approval``` must be explicitly called in rake tasks or similar, it is no longer a before_create hook
+ - Refactoring: ```@user.destroyable?``` must be called in rake tasks or similar, it is no longer a before_destroy check
+ - Various gem updates
+ - Upgrade to Paperclip 5 (see https://github.com/thoughtbot/paperclip/wiki/Upgrade-Paperclip-4x-to-5x)
+ - Upgrade to paper_trail 6+ (https://github.com/airblade/paper_trail/blob/master/CHANGELOG.md)
+
 Mon, Dec 5, 2016 (0.14.0)
 ---------------------------------------------------------------------
 Forked to publish 'reduced_fat_crm', a version of fat-free-crm with 

data/Gemfile

@@ -68,7 +68,7 @@ end
 
 group :test do
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem 'selenium-webdriver', '< 3.0.0'
   gem 'database_cleaner'
   gem "acts_as_fu"
   gem 'zeus' unless ENV["CI"]

data/Gemfile.lock

@@ -36,16 +36,18 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (3.5.0)
-      activerecord (>= 3.2, < 5)
+    acts-as-taggable-on (4.0.0)
+      activerecord (>= 4.0)
     acts_as_commentable (4.0.2)
     acts_as_fu (0.0.9)
       activerecord
       sqlite3
-    acts_as_list (0.7.2)
+    acts_as_list (0.8.2)
       activerecord (>= 3.0)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
+    airbrussh (1.1.1)
+      sshkit (>= 1.6.1, != 1.7.0)
     arel (6.0.3)
     authlogic (3.4.6)
       activerecord (>= 3.2)
@@ -53,22 +55,26 @@ GEM
       request_store (~> 1.0)
       scrypt (>= 1.2, < 3.0)
     builder (3.2.2)
-    byebug (8.2.1)
+    byebug (9.0.6)
     cancancan (1.15.0)
-    capistrano (3.4.0)
+    capistrano (3.6.1)
+      airbrussh (>= 1.0.0)
+      capistrano-harrow
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    capistrano-bundler (1.1.4)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (1.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.5)
+    capistrano-harrow (0.5.3)
+    capistrano-rails (1.2.0)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.5.0)
+    capybara (2.10.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -82,37 +88,37 @@ GEM
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
     concurrent-ruby (1.0.2)
-    countries (1.2.2)
-      currencies (~> 0.4.2)
+    countries (2.0.4)
       i18n_data (~> 0.7.0)
-    country_select (2.5.1)
-      countries (~> 1.2.0)
+      money (~> 6.7)
+      unicode_utils (~> 1.4)
+    country_select (3.0.0)
+      countries (~> 2.0)
       sort_alphabetical (~> 1.0)
     css_parser (1.4.7)
       addressable
-    currencies (0.4.2)
     daemons (1.2.4)
-    database_cleaner (1.5.1)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     dynamic_form (1.1.4)
     email_reply_parser_ffcrm (0.5.0)
     erubis (2.7.0)
     eventmachine (1.2.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    ffaker (2.1.0)
+    ffaker (2.3.0)
     ffi (1.9.14)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -122,9 +128,9 @@ GEM
     formatador (0.2.5)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
-    guard (2.13.0)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -132,32 +138,33 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rails (0.7.2)
+    guard-rails (0.8.0)
       guard (~> 2.11)
       guard-compat (~> 1.0)
-    guard-rspec (4.6.4)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     haml (4.0.7)
       tilt
-    headless (2.2.0)
+    headless (2.3.1)
     htmlentities (4.3.4)
     i18n (0.7.0)
     i18n_data (0.7.0)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.2.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (1.8.3)
     kgio (2.10.0)
     libv8 (3.16.14.17)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
@@ -167,34 +174,35 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mimemagic (0.3.0)
+    mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.0)
-    multi_json (1.11.2)
+    minitest (5.10.1)
+    money (6.7.1)
+      i18n (>= 0.6.4, <= 0.7.0)
+      sixarm_ruby_unaccent (>= 1.1.1, < 2)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    notiffany (0.0.8)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    paper_trail (4.0.1)
-      activerecord (>= 3.0, < 6.0)
-      activesupport (>= 3.0, < 6.0)
+    paper_trail (6.0.1)
+      activerecord (>= 4.0, < 5.2)
       request_store (~> 1.1)
-    paperclip (4.3.6)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
-      mimemagic (= 0.3.0)
-    pg (0.18.4)
-    polyamorous (1.3.0)
+      mimemagic (~> 0.3.0)
+    pg (0.19.0)
+    polyamorous (1.3.1)
       activerecord (>= 3.0)
-    premailer (1.8.6)
-      css_parser (>= 1.3.6)
+    premailer (1.8.7)
+      css_parser (>= 1.4.5)
       htmlentities (>= 4.0.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -236,8 +244,8 @@ GEM
       rails_stdout_logging
     rails_autolink (1.1.6)
       rails (> 3.1)
-    rails_serve_static_assets (0.0.4)
-    rails_stdout_logging (0.0.4)
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.2.7.1)
       actionpack (= 4.2.7.1)
       activesupport (= 4.2.7.1)
@@ -262,7 +270,7 @@ GEM
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     ref (2.0.0)
-    request_store (1.2.1)
+    request_store (1.3.1)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)
     responds_to_parent (1.1.0)
@@ -270,7 +278,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-activemodel-mocks (1.0.2)
+    rspec-activemodel-mocks (1.0.3)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
@@ -291,28 +299,29 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.0)
-    sass (3.4.20)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.4.22)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scrypt (2.0.2)
+    scrypt (2.1.1)
       ffi-compiler (>= 0.0.2)
       rake
-    select2-rails (3.5.9.3)
+    select2-rails (4.0.3)
       thor (~> 0.14)
-    selenium-webdriver (2.48.1)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     shellany (0.0.1)
-    simple_form (3.2.1)
+    simple_form (3.3.1)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
+    sixarm_ruby_unaccent (1.1.1)
     slop (3.6.0)
     sort_alphabetical (1.1.0)
       unicode_utils (>= 1.2.2)
@@ -330,10 +339,10 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
+      rack (>= 1, < 3)
     thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.5)
@@ -344,15 +353,14 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode_utils (1.4.0)
-    unicorn (5.0.1)
+    unicorn (5.2.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
     websocket (1.2.3)
-    will_paginate (3.0.7)
+    will_paginate (3.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    zeus (0.15.4)
+    zeus (0.15.10)
       method_source (>= 0.6.7)
 
 PLATFORMS
@@ -391,7 +399,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   nokogiri (>= 1.6.8)
-  paper_trail (>= 4.0.0.beta2)
+  paper_trail (~> 6.0.0)
   paperclip
   pg
   premailer
@@ -413,8 +421,8 @@ DEPENDENCIES
   rspec-rails
   sass
   sass-rails
-  select2-rails (~> 3.5.9.3)
-  selenium-webdriver
+  select2-rails
+  selenium-webdriver (< 3.0.0)
   simple_form
   sprockets-rails (= 2.2.2)
   therubyracer

data/README.md

@@ -1,7 +1,7 @@
 # Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]  [![Code Climate](https://codeclimate.com/github/fatfreecrm/fat_free_crm.png)](https://codeclimate.com/github/fatfreecrm/fat_free_crm)
 
-[travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
-[travis-ci-url]: http://travis-ci.org/fatfreecrm/fat_free_crm
+[travis-img-url]: https://secure.travis-ci.org/reduced-fat-crm/fat_free_crm.png?branch=master
+[travis-ci-url]: https://travis-ci.org/reduced-fat-crm/fat_free_crm
 
 ### An open source, Ruby on Rails [customer relationship management][crm-wiki] platform (CRM).
 
@@ -48,19 +48,20 @@ Pull requests and bug reports are always welcome!
 
 Visit our website at http://www.fatfreecrm.com/
 
-## Rails 4 support
+## Usage
+This is a fork of fat free crm, as the original project was a little quiet.
 
-The master branch is now on Rails 4.2. However, there is a [Rails 3.2 branch](https://github.com/fatfreecrm/fat_free_crm/tree/rails3) available if you still need to use it. Please note that subsequent gem releases will focus on Rails 4 (v0.14.0+ as yet unreleased).
+To use this; simply add to your Gemfile
+```
+gem 'reduced_fat_crm', require: 'fat_free_crm'
+```
+in place of your previous fat_free_crm verison.
 
-## Important security note
 
-Please note that several severe vulnerabilities have been fixed recently. You should upgrade to the most recent 0.13.x version or higher. See the [**security vulnerabilities**](https://github.com/fatfreecrm/fat_free_crm/wiki/Security) page for more details.
 
 ## System Requirements
 
-* Ruby 2 (2.2 recommended)
-  * Ruby 1.9.3 is no longer compatible (final gem release tag v0.13.6)
-  * Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
+* Ruby 2.3+ recommended
 * MySQL v4.1.1 or later (v5+ is recommended), SQLite v3.4 or later, or Postgres 8.4.8 or later.
 * ImageMagick (optional, only needed if you would like to use avatars)
 

data/app/controllers/admin/users_controller.rb

@@ -44,8 +44,10 @@ class Admin::UsersController < Admin::ApplicationController
   # POST /admin/users.xml                                                  AJAX
   #----------------------------------------------------------------------------
   def create
+    params[:user][:email].try(:strip!)
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
     @user = User.new(user_params)
+    @user.check_if_needs_approval
     @user.save_without_session_maintenance
 
     respond_with(@user)
@@ -55,6 +57,7 @@ class Admin::UsersController < Admin::ApplicationController
   # PUT /admin/users/1.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def update
+    params[:user][:email].try(:strip!)
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
     @user = User.find(params[:id])
     @user.attributes = user_params
@@ -73,7 +76,9 @@ class Admin::UsersController < Admin::ApplicationController
   # DELETE /admin/users/1.xml                                              AJAX
   #----------------------------------------------------------------------------
   def destroy
-    flash[:warning] = t(:msg_cant_delete_user, @user.full_name) unless @user.destroy
+    unless @user.destroyable? && @user.destroy
+      flash[:warning] = t(:msg_cant_delete_user, @user.full_name)
+    end
 
     respond_with(@user)
   end