fat_free_crm 0.13.6 → 0.14.0

data/lib/fat_free_crm/core_ext/nil.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class NilClass
-
   def true?
     false
   end
@@ -12,6 +11,4 @@ class NilClass
   def false?
     false
   end
-
 end
-

data/lib/fat_free_crm/core_ext/string.rb

@@ -4,40 +4,28 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class String
-
-  alias :- :delete
-
+  alias_method :-, :delete
 
   def n2br
     strip.gsub("\n", "<br />")
   end
 
-
   def wrap(prefix, suffix = prefix)
     prefix + self + suffix
   end
 
-
   def digitize
     gsub(/[^\d]/, "")  # "$100,000".digitize # => 100000
   end
 
-
   def to_url
-    self.match(/^https?:\/\//) ? self : "http://" << self
-  end
-
-
-  def snakecase
-    self.strip.downcase.gsub(/[\s\/]+/, "_")
+    match(/^https?:\/\//) ? self : "http://" << self
   end
 
-
   def true?
     self == "true"
   end
 
-
   def false?
     self == "false"
   end
@@ -45,18 +33,16 @@ class String
   # Generates all permutations for first and last name, based on the order of parts
   # A query with 4 words will generate 6 permutations
   def name_permutations
-    parts = self.split(" ")
-    (parts.size - 1).times.map {|i|
+    parts = split(" ")
+    (parts.size - 1).times.map do|i|
       # ["A", "B", "C", "D"]  =>  [["A B C", "D"], ["A B", "C D"], ["A", "B C D"]]
-      [parts[(0..i)].join(" "), parts[(i+1)..-1].join(" ")]
-    }.inject([]) { |arr, perm|
+      [parts[(0..i)].join(" "), parts[(i + 1)..-1].join(" ")]
+    end.inject([]) do |arr, perm|
       # Search both [first, last] and [last, first]
       # e.g. for every ["A B C", "D"], also include ["D", "A B C"]
       arr << perm
       arr << perm.reverse
       arr
-    }
+    end
   end
-
 end
-

data/lib/fat_free_crm/custom_fields.rb

@@ -7,6 +7,6 @@
 #
 # Register CustomFields when Field class is loaded
 ActiveSupport.on_load(:fat_free_crm_field) do # self == Field
-  self.register(:as => 'date_pair', :klass => 'CustomFieldDatePair', :type => 'date')
-  self.register(:as => 'datetime_pair', :klass => 'CustomFieldDatetimePair', :type => 'timestamp')
+  register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date')
+  register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp')
 end

data/lib/fat_free_crm/engine.rb

@@ -7,7 +7,21 @@ module FatFreeCRM
   class Engine < ::Rails::Engine
     config.autoload_paths += Dir[root.join("app/models/**")] +
                              Dir[root.join("app/controllers/entities")]
+
     config.active_record.observers = [:lead_observer, :opportunity_observer,
                                       :task_observer, :entity_observer]
+
+    initializer "model_core.factories", :after => "factory_girl.set_factory_paths" do
+      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    end
+
+    initializer :append_migrations do |app|
+      unless app.root.to_s == root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
+
   end
 end

data/lib/fat_free_crm/errors.rb

@@ -6,7 +6,6 @@
 module FatFreeCRM
   module ActiveModel
     module Errors
-
       # Override ActiveModel::Errors#each so we could display validation
       # errors as is without rendering the attribute name. Simply place
       # a caret as the first character of the error message.
@@ -31,7 +30,6 @@ module FatFreeCRM
           end
         end
       end
-
     end
   end
 end

data/lib/fat_free_crm/exceptions.rb

@@ -9,14 +9,13 @@ module FatFreeCRM
 end
 
 class ActionController::Base
-  rescue_from FatFreeCRM::MissingSettings,  :with => :render_fat_free_crm_exception
-  rescue_from FatFreeCRM::ObsoleteSettings, :with => :render_fat_free_crm_exception
+  rescue_from FatFreeCRM::MissingSettings,  with: :render_fat_free_crm_exception
+  rescue_from FatFreeCRM::ObsoleteSettings, with: :render_fat_free_crm_exception
 
   private
 
   def render_fat_free_crm_exception(exception)
     logger.error exception.inspect
-    render :layout => false, :template => "/layouts/500", :format => :html, :status => 500, :locals => { :exception => exception }
+    render layout: false, template: "/layouts/500", format: :html, status: 500, locals: { exception: exception }
   end
 end
-

data/lib/fat_free_crm/export_csv.rb

@@ -7,7 +7,6 @@ require "csv"
 
 module FatFreeCRM
   class ExportCSV
-
     # CSV export. Based on to_csv Rails plugin by Ary Djmal
     # https://github.com/arydjmal/to_csv
     #----------------------------------------------------------------------------
@@ -30,6 +29,5 @@ module FatFreeCRM
         end
       end
     end
-
   end
 end

data/lib/fat_free_crm/exportable.rb

@@ -5,13 +5,12 @@
 #------------------------------------------------------------------------------
 module FatFreeCRM
   module Exportable
-
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     module ClassMethods
-      def exportable(options = {})
+      def exportable(_options = {})
         unless included_modules.include?(InstanceMethods)
           include InstanceMethods
           extend SingletonMethods
@@ -26,16 +25,16 @@ module FatFreeCRM
       end
 
       def self.included(base)
-        if base.instance_methods.include?(:assignee) or base.instance_methods.include?('assignee')
+        if base.instance_methods.include?(:assignee) || base.instance_methods.include?('assignee')
           define_method :assigned_to_full_name do
-            user = self.assignee
+            user = assignee
             user ? user.full_name : ''
           end
         end
 
-        if base.instance_methods.include?(:completor) or base.instance_methods.include?('completor')
+        if base.instance_methods.include?(:completor) || base.instance_methods.include?('completor')
           define_method :completed_by_full_name do
-            user = self.completor
+            user = completor
             user ? user.full_name : ''
           end
         end
@@ -44,7 +43,6 @@ module FatFreeCRM
 
     module SingletonMethods
     end
-
   end # Exportable
 end # FatFreeCRM
 

data/lib/fat_free_crm/fields.rb

@@ -5,7 +5,6 @@
 #------------------------------------------------------------------------------
 module FatFreeCRM
   module Fields
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -24,7 +23,7 @@ module FatFreeCRM
     module SingletonMethods
       def field_groups
         if ActiveRecord::Base.connection.table_exists? 'field_groups'
-          FieldGroup.where(:klass_name => self.name).order(:position)
+          FieldGroup.where(klass_name: name).order(:position)
         else
           []
         end
@@ -36,7 +35,7 @@ module FatFreeCRM
 
       def serialize_custom_fields!
         fields.each do |field|
-          if !serialized_attributes.keys.include?(field.name) and field.as == 'check_boxes'
+          if !serialized_attributes.keys.include?(field.name) && field.as == 'check_boxes'
             serialize(field.name.to_sym, Array)
           end
         end
@@ -45,7 +44,7 @@ module FatFreeCRM
       # Shows custom field select options in ransack search form
       def ransack_column_select_options
         field_groups.each_with_object({}) do |group, hash|
-          group.fields.select{|f| f.collection.present? }.each do |field|
+          group.fields.select { |f| f.collection.present? }.each do |field|
             hash[field.name] = field.collection.each_with_object({}) do |option, options|
               options[option] = option
             end
@@ -63,10 +62,10 @@ module FatFreeCRM
       # run custom field validations on this object
       #------------------------------------------------------------------------------
       def custom_fields_validator
-        self.field_groups.map(&:fields).flatten.each{|f| f.custom_validator(self) }
+        field_groups.map(&:fields).flatten.each { |f| f.custom_validator(self) }
       end
 
-      def assign_attributes(new_attributes, options = {})
+      def assign_attributes(new_attributes)
         super
       # If attribute is unknown, a new custom field may have been added.
       # Refresh columns and try again.
@@ -76,11 +75,11 @@ module FatFreeCRM
       end
 
       def method_missing(method_id, *args, &block)
-        if method_id.to_s =~ /\Acf_/
+        if method_id.to_s =~ /\Acf_.*[^=]\Z/
           # Refresh columns and try again.
           self.class.reset_column_information
           # If new record, create new object from class, else reload class
-          object = self.new_record? ? self.class.new : (self.reload && self)
+          object = self.new_record? ? self.class.new : (reload && self)
           # ensure serialization is setup if needed
           self.class.serialize_custom_fields!
           # Try again if object now responds to method, else return nil

data/lib/fat_free_crm/gem_dependencies.rb

@@ -4,7 +4,11 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 require 'rails/all'
+require 'rails-observers'
+require 'responders'
 require 'jquery-rails'
+require 'jquery-migrate-rails'
+require 'jquery-ui-rails'
 require 'select2-rails'
 require 'haml'
 require 'sass'
@@ -22,7 +26,6 @@ require 'ransack_ui'
 require 'paper_trail'
 require 'cancan'
 require 'rails3-jquery-autocomplete'
-require 'valium'
 require 'ffaker'
 require 'premailer'
 require 'nokogiri'

data/lib/fat_free_crm/gem_ext/active_record/schema_dumper.rb

@@ -11,14 +11,14 @@ require 'active_record'
 unless ENV['INCLUDE_CUSTOM_FIELDS']
   module ActiveRecord
     SchemaDumper.class_eval do
-      def initialize_with_ignored_custom_fields(connection)
+      def initialize_with_ignored_custom_fields(connection, options = {})
         # Override :columns method on this connection, to ignore any custom field columns
         connection.class_eval do
           def columns(*args)
             super.reject { |c| c.name.start_with? "cf_" }
           end
         end
-        initialize_without_ignored_custom_fields(connection)
+        initialize_without_ignored_custom_fields(connection, options)
       end
 
       alias_method_chain :initialize, :ignored_custom_fields

data/lib/fat_free_crm/gem_ext/active_support/buffered_logger.rb

@@ -4,7 +4,6 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class ActiveSupport::BufferedLogger
-
   BRIGHT = "\033[1;37;40m"
   NORMAL = "\033[0m"
 
@@ -15,6 +14,4 @@ class ActiveSupport::BufferedLogger
   def i(*args)
     info "#{BRIGHT}\n\n" << args.map(&:inspect).join(" ") << "#{NORMAL}\n\n\n"
   end
-
 end
-

data/lib/fat_free_crm/gem_ext/rails/engine.rb

@@ -4,19 +4,12 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 # Override engine views so that plugin views have higher priority.
-Rails::Engine.initializers.detect{|i| i.name == :add_view_paths }.
-  instance_variable_set("@block", Proc.new {
+Rails::Engine.initializers.detect { |i| i.name == :add_view_paths }
+  .instance_variable_set("@block", proc do
     views = paths["app/views"].to_a
     unless views.empty?
-      ActiveSupport.on_load(:action_controller){ append_view_path(views) }
-      ActiveSupport.on_load(:action_mailer){ append_view_path(views) }
+      ActiveSupport.on_load(:action_controller) { append_view_path(views) }
+      ActiveSupport.on_load(:action_mailer) { append_view_path(views) }
     end
-  }
-)
-
-# Override I18n load paths so that plugin locales have higher priority.
-Rails::Engine.initializers.detect{|i| i.name == :add_locales }.
-  instance_variable_set("@block", Proc.new {
-    config.i18n.railties_load_path.concat( paths["config/locales"].to_a ).reverse!
-  }
+  end
 )

data/lib/fat_free_crm/gem_ext/rake/task.rb

@@ -4,7 +4,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module Rake
-  Task.class_eval do   
+  Task.class_eval do
     # Removes a Rake task
     def self.remove(task_name)
       Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)

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

@@ -8,7 +8,7 @@
 module SimpleForm
   module ActionViewExtensions
     module FormHelper
-      def simple_form_for(record, options={}, &block)
+      def simple_form_for(record, options = {}, &block)
         options[:builder] ||= SimpleForm::FormBuilder
         options[:html] ||= {}
         unless options[:html].key?(:novalidate)
@@ -22,4 +22,3 @@ module SimpleForm
     end
   end
 end
-

data/lib/fat_free_crm/i18n.rb

@@ -7,7 +7,6 @@ require 'pathname'
 
 module FatFreeCRM
   module I18n
-
     #----------------------------------------------------------------------------
     def t(*args)
       if args.size == 1
@@ -27,14 +26,14 @@ module FatFreeCRM
     # translations too and we only want the locales that Fat Free CRM supports.
     #----------------------------------------------------------------------------
     def locales
-      @@locales ||= ::I18n.load_path.grep(/_fat_free_crm\.yml$/).map{ |path| Pathname.new(path).basename.to_s.match(/(.*)_fat_free_crm\.yml/)[1] }.uniq
+      @@locales ||= ::I18n.load_path.grep(/_fat_free_crm\.yml$/).map { |path| Pathname.new(path).basename.to_s.match(/(.*)_fat_free_crm\.yml/)[1] }.uniq
     end
 
     # Return a hash where the key is locale name, and the value is language name
     # as defined in the locale_fat_free_crm.yml file.
     #----------------------------------------------------------------------------
     def languages
-      @@languages ||= Hash[ locales.map{ |locale| [ locale, t(:language, locale: locale) ] } ]
+      @@languages ||= Hash[locales.map { |locale| [locale, t(:language, locale: locale)] }]
     end
   end
 end

data/lib/fat_free_crm/load_settings.rb

@@ -10,11 +10,9 @@
 # Then override with settings.yml
 # Don't override default settings in test environment
 ActiveSupport.on_load(:fat_free_crm_setting) do
-
   setting_files = [FatFreeCRM.root.join("config", "settings.default.yml")]
   setting_files << Rails.root.join("config", "settings.yml") unless Rails.env == 'test'
   setting_files.each do |settings_file|
     Setting.load_settings_from_yaml(settings_file) if File.exist?(settings_file)
   end
-
 end

data/lib/fat_free_crm/mail_processor/base.rb

@@ -23,9 +23,9 @@ module FatFreeCRM
       #--------------------------------------------------------------------------------------
       def setup
         log "connecting to #{@settings[:server]}..."
-        connect!(:setup => true) or return nil
+        connect!(setup: true) or return nil
         log "logged in to #{@settings[:server]}, checking folders..."
-        folders = [ @settings[:scan_folder] ]
+        folders = [@settings[:scan_folder]]
         folders << @settings[:move_to_folder] unless @settings[:move_to_folder].blank?
         folders << @settings[:move_invalid_to_folder] unless @settings[:move_invalid_to_folder].blank?
 
@@ -88,7 +88,7 @@ module FatFreeCRM
 
       #--------------------------------------------------------------------------------------
       def with_new_emails
-        @imap.uid_search(['NOT', 'SEEN']).each do |uid|
+        @imap.uid_search(%w(NOT SEEN)).each do |uid|
           begin
             email = Mail.new(@imap.uid_fetch(uid, 'RFC822').first.attr['RFC822'])
             log "fetched new message...", email
@@ -98,7 +98,7 @@ module FatFreeCRM
               discard(uid)
             end
           rescue Exception => e
-            if ["test", "development"].include?(Rails.env)
+            if %w(test development).include?(Rails.env)
               $stderr.puts e
               $stderr.puts e.backtrace
             end
@@ -113,7 +113,6 @@ module FatFreeCRM
         end
       end
 
-
       # Discard message (not valid) action based on settings
       #------------------------------------------------------------------------------
       def discard(uid)
@@ -159,7 +158,9 @@ module FatFreeCRM
 
       #------------------------------------------------------------------------------
       def find_sender(email_address)
-        if @sender = User.first(:conditions => [ "(lower(email) = ? OR lower(alt_email) = ?) AND suspended_at IS NULL", email_address.downcase, email_address.downcase ])
+        if @sender = User.find_by(
+            '(lower(email) = :email OR lower(alt_email) = :email) AND suspended_at IS NULL',
+            email: email_address.downcase)
           # Set the PaperTrail user for versions (if user is found)
           PaperTrail.whodunnit = @sender.id.to_s
         end
@@ -169,7 +170,7 @@ module FatFreeCRM
       def sender_has_permissions_for?(asset)
         return true if asset.access == "Public"
         return true if asset.user_id == @sender.id || asset.assigned_to == @sender.id
-        return true if asset.access == "Shared" && Permission.where('user_id = ? AND asset_id = ? AND asset_type = ?', @sender.id, asset.id, asset.class.to_s).count > 0
+        return true if asset.access == "Shared" && Permission.exists('user_id = ? AND asset_id = ? AND asset_type = ?', @sender.id, asset.id, asset.class.to_s)
 
         false
       end
@@ -189,21 +190,20 @@ module FatFreeCRM
       # if only html is present.
       #--------------------------------------------------------------------------------------
       def plain_text_body(email)
-
         # Extract all parts including nested
         parts = if email.multipart?
-          email.parts.map {|p| p.multipart? ? p.parts : p}.flatten
-        else
-          charset = email.charset
-          [email]
+                  email.parts.map { |p| p.multipart? ? p.parts : p }.flatten
+                else
+                  charset = email.charset
+                  [email]
         end
 
-        if text_part = parts.detect {|p| p.content_type.include?('text/plain')}
+        if text_part = parts.detect { |p| p.content_type.include?('text/plain') }
           text_body = text_part.body.to_s
           charset = text_part.charset if email.multipart?
         else
-          html_part = parts.detect {|p| p.content_type.include?('text/html')} || email
-          text_body = Premailer.new(html_part.body.to_s, :with_html_string => true).to_plain_text
+          html_part = parts.detect { |p| p.content_type.include?('text/html') } || email
+          text_body = Premailer.new(html_part.body.to_s, with_html_string: true).to_plain_text
           charset = html_part.charset if email.multipart?
         end
 
@@ -222,7 +222,6 @@ module FatFreeCRM
           replace: ''
         )
       end
-
     end
   end
 end