bumped version in podspec

VIM-2669

VIMVideoPlayer.podspec

@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "VIMVideoPlayer"
-  s.version      = "5.5"
+  s.version      = "5.5.5"
   s.summary      = "A simple wrapper around the AVPlayer and AVPlayerLayer classes."
   s.description  = <<-DESC
                    VIMVideoPlayer is a simple wrapper around the AVPlayer and AVPlayerLayer classes. Check out the README for details. And the Pegasus project for a demo.
@@ -19,7 +19,14 @@ Pod::Spec.new do |s|
   s.license      = "MIT"
   s.license      = { :type => "MIT", :file => "LICENSE.md" }
 
-  s.authors            = { "Alfie Hanssen" => "alfiehanssen@gmail.com" }
+s.authors            = { "Alfie Hanssen" => "alfiehanssen@gmail.com",
+                            "Rob Huebner" => "robh@vimeo.com",
+                            "Gavin King" => "gavin@vimeo.com",
+                            "Kashif Muhammad" => "support@vimeo.com",
+                            "Andrew Whitcomb" => "support@vimeo.com",
+                            "Stephen Fredieu" => "support@vimeo.com",
+                            "Rahul Kumar" => "support@vimeo.com" }
+
   s.social_media_url   = "http://twitter.com/vimeo"
 
   # s.platform     = :ios

VIMVideoPlayer/VIMVideoPlayer.m

@@ -55,6 +55,8 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
 @property (nonatomic, assign) BOOL isTimingUpdateEnabled;
 @property (nonatomic, strong) id timeObserverToken;
 
+@property (nonatomic, strong) AVPlayerItem *item;
+
 @end
 
 @implementation VIMVideoPlayer
@@ -68,8 +70,6 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
     [self removeTimeObserver];
     
     [self cancelFadeVolume];
-
-    NSLog(@"dealloc");
 }
 
 - (instancetype)init
@@ -407,11 +407,13 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
 
 - (void)resetPlayerItemIfNecessary
 {
-    if (self.player.currentItem)
+    if (self.item)
     {
-        [self removePlayerItemObservers:self.player.currentItem];
+        [self removePlayerItemObservers:self.item];
         
         [self.player replaceCurrentItemWithPlayerItem:nil];
+        
+        self.item = nil;
     }
     
     _volumeFadeDuration = DefaultVolumeFadeDuration;
@@ -424,6 +426,10 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
 
 - (void)preparePlayerItem:(AVPlayerItem *)playerItem
 {
+    NSParameterAssert(playerItem);
+    
+    self.item = playerItem;
+    
     [self addPlayerItemObservers:playerItem];
     
     [self.player replaceCurrentItemWithPlayerItem:playerItem];
@@ -702,14 +708,25 @@ static void *VideoPlayer_PlayerItemLoadedTimeRangesContext = &VideoPlayer_Player
                 }
                 case AVPlayerItemStatusFailed:
                 {
-                    NSLog(@"Video player Status Failed: error = %@", self.player.currentItem.error);
+                    NSLog(@"Video player Status Failed: player item error = %@", self.player.currentItem.error);
+                    NSLog(@"Video player Status Failed: player error = %@", self.player.error);
                     
+                    NSError *error = self.player.error;
+                    if (!error)
+                    {
+                        error = self.player.currentItem.error;
+                    }
+                    else
+                    {
+                        error = [NSError errorWithDomain:kVideoPlayerErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"unknown player error, status == AVPlayerItemStatusFailed"}];
+                    }
+                    
+                    [self reset];
+
                     if ([self.delegate respondsToSelector:@selector(videoPlayer:didFailWithError:)])
                     {
-                        [self reset];
-                        
                         dispatch_async(dispatch_get_main_queue(), ^{
-                            [self.delegate videoPlayer:self didFailWithError:self.player.currentItem.error];
+                            [self.delegate videoPlayer:self didFailWithError:error];
                         });
                     }
                     

VIMVideoPlayer/VIMVideoPlayerView.m

@@ -40,21 +40,39 @@
     [self detachPlayer];
 }
 
-- (instancetype)init
+- (instancetype)initWithFrame:(CGRect)frame
 {
-    self = [super init];
+    self = [super initWithFrame:frame];
+    
     if (self)
     {
-        _player = [[VIMVideoPlayer alloc] init];
-        _player.muted = YES;
-        _player.looping = YES;
-        
-        [self attachPlayer];
+        [self commonInit];
     }
     
     return self;
 }
 
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    
+    if (self)
+    {
+        [self commonInit];
+    }
+    
+    return self;
+}
+
+- (void)commonInit
+{
+    _player = [[VIMVideoPlayer alloc] init];
+    _player.muted = YES;
+    _player.looping = YES;
+    
+    [self attachPlayer];
+}
+
 #pragma mark - Public API
 
 - (void)setPlayer:(VIMVideoPlayer *)player