fat_free_crm 0.15.0.beta → 0.15.0.beta.2

data/app/helpers/versions_helper.rb

@@ -23,7 +23,7 @@ module VersionsHelper
         first = link_to(h(account.name), account_path(account))
       end
       if second.present? && (account = Account.find_by_id(second))
-        second  = link_to(h(account.name), account_path(account))
+        second = link_to(h(account.name), account_path(account))
       end
     end
 

data/app/inputs/date_pair_input.rb

@@ -17,7 +17,7 @@ class DatePairInput < SimpleForm::Inputs::Base
       label = field == field1 ? I18n.t('pair.start') : I18n.t('pair.end')
       [:required, :disabled].each { |k| input_html_options.delete(k) } # ensure these come from field not default options
       input_html_options.merge!(field.input_options)
-      input_html_options.merge!(value: value(field))
+      input_html_options[:value] = value(field)
       out << "<label#{' class="req"' if input_html_options[:required]}>#{label}</label>".html_safe
       text = @builder.text_field(field.name, merge_wrapper_options(input_html_options, wrapper_options))
       out << text << '</div>'.html_safe

data/app/inputs/date_time_input.rb

@@ -7,7 +7,7 @@ class DateTimeInput < SimpleForm::Inputs::DateTimeInput
   def input(wrapper_options)
     add_autocomplete!
     input_html_options.merge(input_options)
-    input_html_options.merge!(value: value)
+    input_html_options[:value] = value
     @builder.text_field(attribute_name, merge_wrapper_options(input_html_options, wrapper_options))
   end
 

data/app/models/entities/contact.rb

@@ -101,6 +101,7 @@ class Contact < ActiveRecord::Base
   def self.per_page
     20
   end
+
   def self.first_name_position
     "before"
   end

data/app/models/entities/lead.rb

@@ -85,6 +85,7 @@ class Lead < ActiveRecord::Base
   def self.per_page
     20
   end
+
   def self.first_name_position
     "before"
   end
@@ -150,9 +151,7 @@ class Lead < ActiveRecord::Base
   # Attach a task to the lead if it hasn't been attached already.
   #----------------------------------------------------------------------------
   def attach!(task)
-    unless task_ids.include?(task.id)
-      tasks << task
-    end
+    tasks << task unless task_ids.include?(task.id)
   end
 
   # Discard a task from the lead.
@@ -175,16 +174,12 @@ class Lead < ActiveRecord::Base
 
   #----------------------------------------------------------------------------
   def increment_leads_count
-    if campaign_id
-      Campaign.increment_counter(:leads_count, campaign_id)
-    end
+    Campaign.increment_counter(:leads_count, campaign_id) if campaign_id
   end
 
   #----------------------------------------------------------------------------
   def decrement_leads_count
-    if campaign_id
-      Campaign.decrement_counter(:leads_count, campaign_id)
-    end
+    Campaign.decrement_counter(:leads_count, campaign_id) if campaign_id
   end
 
   # Make sure at least one user has been selected if the lead is being shared.

data/app/models/entities/opportunity.rb

@@ -91,6 +91,7 @@ class Opportunity < ActiveRecord::Base
   def self.per_page
     20
   end
+
   def self.default_stage
     Setting[:opportunity_default_stage].try(:to_s) || 'prospecting'
   end
@@ -174,16 +175,12 @@ class Opportunity < ActiveRecord::Base
 
   #----------------------------------------------------------------------------
   def increment_opportunities_count
-    if campaign_id
-      Campaign.increment_counter(:opportunities_count, campaign_id)
-    end
+    Campaign.increment_counter(:opportunities_count, campaign_id) if campaign_id
   end
 
   #----------------------------------------------------------------------------
   def decrement_opportunities_count
-    if campaign_id
-      Campaign.decrement_counter(:opportunities_count, campaign_id)
-    end
+    Campaign.decrement_counter(:opportunities_count, campaign_id) if campaign_id
   end
 
   ActiveSupport.run_load_hooks(:fat_free_crm_opportunity, self)

data/app/models/fields/field.rb

@@ -46,7 +46,7 @@ class Field < ActiveRecord::Base
     'url'         => { klass: 'CustomField', type: 'string' },
     'tel'         => { klass: 'CustomField', type: 'string' },
     'select'      => { klass: 'CustomField', type: 'string' },
-    'radio_buttons'       => { klass: 'CustomField', type: 'string' },
+    'radio_buttons' => { klass: 'CustomField', type: 'string' },
     'check_boxes' => { klass: 'CustomField', type: 'text' },
     'boolean'     => { klass: 'CustomField', type: 'boolean' },
     'date'        => { klass: 'CustomField', type: 'date' },
@@ -63,7 +63,7 @@ class Field < ActiveRecord::Base
   validates_inclusion_of :as, in: proc { field_types.keys }, message: "^Invalid field type.", allow_blank: true
 
   def column_type(field_type = as)
-    (opts = Field.field_types[field_type]) ? opts[:type] : fail("Unknown field_type: #{field_type}")
+    (opts = Field.field_types[field_type]) ? opts[:type] : raise("Unknown field_type: #{field_type}")
   end
 
   def input_options
@@ -113,7 +113,6 @@ class Field < ActiveRecord::Base
     # Example options: :as => 'datepair', :type => 'date', :klass => 'CustomFieldDatePair'
     #------------------------------------------------------------------------------
     def register(options)
-      opts = options.dup
       as = options.delete(:as)
       (@@field_types ||= BASE_FIELD_TYPES).merge!(as => options)
     end

data/app/models/polymorphic/address.rb

@@ -51,7 +51,7 @@ class Address < ActiveRecord::Base
   def self.reject_address(attributes)
     exists = attributes['id'].present?
     empty = %w(street1 street2 city state zipcode country full_address).map { |name| attributes[name].blank? }.all?
-    attributes.merge!(_destroy: 1) if exists && empty
+    attributes[:_destroy] = 1 if exists && empty
     (!exists && empty)
   end
 

data/app/models/polymorphic/comment.rb

@@ -23,7 +23,7 @@ class Comment < ActiveRecord::Base
   belongs_to :user
   belongs_to :commentable, polymorphic: true
 
-  scope :created_by, lambda { |user| where(user_id: user.id) }
+  scope :created_by, ->(user) { where(user_id: user.id) }
 
   validates_presence_of :user, :commentable, :comment
   has_paper_trail class_name: 'Version', meta: { related: :commentable },

data/app/models/polymorphic/task.rb

@@ -166,6 +166,7 @@ class Task < ActiveRecord::Base
       "due_later"
     end
   end
+
   # Returns list of tasks grouping them by due date as required by tasks/index.
   #----------------------------------------------------------------------------
   def self.find_all_grouped(user, view)
@@ -194,7 +195,7 @@ class Task < ActiveRecord::Base
   def self.totals(user, view = "pending")
     return {} unless ALLOWED_VIEWS.include?(view)
     settings = (view == "completed" ? Setting.task_completed : Setting.task_bucket)
-    settings.inject(HashWithIndifferentAccess[all: 0]) do |hash, key|
+    settings.each_with_object(HashWithIndifferentAccess[all: 0]) do |key, hash|
       hash[key] = (view == "assigned" ? assigned_by(user).send(key).pending.count : my(user).send(key).send(view).count)
       hash[:all] += hash[key]
       hash
@@ -220,8 +221,6 @@ class Task < ActiveRecord::Base
       Time.zone.now.midnight + 100.years
     when "specific_time"
       calendar ? parse_calendar_date : nil
-    else # due_later or due_asap
-      nil
     end
   end
 

data/app/models/polymorphic/version.rb

@@ -13,10 +13,10 @@ class Version < PaperTrail::Version
   belongs_to :related, polymorphic: true
   belongs_to :user, foreign_key: :whodunnit
 
-  scope :default_order,  lambda { order('created_at DESC') }
-  scope :include_events, lambda { |*events| where(event: events) }
-  scope :exclude_events, lambda { |*events| where('event NOT IN (?)', events) }
-  scope :for,            lambda { |user| where(whodunnit: user.id.to_s) }
+  scope :default_order,  -> { order('created_at DESC') }
+  scope :include_events, ->(*events) { where(event: events) }
+  scope :exclude_events, ->(*events) { where('event NOT IN (?)', events) }
+  scope :for,            ->(user) { where(whodunnit: user.id.to_s) }
 
   class << self
     def recent_for_user(user, limit = 10)
@@ -32,7 +32,7 @@ class Version < PaperTrail::Version
                 .offset(offset)
                 .default_order
 
-        break if query.size == 0
+        break if query.empty?
         versions += query.select { |v| v.item.present? }
         versions.uniq! { |v| [v.item_id, v.item_type] }
         offset += limit * 2

data/app/models/setting.rb

@@ -56,15 +56,11 @@ class Setting < ActiveRecord::Base
       # Check database
       if database_and_table_exists?
         if setting = find_by_name(name.to_s)
-          unless setting.value.nil?
-            return cache[name] = setting.value
-          end
+          return cache[name] = setting.value unless setting.value.nil?
         end
       end
       # Check YAML settings
-      if yaml_settings.key?(name)
-        return cache[name] = yaml_settings[name]
-      end
+      return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end
 
     # Set setting value
@@ -89,7 +85,10 @@ class Setting < ActiveRecord::Base
       # Returns false if table or database is unavailable.
       # Catches all database-related errors, so that Setting will return nil
       # instead of crashing the entire application.
-      table_exists? rescue false
+
+      table_exists?
+    rescue
+      false
     end
 
     # Loads settings from YAML files

data/app/models/users/user.rb

@@ -105,7 +105,7 @@ class User < ActiveRecord::Base
 
   #----------------------------------------------------------------------------
   def awaits_approval?
-    self.suspended? && login_count == 0 && Setting.user_signup == :needs_approval
+    suspended? && login_count == 0 && Setting.user_signup == :needs_approval
   end
 
   #----------------------------------------------------------------------------
@@ -161,7 +161,7 @@ class User < ActiveRecord::Base
   def has_related_assets?
     sum = %w(Account Campaign Lead Contact Opportunity Comment Task).detect do |asset|
       klass = asset.constantize
-      
+
       asset != "Comment" && klass.assigned_to(self).exists? || klass.created_by(self).exists?
     end
     !sum.nil?

data/app/views/shared/_tags.html.haml

@@ -3,8 +3,4 @@
   %td{ :valign => :top, :colspan => span }
     .label= t(:tags) + ":"
 
-    = f.hidden_field :tag_list,
-    {:class => "select2_tag", :data => {:tags => Tag.all.map{|t| t.name},
-    :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags),
-    :multiple => true, :asset_id => f.object.try(:id),
-    }, value: f.object.tag_list.join(",")}
+    = f.select :tag_list, Tag.all.map{|t| t.name}, {}, {:class => "select2_tag", :data => {:tags => true, :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags), :multiple => true, :asset_id => f.object.try(:id)}, :multiple => true}

data/config/environments/test.rb

@@ -28,7 +28,7 @@ if defined?(FatFreeCRM::Application)
     config.action_dispatch.show_exceptions = false
 
     # Disable request forgery protection in test environment
-    config.action_controller.allow_forgery_protection    = false
+    config.action_controller.allow_forgery_protection = false
 
     # Tell Action Mailer not to deliver emails to the real world.
     # The :test delivery method accumulates sent emails in the

data/config/initializers/assets.rb

@@ -8,7 +8,7 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( print.css chosen-sprite.png jquery-ui/* jquery_ui_datepicker/*.js )
+Rails.application.config.assets.precompile += %w(print.css chosen-sprite.png jquery-ui/* jquery_ui_datepicker/*.js)
 
 # Don't initialize Rails environment
 Rails.application.config.assets.initialize_on_precompile = false

data/config/initializers/paper_trail.rb

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

data/config/initializers/simple_form.rb

@@ -57,7 +57,7 @@ SimpleForm.setup do |config|
   # config.collection_value_methods = [ :id, :to_s ]
 
   # How the label text should be generated altogether with the required text.
-  config.label_text = lambda { |label, _required, _explicit_label| "#{label}" }
+  config.label_text = ->(label, _required, _explicit_label) { label.to_s }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil

data/config/initializers/views.rb

@@ -43,5 +43,4 @@
    controllers: ['campaigns'], actions: ['index'], template: 'campaigns/index_long' },
  { name: 'campaigns_show_normal', title: 'Normal format', icon: 'fa-list',
    controllers: ['campaigns'], actions: ['show'], template: nil }, # default show view
-
 ].each { |view| FatFreeCRM::ViewFactory.new(view) }

data/config/locales/th.rb

@@ -41,9 +41,9 @@ end
 
   date: {
     formats: {
-      default: lambda { |date, _opts| "%d-%m-#{date.year + 543}" },
+      default: ->(date, _opts) { "%d-%m-#{date.year + 543}" },
       short: "%d %b",
-      long: lambda { |date, _opts| "%d %B #{date.year + 543}" }
+      long: ->(date, _opts) { "%d %B #{date.year + 543}" }
     },
 
     day_names: %w(อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์),
@@ -56,9 +56,9 @@ end
 
   time: {
     formats: {
-      default: lambda { |date, _opts| "%a %d %b #{date.year + 543} %H:%M:%S %z" },
+      default: ->(date, _opts) { "%a %d %b #{date.year + 543} %H:%M:%S %z" },
       short: "%d %b %H:%M น.",
-      long: lambda { |date, _opts| "%d %B #{date.year + 543} %H:%M น." }
+      long: ->(date, _opts) { "%d %B #{date.year + 543} %H:%M น." }
     },
     am: "ก่อนเที่ยง",
     pm: "หลังเที่ยง"

data/config/unicorn.rb

@@ -12,7 +12,7 @@ worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
 timeout 15
 preload_app true
 
-before_fork do |server, worker|
+before_fork do |_server, _worker|
   Signal.trap 'TERM' do
     puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
     Process.kill 'QUIT', Process.pid
@@ -22,7 +22,7 @@ before_fork do |server, worker|
     ActiveRecord::Base.connection.disconnect!
 end
 
-after_fork do |server, worker|
+after_fork do |_server, _worker|
   Signal.trap 'TERM' do
     puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
   end

data/db/migrate/20100928030620_remove_uuid.rb

@@ -4,14 +4,12 @@ class RemoveUuid < ActiveRecord::Migration
   def self.up
     [:users, :accounts, :campaigns, :leads, :contacts, :opportunities, :tasks].each do |table|
       remove_column table, :uuid
-      if self.uuid_configured?
-        execute("DROP TRIGGER IF EXISTS #{table}_uuid")
-      end
+      execute("DROP TRIGGER IF EXISTS #{table}_uuid") if uuid_configured?
     end
   end
 
   def self.down
-    fail ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs"
+    raise ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs"
   end
 
   private

data/db/migrate/20111201030535_add_field_groups_klass_name.rb

@@ -6,7 +6,8 @@ class AddFieldGroupsKlassName < ActiveRecord::Migration
     %w(Account Campaign Contact Lead Opportunity).each do |entity|
       klass = entity.classify.constantize
       field_group = FieldGroup.new
-      field_group.label, field_group.klass_name = 'Custom Fields', klass.name
+      field_group.label = 'Custom Fields'
+      field_group.klass_name = klass.name
       field_group.save!
       Field.where(field_group_id: nil, klass_name: klass.name).update_all(field_group_id: field_group.id)
     end

data/db/migrate/20120224073107_remove_default_value_and_clear_settings.rb

@@ -3,7 +3,7 @@ class RemoveDefaultValueAndClearSettings < ActiveRecord::Migration
     remove_column :settings, :default_value
 
     # Truncate settings table
-    if connection.adapter_name.downcase == "sqlite"
+    if connection.adapter_name.casecmp("sqlite").zero?
       execute("DELETE FROM settings")
     else # mysql and postgres
       execute("TRUNCATE settings")

data/db/schema.rb

@@ -12,7 +12,6 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160511053730) do
-
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -455,5 +454,4 @@ ActiveRecord::Schema.define(version: 20160511053730) do
   add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id", using: :btree
   add_index "versions", ["transaction_id"], name: "index_versions_on_transaction_id", using: :btree
   add_index "versions", ["whodunnit"], name: "index_versions_on_whodunnit", using: :btree
-
 end

data/fat_free_crm.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0.0'
   gem.license = 'MIT'
 
-  gem.add_dependency 'rails',               '~> 4.2.0'
+  gem.add_dependency 'rails',               '~> 4.2'
   gem.add_dependency 'rails-observers'
   # Sprockets 2.2.3 appears to have a bug resolving assets from the engine update to '>= 3.0.0 once released'
   gem.add_dependency 'sprockets-rails',     '2.2.2'
@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
   # 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 'authlogic',           '>= 3.4.4', '< 3.5.0' # View tests fail on authlogic 3.5.0+
   gem.add_dependency 'acts_as_commentable'
   gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
   gem.add_dependency 'dynamic_form'
@@ -52,12 +52,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
   gem.add_dependency 'thor'
   gem.add_dependency 'rails_autolink'
-  gem.add_dependency 'coffee-script-source', '~>1.8.0' # pegged until https://github.com/jashkenas/coffeescript/issues/3829 is resolved
+  gem.add_dependency 'coffee-script-source', '~> 1.8', '>= 1.8.0' # pegged until https://github.com/jashkenas/coffeescript/issues/3829 is resolved
   gem.add_dependency 'country_select'
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
-  gem.add_dependency 'ransack_ui',          '>= 1.3.1'
-  gem.add_dependency 'ransack',             '~> 1.6.2'
+  gem.add_dependency 'ransack_ui',          '~> 1.3', '>= 1.3.1'
+  gem.add_dependency 'ransack',             '~> 1.6', '>= 1.6.2'
   gem.add_dependency 'email_reply_parser_ffcrm'
 end

data/lib/fat_free_crm.rb

@@ -26,9 +26,7 @@ module FatFreeCRM
 end
 
 # Load Fat Free CRM as a Rails Engine, unless running as a Rails Application
-unless defined?(FatFreeCRM::Application)
-  require 'fat_free_crm/engine'
-end
+require 'fat_free_crm/engine' unless defined?(FatFreeCRM::Application)
 
 require 'fat_free_crm/load_settings' # register load hook for Setting