flac2mp3 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWJhM2U1ZThkNTUyZGQ3NGQ0YzU4ODY0YjU1ZTY5YmUyODBlNzBhNA==
+  data.tar.gz: !binary |-
+    ZjRhMzhmYTdlNTJhNGUyYzVlOWQzNGQ1YzUxYzA3MjFhY2UwMjlmNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzRlOWFmMmVmMTk3YTM0NjY0ODk3M2NhZWY5ZTZmMDA0YTIwYWY3NWZjZWFm
+    MGMzOThiN2YxMjU0NTAzNzIwMjk3ZDIwMTY1NDNmN2RhZGQ0YTM5OWI3ZTJj
+    NTIwZDczMWQ0M2E2ZTM5NTQyZDZhMWI4ZDYxOTgxZDNlNzhlMGU=
+  data.tar.gz: !binary |-
+    MmQ1Yjk0YzUxMDc3MjZjNmM5YWZlYTNkZDQ1YWRiYzNiZjc5YTA5NGQwNGE1
+    ODMwZTM3YWFhZTA1ZjYyNTZhYjZjZjQ1MzVkZWU5YzdmNTVhZDZhYmQ5NGE5
+    YzMzOTUzMWIwZjE1YjJkZjVhNDg2N2Y1MGFkMDgwOGRiODc5ZjA=

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.1 2013-04-20
+
+* 1 tiny enhancement:
+  * Switched from iconv to built-in encoding
+
 == 0.4.0 2009-09-22
 
 * 1 enhancement:
@@ -22,7 +27,7 @@
 * 2 enhancements:
   * Now has a configuration file, ~/.flac2mp3, where options can be stored.
     Options given on the command-line override any configuration options.
-	* Greatly refactored internals, though the command-line operation remains the same.
+  * Greatly refactored internals, though the command-line operation remains the same.
 
 == 0.2.8 2008-07-21
 
@@ -43,7 +48,7 @@
 
 * 1 bug fix:
   * Composer now actually carried over from FLAC to MP3 tags, not just thought to be.
-  
+
 * 3 enhancements:
   * Compilation flag carried over.
   * Track total carried over in addition to track number.

data/lib/flac2mp3.rb

@@ -2,60 +2,62 @@ $:.unshift File.dirname(__FILE__)
 require 'flacinfo'
 require 'mp3info'
 require 'yaml'
-require 'iconv'
 
 class Flac2mp3
   def initialize(options = {})
     load_config
     set_options(options)
   end
-  
+
   def convert(filename)
     raise TypeError, "'#{filename}' is not a file" unless FileTest.file?(filename)
     process_conversion(filename)
     File.delete(filename) if delete?
   end
-  
+
   def process_conversion(filename)
     outfile = output_filename(filename)
     convert_data(filename, outfile)
     convert_metadata(filename, outfile)
   end
-  
+
   def convert_data(filename, outfile)
     system "#{flac_command(filename)} | #{mp3_command(outfile)}"
   end
-  
+
   def flac_command(filename)
     command = 'flac'
     command << ' --silent' if silent?
-    
+
     "#{command} --stdout --decode #{safequote(filename)}"
   end
-  
+
   def mp3_command(filename)
     command = 'lame'
     command << ' --silent' if silent?
-    
+
     "#{command} #{encoding} - #{safequote(filename)}"
   end
-  
+
   def convert_metadata(filename, outfile)
     set_mp3data(outfile, get_flacdata(filename))
   end
-  
+
   def get_flacdata(filename)
-    FlacInfo.new(filename).tags.inject({}) do |hash, (key, value)|
+    hash = {}
+
+    FlacInfo.new(filename).tags.each do |(key, value)|
       key = key.to_s.downcase.to_sym
       value = value.to_i if value.respond_to?(:match) and value.match(/^\d+$/)
       value = value.to_s if self.class.string_fields.include?(key)
-      value = Iconv.conv('ISO-8859-1//TRANSLIT', 'UTF-8', value) if value.is_a?(String)
-      
+      value = value.force_encoding('UTF-8') if value.is_a?(String)
+
       hash[key] = value
-      hash
     end
+
+    hash
   end
-  
+
   def set_mp3data(filename, tags)
     raise TypeError, "Tags must be a hash" unless tags.is_a?(Hash)
     Mp3Info.open(filename) do |mp3|
@@ -65,56 +67,56 @@ class Flac2mp3
       end
     end
   end
-  
+
   def load_config
     @config = {}
     yaml = YAML.load(File.read(File.expand_path('~/.flac2mp3'))) || {}
     yaml.each { |k, v|  @config[k.to_sym] = v }
   rescue Errno::ENOENT
   end
-  
+
   def set_options(options)
     raise TypeError, 'options must be a hash' unless options.is_a?(Hash)
     @options = config.merge(options)
   end
-  
+
   def options
     @options.dup
   end
-  
+
   def config
     @config.dup
   end
-  
+
   def delete?
     !!options[:delete]
   end
-  
+
   def silent?
     !!options[:silent]
   end
-  
+
   def encoding
     options[:encoding] || self.class.default_encoding
   end
-  
+
   def output_filename(filename)
     filename.chomp('.flac') + '.mp3'
   end
-  
+
   def safequote(filename)
     filename.gsub(/(\W)/, '\\\\\1')
   end
-  
+
   class << self
     def convert(filename, options = {})
       new(options).convert(filename)
     end
-    
+
     def convert_metadata(infile, outfile)
       new.convert_metadata(infile, outfile)
     end
-    
+
     def tag_mapping
       {
         :album       => :album,
@@ -133,39 +135,39 @@ class Flac2mp3
         :tag         => :TIT1
       }
     end
-    
+
     def convert_tags(tags)
       mp3_tags = {}
-      
+
       tags.each do |key, value|
         next unless mp3tag = tag_mapping[key]
-        
+
         if format = tag_formats[mp3tag]
-          value = format.gsub(/:(\w+)/) do 
+          value = format.gsub(/:(\w+)/) do
             field = $1
             tags[field.to_sym]
           end
         end
-        
+
         target = tag2_fields.include?(key) ? :tag2 : :tag
         mp3_tags[mp3tag] = { :target => target, :value => value }
       end
-      
+
       mp3_tags
     end
-    
+
     def default_encoding
       '--preset standard'
     end
-    
+
     def string_fields
       [:title, :description]
     end
-    
+
     def tag2_fields
       [:bpm, :composer, :compilation, :tracktotal, :tracknumber, :disctotal, :discnumber, :tag]
     end
-    
+
     def tag_formats
       {
         :TRCK => ':tracknumber/:tracktotal',

data/lib/flac2mp3/version.rb

@@ -2,7 +2,7 @@ class Flac2mp3 #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/flac2mp3_command_spec.rb

@@ -12,127 +12,127 @@ describe 'flac2mp3 command' do
   before do
     Flac2mp3.stub!(:convert)
     Flac2mp3.stub!(:convert_metadata)
-    
+
     [:ARGV, :OPTIONS, :MANDATORY_OPTIONS].each do |const|
       Object.send(:remove_const, const) if Object.const_defined?(const)
     end
   end
-  
+
   it 'should exist' do
     lambda { run_command('blah') }.should.not.raise(Errno::ENOENT)
   end
-  
+
   it 'should require a filename' do
     self.should.receive(:puts) do |output|
       output.should.match(/usage.+filename/i)
     end
     run_command
   end
-  
+
   it 'should pass the filename to Flac2mp3 for conversion' do
     Flac2mp3.should.receive(:convert) do |filename, _|
       filename.should == 'blah'
     end
     run_command('blah')
   end
-  
+
   it 'should pass on a true flac-deletion option if specified on the command line (using --delete)' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:delete].should == true
     end
     run_command('blah', '--delete')
   end
-  
+
   it 'should pass on a false flac-deletion option if specified on the command line (using --no-delete)' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:delete].should == false
     end
     run_command('blah', '--no-delete')
   end
-  
+
   it 'should pass on a true flac-deletion option if specified on the command line (using -d)' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:delete].should == true
     end
     run_command('blah', '-d')
   end
-  
+
   it 'should not pass on any flac-deletion option if nothing specified on the command line' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options.should.not.include(:delete)
     end
     run_command('blah')
   end
-  
+
   it 'should pass on a true silence option if specified on the command line (using --silent)' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:silent].should == true
     end
     run_command('blah', '--silent')
   end
-  
+
   it 'should pass on a true silence option if specified on the command line (using -s)' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:silent].should == true
     end
     run_command('blah', '-s')
   end
-  
+
   it 'should not pass on any silence option if nothing specified on the command line' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options.should.not.include(:silent)
     end
     run_command('blah')
   end
-  
+
   it 'should pass on the encoding option specified on the command line' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:encoding].should == '--preset fast standard'
     end
     run_command('blah', '--encoding', '--preset fast standard')
   end
-  
+
   it 'should pass on the encoding option specified in shorthand on the command line' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options[:encoding].should == '--preset fast standard'
     end
     run_command('blah', '-e', '--preset fast standard')
   end
-  
+
   it 'should pass on no encoding option if none specified on the command line' do
     Flac2mp3.should.receive(:convert) do |_, options|
       options.should.not.include(:encoding)
     end
     run_command('blah')
   end
-  
+
   it 'should take a --meta option to convert metadata' do
     lambda { run_command('--meta', 'blah.flac', 'something.mp3') }.should.not.raise(OptionParser::InvalidOption)
   end
-  
+
   describe 'when converting metadata' do
     before do
       @infile = 'blah.flac'
       @outfile = 'something.mp3'
     end
-    
+
     it 'should require two filenames' do
       self.should.receive(:puts) do |output|
         output.should.match(/usage.+filename/i)
       end
       run_command('--meta', @infile)
     end
-    
+
     it 'should pass the filenames to Flac2mp3 for metadata conversion' do
       Flac2mp3.should.receive(:convert_metadata).with(@infile, @outfile)
       run_command('--meta', @infile, @outfile)
     end
-    
+
     it 'should not attempt to convert any files' do
       Flac2mp3.should.receive(:convert).never
       run_command('--meta', @infile, @outfile)
     end
-    
+
     it 'should accept a shorthand -m option' do
       Flac2mp3.should.receive(:convert_metadata).with(@infile, @outfile)
       run_command('-m', @infile, @outfile)

data/spec/flac2mp3_spec.rb

@@ -4,49 +4,49 @@ describe Flac2mp3 do
   before do
     @flac2mp3 = Flac2mp3.new
   end
-  
+
   describe 'when initialized' do
     before do
       @options = { :silent => true, :delete => false }
     end
-    
+
     it 'should accept options' do
       lambda { Flac2mp3.new(@options) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should not require options' do
       lambda { Flac2mp3.new }.should.not.raise(ArgumentError)
     end
-    
+
     describe do
       # unnamed describe block just to give a level of organization
       # to this subclass-based initialize-behavior testing
       before do
         @subclass = Class.new(Flac2mp3) do
           attr_reader :config_loaded, :options_set, :options
-          
+
           def load_config
             @config_loaded = true
           end
-          
+
           def set_options(*args)
             @options_set = true
             @options = args
           end
         end
       end
-      
+
       it 'should load the configuration' do
         obj = @subclass.new
         obj.config_loaded.should == true
       end
-      
+
       it 'should set the options' do
         obj = @subclass.new(@options)
         obj.options_set.should == true
         obj.options.should == [@options]
       end
-      
+
       it 'should default to empty options' do
         obj = @subclass.new
         obj.options_set.should == true
@@ -54,251 +54,251 @@ describe Flac2mp3 do
       end
     end
   end
-  
+
   it 'should load the configuration' do
     @flac2mp3.should.respond_to(:load_config)
   end
-  
+
   describe 'loading the configuration' do
     it 'should look for a config file' do
       File.should.receive(:read).with(File.expand_path('~/.flac2mp3')).and_return('')
       @flac2mp3.load_config
     end
-    
+
     describe 'when a config file is found' do
       before do
         @config = { :silent => true, :delete => false }
         @contents = @config.to_yaml
         File.stub!(:read).and_return(@contents)
       end
-      
+
       it 'should parse the file as YAML' do
         YAML.should.receive(:load).with(@contents)
         @flac2mp3.load_config
       end
-      
+
       it 'should store the config' do
         @flac2mp3.load_config
         @flac2mp3.config.should == @config
       end
-      
+
       it 'should convert string keys to symbols' do
         File.stub!(:read).and_return({ 'silent' => true, 'delete' => false }.to_yaml)
         @flac2mp3.load_config
         @flac2mp3.config.should == @config
       end
-      
+
       it 'should handle an empty file' do
         File.stub!(:read).and_return('')
         @flac2mp3.load_config
         @flac2mp3.config.should == {}
       end
-      
+
       it 'should not allow changes to the config' do
         @flac2mp3.load_config
         @flac2mp3.config[:some_key] = 'some value'
         @flac2mp3.config.should == @config
       end
     end
-    
+
     describe 'when no config file is found' do
       before do
         File.stub!(:read).and_raise(Errno::ENOENT)
       end
-      
+
       it 'should store an empty config' do
         Flac2mp3.new.config.should == {}
       end
     end
   end
-  
+
   it 'should set options' do
     @flac2mp3.should.respond_to(:set_options)
   end
-  
+
   describe 'setting options' do
     before do
       @options = { :silent => true, :delete => false }
     end
-    
+
     it 'should accept options' do
       lambda { @flac2mp3.set_options(:silent => true) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require options' do
       lambda { @flac2mp3.set_options }.should.raise(ArgumentError)
     end
-    
+
     it 'should accept a hash of options' do
       lambda { @flac2mp3.set_options(:silent => true) }.should.not.raise(TypeError)
     end
-    
+
     it 'should require a hash of options' do
       lambda { @flac2mp3.set_options('silent') }.should.raise(TypeError)
     end
-    
+
     it 'should store the options' do
       @flac2mp3.set_options(@options)
       @flac2mp3.options.should == @options
     end
-    
+
     it 'should not allow changes to the options' do
       @flac2mp3.set_options(@options.dup)
       @flac2mp3.options[:some_key] = 'some value'
       @flac2mp3.options.should == @options
     end
   end
-  
+
   describe 'querying options' do
     before do
       File.stub!(:read).and_return('')
       @flac2mp3.load_config
     end
-    
+
     it 'should indicate the original file should be deleted when a true option is given' do
       @flac2mp3.set_options(:delete => true)
       @flac2mp3.delete?.should == true
     end
-    
+
     it 'should indicate the original file should not be deleted when a false option is given' do
       @flac2mp3.set_options(:delete => false)
       @flac2mp3.delete?.should == false
     end
-    
+
     it 'should indicate the original file should not be deleted when no option is given' do
       @flac2mp3.set_options({})
       @flac2mp3.delete?.should == false
     end
-    
+
     it 'should indicate the conversion should be silent when a true option is given' do
       @flac2mp3.set_options(:silent => true)
       @flac2mp3.silent?.should == true
     end
-    
+
     it 'should indicate the conversion should not be silent when a false option is given' do
       @flac2mp3.set_options(:silent => false)
       @flac2mp3.silent?.should == false
     end
-    
+
     it 'should indicate the conversion should not be silent when no option is given' do
       @flac2mp3.set_options({})
       @flac2mp3.silent?.should == false
     end
-    
+
     it 'should store the given encoding' do
       encoding = '-VAWESOME'
       @flac2mp3.set_options(:encoding => encoding)
       @flac2mp3.encoding.should == encoding
     end
-    
+
     it 'should default the encoding to --preset standard' do
       @flac2mp3.set_options({})
       @flac2mp3.encoding.should == '--preset standard'
     end
-    
+
     it 'should use values from the configuration' do
       config = {:silent => true}
       File.stub!(:read).and_return(config.to_yaml)
       Flac2mp3.new.silent?.should == true
     end
-    
+
     it 'should override configuration values with options' do
       config = {:silent => true}
       File.stub!(:read).and_return(config.to_yaml)
       Flac2mp3.new(:silent => false).silent?.should == false
     end
-    
+
     it 'should combine configuration and option values' do
       config = {:silent => true}
       File.stub!(:read).and_return(config.to_yaml)
       flac2mp3 = Flac2mp3.new(:delete => true)
-      
+
       flac2mp3.silent?.should == true
       flac2mp3.delete?.should == true
     end
   end
-  
+
   it 'should convert' do
     @flac2mp3.should.respond_to(:convert)
   end
-  
+
   describe 'when converting' do
     before do
       @filename = 'test.flac'
       @flac2mp3.stub!(:process_conversion)
       FileTest.stub!(:file?).and_return(true)
     end
-    
+
     it 'should accept a filename' do
       lambda { @flac2mp3.convert(@filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.convert }.should.raise(ArgumentError)
     end
-    
+
     it 'should check if the filename belongs to a regular file' do
       FileTest.should.receive(:file?).with(@filename).and_return(true)
       @flac2mp3.convert(@filename)
     end
-    
+
     describe 'when given a filename belonging to a regular file' do
       before do
         FileTest.stub!(:file?).and_return(true)
       end
-      
+
       it 'should not error' do
         lambda { @flac2mp3.convert(@filename) }.should.not.raise(TypeError)
       end
-            
+
       it 'should process the conversion' do
         @flac2mp3.should.receive(:process_conversion).with(@filename)
         @flac2mp3.convert(@filename)
       end
-      
+
       it 'should check if the original file should be deleted' do
         @flac2mp3.should.receive(:delete?)
         @flac2mp3.convert(@filename)
       end
-      
+
       describe 'when the original file should be deleted' do
         before do
           @flac2mp3.stub!(:delete?).and_return(true)
         end
-        
+
         it 'should delete the original file' do
           File.should.receive(:delete).with(@filename)
           @flac2mp3.convert(@filename)
         end
       end
-      
+
       describe 'when the original file should not be deleted' do
         before do
           @flac2mp3.stub!(:delete?).and_return(false)
         end
-        
+
         it 'should not delete the original file' do
           File.should.receive(:delete).never
           @flac2mp3.convert(@filename)
         end
       end
     end
-    
+
     describe 'when given a filename not belonging to a regular file' do
       before do
         FileTest.stub!(:file?).and_return(false)
       end
-      
+
       it 'should error' do
         lambda { @flac2mp3.convert(@filename) }.should.raise(TypeError)
       end
     end
   end
-  
+
   it 'should process conversion' do
     @flac2mp3.should.respond_to(:process_conversion)
   end
-  
+
   describe 'when processing conversion' do
     before do
       @filename     = 'test.flac'
@@ -307,35 +307,35 @@ describe Flac2mp3 do
       @flac2mp3.stub!(:convert_data)
       @flac2mp3.stub!(:convert_metadata)
     end
-    
+
     it 'should accept a filename' do
       lambda { @flac2mp3.process_conversion(@filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.process_conversion }.should.raise(ArgumentError)
     end
-    
+
     it 'get the output filename from the given filename' do
       @flac2mp3.should.receive(:output_filename).with(@filename)
       @flac2mp3.process_conversion(@filename)
     end
-    
+
     it 'should convert data' do
       @flac2mp3.should.receive(:convert_data).with(@filename, @out_filename)
       @flac2mp3.process_conversion(@filename)
     end
-    
+
     it 'should convert metadata' do
       @flac2mp3.should.receive(:convert_metadata).with(@filename, @out_filename)
       @flac2mp3.process_conversion(@filename)
     end
   end
-  
+
   it 'should provide an output filename' do
     @flac2mp3.should.respond_to(:output_filename)
   end
-  
+
   describe 'providing an output filename' do
     it 'should accept a filename' do
       lambda { @flac2mp3.output_filename('blah.flac') }.should.not.raise(ArgumentError)
@@ -353,11 +353,11 @@ describe Flac2mp3 do
       @flac2mp3.output_filename('blah').should == 'blah.mp3'
     end
   end
-  
+
   it 'should convert data' do
     @flac2mp3.should.respond_to(:convert_data)
   end
-  
+
   describe 'when converting data' do
     before do
       @filename     = 'test.flac'
@@ -368,39 +368,39 @@ describe Flac2mp3 do
       @flac2mp3.stub!(:mp3_command).and_return(@mp3_command)
       @flac2mp3.stub!(:system)
     end
-    
+
     it 'should accept a filename and an output filename' do
       lambda { @flac2mp3.convert_data(@filename, @out_filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require an output filename' do
       lambda { @flac2mp3.convert_data(@filename) }.should.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.convert_data }.should.raise(ArgumentError)
     end
-    
+
     it 'should call the flac command with the given filename' do
       @flac2mp3.should.receive(:flac_command).with(@filename)
       @flac2mp3.convert_data(@filename, @out_filename)
     end
-    
+
     it 'should call the mp3 command with the given output filename' do
       @flac2mp3.should.receive(:mp3_command).with(@out_filename)
       @flac2mp3.convert_data(@filename, @out_filename)
     end
-    
+
     it 'should shell out to the system with the flac and mp3 commands' do
       @flac2mp3.should.receive(:system).with("#{@flac_command} | #{@mp3_command}")
       @flac2mp3.convert_data(@filename, @out_filename)
     end
   end
-  
+
   it 'should provide a flac command' do
     @flac2mp3.should.respond_to(:flac_command)
   end
-  
+
   describe 'when providing a flac command' do
     before do
       @filename = 'test.flac'
@@ -408,50 +408,50 @@ describe Flac2mp3 do
       @flac2mp3.stub!(:safequote).and_return(@safe_filename)
       @flac2mp3.stub!(:silent?)
     end
-    
+
     it 'should accept a filename' do
       lambda { @flac2mp3.flac_command(@filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.flac_command }.should.raise(ArgumentError)
     end
-    
+
     it 'should safequote the filename' do
       @flac2mp3.should.receive(:safequote).with(@filename)
       @flac2mp3.flac_command(@filename)
     end
-    
+
     it 'should check if the command should be silent' do
       @flac2mp3.should.receive(:silent?)
       @flac2mp3.flac_command(@filename)
     end
-    
+
     describe 'when the command should be silent' do
       before do
         @flac2mp3.stub!(:silent?).and_return(true)
       end
-      
+
       it 'should provide a flac shell command that will be silent' do
         @flac2mp3.flac_command(@filename).should == "flac --silent --stdout --decode #{@safe_filename}"
       end
     end
-    
+
     describe 'when the command should not be silent' do
       before do
         @flac2mp3.stub!(:silent?).and_return(false)
       end
-      
+
       it 'should provide a flac shell command that will not be silent' do
         @flac2mp3.flac_command(@filename).should == "flac --stdout --decode #{@safe_filename}"
       end
     end
   end
-  
+
   it 'should provide an mp3 command' do
     @flac2mp3.should.respond_to(:mp3_command)
   end
-  
+
   describe 'when providing an mp3 command' do
     before do
       @filename = 'test.mp3'
@@ -461,64 +461,64 @@ describe Flac2mp3 do
       @encoding = '--VAWESOME'
       @flac2mp3.stub!(:encoding).and_return(@encoding)
     end
-    
+
     it 'should accept a filename' do
       lambda { @flac2mp3.mp3_command(@filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.mp3_command }.should.raise(ArgumentError)
     end
-    
+
     it 'should safequote the filename' do
       @flac2mp3.should.receive(:safequote).with(@filename)
       @flac2mp3.mp3_command(@filename)
     end
-    
+
     it 'should check if the command should be silent' do
       @flac2mp3.should.receive(:silent?)
       @flac2mp3.mp3_command(@filename)
     end
-    
+
     it 'should check the encoding to use' do
       @flac2mp3.should.receive(:encoding)
       @flac2mp3.mp3_command(@filename)
     end
-    
+
     describe 'when the command should be silent' do
       before do
         @flac2mp3.stub!(:silent?).and_return(true)
       end
-      
+
       it 'should provide an mp3 shell command that will be silent' do
         @flac2mp3.mp3_command(@filename).should == "lame --silent #{@encoding} - #{@safe_filename}"
       end
     end
-    
+
     describe 'when the command should not be silent' do
       before do
         @flac2mp3.stub!(:silent?).and_return(false)
       end
-      
+
       it 'should provide an mp3 shell command that will not be silent' do
         @flac2mp3.mp3_command(@filename).should == "lame #{@encoding} - #{@safe_filename}"
       end
     end
   end
-  
+
   it 'should quote filenames safely' do
     @flac2mp3.should.respond_to(:safequote)
   end
-  
+
   describe 'when quoting a filename safely' do
     it 'should accept a filename' do
       lambda { @flac2mp3.safequote('test.flac') }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.safequote }.should.raise(ArgumentError)
     end
-    
+
     it 'should leave alphanumeric characters alone' do
       @flac2mp3.safequote('abc_123').should == 'abc_123'
     end
@@ -527,11 +527,11 @@ describe Flac2mp3 do
       @flac2mp3.safequote(%q[a-b"c 12'3]).should == %q[a\-b\"c\ 12\'3]
     end
   end
-  
+
   it 'should convert metadata' do
     @flac2mp3.should.respond_to(:convert_metadata)
   end
-  
+
   describe 'when converting metadata' do
     before do
       @filename     = 'test.flac'
@@ -540,34 +540,34 @@ describe Flac2mp3 do
       @flac2mp3.stub!(:get_flacdata).and_return(@flacdata)
       @flac2mp3.stub!(:set_mp3data)
     end
-    
+
     it 'should accept a filename and an output filename' do
       lambda { @flac2mp3.convert_metadata(@filename, @out_filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require an output filename' do
       lambda { @flac2mp3.convert_metadata(@filename) }.should.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.convert_metadata }.should.raise(ArgumentError)
     end
-    
+
     it 'should get the flac metadata' do
       @flac2mp3.should.receive(:get_flacdata).with(@filename)
       @flac2mp3.convert_metadata(@filename, @out_filename)
     end
-    
+
     it 'should set the mp3 metadata with the flac metadata' do
       @flac2mp3.should.receive(:set_mp3data).with(@out_filename, @flacdata)
       @flac2mp3.convert_metadata(@filename, @out_filename)
     end
   end
-  
+
   it 'should get flac metadata' do
     @flac2mp3.should.respond_to(:get_flacdata)
   end
-  
+
   describe 'when getting flac metadata' do
     before do
       @filename = 'test.flac'
@@ -575,15 +575,15 @@ describe Flac2mp3 do
       @flacinfo = mock('flac info', :tags => @tags)
       FlacInfo.stub!(:new).and_return(@flacinfo)
     end
-    
+
     it 'should accept a filename' do
       lambda { @flac2mp3.get_flacdata(@filename) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.get_flacdata }.should.raise(ArgumentError)
     end
-    
+
     it 'should create a FlacInfo object' do
       FlacInfo.should.receive(:new).with(@filename).and_return(@flacinfo)
       @flac2mp3.get_flacdata(@filename)
@@ -593,7 +593,7 @@ describe Flac2mp3 do
       @flacinfo.should.receive(:tags).and_return(@tags)
       @flac2mp3.get_flacdata(@filename)
     end
-    
+
     it 'should return a hash of the tag data' do
       @tags[:artist] = 'blah'
       @tags[:blah] = 'boo'
@@ -604,7 +604,7 @@ describe Flac2mp3 do
       data[:blah].should == 'boo'
       data[:comment].should == 'hey'
     end
-    
+
     it 'should convert tags to symbols' do
       @tags['artist'] = 'blah'
       @tags['blah'] = 'boo'
@@ -619,7 +619,7 @@ describe Flac2mp3 do
       data.should.not.include('blah')
       data.should.not.include('comment')
     end
-    
+
     it 'should convert tags to lowercase' do
       @tags['Artist'] = 'blah'
       @tags[:BLAH] = 'boo'
@@ -634,21 +634,21 @@ describe Flac2mp3 do
       data.should.not.include(:BLAH)
       data.should.not.include('cOmMeNt')
     end
-    
+
     it 'should convert values consisting only of digits to actual numbers' do
       @tags[:track] = '12'
 
       data = @flac2mp3.get_flacdata(@filename)
       data[:track].should == 12
     end
-    
+
     it 'should leave numeric values as numbers' do
       @tags[:track] = 12
-      
+
       data = @flac2mp3.get_flacdata(@filename)
       data[:track].should == 12
     end
-    
+
     it 'should leave numeric titles as strings' do
       @tags[:title] = '45'  # This was my first run-in with this problem, the opening track on Elvis Costello's /When I Was Cruel/
 
@@ -676,55 +676,55 @@ describe Flac2mp3 do
       data = @flac2mp3.get_flacdata(@filename)
       data[:description].should == '1938'
     end
-    
+
     # iTunes wants ISO-8859-1, and I want my MP3s to display well in iTunes
-    it 'should convert UTF-8 titles to ISO-8859-1' do
+    it 'should result in ISO-8859-1 titles' do
       @tags[:title] = "L\303\251gende"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:title].should == "L\351gende"
+      data[:title].should == "L\351gende".force_encoding('ISO-8859-1')
     end
-    
-    it 'should convert UTF-8 titles to ISO-8859-1 even if the title key is not a simple downcased symbol' do
+
+    it 'should result in ISO-8859-1 titles even if the title key is not a simple downcased symbol' do
       @tags['TITLE'] = "L\303\251gende"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:title].should == "L\351gende"
+      data[:title].should == "L\351gende".force_encoding('ISO-8859-1')
     end
-    
-    it 'should convert UTF-8 artist names to ISO-8859-1' do
+
+    it 'should result in ISO-8859-1 artist names' do
       @tags[:artist] = "St\303\251phane Grappelli"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:artist].should == "St\351phane Grappelli"
+      data[:artist].should == "St\351phane Grappelli".force_encoding('ISO-8859-1')
     end
-    
-    it 'should convert UTF-8 artist names to ISO-8859-1 even if the artist key is not a simple downcased symbol' do
+
+    it 'should result in ISO-8859-1 artist names even if the artist key is not a simple downcased symbol' do
       @tags['ARTIST'] = "St\303\251phane Grappelli"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:artist].should == "St\351phane Grappelli"
+      data[:artist].should == "St\351phane Grappelli".force_encoding('ISO-8859-1')
     end
-    
-    it 'should convert UTF-8 album titles to ISO-8859-1' do
+
+    it 'should result in ISO-8859-1 album titles' do
       @tags[:album] = "Still on Top \342\200\224 The Greatest Hits"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:album].should == "Still on Top - The Greatest Hits"  # not a strict conversion, but a transliteration
+      data[:album].should == "Still on Top - The Greatest Hits".force_encoding('ISO-8859-1')  # not a strict conversion, but a transliteration
     end
-    
-    it 'should convert UTF-8 album titles to ISO-8859-1 even if the album key is not a simple downcased symbol' do
+
+    it 'should result in ISO-8859-1 album titles even if the album key is not a simple downcased symbol' do
       @tags['ALBUM'] = "Still on Top \342\200\224 The Greatest Hits"
 
       data = @flac2mp3.get_flacdata(@filename)
-      data[:album].should == "Still on Top - The Greatest Hits"  # not a strict conversion, but a transliteration
+      data[:album].should == "Still on Top - The Greatest Hits".force_encoding('ISO-8859-1')  # not a strict conversion, but a transliteration
     end
   end
-  
+
   it 'should set mp3 metadata' do
     @flac2mp3.should.respond_to(:set_mp3data)
   end
-  
+
   describe 'when setting mp3 metadata' do
     before do
       @filename = 'test.mp3'
@@ -734,32 +734,32 @@ describe Flac2mp3 do
       @mp3info  = mock('mp3 info', :tag => @mp3tags, :tag2 => @mp3tags2)
       Mp3Info.stub!(:open).and_yield(@mp3info)
     end
-    
+
     it 'should accept a filename and tag data' do
       lambda { @flac2mp3.set_mp3data(@filename, {}) }.should.not.raise(ArgumentError)
     end
-    
+
     it 'should require tag data' do
       lambda { @flac2mp3.set_mp3data(@filename) }.should.raise(ArgumentError)
     end
-    
+
     it 'should require a filename' do
       lambda { @flac2mp3.set_mp3data }.should.raise(ArgumentError)
     end
-    
+
     it 'should accept a hash of tag data' do
       lambda { @flac2mp3.set_mp3data(@filename, 'tag data') }.should.raise(TypeError)
     end
-    
+
     it 'should require a hash of tag data' do
       lambda { @flac2mp3.set_mp3data(@filename, {}) }.should.not.raise(TypeError)
     end
-    
+
     it 'should use an Mp3Info object' do
       Mp3Info.should.receive(:open).with(@filename)
       @flac2mp3.set_mp3data(@filename, @tags)
     end
-    
+
     it 'should set tags in the Mp3Info object' do
       @tags[:album] = 'blah'
       @tags[:artist] = 'boo'
@@ -820,7 +820,7 @@ describe Flac2mp3 do
 
       @flac2mp3.set_mp3data(@filename, @tags)
     end
-    
+
     it "should use tag2 for 'tag' ('grouping')" do
       @tags[:tag] = 'one, two, three, oclock'
 
@@ -847,12 +847,12 @@ describe Flac2mp3 do
       @flac2mp3.set_mp3data(@filename, @tags)
     end
   end
-  
+
   describe 'as a class' do
     it 'should convert' do
       Flac2mp3.should.respond_to(:convert)
     end
-    
+
     describe 'when converting' do
       before do
         @filename = 'test.flac'
@@ -860,39 +860,39 @@ describe Flac2mp3 do
         @flac2mp3 = mock('flac2mp3', :convert => nil)
         Flac2mp3.stub!(:new).and_return(@flac2mp3)
       end
-      
+
       it 'should accept a filename and a hash of options' do
         lambda { Flac2mp3.convert(@filename, @options) }.should.not.raise(ArgumentError)
       end
-      
+
       it 'should not require options' do
         lambda { Flac2mp3.convert(@filename) }.should.not.raise(ArgumentError)
       end
-      
+
       it 'should require a filename' do
         lambda { Flac2mp3.convert }.should.raise(ArgumentError)
       end
-      
+
       it 'should instantiate a new Flac2mp3 object' do
         Flac2mp3.should.receive(:new).and_return(@flac2mp3)
         Flac2mp3.convert(@filename)
       end
-      
+
       it 'should pass the options when instantiating the Flac2mp3 object' do
         Flac2mp3.should.receive(:new).with(@options).and_return(@flac2mp3)
         Flac2mp3.convert(@filename, @options)
       end
-      
+
       it 'should use the Flac2mp3 object to convert the given file' do
         @flac2mp3.should.receive(:convert).with(@filename)
         Flac2mp3.convert(@filename)
       end
     end
-    
+
     it 'should convert metadata' do
       Flac2mp3.should.respond_to(:convert_metadata)
     end
-    
+
     describe 'when converting metadata' do
       before do
         @infile  = 'test.flac'
@@ -900,30 +900,30 @@ describe Flac2mp3 do
         @flac2mp3 = mock('flac2mp3', :convert_metadata => nil)
         Flac2mp3.stub!(:new).and_return(@flac2mp3)
       end
-      
+
       it 'should accept two filenames' do
         lambda { Flac2mp3.convert_metadata(@infile, @outfile) }.should.not.raise(ArgumentError)
       end
-      
+
       it 'should require two filenames' do
         lambda { Flac2mp3.convert_metadata(@infile) }.should.raise(ArgumentError)
       end
-      
+
       it 'should instantiate a new Flac2mp3 object' do
         Flac2mp3.should.receive(:new).and_return(@flac2mp3)
         Flac2mp3.convert_metadata(@infile, @outfile)
       end
-      
+
       it 'should use the Flac2mp3 object to convert the metadata between the given files' do
         @flac2mp3.should.receive(:convert_metadata).with(@infile, @outfile)
         Flac2mp3.convert_metadata(@infile, @outfile)
       end
     end
-    
+
     it 'should provide a tag mapping' do
       Flac2mp3.should.respond_to(:tag_mapping)
     end
-    
+
     describe 'providing a tag mapping' do
       it 'should return a hash' do
         Flac2mp3.tag_mapping.should.be.kind_of(Hash)
@@ -980,7 +980,7 @@ describe Flac2mp3 do
       it "should map 'compilation' to 'TCMP'" do
         Flac2mp3.tag_mapping[:compilation].should == :TCMP
       end
-      
+
       it "should map 'tag' to 'TIT1'" do
         Flac2mp3.tag_mapping[:tag].should == :TIT1
       end