Renamed Video class to Media

lib/Voyeur/converter.rb

@@ -1,7 +1,7 @@
 module Voyeur
   class Converter
-    attr_accessor :input_video
-    attr_reader :output_video
+    attr_accessor :input_media
+    attr_reader :output_media
     attr_reader :status
 
     def self.create(options)
@@ -17,10 +17,10 @@ def self.create(options)
     end
 
     def convert(options)
-      @input_video = options[:video]
-      raise Voyeur::Exceptions::NoVideoPresent unless @input_video
+      @input_media = options[:media]
+      raise Voyeur::Exceptions::NoMediaPresent unless @input_media
       output_filename = self.output_path( options[:output_path] )
-      @output_video = Video.new(filename: output_file(options[:output_path], options[:output_filename]))
+      @output_media = Media.new(filename: output_file(options[:output_path], options[:output_filename]))
       self.call_external_converter
     end
 
@@ -32,11 +32,11 @@ def output_file(path, filename)
 
     def output_path(output_path = nil)
       raise Voyeur::Exceptions::InvalidLocation if output_path && !File.directory?(output_path)
-      output_path ? output_path : File.dirname(@input_video.filename)
+      output_path ? output_path : File.dirname(@input_media.filename)
     end
 
     def output_filename(input_filename = nil)
-      filename = input_filename.nil? ? @input_video.filename : input_filename
+      filename = input_filename.nil? ? @input_media.filename : input_filename
       File.basename(filename, '.*') + ".#{self.file_extension}"
     end
 
@@ -57,7 +57,7 @@ def call_external_converter
       error_message = err.split('\n').last
 
       @status = { status: status.exitstatus, stdout: out, stderr: err,
-        error_message: error_message, video: @output_video }
+        error_message: error_message, media: @output_media }
       return @status
     end
   end

lib/Voyeur/exceptions.rb

@@ -1,6 +1,6 @@
 module Voyeur
   module Exceptions
-    class NoVideoPresent < StandardError; end
+    class NoMediaPresent < StandardError; end
     class InvalidFormat < StandardError; end
     class InvalidLocation < StandardError; end
   end

lib/voyeur.rb

@@ -1,5 +1,5 @@
 require "Voyeur/version"
-require "Voyeur/video"
+require "Voyeur/media"
 require "Voyeur/exceptions"
 require "Voyeur/converter"
 
@@ -10,4 +10,4 @@
 require "Voyeur/audio_converters/aac"
 require "Voyeur/audio_converters/ogg"
 
-require 'open4'
+require 'open4'

spec/converters/audio_converters/aac_spec.rb

@@ -3,7 +3,7 @@
 describe Voyeur::Aac do
   before :each do
     @converter = Voyeur::Converter.create(format: :aac)
-    @audio = Voyeur::Video.new(filename: valid_mpeg_file_path)
+    @audio = Voyeur::Media.new(filename: valid_mpeg_file_path)
   end
 
   it "should use the correct factory" do
@@ -21,27 +21,27 @@
 
     context "#convert_options: " do
       it "should name the file correctly" do
-        @converter.convert(video: @audio)
+        @converter.convert(media: @audio)
         output_file = valid_mpeg_file_path.gsub(/mpeg/, "aac")
-        @converter.output_video.filename.should == output_file
+        @converter.output_media.filename.should == output_file
       end
 
       it "should return an audio file" do
-        @converter.convert(video: @audio)
-        @converter.input_video.should == @audio
+        @converter.convert(media: @audio)
+        @converter.input_media.should == @audio
       end
 
       context "audio file - " do
         it "should return conversion status indicating success" do
-          result = @converter.convert(video: @audio)
+          result = @converter.convert(media: @audio)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
 
         it "should allow it to be named" do
-          result = @converter.convert(video: @audio)
+          result = @converter.convert(media: @audio)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
       end
     end
@@ -50,14 +50,14 @@
   context "An invalid audio file" do
     before :each do
       @converter = Voyeur::Converter.create(format: :aac)
-      @audio = Voyeur::Video.new(filename: 'test_video.mpeg')
+      @audio = Voyeur::Media.new(filename: 'test_media.mpeg')
     end
 
     it "should return conversion status indicating failure" do
-      result = @converter.convert(video: @audio)
+      result = @converter.convert(media: @audio)
       result[:status].should == 1
-      result[:video].should == @converter.output_video
-      result[:error_message].should match(/test_video.mpeg: No such file or directory/)
+      result[:media].should == @converter.output_media
+      result[:error_message].should match(/test_media.mpeg: No such file or directory/)
       result[:stderr].nil?.should == false
     end
   end

spec/converters/audio_converters/ogg_spec.rb

@@ -3,7 +3,7 @@
 describe Voyeur::Ogg do
   before :each do
     @converter = Voyeur::Converter.create(format: :ogg)
-    @audio = Voyeur::Video.new(filename: valid_mpeg_file_path)
+    @audio = Voyeur::Media.new(filename: valid_mpeg_file_path)
   end
 
   it "should use the correct factory" do
@@ -20,28 +20,28 @@
     end
 
     context "#convert_options: " do
-      it "should name the video correctly" do
-        @converter.convert(video: @audio)
+      it "should name the media correctly" do
+        @converter.convert(media: @audio)
         output_file = valid_mpeg_file_path.gsub(/mpeg/, "ogg")
-        @converter.output_video.filename.should == output_file
+        @converter.output_media.filename.should == output_file
       end
 
       it "should return an audio file" do
-        @converter.convert(video: @audio)
-        @converter.input_video.should == @audio
+        @converter.convert(media: @audio)
+        @converter.input_media.should == @audio
       end
 
       context "audio file - " do
         it "should return conversion status indicating success" do
-          result = @converter.convert(video: @audio)
+          result = @converter.convert(media: @audio)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
 
         it "should allow it to be named" do
-          result = @converter.convert(video: @audio)
+          result = @converter.convert(media: @audio)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
       end
     end
@@ -50,14 +50,14 @@
   context "An invalid audio file" do
     before :each do
       @converter = Voyeur::Converter.create(format: :ogg)
-      @audio = Voyeur::Video.new(filename: 'test_video.mpeg')
+      @audio = Voyeur::Media.new(filename: 'test_media.mpeg')
     end
 
     it "should return conversion status indicating failure" do
-      result = @converter.convert(video: @audio)
+      result = @converter.convert(media: @audio)
       result[:status].should == 1
-      result[:video].should == @converter.output_video
-      result[:error_message].should match(/test_video.mpeg: No such file or directory/)
+      result[:media].should == @converter.output_media
+      result[:error_message].should match(/test_media.mpeg: No such file or directory/)
       result[:stderr].nil?.should == false
     end
   end

spec/converters/video_converters/iphone_spec.rb

@@ -3,7 +3,7 @@
 describe Voyeur::Iphone do
   before :each do
     @converter = Voyeur::Converter.create(format: :iphone)
-    @video = Voyeur::Video.new(filename: valid_mpeg_file_path)
+    @media = Voyeur::Media.new(filename: valid_mpeg_file_path)
   end
 
   it "should use the correct factory" do
@@ -14,51 +14,51 @@
     @converter.convert_options.should == "-s 320x240 -r 30000/1001 -b 200k -bt 240k -vcodec libx264 -vpre ipod320 -acodec libfaac -ac 2 -ar 48000 -ab 192k"
   end
 
-  context "A valid Video" do
+  context "A valid Media" do
     after :each do
       File.delete(valid_mpeg_file_path.gsub(/mpeg/, "mp4")) if File.exists?(valid_mpeg_file_path.gsub(/mpeg/, "mp4"))
     end
 
     context "#convert_options" do
-      it "should name the video correctly" do
-        @converter.convert(video: @video)
+      it "should name the media correctly" do
+        @converter.convert(media: @media)
         output_file = valid_mpeg_file_path.gsub(/mpeg/, "mp4")
-        @converter.output_video.filename.should == output_file
+        @converter.output_media.filename.should == output_file
       end
 
-      it "should return a video" do
-        @converter.convert(video: @video)
-        @converter.input_video.should == @video
+      it "should return a media" do
+        @converter.convert(media: @media)
+        @converter.input_media.should == @media
       end
 
-      context "real video" do
+      context "real media" do
         it "should return conversion status indicating success" do
-          result = @converter.convert(video: @video)
+          result = @converter.convert(media: @media)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
 
-        it "should allow them to name the video" do
-          result = @converter.convert(video: @video)
+        it "should allow them to name the media" do
+          result = @converter.convert(media: @media)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
       end
     end
   end
 
-  context "An invalid Video" do
+  context "An invalid Media" do
     before :each do
       @converter = Voyeur::Converter.create(format: :mp4)
-      @video = Voyeur::Video.new(filename: 'test_video.mpeg')
+      @media = Voyeur::Media.new(filename: 'test_media.mpeg')
     end
 
     context "File does not exist" do
       it "should return conversion status indicating failure" do
-        result = @converter.convert(video: @video)
+        result = @converter.convert(media: @media)
         result[:status].should == 1
-        result[:video].should == @converter.output_video
-        result[:error_message].should match(/test_video.mpeg: No such file or directory/)
+        result[:media].should == @converter.output_media
+        result[:error_message].should match(/test_media.mpeg: No such file or directory/)
         result[:stderr].nil?.should == false
       end
     end

spec/converters/video_converters/mp4_spec.rb

@@ -3,7 +3,7 @@
 describe Voyeur::Mp4 do
   before :each do
     @converter = Voyeur::Converter.create(format: :mp4)
-    @video = Voyeur::Video.new(filename: valid_mpeg_file_path)
+    @media = Voyeur::Media.new(filename: valid_mpeg_file_path)
   end
 
   it "should use the correct factory" do
@@ -14,51 +14,51 @@
     @converter.convert_options.should == "-b 1500k -vcodec libx264 -g 30"
   end
 
-  context "A valid Video" do
+  context "A valid Media" do
     after :each do
       File.delete(valid_mpeg_file_path.gsub(/mpeg/, "mp4")) if File.exists?(valid_mpeg_file_path.gsub(/mpeg/, "mp4"))
     end
 
     context "#convert_options" do
-      it "should name the video correctly" do
-        @converter.convert(video: @video)
+      it "should name the media correctly" do
+        @converter.convert(media: @media)
         output_file = valid_mpeg_file_path.gsub(/mpeg/, "mp4")
-        @converter.output_video.filename.should == output_file
+        @converter.output_media.filename.should == output_file
       end
 
-      it "should return a video" do
-        @converter.convert(video: @video)
-        @converter.input_video.should == @video
+      it "should return a media" do
+        @converter.convert(media: @media)
+        @converter.input_media.should == @media
       end
 
-      context "real video" do
+      context "real media" do
         it "should return conversion status indicating success" do
-          result = @converter.convert(video: @video)
+          result = @converter.convert(media: @media)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
 
-        it "should allow them to name the video" do
-          result = @converter.convert(video: @video)
+        it "should allow them to name the media" do
+          result = @converter.convert(media: @media)
           result[:status].should == 0
-          result[:video].should == @converter.output_video
+          result[:media].should == @converter.output_media
         end
       end
     end
   end
 
-  context "An invalid Video" do
+  context "An invalid Media" do
     before :each do
       @converter = Voyeur::Converter.create(format: :mp4)
-      @video = Voyeur::Video.new(filename: 'test_video.mpeg')
+      @media = Voyeur::Media.new(filename: 'test_media.mpeg')
     end
 
     context "File does not exist" do
       it "should return conversion status indicating failure" do
-        result = @converter.convert(video: @video)
+        result = @converter.convert(media: @media)
         result[:status].should == 1
-        result[:video].should == @converter.output_video
-        result[:error_message].should match(/test_video.mpeg: No such file or directory/)
+        result[:media].should == @converter.output_media
+        result[:error_message].should match(/test_media.mpeg: No such file or directory/)
         result[:stderr].nil?.should == false
       end
     end