m3u8 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fca5696b131d1b9c9eda4235a34cf23353716d8
-  data.tar.gz: 0582cd52fb35119e458c373f6163be4d0eb8e4b0
+  metadata.gz: 862441ecee4bbc8fe057efdefe16649ba31b6276
+  data.tar.gz: 2f9995c6089dcb771fc6a6781936952b4ad03200
 SHA512:
-  metadata.gz: d5b4df0be5dfea3e309644f28d2e00cd26ef9b92a9a018ff0e7714086f2c19d5f16bf40329d8e03938be20a4e829da3edc068aee820b7ab723a41e4defa5c61c
-  data.tar.gz: 8a137600403c6564591422778cf02cc43d6cb5baa9d51a3dcbce6d526e6fa30ed66f1a185d4523e8585ad362726f3e84a5b89ed4c7b56dd015ad90803c565aa2
+  metadata.gz: 94a2443f80f7f7f8d780bdd2d0fbc7ef2b8fe22c79e4753a292e1e48dfa740fd02817774408658adf2545fb82aecd93d56be156a1b0affe18d302376f2ff5394
+  data.tar.gz: 278b7d96d867e107d693874a35ee101c10b51800379b261e6d7b7c7728c55fec0b8a37e08af6080a01bd9e303c35edfbaff496d85c0eb1b6f0c1b473368b0bbe

data/README.md

@@ -6,7 +6,7 @@
 [![security](https://hakiri.io/github/sethdeckard/m3u8/master.svg)](https://hakiri.io/github/sethdeckard/m3u8/master)
 # m3u8
 
-m3u8 provides generation of m3u8 playlists used the [HTTP Live Streaming](https://developer.apple.com/library/ios/documentation/networkinginternet/conceptual/streamingmediaguide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40008332-CH1-SW1) (HLS) specification created by Apple. This is useful if you wish to generate m3u8 playlists on the fly in your web application (to integrate authentication, do something custom,  etc) while of course serving up the actual MPEG transport stream files (.ts) from a CDN. You could also use m3u8 to generate playlist files as part of an encoding pipeline.
+m3u8 provides generation and parsing of m3u8 playlists used the [HTTP Live Streaming](https://developer.apple.com/library/ios/documentation/networkinginternet/conceptual/streamingmediaguide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40008332-CH1-SW1) (HLS) specification created by Apple. This is useful if you wish to generate m3u8 playlists on the fly in your web application (to integrate authentication, do something custom,  etc) while of course serving up the actual MPEG transport stream files (.ts) from a CDN. You could also use m3u8 to generate playlist files as part of an encoding pipeline. You can also parse existing playlists, add content to them and generate a new output.
 
 ## Installation
 
@@ -24,7 +24,7 @@ Or install it yourself as:
 
     $ gem install m3u8
 
-## Usage
+## Usage (Generation)
 
 
 	require 'm3u8'
@@ -38,10 +38,14 @@ Or install it yourself as:
     playlist = M3u8::Playlist.new
     playlist.add_segment 11.344644, "1080-7mbps00000.ts"
     
+    #you can also add PlaylistItem or SegmentItem instances directly to the array of items in the playlist (new in v.2.0):
+    item = SegmentItem.new(duration: 11, segment: 'test.ts')
+    playlist.items.push item
+    
     #just get the codec string for custom use
     options = { :profile => 'baseline', :level => 3.0, :audio => 'aac-lc' }
     codecs = M3u8::Playlist.codecs options
-    #=> "avc1.66.30,mp4a.40.2"
+     => "avc1.66.30,mp4a.40.2"
 	
 	#specify options for playlist, these are ignored if playlist becomes a master playlist (child playlist added):
 	options = { :version => 1, :cache => false, :target => 12, :sequence => 1}
@@ -65,13 +69,32 @@ Or install it yourself as:
     #3.0, 3.1, 4.0, 4.1
     
     #not all Levels and Profiles can be combined, consult H.264 documentation
+
+## Parsing Usage (new in v.2.0)
+
+    file = File.open 'spec/fixtures/master.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+    playlist.master?
+     => true
+
+    #acess items in playlist:
+    playlist.items
+
+    playlist.items.first
+      => #<M3u8::PlaylistItem:0x007fa569bc7698 @program_id="1", @resolution="1920x1080", @codecs="avc1.640028,mp4a.40.2", @bandwidth="5042000", @playlist="hls/1080-7mbps/1080-7mbps.m3u8">
 	
 ## Features
-* Distinction between segment and master playlists are handled automatically (no need to use a different class)
+* Distinction between segment and master playlists is handled automatically (no need to use a different class).
 * Automatically generates the audio/video codec string based on names and options you are familar with.
 * Provides validation of input when adding playlists or segments.
 * Allows all options to be configured on a playlist (caching, version, etc.)
 * Can write playlist to an IO object (StringIO/File, etc) or access string via to_s.
+* Can read playlists into a model (Playlist and Items) from an IO object.
+
+## Missing (but planned) Features 
+* Support for encryption keys and DRM.
+* Support for more obscure tags.
 
 ## Contributing
 

data/lib/m3u8.rb

@@ -1,6 +1,9 @@
 require 'stringio'
 require 'm3u8/version'
 require 'm3u8/playlist'
+require 'm3u8/playlist_item'
+require 'm3u8/segment_item'
+require 'm3u8/reader'
 require 'm3u8/error'
 
 module M3u8

data/lib/m3u8/playlist.rb

@@ -1,25 +1,30 @@
 module M3u8
   class Playlist
-    attr_accessor :io, :options, :header, :empty, :master
+    attr_accessor :items, :version, :cache, :target, :sequence
     MISSING_CODEC_MESSAGE = 'An audio or video codec should be provided.'
     NON_MASTER_ERROR_MESSAGE = 'Playlist is not a master playlist, playlist' \
       ' can not be added.'
     MASTER_ERROR_MESSAGE = 'Playlist is a master playlist, segment can not ' \
       'be added.'
+    MIXED_TYPE_ERROR_MESSAGE = 'Playlist contains mixed types of items'
 
     def initialize(options = {})
-      self.options = {
+      assign_options options
+      self.items = []
+    end
+
+    def assign_options(options)
+      options = {
         version: 3,
         sequence: 0,
         cache: true,
         target: 10
       }.merge options
 
-      self.header = false
-      self.empty = true
-      self.master = nil
-      self.io = StringIO.open
-      io.puts '#EXTM3U'
+      self.version = options[:version]
+      self.sequence = options[:sequence]
+      self.cache = options[:cache]
+      self.target = options[:target]
     end
 
     def self.codecs(options = {})
@@ -37,30 +42,24 @@ module M3u8
       }.merge options
 
       validate_playlist_type true
-      self.master = true
-      self.empty = false
 
-      resolution = resolution options[:width], options[:height]
       codecs = codecs(audio: options[:audio], profile: options[:profile],
                       level: options[:level])
       fail MissingCodecError, MISSING_CODEC_MESSAGE if codecs.nil?
-      io.puts "#EXT-X-STREAM-INF:PROGRAM-ID=#{program_id},#{resolution}" +
-        %Q{CODECS="#{codecs}",BANDWIDTH=#{bitrate}}
-      io.puts playlist
+
+      params = { program_id: program_id, playlist: playlist, bitrate: bitrate,
+                 width: options[:width], height: options[:height],
+                 codecs: codecs }
+      item = PlaylistItem.new params
+      items.push item
     end
 
     def add_segment(duration, segment)
       validate_playlist_type false
-      self.master = false
-      self.empty = false
-
-      unless header
-        write_header
-        self.header = true
-      end
 
-      io.puts "#EXTINF:#{duration},"
-      io.puts segment
+      params = { duration: duration, segment: segment }
+      item = SegmentItem.new params
+      items.push item
     end
 
     def codecs(options = {})
@@ -85,26 +84,44 @@ module M3u8
     end
 
     def write(output)
-      output.puts to_s
+      validate
+
+      output.puts '#EXTM3U'
+      write_header(output) unless master?
+
+      items.each do |item|
+        output.puts item.to_s
+      end
+
+      return if master?
+      output.puts '#EXT-X-ENDLIST'
     end
 
     def master?
-      return false if empty
-      master
+      return false if playlist_size == 0 && segment_size == 0
+      playlist_size > 0
     end
 
     def to_s
-      if master?
-        io.string
-      else
-        "#{io.string}#EXT-X-ENDLIST"
-      end
+      output = StringIO.open
+      write output
+      output.string
+    end
+
+    def valid?
+      return false if playlist_size > 0 && segment_size > 0
+      true
     end
 
     private
 
+    def validate
+      return if valid?
+      fail PlaylistTypeError, MIXED_TYPE_ERROR_MESSAGE
+    end
+
     def validate_playlist_type(master)
-      return if empty
+      return if items.size == 0
       if master && !master?
         fail PlaylistTypeError, NON_MASTER_ERROR_MESSAGE
       elsif !master && master?
@@ -112,15 +129,23 @@ module M3u8
       end
     end
 
-    def write_header
-      io.puts "#EXT-X-VERSION:#{options[:version]}"
-      io.puts "#EXT-X-MEDIA-SEQUENCE:#{options[:sequence]}"
-      io.puts "#EXT-X-ALLOW-CACHE:#{cache_string}"
-      io.puts "#EXT-X-TARGETDURATION:#{options[:target]}"
+    def playlist_size
+      items.select { |item| item.is_a?(PlaylistItem) }.size
+    end
+
+    def segment_size
+      items.select { |item| item.is_a?(SegmentItem) }.size
+    end
+
+    def write_header(output)
+      output.puts "#EXT-X-VERSION:#{version}"
+      output.puts "#EXT-X-MEDIA-SEQUENCE:#{sequence}"
+      output.puts "#EXT-X-ALLOW-CACHE:#{cache_string}"
+      output.puts "#EXT-X-TARGETDURATION:#{target}"
     end
 
     def cache_string
-      options[:cache] ? 'YES' : 'NO'
+      cache ? 'YES' : 'NO'
     end
 
     def audio_codec(audio)
@@ -143,10 +168,5 @@ module M3u8
       return 'avc1.640028' if profile == 'high' &&
                               (level == 4.0 || level == 4.1)
     end
-
-    def resolution(width, height)
-      return if width.nil?
-      "RESOLUTION=#{width}x#{height},"
-    end
   end
 end

data/lib/m3u8/playlist_item.rb

@@ -0,0 +1,28 @@
+module M3u8
+  class PlaylistItem
+    attr_accessor :program_id, :width, :height, :codecs, :bitrate, :playlist
+
+    def initialize(params = {})
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def resolution
+      return if width.nil?
+      "#{width}x#{height}"
+    end
+
+    def to_s
+      "#EXT-X-STREAM-INF:PROGRAM-ID=#{program_id},#{resolution_format}" +
+        %(CODECS="#{codecs}",BANDWIDTH=#{bitrate}\n#{playlist})
+    end
+
+    private
+
+    def resolution_format
+      return if resolution.nil?
+      "RESOLUTION=#{resolution},"
+    end
+  end
+end

data/lib/m3u8/reader.rb

@@ -0,0 +1,117 @@
+module M3u8
+  class Reader
+    attr_accessor :playlist, :item, :open, :master
+    PLAYLIST_START = '#EXTM3U'
+    VERSION_START = '#EXT-X-VERSION:'
+    SEQUENCE_START = '#EXT-X-MEDIA-SEQUENCE:'
+    CACHE_START = '#EXT-X-ALLOW-CACHE:'
+    TARGET_START = '#EXT-X-TARGETDURATION:'
+    STREAM_START = '#EXT-X-STREAM-INF:'
+    SEGMENT_START = '#EXTINF:'
+    PROGRAM_ID = 'PROGRAM-ID'
+    RESOLUTION = 'RESOLUTION'
+    CODECS = 'CODECS'
+    BANDWIDTH = 'BANDWIDTH'
+
+    def initialize
+      self.playlist = Playlist.new
+    end
+
+    def read(input)
+      input.each_line do |line|
+        parse_line line
+      end
+      playlist
+    end
+
+    private
+
+    def parse_line(line)
+      return if line.start_with? PLAYLIST_START
+
+      if line.start_with? VERSION_START
+        parse_version line
+      elsif line.start_with? SEQUENCE_START
+        parse_sequence line
+      elsif line.start_with? CACHE_START
+        parse_cache line
+      elsif line.start_with? TARGET_START
+        parse_target line
+      elsif line.start_with? STREAM_START
+        parse_stream line
+      elsif line.start_with? SEGMENT_START
+        parse_segment line
+      elsif !item.nil? && open
+        parse_value(line)
+      end
+    end
+
+    def parse_version(line)
+      playlist.version = line.gsub(VERSION_START, '').to_i
+    end
+
+    def parse_sequence(line)
+      playlist.sequence = line.gsub(SEQUENCE_START, '').to_i
+    end
+
+    def parse_cache(line)
+      line = line.gsub(CACHE_START, '')
+      playlist.cache = parse_yes_no(line)
+    end
+
+    def parse_yes_no(string)
+      string == 'YES' ? true : false
+    end
+
+    def parse_target(line)
+      playlist.target = line.gsub(TARGET_START, '').to_i
+    end
+
+    def parse_stream(line)
+      self.master = true
+      self.open = true
+
+      self.item = M3u8::PlaylistItem.new
+      line = line.gsub STREAM_START, ''
+      attributes = line.scan(/([A-z-]+)\s*=\s*("[^"]*"|[^,]*)/)
+      attributes.each do |pair|
+        value = pair[1].gsub("\n", '').gsub('"', '')
+        case pair[0]
+        when PROGRAM_ID
+          item.program_id = value
+        when RESOLUTION
+          parse_resolution value
+        when CODECS
+          item.codecs = value
+        when BANDWIDTH
+          item.bitrate = value.to_i
+        end
+      end
+    end
+
+    def parse_segment(line)
+      self.master = false
+      self.open = true
+
+      self.item = M3u8::SegmentItem.new
+      item.duration = line.gsub(SEGMENT_START, '').gsub("\n", '').gsub(',', '')
+        .to_f
+    end
+
+    def parse_resolution(resolution)
+      item.width = resolution.split('x')[0].to_i
+      item.height = resolution.split('x')[1].to_i
+    end
+
+    def parse_value(line)
+      value = line.gsub "\n", ''
+      if master
+        item.playlist = value
+      else
+        item.segment = value
+      end
+      playlist.items.push item
+      self.open = false
+    end
+  end
+end

data/lib/m3u8/segment_item.rb

@@ -0,0 +1,15 @@
+module M3u8
+  class SegmentItem
+    attr_accessor :duration, :segment
+
+    def initialize(params = {})
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def to_s
+      "#EXTINF:#{duration},\n#{segment}"
+    end
+  end
+end

data/lib/m3u8/version.rb

@@ -1,3 +1,3 @@
 module M3u8
-  VERSION = "0.1.3"
+  VERSION = '0.2.0'
 end

data/m3u8.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = M3u8::VERSION
   spec.authors       = ["Seth Deckard"]
   spec.email         = ["seth@deckard.me"]
-  spec.summary       = %q{Generate m3u8 playlists for HTTP Live Streaming (HLS).}
-  spec.description   = %q{Generate m3u8 playlists for HTTP Live Streaming (HLS).}
+  spec.summary       = %q{Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).}
+  spec.description   = %q{Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).}
   spec.homepage      = "https://github.com/sethdeckard/m3u8"
   spec.license       = "MIT"
 

data/spec/fixtures/master.m3u8

@@ -0,0 +1,13 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=1920x1080,CODECS="avc1.640028,mp4a.40.2",BANDWIDTH=5042000
+hls/1080-7mbps/1080-7mbps.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=1920x1080,CODECS="avc1.640028,mp4a.40.2",BANDWIDTH=4853000
+hls/1080/1080.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=1280x720,CODECS="avc1.4d001f,mp4a.40.2",BANDWIDTH=2387000
+hls/720/720.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=896x504,CODECS="avc1.4d001f,mp4a.40.2",BANDWIDTH=1365000
+hls/504/504.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=640x360,CODECS="avc1.66.30,mp4a.40.2",BANDWIDTH=861000
+hls/360/360.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="mp4a.40.2",BANDWIDTH=6400
+hls/64k/64k.m3u8

data/spec/fixtures/playlist.m3u8

@@ -0,0 +1,282 @@
+#EXTM3U
+#EXT-X-VERSION:4
+#EXT-X-MEDIA-SEQUENCE:1
+#EXT-X-ALLOW-CACHE:NO
+#EXT-X-TARGETDURATION:12
+#EXTINF:11.344644,
+1080-7mbps00000.ts
+#EXTINF:11.261233,
+1080-7mbps00001.ts
+#EXTINF:7.507489,
+1080-7mbps00002.ts
+#EXTINF:11.261233,
+1080-7mbps00003.ts
+#EXTINF:11.261233,
+1080-7mbps00004.ts
+#EXTINF:7.507489,
+1080-7mbps00005.ts
+#EXTINF:11.261233,
+1080-7mbps00006.ts
+#EXTINF:11.261233,
+1080-7mbps00007.ts
+#EXTINF:7.507478,
+1080-7mbps00008.ts
+#EXTINF:11.261233,
+1080-7mbps00009.ts
+#EXTINF:11.261233,
+1080-7mbps00010.ts
+#EXTINF:7.507478,
+1080-7mbps00011.ts
+#EXTINF:11.261233,
+1080-7mbps00012.ts
+#EXTINF:11.261233,
+1080-7mbps00013.ts
+#EXTINF:7.507489,
+1080-7mbps00014.ts
+#EXTINF:11.261233,
+1080-7mbps00015.ts
+#EXTINF:11.261233,
+1080-7mbps00016.ts
+#EXTINF:7.507489,
+1080-7mbps00017.ts
+#EXTINF:11.261233,
+1080-7mbps00018.ts
+#EXTINF:11.261233,
+1080-7mbps00019.ts
+#EXTINF:7.507478,
+1080-7mbps00020.ts
+#EXTINF:11.261233,
+1080-7mbps00021.ts
+#EXTINF:11.261233,
+1080-7mbps00022.ts
+#EXTINF:7.507478,
+1080-7mbps00023.ts
+#EXTINF:11.261233,
+1080-7mbps00024.ts
+#EXTINF:11.261233,
+1080-7mbps00025.ts
+#EXTINF:7.507489,
+1080-7mbps00026.ts
+#EXTINF:11.261233,
+1080-7mbps00027.ts
+#EXTINF:11.261233,
+1080-7mbps00028.ts
+#EXTINF:7.507489,
+1080-7mbps00029.ts
+#EXTINF:11.261233,
+1080-7mbps00030.ts
+#EXTINF:11.261233,
+1080-7mbps00031.ts
+#EXTINF:7.507478,
+1080-7mbps00032.ts
+#EXTINF:11.261233,
+1080-7mbps00033.ts
+#EXTINF:11.261233,
+1080-7mbps00034.ts
+#EXTINF:7.507489,
+1080-7mbps00035.ts
+#EXTINF:11.261233,
+1080-7mbps00036.ts
+#EXTINF:11.261222,
+1080-7mbps00037.ts
+#EXTINF:7.507489,
+1080-7mbps00038.ts
+#EXTINF:11.261233,
+1080-7mbps00039.ts
+#EXTINF:11.261233,
+1080-7mbps00040.ts
+#EXTINF:7.507489,
+1080-7mbps00041.ts
+#EXTINF:11.261233,
+1080-7mbps00042.ts
+#EXTINF:11.261233,
+1080-7mbps00043.ts
+#EXTINF:7.507478,
+1080-7mbps00044.ts
+#EXTINF:11.261233,
+1080-7mbps00045.ts
+#EXTINF:11.261233,
+1080-7mbps00046.ts
+#EXTINF:7.507489,
+1080-7mbps00047.ts
+#EXTINF:11.261233,
+1080-7mbps00048.ts
+#EXTINF:11.261222,
+1080-7mbps00049.ts
+#EXTINF:7.507489,
+1080-7mbps00050.ts
+#EXTINF:11.261233,
+1080-7mbps00051.ts
+#EXTINF:11.261233,
+1080-7mbps00052.ts
+#EXTINF:7.507489,
+1080-7mbps00053.ts
+#EXTINF:11.261233,
+1080-7mbps00054.ts
+#EXTINF:11.261233,
+1080-7mbps00055.ts
+#EXTINF:7.507478,
+1080-7mbps00056.ts
+#EXTINF:11.261233,
+1080-7mbps00057.ts
+#EXTINF:11.261233,
+1080-7mbps00058.ts
+#EXTINF:7.507489,
+1080-7mbps00059.ts
+#EXTINF:11.261233,
+1080-7mbps00060.ts
+#EXTINF:11.261222,
+1080-7mbps00061.ts
+#EXTINF:7.507489,
+1080-7mbps00062.ts
+#EXTINF:11.261233,
+1080-7mbps00063.ts
+#EXTINF:11.261233,
+1080-7mbps00064.ts
+#EXTINF:7.507489,
+1080-7mbps00065.ts
+#EXTINF:11.261233,
+1080-7mbps00066.ts
+#EXTINF:11.261233,
+1080-7mbps00067.ts
+#EXTINF:7.507478,
+1080-7mbps00068.ts
+#EXTINF:11.261233,
+1080-7mbps00069.ts
+#EXTINF:11.261233,
+1080-7mbps00070.ts
+#EXTINF:7.507489,
+1080-7mbps00071.ts
+#EXTINF:11.261233,
+1080-7mbps00072.ts
+#EXTINF:11.261233,
+1080-7mbps00073.ts
+#EXTINF:7.507489,
+1080-7mbps00074.ts
+#EXTINF:11.261222,
+1080-7mbps00075.ts
+#EXTINF:11.261233,
+1080-7mbps00076.ts
+#EXTINF:7.507489,
+1080-7mbps00077.ts
+#EXTINF:11.261233,
+1080-7mbps00078.ts
+#EXTINF:11.261233,
+1080-7mbps00079.ts
+#EXTINF:7.507478,
+1080-7mbps00080.ts
+#EXTINF:11.261233,
+1080-7mbps00081.ts
+#EXTINF:11.261233,
+1080-7mbps00082.ts
+#EXTINF:7.507489,
+1080-7mbps00083.ts
+#EXTINF:11.261233,
+1080-7mbps00084.ts
+#EXTINF:11.261233,
+1080-7mbps00085.ts
+#EXTINF:7.507489,
+1080-7mbps00086.ts
+#EXTINF:11.261222,
+1080-7mbps00087.ts
+#EXTINF:11.261233,
+1080-7mbps00088.ts
+#EXTINF:7.507489,
+1080-7mbps00089.ts
+#EXTINF:11.261233,
+1080-7mbps00090.ts
+#EXTINF:11.261233,
+1080-7mbps00091.ts
+#EXTINF:7.507478,
+1080-7mbps00092.ts
+#EXTINF:11.261233,
+1080-7mbps00093.ts
+#EXTINF:11.261233,
+1080-7mbps00094.ts
+#EXTINF:7.507489,
+1080-7mbps00095.ts
+#EXTINF:11.261233,
+1080-7mbps00096.ts
+#EXTINF:11.261233,
+1080-7mbps00097.ts
+#EXTINF:7.507489,
+1080-7mbps00098.ts
+#EXTINF:11.261222,
+1080-7mbps00099.ts
+#EXTINF:11.261233,
+1080-7mbps00100.ts
+#EXTINF:7.507489,
+1080-7mbps00101.ts
+#EXTINF:11.261233,
+1080-7mbps00102.ts
+#EXTINF:11.261233,
+1080-7mbps00103.ts
+#EXTINF:7.507478,
+1080-7mbps00104.ts
+#EXTINF:11.261233,
+1080-7mbps00105.ts
+#EXTINF:11.261233,
+1080-7mbps00106.ts
+#EXTINF:7.507489,
+1080-7mbps00107.ts
+#EXTINF:11.261233,
+1080-7mbps00108.ts
+#EXTINF:11.261233,
+1080-7mbps00109.ts
+#EXTINF:7.507489,
+1080-7mbps00110.ts
+#EXTINF:11.261233,
+1080-7mbps00111.ts
+#EXTINF:11.261233,
+1080-7mbps00112.ts
+#EXTINF:7.507478,
+1080-7mbps00113.ts
+#EXTINF:11.261233,
+1080-7mbps00114.ts
+#EXTINF:11.261233,
+1080-7mbps00115.ts
+#EXTINF:7.507478,
+1080-7mbps00116.ts
+#EXTINF:11.261233,
+1080-7mbps00117.ts
+#EXTINF:7.507478,
+1080-7mbps00118.ts
+#EXTINF:11.261233,
+1080-7mbps00119.ts
+#EXTINF:11.261233,
+1080-7mbps00120.ts
+#EXTINF:7.507489,
+1080-7mbps00121.ts
+#EXTINF:11.261233,
+1080-7mbps00122.ts
+#EXTINF:11.261233,
+1080-7mbps00123.ts
+#EXTINF:7.507489,
+1080-7mbps00124.ts
+#EXTINF:11.261222,
+1080-7mbps00125.ts
+#EXTINF:11.261233,
+1080-7mbps00126.ts
+#EXTINF:7.507489,
+1080-7mbps00127.ts
+#EXTINF:11.261233,
+1080-7mbps00128.ts
+#EXTINF:11.261233,
+1080-7mbps00129.ts
+#EXTINF:7.507478,
+1080-7mbps00130.ts
+#EXTINF:11.261233,
+1080-7mbps00131.ts
+#EXTINF:11.261233,
+1080-7mbps00132.ts
+#EXTINF:7.507489,
+1080-7mbps00133.ts
+#EXTINF:11.261233,
+1080-7mbps00134.ts
+#EXTINF:11.261233,
+1080-7mbps00135.ts
+#EXTINF:7.507489,
+1080-7mbps00136.ts
+#EXTINF:1.793444,
+1080-7mbps00137.ts
+#EXT-X-ENDLIST

data/spec/playlist_item_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe M3u8::PlaylistItem do
+  it 'should initialize with hash' do
+    hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
+             bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    expect(item.program_id).to eq 1
+    expect(item.width).to eq 1920
+    expect(item.height).to eq 1080
+    expect(item.resolution).to eq '1920x1080'
+    expect(item.codecs).to eq 'avc'
+    expect(item.bitrate).to eq 540
+    expect(item.playlist).to eq 'test.url'
+  end
+
+  it 'should provide m3u8 format representation' do
+    hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
+             bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=1920x1080,' +
+               %(CODECS="avc",BANDWIDTH=540\ntest.url)
+    expect(output).to eq expected
+
+    hash = { program_id: 1, codecs: 'avc', bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-STREAM-INF:PROGRAM-ID=1,' +
+               %(CODECS="avc",BANDWIDTH=540\ntest.url)
+    expect(output).to eq expected
+  end
+end

data/spec/playlist_spec.rb

@@ -123,7 +123,7 @@ describe M3u8::Playlist do
       "#EXT-X-TARGETDURATION:10\n" \
       "#EXTINF:11.344644,\n" \
       "1080-7mbps00000.ts\n" \
-      '#EXT-X-ENDLIST'
+      "#EXT-X-ENDLIST\n"
 
     expect(playlist.to_s).to eq output
 
@@ -138,7 +138,7 @@ describe M3u8::Playlist do
       "1080-7mbps00000.ts\n" \
       "#EXTINF:11.261233,\n" \
       "1080-7mbps00001.ts\n" \
-      '#EXT-X-ENDLIST'
+      "#EXT-X-ENDLIST\n"
 
     expect(playlist.to_s).to eq output
 
@@ -153,7 +153,7 @@ describe M3u8::Playlist do
       "#EXT-X-TARGETDURATION:12\n" \
       "#EXTINF:11.344644,\n" \
       "1080-7mbps00000.ts\n" \
-      '#EXT-X-ENDLIST'
+      "#EXT-X-ENDLIST\n"
 
     expect(playlist.to_s).to eq output
   end
@@ -203,6 +203,47 @@ describe M3u8::Playlist do
       .to raise_error(M3u8::PlaylistTypeError, message)
   end
 
+  it 'should raise error on write if item types are mixed' do
+    playlist = M3u8::Playlist.new
+
+    hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
+             bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    playlist.items.push item
+
+    hash = { duration: 10.991, segment: 'test.ts' }
+    item = M3u8::SegmentItem.new(hash)
+    playlist.items.push item
+
+    message = 'Playlist contains mixed types of items'
+    io = StringIO.new
+    expect { playlist.write io }
+      .to raise_error(M3u8::PlaylistTypeError, message)
+  end
+
+  it 'should return valid status' do
+    playlist = M3u8::Playlist.new
+    expect(playlist.valid?).to be true
+
+    hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
+             bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    playlist.items.push item
+    expect(playlist.valid?).to be true
+
+    hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
+             bitrate: 540, playlist: 'test.url' }
+    item = M3u8::PlaylistItem.new(hash)
+    playlist.items.push item
+    expect(playlist.valid?).to be true
+
+    hash = { duration: 10.991, segment: 'test.ts' }
+    item = M3u8::SegmentItem.new(hash)
+    playlist.items.push item
+
+    expect(playlist.valid?).to be false
+  end
+
   it 'should raise error if codecs are missing' do
     playlist = M3u8::Playlist.new
     message = 'An audio or video codec should be provided.'
@@ -210,4 +251,12 @@ describe M3u8::Playlist do
       .to raise_error(M3u8::MissingCodecError, message)
   end
 
+  it 'should expose options as attributes' do
+    options = { version: 1, cache: false, target: 12, sequence: 1 }
+    playlist = M3u8::Playlist.new options
+    expect(playlist.version).to be 1
+    expect(playlist.cache).to be false
+    expect(playlist.target).to be 12
+    expect(playlist.sequence).to be 1
+  end
 end

data/spec/reader_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe M3u8::Reader do
+  it 'should parse master playlist' do
+    file = File.open 'spec/fixtures/master.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+    expect(playlist.master?).to be true
+
+    item = playlist.items[0]
+    expect(item).to be_a(M3u8::PlaylistItem)
+    expect(item.playlist).to eq('hls/1080-7mbps/1080-7mbps.m3u8')
+    expect(item.program_id).to eq('1')
+    expect(item.width).to eq(1920)
+    expect(item.height).to eq(1080)
+    expect(item.resolution).to eq('1920x1080')
+    expect(item.codecs).to eq('avc1.640028,mp4a.40.2')
+    expect(item.bitrate).to eq(5_042_000)
+
+    expect(playlist.items.size).to eq 6
+
+    item = playlist.items.last
+    expect(item.resolution).to be nil
+  end
+
+  it 'should parse segment playlist' do
+    file = File.open 'spec/fixtures/playlist.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+    expect(playlist.master?).to be false
+    expect(playlist.version).to be 4
+    expect(playlist.sequence).to be 1
+    expect(playlist.cache).to be false
+    expect(playlist.target).to be 12
+
+    item = playlist.items[0]
+    expect(item).to be_a(M3u8::SegmentItem)
+    expect(item.duration).to eq 11.344644
+
+    expect(playlist.items.size).to eq 138
+  end
+end

data/spec/segment_item_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe M3u8::SegmentItem do
+  it 'should initialize with hash' do
+    hash = { duration: 10.991, segment: 'test.ts' }
+    item = M3u8::SegmentItem.new(hash)
+    expect(item.duration).to eq 10.991
+    expect(item.segment).to eq 'test.ts'
+  end
+
+  it 'should provide m3u8 format representation' do
+    hash = { duration: 10.991, segment: 'test.ts' }
+    item = M3u8::SegmentItem.new(hash)
+    output = item.to_s
+    expected = "#EXTINF:10.991,\ntest.ts"
+    expect(output).to eq expected
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require 'm3u8/playlist'
+require 'm3u8/playlist_item'
+require 'm3u8/segment_item'
+require 'm3u8/reader'
 require 'm3u8/error'
 
 require 'coveralls'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
-description: Generate m3u8 playlists for HTTP Live Streaming (HLS).
+description: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
 email:
 - seth@deckard.me
 executables: []
@@ -69,9 +69,17 @@ files:
 - lib/m3u8.rb
 - lib/m3u8/error.rb
 - lib/m3u8/playlist.rb
+- lib/m3u8/playlist_item.rb
+- lib/m3u8/reader.rb
+- lib/m3u8/segment_item.rb
 - lib/m3u8/version.rb
 - m3u8.gemspec
+- spec/fixtures/master.m3u8
+- spec/fixtures/playlist.m3u8
+- spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
+- spec/reader_spec.rb
+- spec/segment_item_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sethdeckard/m3u8
 licenses:
@@ -96,7 +104,12 @@ rubyforge_project:
 rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
-summary: Generate m3u8 playlists for HTTP Live Streaming (HLS).
+summary: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
 test_files:
+- spec/fixtures/master.m3u8
+- spec/fixtures/playlist.m3u8
+- spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
+- spec/reader_spec.rb
+- spec/segment_item_spec.rb
 - spec/spec_helper.rb