fat_free_crm 0.11.3 → 0.11.4

data/lib/fat_free_crm/gem_dependencies.rb

@@ -17,6 +17,7 @@
 
 require 'rails/all'
 require 'jquery-rails'
+require 'select2-rails'
 require 'prototype-rails'
 require 'haml'
 require 'sass'
@@ -32,9 +33,14 @@ require 'authlogic'
 require 'chosen-rails'
 require 'ajax-chosen-rails'
 require 'ransack'
+require 'ransack_ui'
 require 'paper_trail'
 require 'cancan'
-require 'squeel'
+require 'rails3-jquery-autocomplete'
+require 'valium'
+require 'ffaker'
+require 'premailer'
+require 'nokogiri'
 
 # Load redcloth if available (for textile markup in emails)
 begin

data/lib/fat_free_crm/permissions.rb

@@ -35,8 +35,7 @@ module FatFreeCRM
           has_many :permissions, :as => :asset
 
           scope :my, lambda {
-            current_ability = Ability.new(User.current_user)
-            accessible_by(current_ability).readonly(false)
+            accessible_by(User.current_ability)
           }
 
           include FatFreeCRM::Permissions::InstanceMethods
@@ -48,44 +47,67 @@ module FatFreeCRM
 
     module InstanceMethods
 
+      # Save shared permissions to the model, if any.
+      #--------------------------------------------------------------------------
+      %w(group user).each do |model|
+        class_eval %Q{
+
+          def #{model}_ids=(value)
+            if access != "Shared"
+              remove_permissions
+            else
+              value.map!{|c| c.split(',')} if value.map{|v| v.to_s.include?(',')}.any? # fix for a bug in "Chosen" which gives values like ["", "1,2,3"] 
+              value = value.flatten.reject(&:blank?).uniq.map(&:to_i)
+              permissions_to_remove = Permission.find_all_by_#{model}_id_and_asset_id_and_asset_type(self.#{model}_ids - value, self.id, self.class)
+              permissions_to_remove.each {|p| (permissions.delete(p); p.destroy)}
+              (value - self.#{model}_ids).each {|id| permissions.build(:#{model}_id => id)}
+            end
+          end
+
+          def #{model}_ids
+            permissions.map(&:#{model}_id).compact
+          end
+        }
+      end
+      
+      # Remove all shared permissions if no longer shared
+      #--------------------------------------------------------------------------
+      def access=(value)
+        remove_permissions unless value == 'Shared'
+        super(value)
+      end
+
+      # Removes all permissions on an object
+      #--------------------------------------------------------------------------
+      def remove_permissions
+        # we don't use dependent => :destroy so must manually remove
+        permissions_to_remove = Permission.find_all_by_asset_id_and_asset_type(self.id, self.class)
+        permissions_to_remove.each {|p| (permissions.delete(p); p.destroy)}
+      end
+
       # Save the model along with its permissions if any.
       #--------------------------------------------------------------------------
-      def save_with_permissions(users)
-        if users && self[:access] == "Shared"
-          users.each { |id| self.permissions << Permission.new(:user_id => id, :asset => self) }
-        end
+      def save_with_permissions(users = nil)
+        ActiveSupport::Deprecation.warn "save_with_permissions is deprecated and may be removed from future releases, use user_ids and group_ids inside attributes instead."
         save
       end
 
       # Update the model along with its permissions if any.
       #--------------------------------------------------------------------------
-      def update_with_permissions(attributes, users)
-        if attributes[:access] != "Shared"
-          self.permissions.delete_all
-        elsif !users.blank? # Check if we have the same users this time around.
-          existing_users = self.permissions.map(&:user_id)
-          if (existing_users.size != users.size) || (existing_users - users != [])
-            self.permissions.delete_all
-            users.each do |id|
-              self.permissions << Permission.new(:user_id => id, :asset => self)
-            end
-          end
-        end
+      def update_with_permissions(attributes, users = nil)
+        ActiveSupport::Deprecation.warn "update_with_permissions is deprecated and may be removed from future releases, use user_ids and group_ids inside attributes instead."
         update_attributes(attributes)
       end
 
       # Save the model copying other model's permissions.
       #--------------------------------------------------------------------------
       def save_with_model_permissions(model)
-        self.access = model.access
-        if model.access == "Shared"
-          model.permissions.each do |permission|
-            self.permissions << Permission.new(:user_id => permission.user_id, :asset => self)
-          end
-        end
+        self.access    = model.access
+        self.user_ids  = model.user_ids
+        self.group_ids = model.group_ids
         save
       end
-
+      
     end
 
     module SingletonMethods
@@ -95,4 +117,3 @@ module FatFreeCRM
 end # FatFreeCRM
 
 ActiveRecord::Base.send(:include, FatFreeCRM::Permissions)
-

data/lib/fat_free_crm/version.rb

@@ -19,7 +19,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 11
-    TINY  = 3
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/fat_free_crm/view_factory.rb

@@ -0,0 +1,95 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+module FatFreeCRM
+
+  # A view factory keeps track of views and the contexts in which they are available.
+  #----------------------------------------------------------------------------
+  #
+  # The context that a view is available for is defined by 'controllers' and 'actions'
+  #   controllers => ['contacts'] means that the view is available when the contacts controller is used
+  #   actions => [:index, show] means that the view is available for search listings AND individual records
+  #   template => 'contacts/index_full' is the partial that is rendered for this view
+  # Icon is optional. If specified, it will be passed to asset_path.
+  #
+  class ViewFactory
+  
+    include Comparable
+
+    @@views = []
+    attr_accessor :id, :name, :icon, :title, :controllers, :actions, :template
+
+    # Class methods
+    #----------------------------------------------------------------------------
+    class << self
+    
+      # Register with the view factory
+      #----------------------------------------------------------------------------
+      def register(view)
+        @@views << view unless @@views.map(&:id).include?(view.id)
+      end
+      
+      # Return views that are available based on context
+      #----------------------------------------------------------------------------
+      def views_for(options = {})
+        controller = options[:controller]
+        action = options[:action]
+        name = options[:name] #optional
+        @@views.select do |view|
+          view.controllers.include?(controller) and view.actions.include?(action) and (name.present? ? view.name == name : true)
+        end
+      end
+      
+      # Return template name of the current view
+      # pass in options[:name] to specify view name
+      #----------------------------------------------------------------------------
+      def template_for_current_view(options = {})
+        view = views_for(options).first
+        view && view.template
+      end
+
+    end
+
+    # Instance methods
+    #----------------------------------------------------------------------------
+    def initialize(options = {})
+      self.name = options[:name]
+      self.title = options[:title]
+      self.icon = options[:icon] # optional
+      self.controllers = options[:controllers] || []
+      self.actions = options[:actions] || []
+      self.template = options[:template]
+      self.id = generate_id
+      self.class.register(self)
+    end
+
+    # Define view equivalence. They are the same if they have the same id.
+    #----------------------------------------------------------------------------
+    def <=>(other)
+      id <=> other.id
+    end
+
+    private
+    
+    # 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('_')
+    end
+
+  end
+end

data/lib/plugins/country_select/lib/country_select.rb

@@ -18,7 +18,15 @@ module ActionView
           priority_countries = ["United States", "Argentina", "Australia", "Brasil", "Canada", "Finland", "France", "Germany", "Italy", "Japan", "Mexico", "Norway", "Poland", "Portugal", "Spain", "Sweden", "Russia", "United Kingdom"]
         end
 
-        country_options += options_for_select(priority_countries, selected)
+        # Add iso code for priority countries 
+        priority_countries_iso = COUNTRIES.select{|c| priority_countries.include?(c[0]) }
+
+        # Add iso code for selected countries if not nil
+        unless selected.nil?
+            selected = COUNTRIES.select{|c| selected.include?(c[1]) }.flatten
+        end
+
+        country_options += options_for_select(priority_countries_iso, selected)
         country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
 
         other_countries = COUNTRIES.select{|c| !priority_countries.include?(c[0]) }
@@ -27,497 +35,509 @@ module ActionView
       # All the countries included in the country_options output.
 
       COUNTRIES = [
-        ['Andorra', 'AN'],
-        ['United Arab Emirates', 'AE'],
         ['Afghanistan', 'AF'],
-        ['Antigua and Barbuda', 'AC'],
-        ['Anguilla', 'AV'],
+        ['Aland Islands', 'AX'],
         ['Albania', 'AL'],
-        ['Armenia', 'AM'],
-        ['Netherlands Antilles', 'NT'],
+        ['Algeria', 'DZ'],
+        ['American Samoa', 'AS'],
+        ['Andorra', 'AD'],
         ['Angola', 'AO'],
-        ['Antarctica', 'AY'],
+        ['Anguilla', 'AI'],
+        ['Antarctica', 'AQ'],
+        ['Antigua and Barbuda', 'AG'],
         ['Argentina', 'AR'],
-        ['American Samoa', 'AQ'],
-        ['Austria', 'AU'],
-        ['Australia', 'AS'],
-        ['Aruba', 'AA'],
-        ['Aland Islands', 'FI'],
-        ['Azerbaijan', 'AJ'],
-        ['Bosnia and Herzegovina', 'BK'],
+        ['Armenia', 'AM'],
+        ['Aruba', 'AW'],
+        ['Australia', 'AU'],
+        ['Austria', 'AT'],
+        ['Azerbaijan', 'AZ'],
+        ['Bahamas', 'BS'],
+        ['Bahrain', 'BH'],
+        ['Bangladesh', 'BD'],
         ['Barbados', 'BB'],
-        ['Bangladesh', 'BG'],
+        ['Belarus', 'BY'],
         ['Belgium', 'BE'],
-        ['Burkina Faso', 'UV'],
-        ['Bulgaria', 'BU'],
-        ['Bahrain', 'BA'],
-        ['Burundi', 'BY'],
-        ['Benin', 'BN'],
-        ['Bermuda', 'BD'],
-        ['Brunei', 'BX'],
-        ['Bolivia', 'BL'],
-        ['Brazil', 'BR'],
-        ['Bahamas', 'BF'],
+        ['Belize', 'BZ'],
+        ['Benin', 'BJ'],
+        ['Bermuda', 'BM'],
         ['Bhutan', 'BT'],
+        ['Bolivia, Plurinational State of', 'BO'],
+        ['Bonaire, Sint Eustatius and Saba', 'BQ'],
+        ['Bosnia and Herzegovina', 'BA'],
+        ['Botswana', 'BW'],
         ['Bouvet Island', 'BV'],
-        ['Botswana', 'BC'],
-        ['Belarus', 'BO'],
-        ['Belize', 'BH'],
-        ['Canada', 'CA'],
-        ['Cocos (Keeling) Islands', 'CK'],
-        ['Congo (Kinshasa)', 'CG'],
-        ['Central African Republic', 'CT'],
-        ['Congo (Brazzaville)', 'CF'],
-        ['Switzerland', 'SZ'],
-        ['Ivory Coast', 'IV'],
-        ['Cook Islands', 'CW'],
-        ['Chile', 'CI'],
+        ['Brazil', 'BR'],
+        ['British Indian Ocean Territory', 'IO'],
+        ['Brunei Darussalam', 'BN'],
+        ['Bulgaria', 'BG'],
+        ['Burkina Faso', 'BF'],
+        ['Burundi', 'BI'],
+        ['Cambodia', 'KH'],
         ['Cameroon', 'CM'],
-        ['China', 'CH'],
+        ['Canada', 'CA'],
+        ['Cape Verde', 'CV'],
+        ['Cayman Islands', 'KY'],
+        ['Central African Republic', 'CF'],
+        ['Chad', 'TD'],
+        ['Chile', 'CL'],
+        ['China', 'CN'],
+        ['Christmas Island', 'CX'],
+        ['Cocos (Keeling) Islands', 'CC'],
         ['Colombia', 'CO'],
-        ['Costa Rica', 'CS'],
-        ['Serbia And Montenegro', 'YI'],
+        ['Comoros', 'KM'],
+        ['Congo', 'CG'],
+        ['Congo, the Democratic Republic of the', 'CD'],
+        ['Cook Islands', 'CK'],
+        ['Costa Rica', 'CR'],
+        ['Cote d\'Ivoire', 'CI'],
+        ['Croatia', 'HR'],
         ['Cuba', 'CU'],
-        ['Cape Verde', 'CV'],
-        ['Christmas Island', 'KT'],
+        ['Curacao', 'CW'],
         ['Cyprus', 'CY'],
-        ['Czech Republic', 'EZ'],
-        ['Germany', 'GM'],
+        ['Czech Republic', 'CZ'],
+        ['Denmark', 'DK'],
         ['Djibouti', 'DJ'],
-        ['Denmark', 'DA'],
-        ['Dominica', 'DO'],
-        ['Dominican Republic', 'DR'],
-        ['Algeria', 'AG'],
+        ['Dominica', 'DM'],
+        ['Dominican Republic', 'DO'],
         ['Ecuador', 'EC'],
-        ['Estonia', 'EN'],
         ['Egypt', 'EG'],
-        ['Western Sahara', 'WI'],
+        ['El Salvador', 'SV'],
+        ['Equatorial Guinea', 'GQ'],
         ['Eritrea', 'ER'],
-        ['Spain', 'SP'],
+        ['Estonia', 'EE'],
         ['Ethiopia', 'ET'],
-        ['Finland', 'FI'],
-        ['Fiji', 'FJ'],
-        ['Falkland Islands', 'FK'],
-        ['Micronesia', 'FM'],
+        ['Falkland Islands (Malvinas)', 'FK'],
         ['Faroe Islands', 'FO'],
+        ['Fiji', 'FJ'],
+        ['Finland', 'FI'],
         ['France', 'FR'],
-        ['Gabon', 'GB'],
-        ['United Kingdom', 'UK'],
-        ['Grenada', 'GJ'],
-        ['Georgia', 'GG'],
-        ['French Guiana', 'FG'],
-        ['Guernsey', 'GK'],
+        ['French Guiana', 'GF'],
+        ['French Polynesia', 'PF'],
+        ['French Southern Territories', 'TF'],
+        ['Gabon', 'GA'],
+        ['Gambia', 'GM'],
+        ['Georgia', 'GE'],
+        ['Germany', 'DE'],
         ['Ghana', 'GH'],
         ['Gibraltar', 'GI'],
+        ['Greece', 'GR'],
         ['Greenland', 'GL'],
-        ['Gambia', 'GA'],
-        ['Guinea', 'GV'],
+        ['Grenada', 'GD'],
         ['Guadeloupe', 'GP'],
-        ['Equatorial Guinea', 'EK'],
-        ['Greece', 'GR'],
-        ['South Georgia and the South Sandwich Islands', 'SX'],
+        ['Guam', 'GU'],
         ['Guatemala', 'GT'],
-        ['Guam', 'GQ'],
-        ['Guinea-Bissau', 'PU'],
+        ['Guernsey', 'GG'],
+        ['Guinea', 'GN'],
+        ['Guinea-Bissau', 'GW'],
         ['Guyana', 'GY'],
-        ['Hong Kong S.A.R., China', 'HK'],
+        ['Haiti', 'HT'],
         ['Heard Island and McDonald Islands', 'HM'],
-        ['Honduras', 'HO'],
-        ['Croatia', 'HR'],
-        ['Haiti', 'HA'],
+        ['Holy See (Vatican City State)', 'VA'],
+        ['Honduras', 'HN'],
+        ['Hong Kong', 'HK'],
         ['Hungary', 'HU'],
+        ['Iceland', 'IS'],
+        ['India', 'IN'],
         ['Indonesia', 'ID'],
-        ['Ireland', 'EI'],
-        ['Israel', 'IS'],
+        ['Iran, Islamic Republic of', 'IR'],
+        ['Iraq', 'IQ'],
+        ['Ireland', 'IE'],
         ['Isle of Man', 'IM'],
-        ['India', 'IN'],
-        ['British Indian Ocean Territory', 'IO'],
-        ['Iraq', 'IZ'],
-        ['Iran', 'IR'],
-        ['Iceland', 'IC'],
+        ['Israel', 'IL'],
         ['Italy', 'IT'],
-        ['Jersey', 'JE'],
         ['Jamaica', 'JM'],
+        ['Japan', 'JP'],
+        ['Jersey', 'JE'],
         ['Jordan', 'JO'],
-        ['Japan', 'JA'],
+        ['Kazakhstan', 'KZ'],
         ['Kenya', 'KE'],
+        ['Kiribati', 'KI'],
+        ['Korea, Democratic People\'s Republic of', 'KP'],
+        ['Korea, Republic of', 'KR'],
+        ['Kosovo', 'XK'],
+        ['Kuwait', 'KW'],
         ['Kyrgyzstan', 'KG'],
-        ['Cambodia', 'CB'],
-        ['Kiribati', 'KR'],
-        ['Comoros', 'CN'],
-        ['Saint Kitts and Nevis', 'SC'],
-        ['North Korea', 'KN'],
-        ['South Korea', 'KS'],
-        ['Kuwait', 'KU'],
-        ['Cayman Islands', 'CJ'],
-        ['Kazakhstan', 'KZ'],
-        ['Laos', 'LA'],
-        ['Lebanon', 'LE'],
-        ['Saint Lucia', 'ST'],
-        ['Liechtenstein', 'LS'],
-        ['Sri Lanka', 'CE'],
-        ['Liberia', 'LI'],
-        ['Lesotho', 'LT'],
-        ['Lithuania', 'LH'],
-        ['Luxembourg', 'LU'],
-        ['Latvia', 'LG'],
+        ['Lao People\'s Democratic Republic', 'LA'],
+        ['Latvia', 'LV'],
+        ['Lebanon', 'LB'],
+        ['Lesotho', 'LS'],
+        ['Liberia', 'LR'],
         ['Libya', 'LY'],
-        ['Morocco', 'MO'],
-        ['Monaco', 'MN'],
-        ['Moldova', 'MD'],
-        ['Montenegro', 'MJ'],
-        ['Madagascar', 'MA'],
-        ['Marshall Islands', 'RM'],
-        ['Macedonia', 'MK'],
+        ['Liechtenstein', 'LI'],
+        ['Lithuania', 'LT'],
+        ['Luxembourg', 'LU'],
+        ['Macao', 'MO'],
+        ['Macedonia, The Former Yugoslav Republic of', 'MK'],
+        ['Madagascar', 'MG'],
+        ['Malawi', 'MW'],
+        ['Malaysia', 'MY'],
+        ['Maldives', 'MV'],
         ['Mali', 'ML'],
-        ['Myanmar', 'BM'],
-        ['Mongolia', 'MG'],
-        ['Macao S.A.R., China', 'MC'],
-        ['Northern Mariana Islands', 'CQ'],
-        ['Martinique', 'MB'],
-        ['Mauritania', 'MR'],
-        ['Montserrat', 'MH'],
         ['Malta', 'MT'],
-        ['Mauritius', 'MP'],
-        ['Maldives', 'MV'],
-        ['Malawi', 'MI'],
+        ['Marshall Islands', 'MH'],
+        ['Martinique', 'MQ'],
+        ['Mauritania', 'MR'],
+        ['Mauritius', 'MU'],
+        ['Mayotte', 'YT'],
         ['Mexico', 'MX'],
-        ['Malaysia', 'MY'],
+        ['Micronesia, Federated States of', 'FM'],
+        ['Moldova, Republic of', 'MD'],
+        ['Monaco', 'MC'],
+        ['Mongolia', 'MN'],
+        ['Montenegro', 'ME'],
+        ['Montserrat', 'MS'],
+        ['Morocco', 'MA'],
         ['Mozambique', 'MZ'],
-        ['Namibia', 'WA'],
+        ['Myanmar', 'MM'],
+        ['Namibia', 'NA'],
+        ['Nauru', 'NR'],
+        ['Nepal', 'NP'],
+        ['Netherlands', 'NL'],
         ['New Caledonia', 'NC'],
-        ['Niger', 'NG'],
+        ['New Zealand', 'NZ'],
+        ['Nicaragua', 'NI'],
+        ['Niger', 'NE'],
+        ['Nigeria', 'NG'],
+        ['Niue', 'NU'],
         ['Norfolk Island', 'NF'],
-        ['Nigeria', 'NI'],
-        ['Nicaragua', 'NU'],
-        ['Netherlands', 'NL'],
+        ['Northern Mariana Islands', 'MP'],
         ['Norway', 'NO'],
-        ['Nepal', 'NP'],
-        ['Nauru', 'NR'],
-        ['Niue', 'NE'],
-        ['New Zealand', 'NZ'],
-        ['Oman', 'MU'],
-        ['Panama', 'PM'],
-        ['Peru', 'PE'],
-        ['French Polynesia', 'FP'],
-        ['Papua New Guinea', 'PP'],
-        ['Philippines', 'RP'],
+        ['Oman', 'OM'],
         ['Pakistan', 'PK'],
+        ['Palau', 'PW'],
+        ['Palestinian Territory, Occupied', 'PS'],
+        ['Panama', 'PA'],
+        ['Papua New Guinea', 'PG'],
+        ['Paraguay', 'PY'],
+        ['Peru', 'PE'],
+        ['Philippines', 'PH'],
+        ['Pitcairn', 'PN'],
         ['Poland', 'PL'],
-        ['Saint Pierre and Miquelon', 'SB'],
-        ['Pitcairn', 'PC'],
-        ['Puerto Rico', 'RQ'],
-        ['Palestinian Territory', 'WE'],
-        ['Portugal', 'PO'],
-        ['Palau', 'PS'],
-        ['Paraguay', 'PA'],
+        ['Portugal', 'PT'],
+        ['Puerto Rico', 'PR'],
         ['Qatar', 'QA'],
         ['Reunion', 'RE'],
         ['Romania', 'RO'],
-        ['Serbia', 'RB'],
-        ['Russia', 'RS'],
+        ['Russian Federation', 'RU'],
         ['Rwanda', 'RW'],
+        ['Saint Barthelemy', 'BL'],
+        ['Saint Helena, Ascension and Tristan da Cunha', 'SH'],
+        ['Saint Kitts and Nevis', 'KN'],
+        ['Saint Lucia', 'LC'],
+        ['Saint Martin (French part)', 'MF'],
+        ['Saint Pierre and Miquelon', 'PM'],
+        ['Saint Vincent and the Grenadines', 'VC'],
+        ['Samoa', 'WS'],
+        ['San Marino', 'SM'],
+        ['Sao Tome and Principe', 'ST'],
         ['Saudi Arabia', 'SA'],
-        ['Solomon Islands', 'BP'],
-        ['Seychelles', 'SE'],
-        ['Sudan', 'SU'],
-        ['Sweden', 'SW'],
-        ['Singapore', 'SN'],
-        ['Saint Helena', 'SH'],
-        ['Slovenia', 'SI'],
-        ['Svalbard and Jan Mayen', 'SV'],
-        ['Slovakia', 'LO'],
+        ['Senegal', 'SN'],
+        ['Serbia', 'RS'],
+        ['Seychelles', 'SC'],
         ['Sierra Leone', 'SL'],
-        ['San Marino', 'SM'],
-        ['Senegal', 'SG'],
+        ['Singapore', 'SG'],
+        ['Sint Maarten (Dutch part)', 'SX'],
+        ['Slovakia', 'SK'],
+        ['Slovenia', 'SI'],
+        ['Solomon Islands', 'SB'],
         ['Somalia', 'SO'],
-        ['Suriname', 'NS'],
-        ['Sao Tome and Principe', 'TP'],
-        ['El Salvador', 'ES'],
-        ['Syria', 'SY'],
-        ['Swaziland', 'WZ'],
-        ['Turks and Caicos Islands', 'TK'],
-        ['Chad', 'CD'],
-        ['French Southern Territories', 'FS'],
-        ['Togo', 'TO'],
+        ['South Africa', 'ZA'],
+        ['South Georgia and the South Sandwich Islands', 'GS'],
+        ['South Sudan', 'SS'],
+        ['Spain', 'ES'],
+        ['Sri Lanka', 'LK'],
+        ['Sudan', 'SD'],
+        ['Suriname', 'SR'],
+        ['Svalbard and Jan Mayen', 'SJ'],
+        ['Swaziland', 'SZ'],
+        ['Sweden', 'SE'],
+        ['Switzerland', 'CH'],
+        ['Syrian Arab Republic', 'SY'],
+        ['Taiwan, Province of China', 'TW'],
+        ['Tajikistan', 'TJ'],
+        ['Tanzania, United Republic of', 'TZ'],
         ['Thailand', 'TH'],
-        ['Tajikistan', 'TI'],
-        ['Tokelau', 'TL'],
-        ['East Timor', 'TT'],
-        ['Turkmenistan', 'TX'],
-        ['Tunisia', 'TS'],
-        ['Tonga', 'TN'],
-        ['Turkey', 'TU'],
-        ['Trinidad and Tobago', 'TD'],
+        ['Timor-Leste', 'TL'],
+        ['Togo', 'TG'],
+        ['Tokelau', 'TK'],
+        ['Tonga', 'TO'],
+        ['Trinidad and Tobago', 'TT'],
+        ['Tunisia', 'TN'],
+        ['Turkey', 'TR'],
+        ['Turkmenistan', 'TM'],
+        ['Turks and Caicos Islands', 'TC'],
         ['Tuvalu', 'TV'],
-        ['Taiwan', 'TW'],
-        ['Tanzania', 'TZ'],
-        ['Ukraine', 'UP'],
         ['Uganda', 'UG'],
+        ['Ukraine', 'UA'],
+        ['United Arab Emirates', 'AE'],
+        ['United Kingdom', 'GB'],
         ['United States', 'US'],
+        ['United States Minor Outlying Islands', 'UM'],
         ['Uruguay', 'UY'],
         ['Uzbekistan', 'UZ'],
-        ['Vatican', 'VT'],
-        ['Saint Vincent and the Grenadines', 'VC'],
-        ['Venezuela', 'VE'],
-        ['British Virgin Islands', 'VI'],
-        ['U.S. Virgin Islands', 'VQ'],
-        ['Vietnam', 'VM'],
-        ['Vanuatu', 'NH'],
+        ['Vanuatu', 'VU'],
+        ['Venezuela, Bolivarian Republic of', 'VE'],
+        ['Viet Nam', 'VN'],
+        ['Virgin Islands, British', 'VG'],
+        ['Virgin Islands, U.S.', 'VI'],
         ['Wallis and Futuna', 'WF'],
-        ['Samoa', 'WS'],
-        ['Yemen', 'YM'],
-        ['Mayotte', 'MF'],
-        ['South Africa', 'SF'],
-        ['Zambia', 'ZA'],
-        ['Zimbabwe', 'ZI']
+        ['Western Sahara', 'EH'],
+        ['Yemen', 'YE'],
+        ['Zambia', 'ZM'],
+        ['Zimbabwe', 'ZW']
       ].sort unless const_defined?("COUNTRIES")
 
       COUNTRIES_HASH = {
-        :AN => 'Andorra',
-        :AE => 'United Arab Emirates',
         :AF => 'Afghanistan',
-        :AC => 'Antigua and Barbuda',
-        :AV => 'Anguilla',
+        :AX => 'Aland Islands',
         :AL => 'Albania',
-        :AM => 'Armenia',
-        :NT => 'Netherlands Antilles',
+        :DZ => 'Algeria',
+        :AS => 'American Samoa',
+        :AD => 'Andorra',
         :AO => 'Angola',
-        :AY => 'Antarctica',
+        :AI => 'Anguilla',
+        :AQ => 'Antarctica',
+        :AG => 'Antigua and Barbuda',
         :AR => 'Argentina',
-        :AQ => 'American Samoa',
-        :AU => 'Austria',
-        :AS => 'Australia',
-        :AA => 'Aruba',
-        :FI => 'Aland Islands',
-        :AJ => 'Azerbaijan',
-        :BK => 'Bosnia and Herzegovina',
+        :AM => 'Armenia',
+        :AW => 'Aruba',
+        :AU => 'Australia',
+        :AT => 'Austria',
+        :AZ => 'Azerbaijan',
+        :BS => 'Bahamas',
+        :BH => 'Bahrain',
+        :BD => 'Bangladesh',
         :BB => 'Barbados',
-        :BG => 'Bangladesh',
+        :BY => 'Belarus',
         :BE => 'Belgium',
-        :UV => 'Burkina Faso',
-        :BU => 'Bulgaria',
-        :BA => 'Bahrain',
-        :BY => 'Burundi',
-        :BN => 'Benin',
-        :BD => 'Bermuda',
-        :BX => 'Brunei',
-        :BL => 'Bolivia',
-        :BR => 'Brazil',
-        :BF => 'Bahamas',
+        :BZ => 'Belize',
+        :BJ => 'Benin',
+        :BM => 'Bermuda',
         :BT => 'Bhutan',
+        :BO => 'Bolivia, Plurinational State of',
+        :BQ => 'Bonaire, Sint Eustatius and Saba',
+        :BA => 'Bosnia and Herzegovina',
+        :BW => 'Botswana',
         :BV => 'Bouvet Island',
-        :BC => 'Botswana',
-        :BO => 'Belarus',
-        :BH => 'Belize',
-        :CA => 'Canada',
-        :CK => 'Cocos (Keeling) Islands',
-        :CG => 'Congo (Kinshasa)',
-        :CT => 'Central African Republic',
-        :CF => 'Congo (Brazzaville)',
-        :SZ => 'Switzerland',
-        :IV => 'Ivory Coast',
-        :CW => 'Cook Islands',
-        :CI => 'Chile',
+        :BR => 'Brazil',
+        :IO => 'British Indian Ocean Territory',
+        :BN => 'Brunei Darussalam',
+        :BG => 'Bulgaria',
+        :BF => 'Burkina Faso',
+        :BI => 'Burundi',
+        :KH => 'Cambodia',
         :CM => 'Cameroon',
-        :CH => 'China',
+        :CA => 'Canada',
+        :CV => 'Cape Verde',
+        :KY => 'Cayman Islands',
+        :CF => 'Central African Republic',
+        :TD => 'Chad',
+        :CL => 'Chile',
+        :CN => 'China',
+        :CX => 'Christmas Island',
+        :CC => 'Cocos (Keeling) Islands',
         :CO => 'Colombia',
-        :CS => 'Costa Rica',
-        :YI => 'Serbia And Montenegro',
+        :KM => 'Comoros',
+        :CG => 'Congo',
+        :CD => 'Congo, the Democratic Republic of the',
+        :CK => 'Cook Islands',
+        :CR => 'Costa Rica',
+        :CI => 'Cote d\'Ivoire',
+        :HR => 'Croatia',
         :CU => 'Cuba',
-        :CV => 'Cape Verde',
-        :KT => 'Christmas Island',
+        :CW => 'Curacao',
         :CY => 'Cyprus',
-        :EZ => 'Czech Republic',
-        :GM => 'Germany',
+        :CZ => 'Czech Republic',
+        :DK => 'Denmark',
         :DJ => 'Djibouti',
-        :DA => 'Denmark',
-        :DO => 'Dominica',
-        :DR => 'Dominican Republic',
-        :AG => 'Algeria',
+        :DM => 'Dominica',
+        :DO => 'Dominican Republic',
         :EC => 'Ecuador',
-        :EN => 'Estonia',
         :EG => 'Egypt',
-        :WI => 'Western Sahara',
+        :SV => 'El Salvador',
+        :GQ => 'Equatorial Guinea',
         :ER => 'Eritrea',
-        :SP => 'Spain',
+        :EE => 'Estonia',
         :ET => 'Ethiopia',
-        :FI => 'Finland',
-        :FJ => 'Fiji',
-        :FK => 'Falkland Islands',
-        :FM => 'Micronesia',
+        :FK => 'Falkland Islands (Malvinas)',
         :FO => 'Faroe Islands',
+        :FJ => 'Fiji',
+        :FI => 'Finland',
         :FR => 'France',
-        :GB => 'Gabon',
-        :UK => 'United Kingdom',
-        :GJ => 'Grenada',
-        :GG => 'Georgia',
-        :FG => 'French Guiana',
-        :GK => 'Guernsey',
+        :GF => 'French Guiana',
+        :PF => 'French Polynesia',
+        :TF => 'French Southern Territories',
+        :GA => 'Gabon',
+        :GM => 'Gambia',
+        :GE => 'Georgia',
+        :DE => 'Germany',
         :GH => 'Ghana',
         :GI => 'Gibraltar',
+        :GR => 'Greece',
         :GL => 'Greenland',
-        :GA => 'Gambia',
-        :GV => 'Guinea',
+        :GD => 'Grenada',
         :GP => 'Guadeloupe',
-        :EK => 'Equatorial Guinea',
-        :GR => 'Greece',
-        :SX => 'South Georgia and the South Sandwich Islands',
+        :GU => 'Guam',
         :GT => 'Guatemala',
-        :GQ => 'Guam',
-        :PU => 'Guinea-Bissau',
+        :GG => 'Guernsey',
+        :GN => 'Guinea',
+        :GW => 'Guinea-Bissau',
         :GY => 'Guyana',
-        :HK => 'Hong Kong S.A.R., China',
+        :HT => 'Haiti',
         :HM => 'Heard Island and McDonald Islands',
-        :HO => 'Honduras',
-        :HR => 'Croatia',
-        :HA => 'Haiti',
+        :VA => 'Holy See (Vatican City State)',
+        :HN => 'Honduras',
+        :HK => 'Hong Kong',
         :HU => 'Hungary',
+        :IS => 'Iceland',
+        :IN => 'India',
         :ID => 'Indonesia',
-        :EI => 'Ireland',
-        :IS => 'Israel',
+        :IR => 'Iran, Islamic Republic of',
+        :IQ => 'Iraq',
+        :IE => 'Ireland',
         :IM => 'Isle of Man',
-        :IN => 'India',
-        :IO => 'British Indian Ocean Territory',
-        :IZ => 'Iraq',
-        :IR => 'Iran',
-        :IC => 'Iceland',
+        :IL => 'Israel',
         :IT => 'Italy',
-        :JE => 'Jersey',
         :JM => 'Jamaica',
+        :JP => 'Japan',
+        :JE => 'Jersey',
         :JO => 'Jordan',
-        :JA => 'Japan',
+        :KZ => 'Kazakhstan',
         :KE => 'Kenya',
+        :KI => 'Kiribati',
+        :KP => 'Korea, Democratic People\'s Republic of',
+        :KR => 'Korea, Republic of',
+        :XK => 'Kosovo',
+        :KW => 'Kuwait',
         :KG => 'Kyrgyzstan',
-        :CB => 'Cambodia',
-        :KR => 'Kiribati',
-        :CN => 'Comoros',
-        :SC => 'Saint Kitts and Nevis',
-        :KN => 'North Korea',
-        :KS => 'South Korea',
-        :KU => 'Kuwait',
-        :CJ => 'Cayman Islands',
-        :KZ => 'Kazakhstan',
-        :LA => 'Laos',
-        :LE => 'Lebanon',
-        :ST => 'Saint Lucia',
-        :LS => 'Liechtenstein',
-        :CE => 'Sri Lanka',
-        :LI => 'Liberia',
-        :LT => 'Lesotho',
-        :LH => 'Lithuania',
-        :LU => 'Luxembourg',
-        :LG => 'Latvia',
+        :LA => 'Lao People\'s Democratic Republic',
+        :LV => 'Latvia',
+        :LB => 'Lebanon',
+        :LS => 'Lesotho',
+        :LR => 'Liberia',
         :LY => 'Libya',
-        :MO => 'Morocco',
-        :MN => 'Monaco',
-        :MD => 'Moldova',
-        :MJ => 'Montenegro',
-        :MA => 'Madagascar',
-        :RM => 'Marshall Islands',
-        :MK => 'Macedonia',
+        :LI => 'Liechtenstein',
+        :LT => 'Lithuania',
+        :LU => 'Luxembourg',
+        :MO => 'Macao',
+        :MK => 'Macedonia, The Former Yugoslav Republic of',
+        :MG => 'Madagascar',
+        :MW => 'Malawi',
+        :MY => 'Malaysia',
+        :MV => 'Maldives',
         :ML => 'Mali',
-        :BM => 'Myanmar',
-        :MG => 'Mongolia',
-        :MC => 'Macao S.A.R., China',
-        :CQ => 'Northern Mariana Islands',
-        :MB => 'Martinique',
-        :MR => 'Mauritania',
-        :MH => 'Montserrat',
         :MT => 'Malta',
-        :MP => 'Mauritius',
-        :MV => 'Maldives',
-        :MI => 'Malawi',
+        :MH => 'Marshall Islands',
+        :MQ => 'Martinique',
+        :MR => 'Mauritania',
+        :MU => 'Mauritius',
+        :YT => 'Mayotte',
         :MX => 'Mexico',
-        :MY => 'Malaysia',
+        :FM => 'Micronesia, Federated States of',
+        :MD => 'Moldova, Republic of',
+        :MC => 'Monaco',
+        :MN => 'Mongolia',
+        :ME => 'Montenegro',
+        :MS => 'Montserrat',
+        :MA => 'Morocco',
         :MZ => 'Mozambique',
-        :WA => 'Namibia',
+        :MM => 'Myanmar',
+        :NA => 'Namibia',
+        :NR => 'Nauru',
+        :NP => 'Nepal',
+        :NL => 'Netherlands',
         :NC => 'New Caledonia',
-        :NG => 'Niger',
+        :NZ => 'New Zealand',
+        :NI => 'Nicaragua',
+        :NE => 'Niger',
+        :NG => 'Nigeria',
+        :NU => 'Niue',
         :NF => 'Norfolk Island',
-        :NI => 'Nigeria',
-        :NU => 'Nicaragua',
-        :NL => 'Netherlands',
+        :MP => 'Northern Mariana Islands',
         :NO => 'Norway',
-        :NP => 'Nepal',
-        :NR => 'Nauru',
-        :NE => 'Niue',
-        :NZ => 'New Zealand',
-        :MU => 'Oman',
-        :PM => 'Panama',
-        :PE => 'Peru',
-        :FP => 'French Polynesia',
-        :PP => 'Papua New Guinea',
-        :RP => 'Philippines',
+        :OM => 'Oman',
         :PK => 'Pakistan',
+        :PW => 'Palau',
+        :PS => 'Palestinian Territory, Occupied',
+        :PA => 'Panama',
+        :PG => 'Papua New Guinea',
+        :PY => 'Paraguay',
+        :PE => 'Peru',
+        :PH => 'Philippines',
+        :PN => 'Pitcairn',
         :PL => 'Poland',
-        :SB => 'Saint Pierre and Miquelon',
-        :PC => 'Pitcairn',
-        :RQ => 'Puerto Rico',
-        :WE => 'Palestinian Territory',
-        :PO => 'Portugal',
-        :PS => 'Palau',
-        :PA => 'Paraguay',
+        :PT => 'Portugal',
+        :PR => 'Puerto Rico',
         :QA => 'Qatar',
         :RE => 'Reunion',
         :RO => 'Romania',
-        :RB => 'Serbia',
-        :RS => 'Russia',
+        :RU => 'Russian Federation',
         :RW => 'Rwanda',
+        :BL => 'Saint Barthelemy',
+        :SH => 'Saint Helena, Ascension and Tristan da Cunha',
+        :KN => 'Saint Kitts and Nevis',
+        :LC => 'Saint Lucia',
+        :MF => 'Saint Martin (French part)',
+        :PM => 'Saint Pierre and Miquelon',
+        :VC => 'Saint Vincent and the Grenadines',
+        :WS => 'Samoa',
+        :SM => 'San Marino',
+        :ST => 'Sao Tome and Principe',
         :SA => 'Saudi Arabia',
-        :BP => 'Solomon Islands',
-        :SE => 'Seychelles',
-        :SU => 'Sudan',
-        :SW => 'Sweden',
-        :SN => 'Singapore',
-        :SH => 'Saint Helena',
-        :SI => 'Slovenia',
-        :SV => 'Svalbard and Jan Mayen',
-        :LO => 'Slovakia',
+        :SN => 'Senegal',
+        :RS => 'Serbia',
+        :SC => 'Seychelles',
         :SL => 'Sierra Leone',
-        :SM => 'San Marino',
-        :SG => 'Senegal',
+        :SG => 'Singapore',
+        :SX => 'Sint Maarten (Dutch part)',
+        :SK => 'Slovakia',
+        :SI => 'Slovenia',
+        :SB => 'Solomon Islands',
         :SO => 'Somalia',
-        :NS => 'Suriname',
-        :TP => 'Sao Tome and Principe',
-        :ES => 'El Salvador',
-        :SY => 'Syria',
-        :WZ => 'Swaziland',
-        :TK => 'Turks and Caicos Islands',
-        :CD => 'Chad',
-        :FS => 'French Southern Territories',
-        :TO => 'Togo',
+        :ZA => 'South Africa',
+        :GS => 'South Georgia and the South Sandwich Islands',
+        :SS => 'South Sudan',
+        :ES => 'Spain',
+        :LK => 'Sri Lanka',
+        :SD => 'Sudan',
+        :SR => 'Suriname',
+        :SJ => 'Svalbard and Jan Mayen',
+        :SZ => 'Swaziland',
+        :SE => 'Sweden',
+        :CH => 'Switzerland',
+        :SY => 'Syrian Arab Republic',
+        :TW => 'Taiwan, Province of China',
+        :TJ => 'Tajikistan',
+        :TZ => 'Tanzania, United Republic of',
         :TH => 'Thailand',
-        :TI => 'Tajikistan',
-        :TL => 'Tokelau',
-        :TT => 'East Timor',
-        :TX => 'Turkmenistan',
-        :TS => 'Tunisia',
-        :TN => 'Tonga',
-        :TU => 'Turkey',
-        :TD => 'Trinidad and Tobago',
+        :TL => 'Timor-Leste',
+        :TG => 'Togo',
+        :TK => 'Tokelau',
+        :TO => 'Tonga',
+        :TT => 'Trinidad and Tobago',
+        :TN => 'Tunisia',
+        :TR => 'Turkey',
+        :TM => 'Turkmenistan',
+        :TC => 'Turks and Caicos Islands',
         :TV => 'Tuvalu',
-        :TW => 'Taiwan',
-        :TZ => 'Tanzania',
-        :UP => 'Ukraine',
         :UG => 'Uganda',
+        :UA => 'Ukraine',
+        :AE => 'United Arab Emirates',
+        :GB => 'United Kingdom',
         :US => 'United States',
+        :UM => 'United States Minor Outlying Islands',
         :UY => 'Uruguay',
         :UZ => 'Uzbekistan',
-        :VT => 'Vatican',
-        :VC => 'Saint Vincent and the Grenadines',
-        :VE => 'Venezuela',
-        :VI => 'British Virgin Islands',
-        :VQ => 'U.S. Virgin Islands',
-        :VM => 'Vietnam',
-        :NH => 'Vanuatu',
+        :VU => 'Vanuatu',
+        :VE => 'Venezuela, Bolivarian Republic of',
+        :VN => 'Viet Nam',
+        :VG => 'Virgin Islands, British',
+        :VI => 'Virgin Islands, U.S.',
         :WF => 'Wallis and Futuna',
-        :WS => 'Samoa',
-        :YM => 'Yemen',
-        :MF => 'Mayotte',
-        :SF => 'South Africa',
-        :ZA => 'Zambia',
-        :ZI => 'Zimbabwe',
+        :EH => 'Western Sahara',
+        :YE => 'Yemen',
+        :ZM => 'Zambia',
+        :ZW => 'Zimbabwe',
         :WW => 'Worldwide'
       }
     end
@@ -548,4 +568,3 @@ module ActionView
     end
   end
 end
-