Merge pull request #2053 from zz9pzza/issue_4242_v2

issue 4242: Another way to remove the warning

Gemfile

@@ -20,9 +20,6 @@ gem 'redis-namespace'
 
 # Here are all our application-specific gems
 
-# Move to the iconv gem...
-gem 'iconv'
-
 # Lograge is opinionated, very opinionated.
 gem "lograge" # https://github.com/roidrage/lograge
 

Gemfile.lock

@@ -140,7 +140,6 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    iconv (1.0.4)
     journey (1.0.4)
     jquery-rails (3.0.1)
       railties (>= 3.0, < 5.0)
@@ -398,7 +397,6 @@ DEPENDENCIES
   google_visualr (>= 2.1)
   htmlentities
   httparty
-  iconv
   jquery-rails (>= 0.2.6)
   kgio
   launchy

app/controllers/downloads_controller.rb

@@ -156,7 +156,7 @@ def create_mobi_html
   def render_mobi_html(template, basename)
     @mobi = true
     html = render_to_string(:template => "downloads/#{template}.html", :layout => 'barebones.html')
-    html = ::Iconv.conv("ASCII//TRANSLIT//IGNORE", "UTF8", html)
+    html = html.encode('ascii', :undef => :replace, :replace => '')
     File.open("#{@work.download_dir}/mobi/#{basename}.html", 'w') {|f| f.write(html)}
   end
 

app/models/work.rb

@@ -737,7 +737,7 @@ def download_folder
 
   def download_fandoms
     string = self.fandoms.size > 3 ? ts("Multifandom") : self.fandoms.string
-    string = ::Iconv.conv("ASCII//TRANSLIT//IGNORE", "UTF8", string)
+    string = string.encode('ascii', :undef => :replace, :replace => '')
     string.gsub(/[^[\w _-]]+/, '')
   end
   def display_authors
@@ -746,12 +746,12 @@ def display_authors
   # need the next two to be filesystem safe and not overly long
   def download_authors
     string = self.anonymous? ? ts("Anonymous") : self.pseuds.sort.map(&:name).join('-')
-    string = ::Iconv.conv("ASCII//TRANSLIT//IGNORE", "UTF8", string)
+    string = string.encode('ascii', :undef => :replace, :replace => '')
     string = string.gsub(/[^[\w _-]]+/, '')
     string.gsub(/^(.{24}[\w.]*).*/) {$1}
   end
   def download_title
-    string = ::Iconv.conv("ASCII//TRANSLIT//IGNORE", "UTF8", self.title)
+    string = self.title.encode('ascii', :undef => :replace, :replace => '')
     string = string.gsub(/[^[\w _-]]+/, '')
     string = "Work by " + download_authors if string.blank?
     string.gsub(/ +/, " ").strip.gsub(/^(.{24}[\w.]*).*/) {$1}