fat_free_crm 0.13.6 → 0.14.0

data/lib/fat_free_crm/version.rb

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

data/lib/fat_free_crm/view_factory.rb

@@ -5,7 +5,6 @@
 #------------------------------------------------------------------------------
 
 module FatFreeCRM
-
   # A view factory keeps track of views and the contexts in which they are available.
   #----------------------------------------------------------------------------
   #
@@ -16,7 +15,6 @@ module FatFreeCRM
   # Icon is optional. If specified, it will be passed to asset_path.
   #
   class ViewFactory
-
     include Comparable
 
     @@views = []
@@ -25,7 +23,6 @@ module FatFreeCRM
     # Class methods
     #----------------------------------------------------------------------------
     class << self
-
       # Register with the view factory
       #----------------------------------------------------------------------------
       def register(view)
@@ -37,9 +34,9 @@ module FatFreeCRM
       def views_for(options = {})
         controller = options[:controller]
         action = options[:action]
-        name = options[:name] #optional
+        name = options[:name] # optional
         @@views.select do |view|
-          view.controllers.include?(controller) and view.actions.include?(action) and (name.present? ? view.name == name : true)
+          view.controllers.include?(controller) && view.actions.include?(action) && (name.present? ? view.name == name : true)
         end
       end
 
@@ -50,7 +47,6 @@ module FatFreeCRM
         view = views_for(options).first
         view && view.template
       end
-
     end
 
     # Instance methods
@@ -77,10 +73,9 @@ module FatFreeCRM
     # This defines what it means for one view to be different to another
     #----------------------------------------------------------------------------
     def generate_id
-       [name, controllers.sort, actions.sort].flatten.map(&:to_s).map(&:underscore).join('_')
+      [name, controllers.sort, actions.sort].flatten.map(&:to_s).map(&:underscore).join('_')
     end
 
     ActiveSupport.run_load_hooks(:fat_free_crm_view_factory, self)
-
   end
 end

data/lib/gravatar_image_tag.rb

@@ -1,5 +1,4 @@
 module GravatarImageTag
-
   class << self
     attr_accessor :configuration
   end
@@ -13,51 +12,47 @@ module GravatarImageTag
   end
 
   class Configuration
-     attr_accessor :default_image, :filetype, :rating, :size, :secure
+    attr_accessor :default_image, :filetype, :rating, :size, :secure
    end
 
   def self.included(base)
-    GravatarImageTag.configure { |c| nil }
+    GravatarImageTag.configure { |_c| nil }
     base.send :include, InstanceMethods
   end
 
   module InstanceMethods
-
     def gravatar_image_tag(email, options = {})
       options[:alt] ||= 'Gravatar'
-      image_tag(GravatarImageTag::gravatar_url(email, options.delete(:gravatar)), options)
+      image_tag(GravatarImageTag.gravatar_url(email, options.delete(:gravatar)), options)
     end
-
   end
 
   def self.gravatar_url(email, overrides = {})
     overrides ||= {}
     gravatar_params = {
-      :default     => GravatarImageTag.configuration.default_image,
-      :filetype    => GravatarImageTag.configuration.filetype,
-      :rating      => GravatarImageTag.configuration.rating,
-      :secure      => GravatarImageTag.configuration.secure,
-      :size        => GravatarImageTag.configuration.size
-    }.merge(overrides).delete_if { |key, value| value.nil? }
+      default:     GravatarImageTag.configuration.default_image,
+      filetype:    GravatarImageTag.configuration.filetype,
+      rating:      GravatarImageTag.configuration.rating,
+      secure:      GravatarImageTag.configuration.secure,
+      size:        GravatarImageTag.configuration.size
+    }.merge(overrides).delete_if { |_key, value| value.nil? }
     "#{gravatar_url_base(gravatar_params.delete(:secure))}/#{gravatar_id(email, gravatar_params.delete(:filetype))}#{url_params(gravatar_params)}"
   end
 
   private
 
-    def self.gravatar_url_base(secure = false)
-      'http' + (!!secure ? 's://secure.' : '://') + 'gravatar.com/avatar'
-    end
-
-    def self.gravatar_id(email, filetype = nil)
-      "#{ Digest::MD5.hexdigest(email) }#{ ".#{filetype}" unless filetype.nil? }" unless email.nil?
-    end
+  def self.gravatar_url_base(secure = false)
+    'http' + (!!secure ? 's://secure.' : '://') + 'gravatar.com/avatar'
+  end
 
-    def self.url_params(gravatar_params)
-      return nil if gravatar_params.keys.size == 0
-      "?#{gravatar_params.map { |key, value| "#{key}=#{URI.escape(value.is_a?(String) ? value : value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"}.join('&amp;')}"
-    end
+  def self.gravatar_id(email, filetype = 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
+    "?#{gravatar_params.map { |key, value| "#{key}=#{URI.escape(value.is_a?(String) ? value : value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.join('&amp;')}"
+  end
 end
 
 ActionView::Base.send(:include, GravatarImageTag) if defined?(ActionView::Base)
-

data/lib/missing_translation_detector.rb

@@ -1,27 +1,27 @@
 # Compares two locale files and detects missing translations.
 class MissingTranslationDetector
   attr_reader :missing_translations
-  
+
   # @params [String] base_file_name File name of the base locale is i.e. en-US
   # @params [String] target_file_name File name of a locale with missing translations is i.e. de
   def initialize(base_file_name, target_file_name)
-    @base = yml_load base_file_name 
-    @target = yml_load target_file_name 
+    @base = yml_load base_file_name
+    @target = yml_load target_file_name
     @missing_translations = []
   end
 
   # Detects missing translations within the target locale file
   # and stores it in "missing_translations".
-  def detect(h=@base, keys=[])
+  def detect(h = @base, keys = [])
     h.each_key do |key|
       key_path = keys.clone.push key
 
       if h[key].is_a?(Hash)
-        detect h[key], key_path 
+        detect h[key], key_path
       elsif blank?(key_path)
-        missing_translations << OpenStruct.new(:key_path => key_path,
-                                               :value => h[key]) 
-      end 
+        missing_translations << OpenStruct.new(key_path: key_path,
+                                               value: h[key])
+      end
     end
   end
 
@@ -34,9 +34,9 @@ class MissingTranslationDetector
 
   def blank?(keys)
     h = @target
-    
+
     keys.each do |key|
-      return true if !h.is_a?(Hash) || !h.has_key?(key)
+      return true if !h.is_a?(Hash) || !h.key?(key)
       h = h[key]
     end
 

data/lib/tasks/ffcrm/comment_replies.rake

@@ -5,25 +5,23 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :comment_replies do
-
     desc "Run comment inbox crawler and process incoming emails"
-    task :run => :environment do
+    task run: :environment do
       require "fat_free_crm/mail_processor/comment_replies"
       FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = false)
     end
     namespace :run do
       desc "[Dry run] - Run comment inbox crawler and process incoming emails"
-      task :dry => :environment do
+      task dry: :environment do
         require "fat_free_crm/mail_processor/comment_replies"
         FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = true)
       end
     end
 
     desc "Set up comment inbox based on currently loaded settings"
-    task :setup => :environment do
+    task setup: :environment do
       require "fat_free_crm/mail_processor/comment_replies"
       FatFreeCRM::MailProcessor::CommentReplies.new.setup
     end
-
   end
 end

data/lib/tasks/ffcrm/config.rake

@@ -5,13 +5,12 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :config do
-
     desc "Setup database.yml"
     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')
-      unless File.exists?(dest)
+      unless File.exist?(dest)
         puts "Copying #{filename} to config/database.yml ..."
         FileUtils.cp orig, dest
       end
@@ -31,12 +30,11 @@ namespace :ffcrm do
       Dir[File.join(Rails.root, 'config', '**', '*.yml')].each do |file|
         YAML::ENGINE.yamler = 'syck'
         puts "Converting #{file}"
-        yml = YAML.load( File.read(file) )
+        yml = YAML.load(File.read(file))
         FileUtils.cp file, "#{file}.bak"
         YAML::ENGINE.yamler = 'psych'
-        File.open(file, 'w'){ |file| file.write(YAML.dump(yml)) }
+        File.open(file, 'w') { |file| file.write(YAML.dump(yml)) }
       end
     end
-
   end
 end

data/lib/tasks/ffcrm/demo.rake

@@ -5,9 +5,8 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :demo do
-
     desc "Load demo data"
-    task :load => :environment do
+    task load: :environment do
       # Load fixtures
       require 'active_record/fixtures'
       Dir.glob(FatFreeCRM.root.join('db', 'demo', '*.{yml,csv}')).each do |fixture_file|
@@ -16,7 +15,7 @@ namespace :ffcrm do
 
       def create_version(options)
         version = Version.new
-        options.each { |k,v| version.send(k.to_s + '=', v) }
+        options.each { |k, v| version.send(k.to_s + '=', v) }
         version.save!
       end
 
@@ -27,27 +26,27 @@ namespace :ffcrm do
         model.constantize.all
       end.flatten.each do |item|
         user = if item.respond_to?(:user)
-          item.user
-        elsif item.respond_to?(:addressable)
-          item.addressable.try(:user)
+                 item.user
+               elsif item.respond_to?(:addressable)
+                 item.addressable.try(:user)
         end
         related = if item.respond_to?(:addressable)
-          item.addressable
-        elsif item.respond_to?(:commentable)
-          item.commentable
-        elsif item.respond_to?(:mediator)
-          item.mediator
+                    item.addressable
+                  elsif item.respond_to?(:commentable)
+                    item.commentable
+                  elsif item.respond_to?(:mediator)
+                    item.mediator
         end
         # Backdate within the last 30 days
         created_at = item.created_at - (rand(30) + 1).days + rand(12 * 60).minutes
         updated_at = created_at + rand(12 * 60).minutes
 
-        create_version(:event => "create", :created_at => created_at, :user => user, :item => item, :related => related)
-        create_version(:event => "update", :created_at => updated_at, :user => user, :item => item, :related => related)
+        create_version(event: "create", created_at: created_at, user: user, item: item, related: related)
+        create_version(event: "update", created_at: updated_at, user: user, item: item, related: related)
 
         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)
+          version = create_version(event: "view", created_at: viewed_at, user: user, item: item)
         end
         print "." if item.id % 10 == 0
       end
@@ -55,10 +54,9 @@ namespace :ffcrm do
     end
 
     desc "Reset the database and reload demo data along with default application settings"
-    task :reload => :environment do
+    task reload: :environment do
       Rake::Task["db:migrate:reset"].invoke
       Rake::Task["ffcrm:demo:load"].invoke
     end
-
   end
 end

data/lib/tasks/ffcrm/dropbox.rake

@@ -5,26 +5,24 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :dropbox do
-  
     desc "Run dropbox crawler and process incoming emails"
-    task :run => :environment do
+    task run: :environment do
       require "fat_free_crm/mail_processor/dropbox"
       FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = false)
     end
 
     namespace :run do
       desc "[Dry run] - Run dropbox crawler and process incoming emails"
-      task :dry => :environment do
+      task dry: :environment do
         require "fat_free_crm/mail_processor/dropbox"
         FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = true)
       end
     end
 
     desc "Set up email dropbox based on currently loaded settings"
-    task :setup => :environment do
+    task setup: :environment do
       require "fat_free_crm/mail_processor/dropbox"
       FatFreeCRM::MailProcessor::Dropbox.new.setup
     end
-
   end
 end

data/lib/tasks/ffcrm/missing_translations.rake

@@ -9,7 +9,7 @@ require 'missing_translation_detector'
 namespace :ffcrm do
   namespace :missing_translations do
     desc 'Detects missing translations for a locale - Takes a locale and compares with "en-US".'
-    task :detect, [:locale] => [:environment] do |t, args|
+    task :detect, [:locale] => [:environment] do |_t, args|
       base_locale = 'en-US'
 
       [[base_locale, args[:locale]],

data/lib/tasks/ffcrm/secret.rake

@@ -5,13 +5,11 @@
 #------------------------------------------------------------------------------
 
 namespace :ffcrm do
-
   desc "Generate a secret token for Rails to use."
   task :secret do
     require 'securerandom'
     secret = SecureRandom.hex(64)
     filename = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb')
-    File.open(filename, 'w'){|f| f.puts "FatFreeCRM::Application.config.secret_token = '#{secret}'"}
+    File.open(filename, 'w') { |f| f.puts "FatFreeCRM::Application.config.secret_token = '#{secret}'" }
   end
-
 end

data/lib/tasks/ffcrm/settings.rake

@@ -5,18 +5,16 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :settings do
-
     desc "Clear settings from database (reset to default)"
-    task :clear => :environment do
+    task clear: :environment do
       Setting.delete_all
     end
 
     desc "Show current settings in the database"
-    task :show => :environment do
+    task show: :environment do
       Setting.select('name').order('name').pluck('name').each do |name|
         puts "\n#{name}:\n  #{Setting.send(name).inspect}"
       end
     end
-
   end
 end

data/lib/tasks/ffcrm/setup.rake

@@ -4,9 +4,8 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 namespace :ffcrm do
-
   desc "Prepare the database"
-  task :setup => :environment do
+  task setup: :environment do
     if ENV["PROCEED"] != 'true'
       puts "\nFatFree CRM is about to run migrations on your database. Make sure you have a backup before proceeding.\n\n"
       proceed = false
@@ -24,12 +23,11 @@ namespace :ffcrm do
         puts "Aborted setup."
       end
     end
-
   end
 
   namespace :setup do
     desc "Create admin user"
-    task :admin => :environment do
+    task admin: :environment do
       username, password, email = ENV["USERNAME"], ENV["PASSWORD"], ENV["EMAIL"]
       unless username && password && email
         puts "\nTo create the admin user you will be prompted to enter username, password,"
@@ -74,11 +72,10 @@ namespace :ffcrm do
       end
       User.reset_column_information # Reload the class since we've added new fields in migrations.
       user = User.find_by_username(username) || User.new
-      user.update_attributes(:username => username, :password => password, :email => email)
+      user.update_attributes(username: username, password: password, email: email)
       user.update_attribute(:admin, true) # Mass assignments don't work for :admin because of the attr_protected
       user.update_attribute(:suspended_at, nil) # Mass assignments don't work for :suspended_at because of the attr_protected
       puts "Admin user has been created."
     end
   end
-
 end

data/lib/tasks/ffcrm/update_data.rake

@@ -5,7 +5,6 @@
 #------------------------------------------------------------------------------
 namespace :ffcrm do
   namespace :update_data do
-
     #
     # Important note about countries. Please read carefully!
     #
@@ -27,8 +26,7 @@ namespace :ffcrm do
     # If not, it asks you to run this rake task.
     #
     desc "Update country codes to ISO 3166-1"
-    task :fix_countries => :environment do
-    
+    task fix_countries: :environment do
       message = """This task is only designed to run once and we think you've run this before!!!
 
 Please read the following carefully!
@@ -53,192 +51,188 @@ If you really want to run it again, you will have to set Setting.have_run_countr
 in a console and continue. This is strongly discouraged. You have been warned!
 
 """
-      
+
       if Setting.have_run_country_migration == true
         puts message
         exit
       end
-    
+
       convert_table = [
-        #["Aland Islands", "FI", "AX"], # this clashed with FI for Finland. We'll prefer Finland.
-        ["Algeria", "AG", "DZ"],
+        # ["Aland Islands", "FI", "AX"], # this clashed with FI for Finland. We'll prefer Finland.
+        %w(Algeria AG DZ),
         ["American Samoa", "AQ", "AS"],
-        ["Andorra", "AN", "AD"],
-        ["Anguilla", "AV", "AI"],
-        ["Antarctica", "AY", "AQ"],
+        %w(Andorra AN AD),
+        %w(Anguilla AV AI),
+        %w(Antarctica AY AQ),
         ["Antigua and Barbuda", "AC", "AG"],
-        ["Aruba", "AA", "AW"],
-        ["Australia", "AS", "AU"],
-        ["Austria", "AU", "AT"],
-        ["Azerbaijan", "AJ", "AZ"],
-        ["Bahamas", "BF", "BS"],
-        ["Bahrain", "BA", "BH"],
-        ["Bangladesh", "BG", "BD"],
-        ["Belarus", "BO", "BY"],
-        ["Belize", "BH", "BZ"],
-        ["Benin", "BN", "BJ"],
-        ["Bermuda", "BD", "BM"],
+        %w(Aruba AA AW),
+        %w(Australia AS AU),
+        %w(Austria AU AT),
+        %w(Azerbaijan AJ AZ),
+        %w(Bahamas BF BS),
+        %w(Bahrain BA BH),
+        %w(Bangladesh BG BD),
+        %w(Belarus BO BY),
+        %w(Belize BH BZ),
+        %w(Benin BN BJ),
+        %w(Bermuda BD BM),
         ["Bosnia and Herzegovina", "BK", "BA"],
-        ["Botswana", "BC", "BW"],
+        %w(Botswana BC BW),
         ["Brunei Darussalam", "BX", "BN"],
-        ["Bulgaria", "BU", "BG"],
+        %w(Bulgaria BU BG),
         ["Burkina Faso", "UV", "BF"],
-        ["Burundi", "BY", "BI"],
-        ["Cambodia", "CB", "KH"],
+        %w(Burundi BY BI),
+        %w(Cambodia CB KH),
         ["Cayman Islands", "CJ", "KY"],
         ["Central African Republic", "CT", "CF"],
-        ["Chad", "CD", "TD"],
-        ["Chile", "CI", "CL"],
-        ["China", "CH", "CN"],
+        %w(Chad CD TD),
+        %w(Chile CI CL),
+        %w(China CH CN),
         ["Christmas Island", "KT", "CX"],
         ["Cocos (Keeling) Islands", "CK", "CC"],
-        ["Comoros", "CN", "KM"],
+        %w(Comoros CN KM),
         ["Congo, the Democratic Republic of the", "CF", "CD"],
         ["Cook Islands", "CW", "CK"],
         ["Costa Rica", "CS", "CR"],
         ["Czech Republic", "EZ", "CZ"],
-        ["Denmark", "DA", "DK"],
-        ["Dominica", "DO", "DM"],
+        %w(Denmark DA DK),
+        %w(Dominica DO DM),
         ["Dominican Republic", "DR", "DO"],
         ["El Salvador", "ES", "SV"],
         ["Equatorial Guinea", "EK", "GQ"],
-        ["Estonia", "EN", "EE"],
+        %w(Estonia EN EE),
         ["French Guiana", "FG", "GF"],
         ["French Polynesia", "FP", "PF"],
         ["French Southern Territories", "FS", "TF"],
-        ["Gabon", "GB", "GA"],
-        ["Gambia", "GA", "GM"],
-        ["Georgia", "GG", "GE"],
-        ["Germany", "GM", "DE"],
-        ["Grenada", "GJ", "GD"],
-        ["Guam", "GQ", "GU"],
-        ["Guernsey", "GK", "GG"],
-        ["Guinea", "GV", "GN"],
+        %w(Gabon GB GA),
+        %w(Gambia GA GM),
+        %w(Georgia GG GE),
+        %w(Germany GM DE),
+        %w(Grenada GJ GD),
+        %w(Guam GQ GU),
+        %w(Guernsey GK GG),
+        %w(Guinea GV GN),
         ["Guinea-Bissau", "PU", "GW"],
-        ["Haiti", "HA", "HT"],
+        %w(Haiti HA HT),
         ["Holy See (Vatican City State)", "VT", "VA"],
-        ["Honduras", "HO", "HN"],
-        ["Iceland", "IC", "IS"],
-        ["Iraq", "IZ", "IQ"],
-        ["Ireland", "EI", "IE"],
-        ["Israel", "IS", "IL"],
-        ["Japan", "JA", "JP"],
-        ["Kiribati", "KR", "KI"],
+        %w(Honduras HO HN),
+        %w(Iceland IC IS),
+        %w(Iraq IZ IQ),
+        %w(Ireland EI IE),
+        %w(Israel IS IL),
+        %w(Japan JA JP),
+        %w(Kiribati KR KI),
         ["Korea, Democratic People's Republic of", "KN", "KP"],
         ["Korea, Republic of", "KS", "KR"],
-        ["Kuwait", "KU", "KW"],
-        ["Latvia", "LG", "LV"],
-        ["Lebanon", "LE", "LB"],
-        ["Lesotho", "LT", "LS"],
-        ["Liberia", "LI", "LR"],
-        ["Liechtenstein", "LS", "LI"],
-        ["Lithuania", "LH", "LT"],
-        ["Macao", "MC", "MO"],
-        ["Madagascar", "MA", "MG"],
-        ["Malawi", "MI", "MW"],
+        %w(Kuwait KU KW),
+        %w(Latvia LG LV),
+        %w(Lebanon LE LB),
+        %w(Lesotho LT LS),
+        %w(Liberia LI LR),
+        %w(Liechtenstein LS LI),
+        %w(Lithuania LH LT),
+        %w(Macao MC MO),
+        %w(Madagascar MA MG),
+        %w(Malawi MI MW),
         ["Marshall Islands", "RM", "MH"],
-        ["Martinique", "MB", "MQ"],
-        ["Mauritius", "MP", "MU"],
-        ["Mayotte", "MF", "YT"],
-        ["Monaco", "MN", "MC"],
-        ["Mongolia", "MG", "MN"],
-        ["Montenegro", "MJ", "ME"],
-        ["Montserrat", "MH", "MS"],
-        ["Morocco", "MO", "MA"],
-        ["Myanmar", "BM", "MM"],
-        ["Namibia", "WA", "NA"],
-        ["Nicaragua", "NU", "NI"],
-        ["Niger", "NG", "NE"],
-        ["Nigeria", "NI", "NG"],
-        ["Niue", "NE", "NU"],
+        %w(Martinique MB MQ),
+        %w(Mauritius MP MU),
+        %w(Mayotte MF YT),
+        %w(Monaco MN MC),
+        %w(Mongolia MG MN),
+        %w(Montenegro MJ ME),
+        %w(Montserrat MH MS),
+        %w(Morocco MO MA),
+        %w(Myanmar BM MM),
+        %w(Namibia WA NA),
+        %w(Nicaragua NU NI),
+        %w(Niger NG NE),
+        %w(Nigeria NI NG),
+        %w(Niue NE NU),
         ["Northern Mariana Islands", "CQ", "MP"],
-        ["Oman", "MU", "OM"],
-        ["Palau", "PS", "PW"],
+        %w(Oman MU OM),
+        %w(Palau PS PW),
         ["Palestinian Territory, Occupied", "WE", "PS"],
-        ["Panama", "PM", "PA"],
+        %w(Panama PM PA),
         ["Papua New Guinea", "PP", "PG"],
-        ["Paraguay", "PA", "PY"],
-        ["Philippines", "RP", "PH"],
-        ["Pitcairn", "PC", "PN"],
-        ["Portugal", "PO", "PT"],
+        %w(Paraguay PA PY),
+        %w(Philippines RP PH),
+        %w(Pitcairn PC PN),
+        %w(Portugal PO PT),
         ["Puerto Rico", "RQ", "PR"],
         ["Russian Federation", "RS", "RU"],
         ["Saint Kitts and Nevis", "SC", "KN"],
         ["Saint Lucia", "ST", "LC"],
         ["Saint Pierre and Miquelon", "SB", "PM"],
         ["Sao Tome and Principe", "TP", "ST"],
-        ["Senegal", "SG", "SN"],
-        ["Serbia", "RB", "RS"],
-        ["Seychelles", "SE", "SC"],
-        ["Singapore", "SN", "SG"],
-        ["Slovakia", "LO", "SK"],
+        %w(Senegal SG SN),
+        %w(Serbia RB RS),
+        %w(Seychelles SE SC),
+        %w(Singapore SN SG),
+        %w(Slovakia LO SK),
         ["Solomon Islands", "BP", "SB"],
         ["South Africa", "SF", "ZA"],
         ["South Georgia and the South Sandwich Islands", "SX", "GS"],
-        ["Spain", "SP", "ES"],
+        %w(Spain SP ES),
         ["Sri Lanka", "CE", "LK"],
-        ["Sudan", "SU", "SD"],
-        ["Suriname", "NS", "SR"],
+        %w(Sudan SU SD),
+        %w(Suriname NS SR),
         ["Svalbard and Jan Mayen", "SV", "SJ"],
-        ["Swaziland", "WZ", "SZ"],
-        ["Sweden", "SW", "SE"],
-        ["Switzerland", "SZ", "CH"],
-        ["Tajikistan", "TI", "TJ"],
+        %w(Swaziland WZ SZ),
+        %w(Sweden SW SE),
+        %w(Switzerland SZ CH),
+        %w(Tajikistan TI TJ),
         ["Timor-Leste", "TT", "TL"],
-        ["Togo", "TO", "TG"],
-        ["Tokelau", "TL", "TK"],
-        ["Tonga", "TN", "TO"],
+        %w(Togo TO TG),
+        %w(Tokelau TL TK),
+        %w(Tonga TN TO),
         ["Trinidad and Tobago", "TD", "TT"],
-        ["Tunisia", "TS", "TN"],
-        ["Turkey", "TU", "TR"],
-        ["Turkmenistan", "TX", "TM"],
+        %w(Tunisia TS TN),
+        %w(Turkey TU TR),
+        %w(Turkmenistan TX TM),
         ["Turks and Caicos Islands", "TK", "TC"],
-        ["Ukraine", "UP", "UA"],
+        %w(Ukraine UP UA),
         ["United Kingdom", "UK", "GB"],
-        ["Vanuatu", "NH", "VU"],
+        %w(Vanuatu NH VU),
         ["Viet Nam", "VM", "VN"],
         ["Virgin Islands, British", "VI", "VG"],
         ["Virgin Islands, U.S.", "VQ", "VI"],
         ["Western Sahara", "WI", "EH"],
-        ["Yemen", "YM", "YE"],
-        ["Zambia", "ZA", "ZM"],
-        ["Zimbabwe", "ZI", "ZW"],
-        ["United States", "USA", "US"],
+        %w(Yemen YM YE),
+        %w(Zambia ZA ZM),
+        %w(Zimbabwe ZI ZW),
+        ["United States", "USA", "US"]
       ]
 
       addresses_to_update = []
 
       # e.g. convert AS -> AU and Australia -> AU
-      # SELECT "addresses".* FROM "addresses" 
+      # SELECT "addresses".* FROM "addresses"
       #    WHERE (("addresses"."country" = 'AU' OR "addresses"."country" = 'Australia'))
-      convert_table.each { |ct|
-        t=Address.arel_table
+      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
 
         tmp = Address.where(scope)
-        tmp.map{ |t| t.country=ct[2] }
-        
+        tmp.map { |t| t.country = ct[2] }
+
         unless tmp.blank?
           addresses_to_update << tmp
         end
-      }
+      end
 
       Address.transaction do
         begin
-          addresses_to_update.each { |address_arr|
-            address_arr.each { |address|
-              address.save!
-            }
-          }
+          addresses_to_update.each do |address_arr|
+            address_arr.each(&:save!)
+          end
           Setting.have_run_country_migration = true
         rescue Exception => e
           ActiveRecord::Rollback
           puts e
         end
       end
-
     end
   end
-
 end