hlspider 0.3.1 → 0.3.2

data/bin/hlspider

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-require 'optparse'
-
 begin
   require 'hlspider'
 rescue LoadError
@@ -8,6 +6,8 @@ rescue LoadError
   require 'hlspider'
 end
 
+require 'optparse'
+
 options = {}
 
 opts_parser = OptionParser.new do |opts|
@@ -44,20 +44,14 @@ else
 end
   
 while x <= options[:loop] do
-  if spider.crawl
-    if spider.aligned?
-      puts "--- Aligned at segment : #{spider.last_segments[0]} ---"
-    else
-      puts "--- Unaligned with segments : #{spider.last_segments.join(', ')} ---"
-    end
-  else
-    @errors.each do |err|
-      puts "--- #{err} ---"
-    end  
-  end    
-  
-  break if @errors
+  spider.crawl!
   
+  if spider.aligned?
+    puts "--- Aligned at segment : #{spider.last_segments[0]} ---"
+  else
+    puts "--- Unaligned with segments : #{spider.last_segments.join(', ')} ---"
+  end
+
   x += 1 unless options[:loop] == 0
   
   sleep(options[:sleep])

data/lib/hlspider/{async_download.rb → downloader.rb}

@@ -3,7 +3,9 @@ require 'eventmachine'
 require 'em-http-request'
 
 module HLSpider
-  module AsyncDownload
+  module Downloader
+    class ConnectionError < StandardError; end;
+    
     # Internal: Asynchronosly download given URLs.
     #
     # urls  - An Array of strings or a single string of URL(s)
@@ -17,9 +19,10 @@ module HLSpider
     #   # => 
     #
     # Returns the Array of responses.
-    # Raises error if there is a request problem. 
-    def async_download(urls)
-      urls = Array.new(urls)
+    # Raises HLSpider::Downloader::ConnectionError if there was a problem
+    # downloading all urls. 
+    def download(urls)
+      urls = Array(urls)
             
       responses = nil
       EventMachine.run {
@@ -40,8 +43,7 @@ module HLSpider
       if responses[:callback].size == urls.size
         responses[:callback].collect { |k,v| v }
       else
-        puts "Connection Error"
-        #raise ConnectError
+        raise ConnectionError, "No all urls returned responses."
       end    
     end  
   end  

data/lib/hlspider/playlist_line.rb

@@ -15,7 +15,7 @@ module HLSpider
     #
     # Returns Boolean.
     def has_segment?(str)
-      !!/.*.ts(\z|\?|$)/.match(str)
+      !!( str[/.*.ts(\z|\?|$)/] )
     end
 
     # Internal: Checks if String str contains links to .m3u8 file extensions.
@@ -32,7 +32,7 @@ module HLSpider
     #
     # Returns Boolean.
     def has_playlist?(str)
-      !!/.m3u8/.match(str)
+      !!( str[/.m3u8/] )
     end  
   
     # Internal: Checks if String str contains 'EXT-X-TARGETDURATION'.
@@ -49,7 +49,7 @@ module HLSpider
     #
     # Returns Boolean.
     def duration_line?(str)
-      !!/EXT-X-TARGETDURATION/.match(str)
+      !!( str[/EXT-X-TARGETDURATION/] )
     end 
   
     # Internal: Parses Integer target duration out of String str
@@ -66,10 +66,8 @@ module HLSpider
     #
     # Returns Integer or nil.
     def parse_duration(str)
-      /EXT-X-TARGETDURATION:(\d*)\z/.match(str)
-
-      if dur = Regexp.last_match(1)
-        dur.to_i
+      if dur = /EXT-X-TARGETDURATION:(\d*)\z/.match(str)
+        dur[1].to_i
       else  
         nil
       end  
@@ -104,9 +102,9 @@ module HLSpider
     #   absolute_url?("http://www.site.tld/file.m3u8")
     #   #=> true
     #
-    # Returns String or nil.    
+    # Returns Boolean.    
     def absolute_url?(str)
-      str.split("://").size > 1
+      !!( str[/\Ahtt(ps|p)\:\/\//] )
     end 
     
     # Internal: Parses string and returns whether or not it is a media sequence line.
@@ -123,7 +121,7 @@ module HLSpider
     #
     # Returns Boolean.
     def media_sequence_line?(str)
-      !!/EXT-X-MEDIA-SEQUENCE/.match(str)
+      !!( str[/EXT-X-MEDIA-SEQUENCE/] )
     end
     
     # Internal: Parses string and returns media sequence number.
@@ -137,10 +135,8 @@ module HLSpider
     #
     # Returns Integer or nil.
     def parse_sequence(line)  
-      /#EXT-X-MEDIA-SEQUENCE:\s*(\d*)/.match(line)
-      
-      if sequence = Regexp.last_match(1)
-        sequence.to_i
+      if sequence = /#EXT-X-MEDIA-SEQUENCE:\s*(\d*)/.match(line)
+        sequence[1].to_i
       else
         nil
       end    

data/lib/hlspider/spider.rb

@@ -15,24 +15,20 @@ require 'em-http-request'
 
 module HLSpider
   class Spider 
+    class InvalidPlaylist < StandardError; end;
+    
     # Public: Gets Array of urls.
     attr_reader :urls
+    
     # Public: Gets Array of valid playlists.
     attr_reader :playlists
-    # Public: Gets Array of invalid playlists.
-    attr_reader :invalid_playlists
-    # Public: Gets Array of errors.
-    attr_reader :errors
-    
+        
     # Public: Initialize a Playlist Spider.
     #
     # urls   - An Array containing multiple String urls to playlist files.
     #          Also accepts single String url that points to parent playlist.
     def initialize(urls)
-      @urls     = [urls].flatten
-      
-      @invalid_playlists = []
-      @errors            = []
+      @urls = Array(urls)
     end  
 
     # Public: Starts the download of Array urls
@@ -41,17 +37,11 @@ module HLSpider
     # Examples
     #
     #   crawl
-    #   # => true
+    #   # => [#<HLSpider::Playlist:0x10ca9bef8>, #<HLSpider::Playlist:0x10ca9bef9>]
     #
-    # Returns Boolean.
-    def crawl
-      @playlists = dive(@urls)
-      
-      if @errors.empty?
-        true
-      else
-        false
-      end    
+    # Returns Array of Playlists
+    def crawl!
+      self.playlists = dive(@urls)  
     end  
     
     # Public: Checks if playlists' segments are aligned.
@@ -77,8 +67,7 @@ module HLSpider
     #
     # Returns Array of Playlists
     def playlists
-      crawl if @playlists.nil?
-      @playlists
+      @playlists ||= crawl!
     end  
     
     # Public: Get Array of last segments across playlists. 
@@ -96,7 +85,7 @@ module HLSpider
     
     private
     
-    include AsyncDownload
+    include Downloader
     
     # Internal: Download playlists from Array urls.
     #
@@ -107,11 +96,11 @@ module HLSpider
     #   # => [#<HLSpider::Playlist:0x10ca9bef8>, #<HLSpider::Playlist:0x10ca9bef9>]
     #
     # Returns Array of Playlists.
-    # Raises Error if invalid playlists were downloaded or there was trouble downloading them.
+    # Raises HLSpider::Spider::InvalidPlaylist if an invalid playlist is downloaded.
     def dive(urls = [])
       playlists = []
             
-      responses = async_download(urls)              
+      responses = download(urls)              
       responses.each do |resp|
         p = Playlist.new(resp.response, resp.req.uri.to_s)
               
@@ -122,11 +111,11 @@ module HLSpider
             playlists << p
           end 
         else
-          @invalid_playlists << p
+          raise InvalidPlaylist, "#{p.source} was an invalid playlist."
         end  
       end
       
-      return playlists.flatten  
+      playlists.flatten  
     end     
   end  
 end

data/lib/hlspider/version.rb

@@ -1,3 +1,3 @@
 module HLSpider
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/hlspider.rb

@@ -1,7 +1,7 @@
 $:.push File.dirname(__FILE__)
 
 require 'hlspider/version'
-require 'hlspider/async_download'
+require 'hlspider/downloader'
 require 'hlspider/playlist_line'
 require 'hlspider/playlist'
 require 'hlspider/spider'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hlspider
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - brookemckim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 Z
+date: 2012-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -86,7 +86,7 @@ files:
 - bin/hlspider
 - hlspider.gemspec
 - lib/hlspider.rb
-- lib/hlspider/async_download.rb
+- lib/hlspider/downloader.rb
 - lib/hlspider/playlist.rb
 - lib/hlspider/playlist_line.rb
 - lib/hlspider/spider.rb