r2mp3 0.2.1 → 0.2.2

data/lib/r2mp3/converter.rb

@@ -63,9 +63,10 @@ module R2mp3
     def dump_to_wav
       puts "dumping to wav...."
       raise ConverterError::InputFileRequired  unless File.exists?(@input_file)
-      %Q{mplayer #{wav_options} #{@input_file}}
+      %{#{R2mp3::Tools::MPLAYER} #{wav_options} #{@input_file}}
     end
     
+    #TODO: More DRY
     def wav_options
       # todo:
       opts = {
@@ -88,11 +89,11 @@ module R2mp3
       input = @wav_output
       options = mp3_options
       @output_path = @output_file
-      %Q{lame #{input} #{@output_file} #{options}}
+      %{#{R2mp3::Tools::LAME} #{input} #{@output_file} #{options}}
     end
     
     #it just works, and shouldn't be here exactly.
-    #To do: move to lame
+    #To do: MORE DRY
     def mp3_options
       # (j)oint, (s)imple, (f)orce, (d)dual-mono, (m)ono
        mode = {

data/lib/r2mp3/inspector.rb

@@ -19,21 +19,18 @@ module R2mp3
     def info
       return nil unless @type.eql?(:mp3)
       Mp3Info.open(@file) do |info|
-        @header = info.header
-        @channel_mode = info.channel_mode
-        @length = info.length
-        #@tag1 = info.tag1
-        @tag = info.tag 
-        @vbr = info.vbr 
-        @layer = info.layer
-        @samplerate = info.samplerate
-        @mpeg_version = info.mpeg_version
-        #@tag1_parsed = info.tag1_parsed 
-        @filename = info.filename
-        @bitrate = info.bitrate
+        mp3_data.each { |d| eval("@#{d} = info.#{d}") }
       end
       self
     end
     
+    def mp3_data
+      [
+       :header, :channel_mode, :length, :tag1, 
+       :tag, :vbr, :layer, :samplerate, :mpeg_version, 
+       :filename, :bitrate
+      ]
+    end
+    
   end
 end

data/lib/r2mp3/tools/lame.rb

@@ -1,7 +1,7 @@
 module R2mp3
   module Tools
+    constant :lame => 'lame'
     class Lame
-      constant :lame => 'lame'
       include Loader::InstanceMethods      
       def parse(result)
         return true unless result[/(\*)+/].nil?

data/lib/r2mp3/tools/loader.rb

@@ -2,13 +2,13 @@ module R2mp3
  module Tools
    class Loader
      
-     def self.load(recipe, options = {})
+     def self.load(recipe)
        name = recipe.split.first
-       tool = "R2mp3::Tools::#{name.classify}".constantize.send(:new, recipe, options)
+       tool = "R2mp3::Tools::#{name.classify}".constantize.send(:new, recipe)
      end
      
      module InstanceMethods
-       def initialize(recipe, options = {})
+       def initialize(recipe)
          @recipe = recipe
        end
        

data/lib/r2mp3/tools/mplayer.rb

@@ -1,7 +1,7 @@
 module R2mp3
   module Tools
+    constant :mplayer => 'mplayer'
     class Mplayer
-      constant :mplayer => 'mplayer'
       include Loader::InstanceMethods
       
       def parse(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r2mp3
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Warachet Samtalee
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-11 00:00:00 +07:00
+date: 2008-09-18 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ files:
 - lib/r2mp3/tools/mplayer.rb
 - lib/r2mp3/version.rb
 - lib/r2mp3.rb
-- lib/README.txt
+- README.txt
 has_rdoc: false
 homepage: http://ziddik.blogspot.com
 post_install_message: