popcap 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea0c001050c49c768666996a3335dfeea602e23
-  data.tar.gz: 801e023c5a89d89175f937e1dc6a8c286755d5af
+  metadata.gz: 19c8a2f61072567a49cd9cfb4dad74e9bb766741
+  data.tar.gz: e694ba3707d3d62326c089804c0eeea990bc531c
 SHA512:
-  metadata.gz: 8b139abe4a75f5e28465ee7e3fd2460f4771ef82ecc167ffe24de16581845aca690b1970f0d3dd89d55546a4d577dc50605333eac4d8fc7b7f8e9f6382ead4a5
-  data.tar.gz: 06991cac3f333aca610873228efbcae2564b798a9af10770fa126615ba24ce80cd8856f32de8aeec7be8230ced270733582939662e7a844c24e11a4307b03119
+  metadata.gz: 2f06b264c3438911551fee0766ce57312a23d703e86e7b1673025d0ffcf73d8cc3d5dbefe26d7c5aa64a91fb064dbe825c17180ef2e8d8c9d4df4e3a81f5995b
+  data.tar.gz: 949a6fab5d0f834592a37e40f1cf4456fbe42fbf2bea3fe5376e8006ca161e881d3311225031402fd5cb066caa2cf56f9fa0eac2561a5cc798afe02a32c729ee

data/lib/pop_cap/audio_file.rb

@@ -7,7 +7,10 @@ require 'pop_cap/tag_struct'
 require 'pop_cap/fileable'
 
 module PopCap
+  VALID_AUDIO_FORMATS = %q(.flac .m4a .mp3 .mp4 .ogg .wav .wma)
+
   FileNotFound = Class.new(StandardError)
+  InvalidAudioFormat = Class.new(StandardError)
   # Public: This is a class for managing audio files on the filesystem.
   # It is used to read & write metadata tags, convert between audio formats,
   # and manage a file on the filesystem using standard UNIX file commands.
@@ -30,6 +33,7 @@ module PopCap
     #
     def initialize(filepath)
       raise(FileNotFound, filepath) unless File.exists?(filepath)
+      raise(InvalidAudioFormat, filepath) unless valid_audio_format?(filepath)
       @filepath = File.realpath(filepath)
     end
 
@@ -171,5 +175,14 @@ module PopCap
       self.reload!
       self.tags
     end
+
+    private
+    def valid_audio_format?(filepath)
+      VALID_AUDIO_FORMATS.include?(file_format(filepath))
+    end
+
+    def file_format(filepath)
+      File.extname(filepath).downcase
+    end
   end
 end

data/lib/pop_cap/version.rb

@@ -1,3 +1,3 @@
 module PopCap
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/spec/lib/pop_cap/analyze_file_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'pop_cap/ffmpeg/analyze_file'
+require 'pop_cap/analyze_file'
 require 'fileutils'
 
 module PopCap

data/spec/lib/pop_cap/audio_file_spec.rb

@@ -117,5 +117,18 @@ module PopCap
         expect(File.exists?('spec/fixtures/sample.mp3')).to be_true
       end
     end
+
+    context "errors" do
+      let(:bad_file_format) { "spec/fixtures/not_audio_file.jpg" }
+
+      before { FileUtils.touch bad_file_format }
+      after { FileUtils.rm_f bad_file_format }
+
+      it "raises an error if invalid audio format" do
+        expect do
+          AudioFile.new(bad_file_format)
+        end.to raise_error
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popcap
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Culley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reek