m3u8 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f00671fa34a2515f395b91535721e0f9c8801d
-  data.tar.gz: 6444a8131f48f8534837def5f39cef7e0dc132ca
+  metadata.gz: cb897f32a24dabcd87ebd26a367425c8eae33113
+  data.tar.gz: 5726036c12d84a49d24ae14f21cf52e817c3bc1c
 SHA512:
-  metadata.gz: 70cc595f2f165d3d2f337437f88b9d0021fb74cf764e4393949e83fe2470ea55f40b95f64ef3772a0f572875f6773acdf0e1ad122a9011a2587daf3c93584d87
-  data.tar.gz: 6bb1ca0567ff9ce9b69accedda38d154050bb9c9e72fcd910694fd4a6c1399c3f69da2c686ddc14e3015f86a61fa1cd06ded8cc5f4373a4c8d82350712081cf3
+  metadata.gz: db0747bc9be34249f3fbf35d40255763e8b96cddcf9d857495361e8186df81fc4285e6740bc54abab804d2617504c77b8ac7befbb2cc2604e7de0a52d2963d65
+  data.tar.gz: ee311cc358cca4494c6d5c1a4fa8e64e50977076d8001d3a1258ca1a4762354f6886b903293f06a424136044b6112e1f4c501dfe449508238d4e6d5e1e7be0dd

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.ruby-version

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 sudo: true
 rvm:
-- 2.3.0
-- 2.2.4
+- 2.4.0
+- 2.3.3
+- 2.2.6
 
 script: rspec spec

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+0.7.0 (2/3/2017) - Added support for EXT-X-INDEPENDENT-SEGMENTS and EXT-X-START tags. Minor version bumped due to changes of default values for new playlists.
+
 0.6.9 (4/24/2016) - Merged pull request #17 from [ghn](https://github.com/ghn). Removes return when parsing next line in playlist.
 
 ***

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/m3u8.svg)](http://badge.fury.io/rb/m3u8)
 [![Build Status](https://travis-ci.org/sethdeckard/m3u8.svg?branch=master)](https://travis-ci.org/sethdeckard/m3u8)
-[![Coverage Status](https://coveralls.io/repos/sethdeckard/m3u8/badge.png)](https://coveralls.io/r/sethdeckard/m3u8)
+[![Coverage Status](https://coveralls.io/repos/github/sethdeckard/m3u8/badge.svg?branch=master)](https://coveralls.io/github/sethdeckard/m3u8?branch=master)
 [![Code Climate](https://codeclimate.com/github/sethdeckard/m3u8/badges/gpa.svg)](https://codeclimate.com/github/sethdeckard/m3u8)
 [![Dependency Status](https://gemnasium.com/sethdeckard/m3u8.svg)](https://gemnasium.com/sethdeckard/m3u8)
 [![security](https://hakiri.io/github/sethdeckard/m3u8/master.svg)](https://hakiri.io/github/sethdeckard/m3u8/master)
@@ -145,7 +145,7 @@ M3u8::Reader is the class handles parsing if you want more control over the proc
 * Supports session data in master playlists.
 * Supports keys for encrypted media segments (EXT-X-KEY, EXT-SESSION-KEY).
 
-## HLS Spec Status (version 17)
+## HLS Spec Status (version 20)
 ### Implemented:
 * EXTM3U
 * EXT-X-VERSION
@@ -165,11 +165,10 @@ M3u8::Reader is the class handles parsing if you want more control over the proc
 * EXT-X-I-FRAME-STREAM-INF
 * EXT-X-SESSION-DATA
 * EXT-X-SESSION-KEY
+* EXT-X-START
 
 ### TODO:
-* EXT-X-DISCONTINUITY-SEQUENCE
-* EXT-X-INDEPENDENT-SEGMENTS
-* EXT-X-START
+* EXT-X-DATERANGE
 
 ## Roadmap 
 * Add the last remaining tags for latest version of the spec.
@@ -187,4 +186,4 @@ M3u8::Reader is the class handles parsing if you want more control over the proc
 
 
 ## License
-MIT License - See [LICENSE.txt](https://github.com/sethdeckard/m3u8/blob/master/LICENSE.txt) for details.
+MIT License - See [LICENSE.txt](https://github.com/sethdeckard/m3u8/blob/master/LICENSE.txt) for details.

data/lib/m3u8.rb

@@ -4,6 +4,13 @@ Dir[File.dirname(__FILE__) + '/m3u8/*.rb'].sort.each { |file| require file }
 
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
+  def intialize_with_byterange(params = {})
+    params.each do |key, value|
+      value = ByteRange.new(value) if value.is_a?(Hash)
+      instance_variable_set("@#{key}", value)
+    end
+  end
+
   def parse_attributes(line)
     array = line.delete("\n").scan(/([A-z-]+)\s*=\s*("[^"]*"|[^,]*)/)
     Hash[array.map { |key, value| [key, value.delete('"')] }]
@@ -13,10 +20,7 @@ module M3u8
     value == 'YES' ? true : false
   end
 
-  def intialize_with_byterange(params = {})
-    params.each do |key, value|
-      value = ByteRange.new(value) if value.is_a?(Hash)
-      instance_variable_set("@#{key}", value)
-    end
+  def to_yes_no(boolean)
+    boolean == true ? 'YES' : 'NO'
   end
 end

data/lib/m3u8/playback_start.rb

@@ -0,0 +1,33 @@
+module M3u8
+  # PlaybackStart represents a #EXT-X-START tag and attributes
+  class PlaybackStart
+    include M3u8
+    attr_accessor :time_offset, :precise
+
+    def initialize(options = {})
+      options.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def parse(text)
+      attributes = parse_attributes(text)
+      @time_offset = attributes['TIME-OFFSET'].to_f
+      precise = attributes['PRECISE']
+      @precise = parse_yes_no(precise) unless precise.nil?
+    end
+
+    def to_s
+      attributes = ["TIME-OFFSET=#{time_offset}",
+                    precise_format].compact.join(',')
+      "#EXT-X-START:#{attributes}"
+    end
+
+    private
+
+    def precise_format
+      return if precise.nil?
+      "PRECISE=#{to_yes_no(precise)}"
+    end
+  end
+end

data/lib/m3u8/playlist.rb

@@ -3,7 +3,7 @@ module M3u8
   # of media segments
   class Playlist
     attr_accessor :items, :version, :cache, :target, :sequence, :type,
-                  :iframes_only
+                  :iframes_only, :independent_segments
 
     def initialize(options = {})
       assign_options options
@@ -21,8 +21,8 @@ module M3u8
     end
 
     def write(output)
-      writer = Writer.new output
-      writer.write self
+      writer = Writer.new(output)
+      writer.write(self)
     end
 
     def master?
@@ -32,7 +32,7 @@ module M3u8
 
     def to_s
       output = StringIO.open
-      write output
+      write(output)
       output.string
     end
 
@@ -52,13 +52,7 @@ module M3u8
     private
 
     def assign_options(options)
-      options = {
-        version: 3,
-        sequence: 0,
-        cache: true,
-        target: 10,
-        iframes_only: false
-      }.merge options
+      options = defaults.merge(options)
 
       self.version = options[:version]
       self.sequence = options[:sequence]
@@ -66,6 +60,16 @@ module M3u8
       self.target = options[:target]
       self.type = options[:type]
       self.iframes_only = options[:iframes_only]
+      self.independent_segments = options[:independent_segments]
+    end
+
+    def defaults
+      {
+        sequence: 0,
+        target: 10,
+        iframes_only: false,
+        independent_segments: false
+      }
     end
 
     def playlist_size

data/lib/m3u8/reader.rb

@@ -8,13 +8,14 @@ module M3u8
       @tags = [basic_tags,
                media_segment_tags,
                media_playlist_tags,
-               master_playlist_tags].inject(:merge)
+               master_playlist_tags,
+               universal_tags].inject(:merge)
     end
 
     def read(input)
       self.playlist = Playlist.new
       input.each_line do |line|
-        parse_line line
+        parse_line(line)
       end
       playlist
     end
@@ -53,6 +54,18 @@ module M3u8
       }
     end
 
+    def universal_tags
+      { '#EXT-X-START' => ->(line) { parse_start(line) },
+        '#EXT-X-INDEPENDENT-SEGMENTS' => proc do
+          playlist.independent_segments = true
+        end
+      }
+    end
+
+    def parse_independent_segments(line)
+      parse_independent_segments
+    end
+
     def parse_line(line)
       return if match_tag(line)
       parse_next_line(line) if !item.nil? && open
@@ -151,6 +164,12 @@ module M3u8
       playlist.items << item
     end
 
+    def parse_start(line)
+      item = M3u8::PlaybackStart.new
+      item.parse(line)
+      playlist.items << item
+    end
+
     def parse_time(line)
       if open
         item.program_date_time = M3u8::TimeItem.parse(line)

data/lib/m3u8/version.rb

@@ -1,4 +1,4 @@
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
-  VERSION = '0.6.9'
+  VERSION = '0.7.0'
 end

data/lib/m3u8/writer.rb

@@ -8,10 +8,8 @@ module M3u8
     end
 
     def write(playlist)
-      validate playlist
-
-      io.puts '#EXTM3U'
-      write_header(playlist) unless playlist.master?
+      validate(playlist)
+      write_header(playlist)
 
       playlist.items.each do |item|
         io.puts item.to_s
@@ -23,26 +21,55 @@ module M3u8
 
     private
 
+    def target_duration_format(playlist)
+      format('#EXT-X-TARGETDURATION:%d', playlist.target)
+    end
+
     def validate(playlist)
       return if playlist.valid?
-      fail PlaylistTypeError, 'Playlist is invalid.'
+      raise PlaylistTypeError, 'Playlist is invalid.'
+    end
+
+    def write_cache_tag(cache)
+      return if cache.nil?
+
+      io.puts "#EXT-X-ALLOW-CACHE:#{cache ? 'YES' : 'NO'}"
     end
 
     def write_header(playlist)
+      io.puts '#EXTM3U'
+      if playlist.master?
+        write_master_playlist_header(playlist)
+      else
+        write_media_playlist_header(playlist)
+      end
+    end
+
+    def write_independent_segments_tag(independent_segments)
+      return unless independent_segments
+
+      io.puts '#EXT-X-INDEPENDENT-SEGMENTS'
+    end
+
+    def write_master_playlist_header(playlist)
+      write_version_tag(playlist.version)
+      write_independent_segments_tag(playlist.independent_segments)
+    end
+
+    def write_media_playlist_header(playlist)
       io.puts "#EXT-X-PLAYLIST-TYPE:#{playlist.type}" unless playlist.type.nil?
-      io.puts "#EXT-X-VERSION:#{playlist.version}"
+      write_version_tag(playlist.version)
+      write_independent_segments_tag(playlist.independent_segments)
       io.puts '#EXT-X-I-FRAMES-ONLY' if playlist.iframes_only
       io.puts "#EXT-X-MEDIA-SEQUENCE:#{playlist.sequence}"
-      io.puts "#EXT-X-ALLOW-CACHE:#{cache(playlist)}"
+      write_cache_tag(playlist.cache)
       io.puts target_duration_format(playlist)
     end
 
-    def cache(playlist)
-      playlist.cache ? 'YES' : 'NO'
-    end
+    def write_version_tag(version)
+      return if version.nil?
 
-    def target_duration_format(playlist)
-      format('#EXT-X-TARGETDURATION:%d', playlist.target)
+      io.puts "#EXT-X-VERSION:#{version}"
     end
   end
 end

data/spec/fixtures/master.m3u8

@@ -1,5 +1,7 @@
 #EXTM3U
+#EXT-X-INDEPENDENT-SEGMENTS
 #EXT-X-SESSION-KEY:METHOD=AES-128,URI="https://priv.example.com/key.php?r=52"
+#EXT-X-START:TIME-OFFSET=20.2
 #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

data/spec/lib/m3u8/playback_start_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe M3u8::PlaybackStart do
+  describe '#intialize' do
+    it 'assigns attributes' do
+      start = described_class.new(time_offset: -12.9, precise: true)
+      expect(start.time_offset).to eq(-12.9)
+      expect(start.precise).to be true
+    end
+  end
+
+  describe '#parse' do
+    it 'parses tag with all attributes' do
+      start = described_class.new
+      tag = '#EXT-X-START:TIME-OFFSET=20.0,PRECISE=YES'
+      start.parse(tag)
+
+      expect(start.time_offset).to eq(20.0)
+      expect(start.precise).to be true
+    end
+
+    it 'parses tag without optional attributes' do
+      start = described_class.new
+      tag = '#EXT-X-START:TIME-OFFSET=-12.9'
+      start.parse(tag)
+
+      expect(start.time_offset).to eq(-12.9)
+      expect(start.precise).to be_nil
+    end
+  end
+
+  describe '#to_s' do
+    it 'returns tag with attributes' do
+      start = described_class.new(time_offset: 9.2, precise: true)
+      tag = start.to_s
+
+      expect(tag).to eq('#EXT-X-START:TIME-OFFSET=9.2,PRECISE=YES')
+    end
+
+    it 'returns tag without optional attributes' do
+      start = described_class.new(time_offset: 9.2)
+      tag = start.to_s
+
+      expect(tag).to eq('#EXT-X-START:TIME-OFFSET=9.2')
+    end
+  end
+end

data/spec/lib/m3u8/playlist_spec.rb

@@ -1,6 +1,33 @@
 require 'spec_helper'
 
 describe M3u8::Playlist do
+  let(:playlist) { described_class.new }
+
+  describe '#new' do
+    it 'initializes with defaults' do
+      expect(playlist.version).to be_nil
+      expect(playlist.cache).to be_nil
+      expect(playlist.target).to be 10
+      expect(playlist.sequence).to be 0
+      expect(playlist.type).to be_nil
+      expect(playlist.iframes_only).to be false
+      expect(playlist.independent_segments).to be false
+    end
+
+    it 'initializes from hash' do
+      options = { version: 7, cache: false, target: 12, sequence: 1,
+                  type: 'VOD', independent_segments: true }
+      playlist = M3u8::Playlist.new(options)
+      expect(playlist.version).to be 7
+      expect(playlist.cache).to be false
+      expect(playlist.target).to be 12
+      expect(playlist.sequence).to be 1
+      expect(playlist.type).to eq('VOD')
+      expect(playlist.iframes_only).to be false
+      expect(playlist.independent_segments).to be true
+    end
+  end
+
   it 'should generate codecs string' do
     options = { profile: 'baseline', level: 3.0, audio_codec: 'aac-lc' }
     codecs = M3u8::Playlist.codecs options
@@ -11,10 +38,11 @@ describe M3u8::Playlist do
     options = { uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
-    playlist = M3u8::Playlist.new
-    playlist.items.push item
+    playlist = M3u8::Playlist.new(independent_segments: true)
+    playlist.items << item
 
-    output = "#EXTM3U\n" +
+    output = "#EXTM3U\n" \
+             "#EXT-X-INDEPENDENT-SEGMENTS\n" +
              %(#EXT-X-STREAM-INF:CODECS="mp4a.40.34") +
              ",BANDWIDTH=6400\nplaylist_url\n"
     expect(playlist.to_s).to eq output
@@ -23,7 +51,7 @@ describe M3u8::Playlist do
                 audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" +
              %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="mp4a.40.34") +
@@ -35,7 +63,7 @@ describe M3u8::Playlist do
                 audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" \
              '#EXT-X-STREAM-INF:PROGRAM-ID=2,RESOLUTION=1920x1080,' +
@@ -48,12 +76,12 @@ describe M3u8::Playlist do
     options = { program_id: '1', uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
-    playlist.items.push item
+    playlist.items << item
     options = { program_id: '2', uri: 'playlist_url', bandwidth: 50_000,
                 width: 1920, height: 1080, profile: 'high', level: 4.1,
                 audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" +
              %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="mp4a.40.34") +
@@ -65,14 +93,12 @@ describe M3u8::Playlist do
 
   it 'should render playlist' do
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
-    item =  M3u8::SegmentItem.new options
+    item =  M3u8::SegmentItem.new(options)
     playlist = M3u8::Playlist.new
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" \
-      "#EXT-X-VERSION:3\n" \
       "#EXT-X-MEDIA-SEQUENCE:0\n" \
-      "#EXT-X-ALLOW-CACHE:YES\n" \
       "#EXT-X-TARGETDURATION:10\n" \
       "#EXTINF:11.344644,\n" \
       "1080-7mbps00000.ts\n" \
@@ -80,13 +106,11 @@ describe M3u8::Playlist do
     expect(playlist.to_s).to eq output
 
     options = { duration: 11.261233, segment: '1080-7mbps00001.ts' }
-    item =  M3u8::SegmentItem.new options
-    playlist.items.push item
+    item =  M3u8::SegmentItem.new(options)
+    playlist.items << item
 
     output = "#EXTM3U\n" \
-      "#EXT-X-VERSION:3\n" \
       "#EXT-X-MEDIA-SEQUENCE:0\n" \
-      "#EXT-X-ALLOW-CACHE:YES\n" \
       "#EXT-X-TARGETDURATION:10\n" \
       "#EXTINF:11.344644,\n" \
       "1080-7mbps00000.ts\n" \
@@ -95,16 +119,16 @@ describe M3u8::Playlist do
       "#EXT-X-ENDLIST\n"
     expect(playlist.to_s).to eq output
 
-    options = { version: 1, cache: false, target: 12, sequence: 1,
+    options = { version: 7, cache: false, target: 12, sequence: 1,
                 type: 'VOD' }
     playlist = M3u8::Playlist.new options
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
     item =  M3u8::SegmentItem.new options
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" \
       "#EXT-X-PLAYLIST-TYPE:VOD\n" \
-      "#EXT-X-VERSION:1\n" \
+      "#EXT-X-VERSION:7\n" \
       "#EXT-X-MEDIA-SEQUENCE:1\n" \
       "#EXT-X-ALLOW-CACHE:NO\n" \
       "#EXT-X-TARGETDURATION:12\n" \
@@ -121,7 +145,7 @@ describe M3u8::Playlist do
     options = { program_id: '1', uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
-    playlist.items.push item
+    playlist.items << item
     playlist.write test_io
 
     output = "#EXTM3U\n" +
@@ -146,7 +170,7 @@ describe M3u8::Playlist do
     options = { program_id: '1', uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
-    playlist.items.push item
+    playlist.items << item
 
     expect(playlist.master?).to be true
   end
@@ -157,11 +181,11 @@ describe M3u8::Playlist do
     hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
              bandwidth: 540, uri: 'test.url' }
     item = M3u8::PlaylistItem.new(hash)
-    playlist.items.push item
+    playlist.items << item
 
     hash = { duration: 10.991, segment: 'test.ts' }
     item = M3u8::SegmentItem.new(hash)
-    playlist.items.push item
+    playlist.items << item
 
     message = 'Playlist is invalid.'
     io = StringIO.new
@@ -176,51 +200,39 @@ describe M3u8::Playlist do
     hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
              bandwidth: 540, uri: 'test.url' }
     item = M3u8::PlaylistItem.new(hash)
-    playlist.items.push item
+    playlist.items << item
     expect(playlist.valid?).to be true
 
     hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
              bandwidth: 540, uri: 'test.url' }
     item = M3u8::PlaylistItem.new(hash)
-    playlist.items.push item
+    playlist.items << item
     expect(playlist.valid?).to be true
 
     hash = { duration: 10.991, segment: 'test.ts' }
     item = M3u8::SegmentItem.new(hash)
-    playlist.items.push item
+    playlist.items << item
 
     expect(playlist.valid?).to be false
   end
 
-  it 'should expose options as attributes' do
-    options = { version: 1, cache: false, target: 12, sequence: 1,
-                type: 'VOD' }
-    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
-    expect(playlist.type).to eq('VOD')
-    expect(playlist.iframes_only).to be false
-  end
-
   it 'should allow reading of playlists' do
     file = File.open 'spec/fixtures/master.m3u8'
     playlist = M3u8::Playlist.read file
     expect(playlist.master?).to be true
-    expect(playlist.items.size).to eq(7)
+    expect(playlist.items.size).to eq(8)
   end
 
   it 'should return the total duration of a playlist' do
     playlist = M3u8::Playlist.new
     item = M3u8::SegmentItem.new(duration: 10.991, segment: 'test_01.ts')
-    playlist.items.push item
+    playlist.items << item
     item = M3u8::SegmentItem.new(duration: 9.891, segment: 'test_02.ts')
-    playlist.items.push item
+    playlist.items << item
     item = M3u8::SegmentItem.new(duration: 10.556, segment: 'test_03.ts')
-    playlist.items.push item
+    playlist.items << item
     item = M3u8::SegmentItem.new(duration: 8.790, segment: 'test_04.ts')
-    playlist.items.push item
+    playlist.items << item
 
     expect(playlist.duration.round(3)).to eq(40.228)
   end

data/spec/lib/m3u8/reader_spec.rb

@@ -7,12 +7,18 @@ describe M3u8::Reader do
     playlist = reader.read file
     expect(playlist.master?).to be true
 
+    expect(playlist.independent_segments).to be true
+
     item = playlist.items[0]
     expect(item).to be_a(M3u8::SessionKeyItem)
     expect(item.method).to eq('AES-128')
     expect(item.uri).to eq('https://priv.example.com/key.php?r=52')
 
     item = playlist.items[1]
+    expect(item).to be_a(M3u8::PlaybackStart)
+    expect(item.time_offset).to eq(20.2)
+
+    item = playlist.items[2]
     expect(item).to be_a(M3u8::PlaylistItem)
     expect(item.uri).to eq('hls/1080-7mbps/1080-7mbps.m3u8')
     expect(item.program_id).to eq('1')
@@ -24,7 +30,7 @@ describe M3u8::Reader do
     expect(item.iframe).to be false
     expect(item.average_bandwidth).to be_nil
 
-    item = playlist.items[6]
+    item = playlist.items[7]
     expect(item).to be_a(M3u8::PlaylistItem)
     expect(item.uri).to eq('hls/64k/64k.m3u8')
     expect(item.program_id).to eq('1')
@@ -36,7 +42,7 @@ describe M3u8::Reader do
     expect(item.iframe).to be false
     expect(item.average_bandwidth).to be_nil
 
-    expect(playlist.items.size).to eq(7)
+    expect(playlist.items.size).to eq(8)
 
     item = playlist.items.last
     expect(item.resolution).to be_nil
@@ -174,12 +180,12 @@ describe M3u8::Reader do
     reader = M3u8::Reader.new
     playlist = reader.read file
 
-    expect(playlist.items.size).to eq(7)
+    expect(playlist.items.size).to eq(8)
 
     file = File.open 'spec/fixtures/master.m3u8'
     playlist = reader.read file
 
-    expect(playlist.items.size).to eq(7)
+    expect(playlist.items.size).to eq(8)
   end
 
   it 'should parse playlist with session data' do

data/spec/lib/m3u8/writer_spec.rb

@@ -4,11 +4,13 @@ describe M3u8::Writer do
   it 'should render master playlist' do
     options = { uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
-    item = M3u8::PlaylistItem.new options
-    playlist = M3u8::Playlist.new
-    playlist.items.push item
+    item = M3u8::PlaylistItem.new(options)
+    playlist = M3u8::Playlist.new(version: 6, independent_segments: true)
+    playlist.items << item
 
-    output = "#EXTM3U\n" +
+    output = "#EXTM3U\n" \
+             "#EXT-X-VERSION:6\n" \
+             "#EXT-X-INDEPENDENT-SEGMENTS\n" +
              %(#EXT-X-STREAM-INF:CODECS="mp4a.40.34") +
              ",BANDWIDTH=6400\nplaylist_url\n"
 
@@ -19,7 +21,7 @@ describe M3u8::Writer do
 
     options = { program_id: '1', uri: 'playlist_url', bandwidth: 6400,
                 audio_codec: 'mp3' }
-    item = M3u8::PlaylistItem.new options
+    item = M3u8::PlaylistItem.new(options)
     playlist = M3u8::Playlist.new
     playlist.items.push item
 
@@ -80,37 +82,35 @@ describe M3u8::Writer do
 
   it 'should render playlist' do
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
-    item =  M3u8::SegmentItem.new options
-    playlist = M3u8::Playlist.new
-    playlist.items.push item
+    item =  M3u8::SegmentItem.new(options)
+    playlist = M3u8::Playlist.new(version: 7)
+    playlist.items << item
 
     output = "#EXTM3U\n" \
-      "#EXT-X-VERSION:3\n" \
+      "#EXT-X-VERSION:7\n" \
       "#EXT-X-MEDIA-SEQUENCE:0\n" \
-      "#EXT-X-ALLOW-CACHE:YES\n" \
       "#EXT-X-TARGETDURATION:10\n" \
       "#EXTINF:11.344644,\n" \
       "1080-7mbps00000.ts\n" \
       "#EXT-X-ENDLIST\n"
     io = StringIO.open
-    writer = M3u8::Writer.new io
+    writer = M3u8::Writer.new(io)
     writer.write playlist
     expect(io.string).to eq output
 
     options = { method: 'AES-128', uri: 'http://test.key',
                 iv: 'D512BBF', key_format: 'identity',
                 key_format_versions: '1/3' }
-    item = M3u8::KeyItem.new options
-    playlist.items.push item
+    item = M3u8::KeyItem.new(options)
+    playlist.items << item
 
     options = { duration: 11.261233, segment: '1080-7mbps00001.ts' }
     item =  M3u8::SegmentItem.new options
-    playlist.items.push item
+    playlist.items << item
 
     output = "#EXTM3U\n" \
-             "#EXT-X-VERSION:3\n" \
+             "#EXT-X-VERSION:7\n" \
              "#EXT-X-MEDIA-SEQUENCE:0\n" \
-             "#EXT-X-ALLOW-CACHE:YES\n" \
              "#EXT-X-TARGETDURATION:10\n" \
              "#EXTINF:11.344644,\n" \
              "1080-7mbps00000.ts\n" +
@@ -120,16 +120,16 @@ describe M3u8::Writer do
              "1080-7mbps00001.ts\n" \
              "#EXT-X-ENDLIST\n"
     io = StringIO.open
-    writer = M3u8::Writer.new io
+    writer = M3u8::Writer.new(io)
     writer.write playlist
     expect(io.string).to eq output
 
     options = { version: 4, cache: false, target: 12, sequence: 1,
                 type: 'EVENT', iframes_only: true }
-    playlist = M3u8::Playlist.new options
+    playlist = M3u8::Playlist.new(options)
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
-    item =  M3u8::SegmentItem.new options
-    playlist.items.push item
+    item =  M3u8::SegmentItem.new(options)
+    playlist.items << item
 
     output = "#EXTM3U\n" \
       "#EXT-X-PLAYLIST-TYPE:EVENT\n" \

data/spec/lib/m3u8_spec.rb

@@ -13,8 +13,18 @@ describe do
 
   it 'should parse yes/no string' do
     value = 'YES'
-    expect(test_class.parse_yes_no value).to be true
+    expect(test_class.parse_yes_no(value)).to be true
     value = 'NO'
-    expect(test_class.parse_yes_no value).to be false
+    expect(test_class.parse_yes_no(value)).to be false
+  end
+
+  describe '#to_yes_no' do
+    it 'converts true to YES' do
+      expect(test_class.to_yes_no(true)).to eq('YES')
+    end
+
+    it 'converts false to NO' do
+      expect(test_class.to_yes_no(false)).to eq('NO')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,6 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -135,6 +134,7 @@ files:
 - lib/m3u8/key_item.rb
 - lib/m3u8/map_item.rb
 - lib/m3u8/media_item.rb
+- lib/m3u8/playback_start.rb
 - lib/m3u8/playlist.rb
 - lib/m3u8/playlist_item.rb
 - lib/m3u8/reader.rb
@@ -161,6 +161,7 @@ files:
 - spec/lib/m3u8/key_item_spec.rb
 - spec/lib/m3u8/map_item_spec.rb
 - spec/lib/m3u8/media_item_spec.rb
+- spec/lib/m3u8/playback_start_spec.rb
 - spec/lib/m3u8/playlist_item_spec.rb
 - spec/lib/m3u8/playlist_spec.rb
 - spec/lib/m3u8/reader_spec.rb
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
@@ -212,6 +213,7 @@ test_files:
 - spec/lib/m3u8/key_item_spec.rb
 - spec/lib/m3u8/map_item_spec.rb
 - spec/lib/m3u8/media_item_spec.rb
+- spec/lib/m3u8/playback_start_spec.rb
 - spec/lib/m3u8/playlist_item_spec.rb
 - spec/lib/m3u8/playlist_spec.rb
 - spec/lib/m3u8/reader_spec.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.2.3