fat_free_crm 0.14.2 → 0.15.0.beta

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

data/app/controllers/application_controller.rb

@@ -6,6 +6,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
+  before_filter :set_paper_trail_whodunnit
+
   before_action :set_context
   before_action :clear_setting_cache
   before_action :cors_preflight_check

data/app/controllers/users_controller.rb

@@ -134,6 +134,7 @@ class UsersController < ApplicationController
   protected
 
   def user_params
+    params[:user][:email].try(:strip!)
     params[:user].permit(
       :username,
       :email,

data/app/helpers/tags_helper.rb

@@ -15,7 +15,7 @@ module TagsHelper
       elsif !query.include?(hashtag)
         query += " #{hashtag}"
       end
-      out << link_to_function(tag, "crm.search_tagged('#{escape_javascript(query)}', '#{model.class.to_s.tableize}')", title: tag)
+      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", title: tag)
     end
   end
 

data/app/models/users/user.rb

@@ -39,9 +39,6 @@
 #
 
 class User < ActiveRecord::Base
-  before_create :check_if_needs_approval
-  before_destroy :check_if_current_user, :check_if_has_related_assets
-
   has_one :avatar, as: :entity, dependent: :destroy  # Personal avatar.
   has_many :avatars                                         # As owner who uploaded it, ex. Contact avatar.
   has_many :comments, as: :commentable                   # As owner who created a comment.
@@ -143,7 +140,9 @@ class User < ActiveRecord::Base
     [name].to_xml
   end
 
-  private
+  def destroyable?
+    check_if_current_user && !has_related_assets?
+  end
 
   # Suspend newly created user if signup requires an approval.
   #----------------------------------------------------------------------------
@@ -159,15 +158,17 @@ class User < ActiveRecord::Base
 
   # Prevent deleting a user unless she has no artifacts left.
   #----------------------------------------------------------------------------
-  def check_if_has_related_assets
-    artifacts = %w(Account Campaign Lead Contact Opportunity Comment Task).inject(0) do |sum, asset|
+  def has_related_assets?
+    sum = %w(Account Campaign Lead Contact Opportunity Comment Task).detect do |asset|
       klass = asset.constantize
-      sum += klass.assigned_to(self).count if asset != "Comment"
-      sum += klass.created_by(self).count
+      
+      asset != "Comment" && klass.assigned_to(self).exists? || klass.created_by(self).exists?
     end
-    artifacts == 0
+    !sum.nil?
   end
 
+  private
+
   # Define class methods
   #----------------------------------------------------------------------------
   class << self

data/config/initializers/paper_trail.rb

@@ -0,0 +1 @@
+PaperTrail.config.track_associations = false

data/fat_free_crm.gemspec

@@ -10,11 +10,11 @@ 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']
+  gem.authors = ['Michael Dvorkin', 'Ben Tillman', 'Nathan Broadbent', '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']
+  gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
   gem.files = files
   gem.version = FatFreeCRM::VERSION::STRING
   gem.required_ruby_version = '>= 2.0.0'
@@ -28,13 +28,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'jquery-rails'
   gem.add_dependency 'jquery-migrate-rails'
   gem.add_dependency 'jquery-ui-rails'
-  gem.add_dependency 'select2-rails', '~> 3.5.9.3'
+  gem.add_dependency 'select2-rails'
   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',         '>= 4.0.0.beta2'
+  gem.add_dependency 'paper_trail',         '~> 6.0.0'
   gem.add_dependency 'authlogic',           '>= 3.4.4'
   gem.add_dependency 'acts_as_commentable'
   gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'

data/lib/development_tasks/rspec.rake

@@ -7,8 +7,8 @@ if defined?(RSpec)
   require 'rspec/core/rake_task'
 
   namespace :spec do
-    desc "Preparing test env"
-    task :prepare do
+    desc "Preparing test env db"
+    task :preparedb do
       tmp_env = Rails.env
       Rails.env = "test"
       Rake::Task["ffcrm:config:copy_database_yml"].invoke
@@ -17,8 +17,4 @@ if defined?(RSpec)
       Rails.env = tmp_env
     end
   end
-
-  Rake::Task["spec"].prerequisites.clear
-  Rake::Task["spec"].prerequisites.push("spec:prepare")
-
 end

data/lib/fat_free_crm/engine.rb

@@ -23,5 +23,10 @@ module FatFreeCRM
       end
     end
 
+    config.to_prepare do
+      Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+        require_dependency(c)
+      end
+    end
   end
 end

data/lib/fat_free_crm/version.rb

@@ -6,9 +6,9 @@
 module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 14
-    TINY  = 2
-    PRE   = nil
+    MINOR = 15
+    TINY  = 0
+    PRE   = 'beta'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/factories/field_factories.rb

@@ -22,7 +22,7 @@ FactoryGirl.define do
 
   factory :field do
     type "Field"
-    field_group         { FactoryGirl.create(:field_group) }
+    field_group
     position            { FactoryGirl.generate(:field_position) }
     label               { FactoryGirl.generate(:field_label) }
     name                { |f| f.label.downcase.gsub(/[^a-z0-9]+/, '_') }

data/spec/factories/opportunity_factories.rb

@@ -15,7 +15,7 @@ FactoryGirl.define do
   factory :opportunity do
     user
     campaign
-    account             { FactoryGirl.create(:account) }
+    account
     assigned_to nil
     name                { FFaker::Lorem.sentence[0, 64] }
     access "Public"

data/spec/mailers/subscription_mailer_spec.rb

@@ -7,9 +7,11 @@ require 'spec_helper'
 
 describe SubscriptionMailer do
   describe "comment notification" do
-    let(:user) { FactoryGirl.create(:user, email: 'notify_me@example.com') }
-    let(:commentable) { FactoryGirl.create(:opportunity, id: 47, name: 'Opportunity name') }
-    let(:comment) { FactoryGirl.create(:comment, commentable: commentable) }
+    let(:user) { build(:user, email: 'notify_me@example.com') }
+    let(:campaign) { build(:campaign, user: user) }
+    let(:account) { build(:account, user: user) }
+    let(:commentable) { build_stubbed(:opportunity, id: 47, name: 'Opportunity name', account: account, campaign: campaign, user: user) }
+    let(:comment) { build(:comment, commentable: commentable, user: user) }
     let(:mail) { SubscriptionMailer.comment_notification(user, comment) }
 
     before :each do

data/spec/mailers/user_mailer_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 
 describe UserMailer do
   describe "password_reset_instructions" do
-    let(:user) { FactoryGirl.create(:user, email: "forgot_my_password@example.com") }
+    let(:user) { FactoryGirl.build(:user, email: "forgot_my_password@example.com") }
     let(:mail) { UserMailer.password_reset_instructions(user) }
 
     before(:each) do
@@ -33,11 +33,11 @@ describe UserMailer do
   end
 
   describe "assigned_entity_notification" do
-    let(:assigner) { FactoryGirl.create(:user, first_name: "Bob", last_name: "Hope") }
-    let(:assignee) { FactoryGirl.create(:user, email: "assignee@example.com") }
+    let(:assigner) { FactoryGirl.build(:user, first_name: "Bob", last_name: "Hope") }
+    let(:assignee) { FactoryGirl.build(:user, email: "assignee@example.com") }
 
     context "for an account" do
-      let(:account) { FactoryGirl.create(:account, id: 16, name: 'Ghostbusters', user: assigner, assignee: assignee) }
+      let(:account) { FactoryGirl.build_stubbed(:account, id: 16, name: 'Ghostbusters', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(account, assigner) }
 
       it "sets fatfree as the sender" do
@@ -62,7 +62,7 @@ describe UserMailer do
     end
 
     context "for a contact" do
-      let(:contact) { FactoryGirl.create(:contact, id: 56, first_name: 'Harold', last_name: 'Ramis', user: assigner, assignee: assignee) }
+      let(:contact) { FactoryGirl.build_stubbed(:contact, id: 56, first_name: 'Harold', last_name: 'Ramis', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(contact, assigner) }
 
       it "sets fatfree as the sender" do
@@ -87,7 +87,7 @@ describe UserMailer do
     end
 
     context "for a lead" do
-      let(:lead) { FactoryGirl.create(:lead, id: 42, first_name: 'Bill', last_name: 'Murray', user: assigner, assignee: assignee) }
+      let(:lead) { FactoryGirl.build_stubbed(:lead, id: 42, first_name: 'Bill', last_name: 'Murray', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(lead, assigner) }
 
       it "sets fatfree as the sender" do

data/spec/models/users/abilities/user_ability_spec.rb

@@ -7,17 +7,17 @@ end
 
 describe "User abilities" do
   subject(:ability)  { Ability.new(user) }
-  let(:subject_user) { create :user }
+  let(:subject_user) { build :user }
 
   context "when site manager, I" do
-    let(:user)  { create :user, admin: true }
+    let(:user)  { build :user, admin: true }
     all_actions.each do |do_action|
       it { is_expected.to be_able_to(do_action, subject_user) }
     end
   end
 
   context "when myself, I" do
-    let(:user) { create :user }
+    let(:user) { build :user }
     let(:subject_user) { user }
     all_actions.each do |do_action|
       it { is_expected.to be_able_to(do_action, subject_user) }

data/spec/models/users/user_spec.rb

@@ -42,61 +42,59 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe User do
   it "should create a new instance given valid attributes" do
-    User.create!(
+    expect(User.new(
       username: "username",
       email:    "user@example.com",
       password: "password",
       password_confirmation: "password"
-    )
+    ).valid?).to eq true
   end
 
   it "should have a valid factory" do
     expect(FactoryGirl.build(:user)).to be_valid
   end
 
-  describe "Destroying users with and without related assets" do
-    before do
-      @user = FactoryGirl.create(:user)
-    end
+  describe '#destroyable?' do
+    describe "Destroying users with and without related assets" do
+      before do
+        @user = FactoryGirl.build(:user)
+      end
 
-    %w(account campaign lead contact opportunity).each do |asset|
-      it "should not destroy the user if she owns #{asset}" do
-        FactoryGirl.create(asset, user: @user)
-        @user.destroy
-        expect { User.find(@user.id) }.to_not raise_error
-        expect(@user.destroyed?).to eq(false)
+      %w(account campaign lead contact opportunity).each do |asset|
+        it "should not destroy the user if she owns #{asset}" do
+          FactoryGirl.create(asset, user: @user)
+
+          expect(@user.destroyable?).to eq(false)
+        end
+
+        it "should not destroy the user if she has #{asset} assigned" do
+          FactoryGirl.create(asset, assignee: @user)
+          expect(@user.destroyable?).to eq(false)
+        end
       end
 
-      it "should not destroy the user if she has #{asset} assigned" do
-        FactoryGirl.create(asset, assignee: @user)
-        @user.destroy
-        expect { User.find(@user.id) }.to_not raise_error
-        expect(@user.destroyed?).to eq(false)
+      it "should not destroy the user if she owns a comment" do
+        login
+        account = build(:account, user: current_user)
+        FactoryGirl.create(:comment, user: @user, commentable: account)
+        expect(@user.destroyable?).to eq(false)
       end
-    end
 
-    it "should not destroy the user if she owns a comment" do
-      login
-      account = FactoryGirl.create(:account, user: current_user)
-      FactoryGirl.create(:comment, user: @user, commentable: account)
-      @user.destroy
-      expect { User.find(@user.id) }.to_not raise_error
-      expect(@user.destroyed?).to eq(false)
-    end
+      it "should not destroy the current user" do
+        login
 
-    it "should not destroy the current user" do
-      login
-      current_user.destroy
-      expect { current_user.reload }.to_not raise_error
-      expect(current_user).not_to be_destroyed
-    end
+        expect(current_user.destroyable?).to eq(false)
+      end
 
-    it "should destroy the user" do
-      @user.destroy
-      expect { User.find(@user.id) }.to raise_error(ActiveRecord::RecordNotFound)
-      expect(@user).to be_destroyed
+      it "should destroy the user" do
+        expect(@user.destroyable?).to eq(true)
+      end
+    end
+  end
+  describe '#destroy' do
+    before do
+      @user = FactoryGirl.create(:user)
     end
-
     it "once the user gets deleted all her permissions must be deleted too" do
       FactoryGirl.create(:permission, user: @user, asset: FactoryGirl.create(:account))
       FactoryGirl.create(:permission, user: @user, asset: FactoryGirl.create(:contact))
@@ -114,69 +112,82 @@ describe User do
     end
   end
 
-  it "should set suspended timestamp upon creation if signups need approval and the user is not an admin" do
-    allow(Setting).to receive(:user_signup).and_return(:needs_approval)
-    @user = FactoryGirl.create(:user, suspended_at: nil)
-    expect(@user).to be_suspended
-  end
+  describe '#check_if_needs_approval' do
+    it "should set suspended timestamp upon creation if signups need approval and the user is not an admin" do
+      allow(Setting).to receive(:user_signup).and_return(:needs_approval)
+      @user = FactoryGirl.build(:user, suspended_at: nil)
+
+      @user.check_if_needs_approval
+
+      expect(@user).to be_suspended
+    end
 
-  it "should not set suspended timestamp upon creation if signups need approval and the user is an admin" do
-    allow(Setting).to receive(:user_signup).and_return(:needs_approval)
-    @user = FactoryGirl.create(:user, admin: true, suspended_at: nil)
-    expect(@user).not_to be_suspended
+    it "should not set suspended timestamp upon creation if signups need approval and the user is an admin" do
+      allow(Setting).to receive(:user_signup).and_return(:needs_approval)
+      @user = FactoryGirl.build(:user, admin: true, suspended_at: nil)
+
+      @user.check_if_needs_approval
+
+      expect(@user).not_to be_suspended
+    end
   end
 
   context "scopes" do
     describe "have_assigned_opportunities" do
-      before :each do
+      before do
         @user1 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user1, stage: 'analysis')
+        FactoryGirl.create(:opportunity, assignee: @user1, stage: 'analysis', account: nil, campaign: nil, user: nil)
 
         @user2 = FactoryGirl.create(:user)
 
         @user3 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user3, stage: 'won')
+        FactoryGirl.create(:opportunity, assignee: @user3, stage: 'won', account: nil, campaign: nil, user: nil)
 
         @user4 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user4, stage: 'lost')
+        FactoryGirl.create(:opportunity, assignee: @user4, stage: 'lost', account: nil, campaign: nil, user: nil)
+
+        @result = User.have_assigned_opportunities
       end
 
       it "includes users with assigned opportunities" do
-        expect(User.have_assigned_opportunities).to include(@user1)
+        expect(@result).to include(@user1)
       end
 
       it "excludes users without any assigned opportunities" do
-        expect(User.have_assigned_opportunities).not_to include(@user2)
+        expect(@result).not_to include(@user2)
       end
 
       it "excludes users with opportunities that have been won or lost" do
-        expect(User.have_assigned_opportunities).not_to include(@user3)
-        expect(User.have_assigned_opportunities).not_to include(@user4)
+        expect(@result).not_to include(@user3)
+        expect(@result).not_to include(@user4)
       end
     end
   end
 
   context "instance methods" do
     describe "assigned_opportunities" do
-      before :each do
+      before do
         @user = FactoryGirl.create(:user)
-        @opportunity1 = FactoryGirl.create(:opportunity, assignee: @user)
-        @opportunity2 = FactoryGirl.create(:opportunity, assignee: FactoryGirl.create(:user))
+
+        @opportunity1 = FactoryGirl.create(:opportunity, assignee: @user, account: nil, campaign: nil, user: nil)
+        @opportunity2 = FactoryGirl.create(:opportunity, assignee: FactoryGirl.create(:user), account: nil, campaign: nil, user: nil)
+
+        @result = @user.assigned_opportunities
       end
 
       it "includes opportunities assigned to user" do
-        expect(@user.assigned_opportunities).to include(@opportunity1)
+        expect(@result).to include(@opportunity1)
       end
 
       it "does not include opportunities assigned to another user" do
-        expect(@user.assigned_opportunities).not_to include(@opportunity2)
+        expect(@result).not_to include(@opportunity2)
       end
     end
   end
 
   describe "Setting I18n.locale" do
     before do
-      @user = FactoryGirl.create(:user)
+      @user = FactoryGirl.build(:user)
       @locale = I18n.locale
     end
 
@@ -199,14 +210,14 @@ describe User do
 
   describe "Setting single access token" do
     it "should update single_access_token attribute if it is not set already" do
-      @user = FactoryGirl.create(:user, single_access_token: nil)
+      @user = FactoryGirl.build(:user, single_access_token: nil)
 
       @user.set_single_access_token
       expect(@user.single_access_token).not_to eq(nil)
     end
 
     it "should not update single_access_token attribute if it is set already" do
-      @user = FactoryGirl.create(:user, single_access_token: "token")
+      @user = FactoryGirl.build(:user, single_access_token: "token")
 
       @user.set_single_access_token
       expect(@user.single_access_token).to eq("token")