hlspider 0.4.0 → 0.5.0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
+  - 2.0.0
   - jruby-19mode
   - rbx-19mode
-  #- ruby-head
   - jruby-head

data/hlspider.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here
   s.add_development_dependency 'minitest', '~> 2.7.0'
+  s.add_development_dependency 'webmock'
 end

data/lib/hlspider/downloader.rb

@@ -4,8 +4,6 @@ require 'hlspider/response'
 # Internal: Asynchronsoly downloads urls and returns Array of responses.
 module HLSpider
   module Downloader
-    class DownloadError < StandardError; end;
-
     # Internal: Download given URLs.
     #
     # urls - An Array of strings or a single string of URL(s)

data/lib/hlspider/playlist.rb

@@ -143,10 +143,10 @@ module HLSpider
     #       http://hls.telvue.com/brightstar/2-1/playlist.m3u8?wowzasessionid=268983957'
     #
     # Returns String file.
-    def to_s
+    def inspect
       @file
     end  
-    alias_method :to_s, :inspect
+    alias_method :inspect, :to_s
   
   private
     include PlaylistLine
@@ -166,7 +166,7 @@ module HLSpider
         @variable_playlist = true 
 
         @file.each_line do |line|
-          @playlists << line.strip if has_playlist?(line)
+          @playlists << line[/([^ "]+.m3u8)/].strip if has_playlist?(line)
         end  
       elsif has_segment?(@file) && !has_playlist?(@file)
         @segment_playlist  = true

data/lib/hlspider/version.rb

@@ -1,3 +1,3 @@
 module HLSpider
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/hlspider/playlist_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe HLSpider::Playlist do
+  before do
+    @segments_playlist = %q{#EXTM3U
+#EXT-X-TARGETDURATION:10
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:7.12,
+segment00000.ts
+segment00001.ts
+#EXT-X-ENDLIST
+    }
+
+    @variable_playlist = %q{#EXTM3U
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=673742
+rel/playlist.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=204909
+http://anotherhost.com/playlist3.m3u8
+    }
+
+    @extra_media_playlist = %q{#EXTM3U
+#EXT-X-FAXS-CM:URI="iphone360.mp4.drmmeta"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="Portuguese",DEFAULT=YES,AUTOSELECT=YES,LANGUAGE="pt",URI="iphone.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",NAME="SAP",DEFAULT=NO,AUTOSELECT=YES,LANGUAGE="en",URI="sap.m3u8"
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=673742,CODECS="mp4a.40.2,avc1.4d401e",AUDIO="aac"
+web.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=401437,CODECS="mp4a.40.2,avc1.4d401e",AUDIO="aac"
+iphone.m3u8
+    }
+  end
+
+  it "should identify if it is a segments playlist" do
+    playlist = HLSpider::Playlist.new(@segments_playlist)
+    playlist.segment_playlist?.must_equal(true)
+    playlist.variable_playlist?.must_equal(false)
+  end
+
+  it "should identify if it is a variable playlist" do
+    playlist = HLSpider::Playlist.new(@variable_playlist)
+    playlist.variable_playlist?.must_equal(true)
+    playlist.segment_playlist?.must_equal(false)
+  end
+
+  it "should resolve relative playlists" do
+    playlist = HLSpider::Playlist.new(@variable_playlist, "http://host.com/main/playlist.m3u8")
+    playlist.playlists[0].must_equal("http://host.com/main/rel/playlist.m3u8")
+  end
+
+  it "should accept absolute playlists" do
+    playlist = HLSpider::Playlist.new(@variable_playlist, "http://host.com/main/playlist.m3u8")
+    playlist.playlists[1].must_equal("http://anotherhost.com/playlist3.m3u8")
+  end
+
+  it "should same value to to_s and inspect" do
+    playlist = HLSpider::Playlist.new(@segments_playlist)
+    playlist.to_s.must_equal(playlist.inspect)
+  end
+
+  it "should accept extra media urls on playlists" do
+    playlist = HLSpider::Playlist.new(@extra_media_playlist, "http://host.com/main/playlist.m3u8")
+    playlist.playlists.must_equal([
+    "http://host.com/main/iphone.m3u8",
+    "http://host.com/main/sap.m3u8",
+    "http://host.com/main/web.m3u8",
+    "http://host.com/main/iphone.m3u8"
+    ])
+  end
+end

data/spec/hlspider/spider_spec.rb

@@ -4,13 +4,79 @@ describe HLSpider::Spider do
   before do
     @playlist  = "http://host.com/playlist.m3u8"
     @playlists = ["http://host.com/playlist.m3u8", "http://host.com/playlist2.m3u8"]
+    stub_request(:get, "http://host.com/playlist.m3u8").to_return({:status => 200, :headers => {}, :body => %q{#EXTM3U
+#EXT-X-TARGETDURATION:10
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:7.12,
+segment00000.ts
+segment00001.ts
+#EXT-X-ENDLIST
+    }})
+    stub_request(:get, "http://host.com/playlist2.m3u8").to_return({:status => 200, :headers => {}, :body => %q{#EXTM3U
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=673742
+playlist.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=204909
+playlist3.m3u8
+    }})
+
+    stub_request(:get, "http://host.com/playlist3.m3u8").to_return({:status => 200, :headers => {}, :body => %q{#EXTM3U
+#EXT-X-TARGETDURATION:10
+#EXT-X-VERSION:3
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:7.12,
+segment00000.ts
+segment00001.ts
+segment00002.ts
+#EXT-X-ENDLIST
+    }})
+
+    stub_request(:get, "http://host.com/playlist4.m3u8").to_return({:status => 200, :headers => {}, :body => %q{#EXT-X-TARGETDURATION:10}})
   end
-  
+
   it "can be created with a String" do
     HLSpider::Spider.new(@playlist).must_be_instance_of(HLSpider::Spider)
-  end    
-  
+  end
+
   it "can be created with an Array" do
     HLSpider::Spider.new(@playlists).must_be_instance_of(HLSpider::Spider)
-  end  
-end  
+  end
+
+  it "should download the playlist content when parsing it" do
+    spider = HLSpider::Spider.new(@playlist)
+    spider.playlists.count.must_equal(1)
+    spider.playlists[0].must_be_instance_of(HLSpider::Playlist)
+    assert_requested(:get, @playlist)
+  end
+
+  it "should download recursively when the playlist if of playlists" do
+    spider = HLSpider::Spider.new(@playlists)
+    spider.playlists.count.must_equal(3)
+    spider.playlists[0].must_be_instance_of(HLSpider::Playlist)
+    spider.playlists[1].must_be_instance_of(HLSpider::Playlist)
+    spider.playlists[2].must_be_instance_of(HLSpider::Playlist)
+    assert_requested(:get, "http://host.com/playlist.m3u8", :times => 2)
+    assert_requested(:get, "http://host.com/playlist2.m3u8")
+    assert_requested(:get, "http://host.com/playlist3.m3u8")
+  end
+
+  it "should raise error when the playlist is invalid" do
+    spider = HLSpider::Spider.new("http://host.com/playlist4.m3u8")
+    assert_raises(HLSpider::Spider::InvalidPlaylist) {
+      spider.playlists
+    }
+  end
+
+  it "should return the last segment of each playlist" do
+    spider = HLSpider::Spider.new(@playlists)
+    spider.last_segments.must_equal([0, 0, 0])
+  end
+
+  it "should check if the playlists are aligned" do
+    spider = HLSpider::Spider.new(@playlists)
+    spider.aligned?.must_equal(true)
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
 require 'minitest/autorun'
+require 'webmock/minitest'
 require 'hlspider'
 
+WebMock.disable_net_connect!
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hlspider
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - brookemckim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-13 00:00:00 Z
+date: 2013-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -33,6 +33,20 @@ dependencies:
         version: 2.7.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.
 email: 
 - brooke.mckim@gmail.com
@@ -60,6 +74,7 @@ files:
 - lib/hlspider/spider.rb
 - lib/hlspider/version.rb
 - spec/hlspider/playlist_line_spec.rb
+- spec/hlspider/playlist_spec.rb
 - spec/hlspider/spider_spec.rb
 - spec/hlspider_spec.rb
 - spec/spec_helper.rb
@@ -98,6 +113,7 @@ specification_version: 3
 summary: Download and parse .m3u8 playlists.
 test_files: 
 - spec/hlspider/playlist_line_spec.rb
+- spec/hlspider/playlist_spec.rb
 - spec/hlspider/spider_spec.rb
 - spec/hlspider_spec.rb
 - spec/spec_helper.rb