From c67165f91094457e0d12cec1a255b857e0a6380e Mon Sep 17 00:00:00 2001
From: Matthew Nichols <matt@nichols.name>
Date: Tue, 17 Mar 2015 21:21:00 -0600
Subject: [PATCH] Upgrades rspec and adds support for m4a files.

---
 atomic-parsley-ruby.gemspec     |  1 +
 lib/atomic-parsley-ruby/file.rb |  2 +-
 spec/dependency_spec.rb         |  2 +-
 spec/file_spec.rb               | 13 +++++++++----
 spec/media_spec.rb              |  4 ++--
 spec/spec_helper.rb             |  1 +
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/atomic-parsley-ruby.gemspec b/atomic-parsley-ruby.gemspec
index adf1e9d..433b5e8 100644
--- a/atomic-parsley-ruby.gemspec
+++ b/atomic-parsley-ruby.gemspec
@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "mocha"
 end
diff --git a/lib/atomic-parsley-ruby/file.rb b/lib/atomic-parsley-ruby/file.rb
index f632cfa..81f5ed8 100644
--- a/lib/atomic-parsley-ruby/file.rb
+++ b/lib/atomic-parsley-ruby/file.rb
@@ -1,7 +1,7 @@
 module AtomicParsleyRuby
   module File
     def self.valid?(fn)
-      if ![".m4v", ".mp4", ".mp3"].include?(::File.extname(fn))
+      if ![".m4v", ".mp4", ".mp3", ".m4a"].include?(::File.extname(fn))
         raise ::AtomicParsleyRuby::Exception, "Invalid file type."
       end
       true
diff --git a/spec/dependency_spec.rb b/spec/dependency_spec.rb
index c68698a..cd42ac2 100644
--- a/spec/dependency_spec.rb
+++ b/spec/dependency_spec.rb
@@ -4,7 +4,7 @@ module AtomicParsleyRuby
   describe Dependency do
      it "raises an exception when AtomicParsley in not in your path" do
       Dependency.stubs("which").with("AtomicParsley").returns("/usr/bin/AtomicParsley")
-      Dependency.path.should eq "/usr/bin/AtomicParsley"
+      expect(Dependency.path).to eq "/usr/bin/AtomicParsley"
      end
 
      it "returns the path when AtomicParsley is in your path" do
diff --git a/spec/file_spec.rb b/spec/file_spec.rb
index ecdd5fa..db0e56f 100644
--- a/spec/file_spec.rb
+++ b/spec/file_spec.rb
@@ -1,21 +1,26 @@
 require "spec_helper"
 
 module AtomicParsleyRuby
-  describe File do
+  RSpec.describe File do
     it "raises an error when an incorrect file name is passed" do
       expect {::AtomicParsleyRuby::File.valid?("test.txt")}.to raise_error(::AtomicParsleyRuby::Exception,"Invalid file type.")
     end
 
     it "does not raise an error for mp4s" do
-      ::AtomicParsleyRuby::File.valid?("test.mp4").should be_true
+      expect(::AtomicParsleyRuby::File.valid?("test.mp4")).to be true
     end
 
     its "does not raise an error for m4vs" do
-      ::AtomicParsleyRuby::File.valid?("test.m4v").should be_true
+      expect(::AtomicParsleyRuby::File.valid?("test.m4v")).to be true
     end
 
     its "does not raise an error for mp3s" do
-      ::AtomicParsleyRuby::File.valid?("test.mp3").should be_true
+      expect(::AtomicParsleyRuby::File.valid?("test.mp3")).to be true
     end
+    
+    it "does not raise an error for m4as" do
+      expect(::AtomicParsleyRuby::File.valid?("test.m4a")).to be true
+    end
+    
   end
 end
\ No newline at end of file
diff --git a/spec/media_spec.rb b/spec/media_spec.rb
index 1693940..ec147c7 100644
--- a/spec/media_spec.rb
+++ b/spec/media_spec.rb
@@ -20,7 +20,7 @@ module AtomicParsleyRuby
         ::AtomicParsleyRuby::Dependency.stubs(:path).returns("AtomicParsley")
         v = Media.new("test.mp4")
         v.send(flag, "test-value")
-        v.cmd.should eq "AtomicParsley test.mp4 --#{flag.to_s} test-value"
+        expect(v.cmd).to eq "AtomicParsley test.mp4 --#{flag.to_s} test-value"
       end
     end
 
@@ -33,7 +33,7 @@ module AtomicParsleyRuby
         config.year "2012"
         config.genre "Punk Rock"
       end
-      v.cmd.should eq "AtomicParsley test.mp4 --artist Some\\ Guy --year 2012 --genre Punk\\ Rock test.mp4 --artist Some\\ Guy --year 2012 --genre Punk\\ Rock"
+      expect(v.cmd).to eq "AtomicParsley test.mp4 --artist Some\\ Guy --year 2012 --genre Punk\\ Rock test.mp4 --artist Some\\ Guy --year 2012 --genre Punk\\ Rock"
     end
 
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0d3fa03..722479e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec/its'
 
 require 'atomic-parsley-ruby' # and any other gems you need