Fix deprecation warnings by switching to default ruby 1.9 String#encode

calls instead of iconv.
berkmancenter · Aug 17, 2012 · babf6f2 · babf6f2
1 parent 4ecdaa8
commit babf6f2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/feed-abstract.rb b/lib/feed-abstract.rb
@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
 require 'rss'
-require 'iconv'
+#require 'iconv'
 
 require 'rss_atom_monkeypatches'
 

diff --git a/lib/feed-abstract/feed.rb b/lib/feed-abstract/feed.rb
@@ -70,16 +70,17 @@ def initialize(xml = nil, opts = {})
       input = (xml.respond_to?(:read)) ? xml.read : xml
 
       if options[:force_encoding]
-        ic = Iconv.new(options[:output_encoding].upcase + ((options[:transliterate_characters]) ? '//TRANSLIT' : '') + '//IGNORE',options[:input_encoding].upcase)
         if input.respond_to?(:encoding)
           # ruby 1.9
           # Only transcode if the encoding isn't valid.
           # See: http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/ for why we're appending the extra space.
           unless (input.encoding.to_s.upcase == options[:output_encoding].upcase && input.valid_encoding?)
-            input = ic.iconv(input << ' ')[0..-2]
+            input.encode!(options[:output_encoding], options[:input_encoding])
           end
         else
           # ruby 1.8
+          require 'iconv'
+          ic = Iconv.new(options[:output_encoding].upcase + ((options[:transliterate_characters]) ? '//TRANSLIT' : '') + '//IGNORE',options[:input_encoding].upcase)
           input = ic.iconv(input << ' ')[0..-2]
         end
       end

diff --git a/lib/feed-abstract/version.rb b/lib/feed-abstract/version.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module FeedAbstract
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end
diff --git a/spec/feed_abstract_channel_spec.rb b/spec/feed_abstract_channel_spec.rb
@@ -244,7 +244,7 @@ module FeedAbstract
       @oa.channel.rights.should == 'Connotea 2011'
       @delicious.channel.rights.should == ''
       @zotero.channel.rights.should == ''
-      @feedburner.channel.rights.should == ' 2011 Cable News Network LP, LLLP.'
+      @feedburner.channel.rights.should == '© 2011 Cable News Network LP, LLLP.'
       @pyblosxom.channel.rights.should == 'Creative Commons Attribution-ShareAlike'
       @chill.channel.rights.should == ''
       @twitter.channel.rights.should == ''