code cleanup: rubocop: fix Performance/Casecmp in lib/redmine/codeset_util.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18503 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4c3334f2ed3c1553d02cc19709127b86c88e4042..a0a5b04efff15b9e633f781f789eb29b7ba659be 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -727,7 +727,6 @@ Naming/VariableNumber:
 # Cop supports --auto-correct.
 Performance/Casecmp:
   Exclude:
-    - 'lib/redmine/codeset_util.rb'
     - 'lib/redmine/scm/adapters/bazaar_adapter.rb'
 
 Performance/FixedSize:

diff --git a/lib/redmine/codeset_util.rb b/lib/redmine/codeset_util.rb
index 657d057d6c0662804bd9b9b015f077a0b2f4e4bc..53728928cb8437e5a1f2421f1a94d3ef848d3468 100644 (file)
--- a/lib/redmine/codeset_util.rb
+++ b/lib/redmine/codeset_util.rb
@@ -22,7 +22,7 @@ module Redmine
         return str
       end
       enc = encoding.blank? ? "UTF-8" : encoding
-      if enc.upcase != "UTF-8"
+      if enc.casecmp("UTF-8") != 0
         str.force_encoding(enc)
         str = str.encode("UTF-8", :invalid => :replace,
               :undef => :replace, :replace => '?')
@@ -62,7 +62,7 @@ module Redmine
       str = str.dup
       str ||= ''
       str.force_encoding('UTF-8')
-      if encoding.upcase != 'UTF-8'
+      if encoding.casecmp('UTF-8') != 0
         str = str.encode(encoding, :invalid => :replace,
                          :undef => :replace, :replace => '?')
       else