fat_free_crm 0.15.0.beta → 0.15.0.beta.2

data/lib/fat_free_crm/callback.rb

@@ -43,6 +43,7 @@ module FatFreeCRM
     def self.view_responder(method)
       @@responder[method] ||= @@classes.map(&:instance).select { |instance| instance.class.view_hooks[method] }
     end
+
     # Invokes the view hook Proc stored under :hook and captures its output.
     # => Instead of defining methods on the class, view hooks are
     #    stored as Procs in a hash. This allows the same hook to be manipulated in
@@ -52,7 +53,7 @@ module FatFreeCRM
     # - a hash of arrays containing Procs and positions to insert content.
     #--------------------------------------------------------------------------
     def self.view_hook(hook, caller, context = {})
-      view_responder(hook).inject(Hash.new([])) do |response, instance|
+      view_responder(hook).each_with_object(Hash.new([])) do |instance, response|
         # Process each operation within each view hook, storing the data in a hash.
         instance.class.view_hooks[hook].each do |op|
           response[op[:position]] += [op[:proc].call(caller, context)]

data/lib/fat_free_crm/core_ext/string.rb

@@ -34,10 +34,10 @@ class String
   # A query with 4 words will generate 6 permutations
   def name_permutations
     parts = split(" ")
-    (parts.size - 1).times.map do|i|
+    Array.new((parts.size - 1)) 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(" ")]
-    end.inject([]) do |arr, perm|
+    end.each_with_object([]) do |perm, arr|
       # Search both [first, last] and [last, first]
       # e.g. for every ["A B C", "D"], also include ["D", "A B C"]
       arr << perm

data/lib/fat_free_crm/engine.rb

@@ -11,7 +11,7 @@ module FatFreeCRM
     config.active_record.observers = [:lead_observer, :opportunity_observer,
                                       :task_observer, :entity_observer]
 
-    initializer "model_core.factories", :after => "factory_girl.set_factory_paths" do
+    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
 

data/lib/fat_free_crm/fields.rb

@@ -79,7 +79,7 @@ module FatFreeCRM
           # 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 : (reload && self)
+          object = 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/i18n.rb

@@ -13,7 +13,7 @@ module FatFreeCRM
         super(args.first, default: args.first.to_s)
       elsif args.second.is_a?(Hash)
         super(*args)
-      elsif args.second.is_a?(Fixnum)
+      elsif args.second.is_a?(Integer)
         super(args.first, count: args.second)
       else
         super(args.first, value: args.second)

data/lib/fat_free_crm/mail_processor/base.rb

@@ -16,7 +16,9 @@ module FatFreeCRM
 
       #--------------------------------------------------------------------------------------
       def initialize
-        @archived, @discarded, @dry_run = 0, 0, false
+        @archived = 0
+        @discarded = 0
+        @dry_run = false
       end
 
       # Setup imap folders in settings.
@@ -81,7 +83,11 @@ module FatFreeCRM
         if @imap
           @imap.logout
           unless @imap.disconnected?
-            @imap.disconnect rescue nil
+            begin
+              @imap.disconnect
+            rescue
+              nil
+            end
           end
         end
       end

data/lib/fat_free_crm/mail_processor/comment_replies.rb

@@ -39,7 +39,8 @@ module FatFreeCRM
       #--------------------------------------------------------------------------------------
       def with_subject_line(email)
         if /\[([^:]*):([^\]]*)\]/ =~ email.subject
-          entity_name, entity_id = Regexp.last_match[1], Regexp.last_match[2]
+          entity_name = Regexp.last_match[1]
+          entity_id = Regexp.last_match[2]
           # Check that entity is a known model
           if ENTITY_SHORTCUTS.values.include?(entity_name)
             yield entity_name, entity_id

data/lib/fat_free_crm/permissions.rb

@@ -74,7 +74,7 @@ module FatFreeCRM
           permissions_to_remove = []
         end
 
-        permissions_to_remove.each { |p| (permissions.delete(p); p.destroy) }
+        permissions_to_remove.each { |p| permissions.delete(p); p.destroy }
       end
 
       # Save the model along with its permissions if any.

data/lib/fat_free_crm/version.rb

@@ -8,7 +8,7 @@ module FatFreeCRM
     MAJOR = 0
     MINOR = 15
     TINY  = 0
-    PRE   = 'beta'
+    PRE   = 'beta.2'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/gravatar_image_tag.rb

@@ -46,11 +46,11 @@ module GravatarImageTag
   end
 
   def self.gravatar_id(email, filetype = nil)
-    "#{ Digest::MD5.hexdigest(email) }#{ ".#{filetype}" unless filetype.nil? }" unless email.nil?
+    "#{Digest::MD5.hexdigest(email)}#{".#{filetype}" unless filetype.nil?}" unless email.nil?
   end
 
   def self.url_params(gravatar_params)
-    return nil if gravatar_params.keys.size == 0
+    return nil if gravatar_params.keys.empty?
     "?#{gravatar_params.map { |key, value| "#{key}=#{URI.escape(value.is_a?(String) ? value : value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.join('&')}"
   end
 end

data/lib/tasks/ffcrm/comment_replies.rake

@@ -8,13 +8,13 @@ namespace :ffcrm do
     desc "Run comment inbox crawler and process incoming emails"
     task run: :environment do
       require "fat_free_crm/mail_processor/comment_replies"
-      FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = false)
+      FatFreeCRM::MailProcessor::CommentReplies.new.run(false)
     end
     namespace :run do
       desc "[Dry run] - Run comment inbox crawler and process incoming emails"
       task dry: :environment do
         require "fat_free_crm/mail_processor/comment_replies"
-        FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = true)
+        FatFreeCRM::MailProcessor::CommentReplies.new.run(true)
       end
     end
 

data/lib/tasks/ffcrm/config.rake

@@ -9,7 +9,8 @@ namespace :ffcrm do
     task :copy_database_yml do
       require 'fileutils'
       filename = "config/database.#{ENV['DB'] || 'postgres'}.yml"
-      orig, dest = FatFreeCRM.root.join(filename), Rails.root.join('config/database.yml')
+      orig = FatFreeCRM.root.join(filename)
+      dest = Rails.root.join('config/database.yml')
       unless File.exist?(dest)
         puts "Copying #{filename} to config/database.yml ..."
         FileUtils.cp orig, dest
@@ -27,13 +28,13 @@ namespace :ffcrm do
       require 'fileutils'
       require 'syck'
       require 'psych'
-      Dir[File.join(Rails.root, 'config', '**', '*.yml')].each do |file|
+      Dir[File.join(Rails.root, 'config', '**', '*.yml')].each do |file_path|
         YAML::ENGINE.yamler = 'syck'
-        puts "Converting #{file}"
-        yml = YAML.load(File.read(file))
-        FileUtils.cp file, "#{file}.bak"
+        puts "Converting #{file_path}"
+        yml = YAML.load(File.read(file_path))
+        FileUtils.cp file_path, "#{file_path}.bak"
         YAML::ENGINE.yamler = 'psych'
-        File.open(file, 'w') { |file| file.write(YAML.dump(yml)) }
+        File.open(file_path, 'w') { |file| file.write(YAML.dump(yml)) }
       end
     end
   end

data/lib/tasks/ffcrm/demo.rake

@@ -46,7 +46,7 @@ namespace :ffcrm do
 
         if [Account, Campaign, Contact, Lead, Opportunity].include?(item.class)
           viewed_at = created_at + rand(12 * 60).minutes
-          version = create_version(event: "view", created_at: viewed_at, user: user, item: item)
+          create_version(event: "view", created_at: viewed_at, user: user, item: item)
         end
         print "." if item.id % 10 == 0
       end

data/lib/tasks/ffcrm/dropbox.rake

@@ -8,14 +8,14 @@ namespace :ffcrm do
     desc "Run dropbox crawler and process incoming emails"
     task run: :environment do
       require "fat_free_crm/mail_processor/dropbox"
-      FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = false)
+      FatFreeCRM::MailProcessor::Dropbox.new.run(false)
     end
 
     namespace :run do
       desc "[Dry run] - Run dropbox crawler and process incoming emails"
       task dry: :environment do
         require "fat_free_crm/mail_processor/dropbox"
-        FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = true)
+        FatFreeCRM::MailProcessor::Dropbox.new.run(true)
       end
     end
 

data/lib/tasks/ffcrm/setup.rake

@@ -28,7 +28,9 @@ namespace :ffcrm do
   namespace :setup do
     desc "Create admin user"
     task admin: :environment do
-      username, password, email = ENV["USERNAME"], ENV["PASSWORD"], ENV["EMAIL"]
+      username = ENV["USERNAME"]
+      password = ENV["PASSWORD"]
+      email = ENV["EMAIL"]
       unless username && password && email
         puts "\nTo create the admin user you will be prompted to enter username, password,"
         puts "and email address. You might also specify the username of existing user.\n"
@@ -40,7 +42,7 @@ namespace :ffcrm do
 
           password ||= "manager"
           print "Password [#{password}]: "
-          echo = lambda { |toggle| return if RUBY_PLATFORM =~ /mswin/; system(toggle ? "stty echo && echo" : "stty -echo") }
+          echo = ->(toggle) { return if RUBY_PLATFORM =~ /mswin/; system(toggle ? "stty echo && echo" : "stty -echo") }
           begin
             echo.call(false)
             reply = STDIN.gets.strip

data/lib/tasks/ffcrm/update_data.rake

@@ -210,16 +210,14 @@ in a console and continue. This is strongly discouraged. You have been warned!
       # SELECT "addresses".* FROM "addresses"
       #    WHERE (("addresses"."country" = 'AU' OR "addresses"."country" = 'Australia'))
       convert_table.each do |ct|
-        t = Address.arel_table
-        scope = t[:country].eq(ct[0]) # Australia
-        scope = scope.or(t[:country].eq(ct[1])) # AU
+        table = Address.arel_table
+        scope = table[:country].eq(ct[0]) # Australia
+        scope = scope.or(table[:country].eq(ct[1])) # AU
 
         tmp = Address.where(scope)
         tmp.map { |t| t.country = ct[2] }
 
-        unless tmp.blank?
-          addresses_to_update << tmp
-        end
+        addresses_to_update << tmp unless tmp.blank?
       end
 
       Address.transaction do
@@ -229,8 +227,8 @@ in a console and continue. This is strongly discouraged. You have been warned!
           end
           Setting.have_run_country_migration = true
         rescue Exception => e
-          ActiveRecord::Rollback
           puts e
+          raise ActiveRecord::Rollback
         end
       end
     end

data/spec/controllers/entities/campaigns_controller_spec.rb

@@ -373,7 +373,7 @@ describe CampaignsController do
 
         xhr :put, :update, id: 42, campaign: { name: "Hello", access: "Shared", user_ids: %w(7 8) }
         expect(assigns[:campaign].access).to eq("Shared")
-        expect(assigns[:campaign].user_ids.sort).to eq([7, 8])
+        expect(assigns[:campaign].user_ids.sort).to eq([he.id, she.id])
       end
 
       describe "campaign got deleted or otherwise unavailable" do

data/spec/controllers/entities/leads_controller_spec.rb

@@ -467,7 +467,7 @@ describe LeadsController do
         she = FactoryGirl.create(:user, id: 8)
 
         xhr :put, :update, id: @lead.id, lead: { access: "Shared", user_ids: %w(7 8) }
-        expect(@lead.user_ids.sort).to eq([7, 8])
+        expect(@lead.user_ids.sort).to eq([he.id, she.id])
       end
 
       it "should get the data for leads sidebar when called from leads index" do

data/spec/controllers/home_controller_spec.rb

@@ -21,7 +21,7 @@ describe HomeController do
     end
 
     it "should not include views in the list of activities" do
-      activity = FactoryGirl.create(:version, item: FactoryGirl.create(:account, user: @current_user), event: "view")
+      FactoryGirl.create(:version, item: FactoryGirl.create(:account, user: @current_user), event: "view")
       expect(controller).to receive(:get_activities).once.and_return([])
 
       get :index
@@ -42,11 +42,12 @@ describe HomeController do
     end
 
     it "should not display completed tasks" do
-      task_1 = FactoryGirl.create(:task, user_id: current_user.id, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
-      task_2 = FactoryGirl.create(:task, user_id: current_user.id, name: "Completed task", bucket: "due_asap", completed_at: 1.days.ago, completed_by: current_user.id, assigned_to: current_user.id)
+      my_task = FactoryGirl.create(:task, user_id: current_user.id, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
+      FactoryGirl.create(:task, user_id: current_user.id, name: "Completed task", bucket: "due_asap", completed_at: 1.days.ago, completed_by: current_user.id, assigned_to: current_user.id)
 
       get :index
-      expect(assigns[:my_tasks]).to eq([task_1])
+
+      expect(assigns[:my_tasks]).to eq([my_task])
     end
 
     it "should get a list of my opportunities ordered by closes_on" do
@@ -202,7 +203,6 @@ describe HomeController do
     end
 
     it "should not do anything when state neither Expanded nor Collapsed" do
-      comment = double(Comment)
       expect(Comment).not_to receive(:find).with("1")
       xhr :get, :timeline, type: "comment", id: "1", state: "Explode"
     end

data/spec/controllers/tasks_controller_spec.rb

@@ -14,7 +14,7 @@ describe TasksController do
   def produce_tasks(user, view)
     settings = (view != "completed" ? Setting.task_bucket : Setting.task_completed)
 
-    settings.inject({}) do | hash, due |
+    settings.each_with_object({}) do |due, hash|
       hash[due] ||= []
       if Date.tomorrow == Date.today.end_of_week && due == :due_tomorrow
         due = :due_this_week
@@ -55,7 +55,8 @@ describe TasksController do
   describe "responding to GET index" do
     before do
       update_sidebar
-      @timezone, Time.zone = Time.zone, 'UTC'
+      @timezone = Time.zone
+      Time.zone = 'UTC'
     end
 
     after do

data/spec/factories/sequences.rb

@@ -5,8 +5,7 @@
 #------------------------------------------------------------------------------
 FactoryGirl.define do
   sequence :address do |_n|
-    FFaker::Address.street_address + " " + FFaker::Address.secondary_address + "\n"
-    FFaker::Address.city + ", " + FFaker::AddressUS.state_abbr + " " + FFaker::AddressUS.zip_code
+    FFaker::Address.street_address + " " + FFaker::Address.secondary_address + "\n" + FFaker::Address.city + ", " + FFaker::AddressUS.state_abbr + " " + FFaker::AddressUS.zip_code
   end
 
   sequence :username do |n|

data/spec/factories/shared_factories.rb

@@ -6,14 +6,14 @@
 FactoryGirl.define do
   factory :version do
     whodunnit ""
-    item                { fail "Please specify :item for the version" }
+    item                { raise "Please specify :item for the version" }
     event "create"
     created_at          { FactoryGirl.generate(:time) }
   end
 
   factory :comment do
     user
-    commentable         { fail "Please specify :commentable for the comment" }
+    commentable         { raise "Please specify :commentable for the comment" }
     title               { FactoryGirl.generate(:title) }
     private false
     comment             { FFaker::Lorem.paragraph }
@@ -25,7 +25,7 @@ FactoryGirl.define do
   factory :email do
     imap_message_id     { "%08x" % rand(0xFFFFFFFF) }
     user
-    mediator            { fail "Please specify :mediator for the email" }
+    mediator            { raise "Please specify :mediator for the email" }
     sent_from           { FFaker::Internet.email }
     sent_to             { FFaker::Internet.email }
     cc                  { FFaker::Internet.email }
@@ -42,7 +42,7 @@ FactoryGirl.define do
   end
 
   factory :address do
-    addressable         { fail "Please specify :addressable for the address" }
+    addressable         { raise "Please specify :addressable for the address" }
     street1             { FFaker::Address.street_address }
     street2             { FFaker::Address.street_address }
     city                { FFaker::Address.city }
@@ -58,7 +58,7 @@ FactoryGirl.define do
 
   factory :avatar do
     user
-    entity              { fail "Please specify :entity for the avatar" }
+    entity              { raise "Please specify :entity for the avatar" }
     image               { File.new(Rails.root.join('spec', 'fixtures', 'rails.png')) }
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }

data/spec/factories/user_factories.rb

@@ -43,15 +43,15 @@ FactoryGirl.define do
 
   factory :permission do
     user
-    asset               { fail "Please specify :asset for the permission" }
+    asset               { raise "Please specify :asset for the permission" }
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
 
   factory :preference do
     user
-    name                { fail "Please specify :name for the preference" }
-    value               { fail "Please specify :value for the preference" }
+    name                { raise "Please specify :name for the preference" }
+    value               { raise "Please specify :value for the preference" }
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end

data/spec/models/entities/opportunity_spec.rb

@@ -35,7 +35,7 @@ describe Opportunity do
   end
 
   it "should be possible to create opportunity with the same name" do
-    first  = FactoryGirl.create(:opportunity, name: "Hello", user: current_user)
+    FactoryGirl.create(:opportunity, name: "Hello", user: current_user)
     expect { FactoryGirl.create(:opportunity, name: "Hello", user: current_user) }.to_not raise_error
   end
 

data/spec/models/fields/custom_field_pair_spec.rb

@@ -18,7 +18,7 @@ describe CustomFieldPair do
       @field = { 'as' => 'foopair', 'field_group_id' => 1, 'label' => 'Event' }
       @pair1 = { 'name' => 'pair1' }
       @pair2 = { 'name' => 'pair2' }
-      @params  = { 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } }
+      @params = { 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } }
     end
 
     it "should create the pair" do
@@ -38,7 +38,7 @@ describe CustomFieldPair do
       @field = { 'as' => 'foopair', 'field_group_id' => 1, 'label' => 'Event' }
       @pair1 = { 'name' => 'pair1' }
       @pair2 = { 'name' => 'pair2' }
-      @params  = { 'id' => '3', 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } }
+      @params = { 'id' => '3', 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } }
     end
 
     it "should update the pair" do

data/spec/models/setting_spec.rb

@@ -31,7 +31,7 @@ describe Setting do
 
   it "should use value from YAML if setting is missing from database" do
     @setting = FactoryGirl.create(:setting, name: "magoody", value: nil)
-    Setting.yaml_settings.merge!(magoody: "thingymabob")
+    Setting.yaml_settings[:magoody] = "thingymabob"
     expect(Setting[:magoody]).to eq("thingymabob")
     expect(Setting.magoody).to eq("thingymabob")
   end