m3u8 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41fb7682951bc08373079dfee9f08b6989b350a
-  data.tar.gz: bd20a5df1f8db01cab94eccc1be9b451071712a3
+  metadata.gz: 8bead9657f94696922af4e09d7f19800b80572ff
+  data.tar.gz: b654a6d47b3cfad36b08f58cb95ffd12e46c3b66
 SHA512:
-  metadata.gz: fe388514a463c631a000fff5ce7cffaa0b93475ec2f3c0911701b049bf5cd97383a19ffc69e5e37f4943320652582d9e26de625a8b888d8dd6a57e33e7c8f65c
-  data.tar.gz: d68bafed0338082337721ce185286577c1079b57eb99eefa9049b4775e4bca46c38f5bbe2993aa6dd69c7d0a27050194f5971e0e6ce9b74bbd0b79c48bc40954
+  metadata.gz: fc8d26287b07199eaba044e66330f519a6c96b44b52e607ea48cafb286d4a005e22d1f43cdfb2d353c9ccc79e4ea92fd188ed7e4cdee570580110b7b23ff5f6f
+  data.tar.gz: 9b82bbb066aa4ccbb6e3f9827ec7ca56fbb845f56ac57826fbe29d37bdd06631bf1800b43cd42e28b582630c5fd50a6c91818af1c87b223e76cac54ed71b0062

data/CHANGELOG.md

@@ -1,8 +1,12 @@
-### 0.5.3 (2/24/2015) - [stan3](https://github.com/stan3) fixed issue recently introduced in Reader where EXT-X-STREAM-INF missing resolution would break parsing.
+#### 0.6.1 (8/15/2015) - Added support for EXT-X-PROGRAM-DATE-TIME tags.
+
+#### 0.6.0 (6/20/2015) - Added support for EXT-X-MAP tags, introduced ByteRange class to handled shared byterange parsing/serialization functionality. Breaking changes: SegmentItem now exposes a single byterange instance accessor rather than byterange_length and byterange_start, made all parse methods static for consistency (ex: MediaItem.parse).
+
+#### 0.5.3 (2/24/2015) - [stan3](https://github.com/stan3) fixed issue recently introduced in Reader where EXT-X-STREAM-INF missing resolution would break parsing.
 
 #### 0.5.2 (2/18/2015) - Fix issue where PlaylistItem.average_bandwidth would default to 0 instead of nil when not present in m3u8 being parsed.
 
-#### 0.5.1 (2/16/2015) - [takashisite](https://github.com/takashisite) added support for [EXT-X-DISCONTINUITY](https://tools.ietf.org/html/draft-pantos-http-live-streaming-14#section-4.3.2.3). Added support for [EXT-X-KEY](https://tools.ietf.org/html/draft-pantos-http-live-streaming-14#section-4.3.2.4) (keys for encrypted segments). 
+#### 0.5.1 (2/16/2015) - [takashisite](https://github.com/takashisite) added support for [EXT-X-DISCONTINUITY](https://tools.ietf.org/html/draft-pantos-http-live-streaming-14#section-4.3.2.3). Added support for [EXT-X-KEY](https://tools.ietf.org/html/draft-pantos-http-live-streaming-14#section-4.3.2.4) (keys for encrypted segments).
 ***
 #### 0.5.0 (2/10/2015) - BREAKING: renamed PlaylistItem.playlist to PlaylistItem.uri, MediaItem.group to MediaItem.group_id, and PlaylistItem.bitrate to PlaylistItem.bandwidth so attributes more closely match the spec. Added support for EXT-X-I-FRAME-STREAM-INF, EXT-X-I-FRAMES-ONLY, EXT-X-BYTERANGE, and EXT-X-SESSION-DATA.
 ***

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
+gem 'simplecov', require: false

data/lib/m3u8.rb

@@ -5,8 +5,11 @@ require 'm3u8/playlist_item'
 require 'm3u8/segment_item'
 require 'm3u8/discontinuity_item'
 require 'm3u8/key_item'
+require 'm3u8/map_item'
 require 'm3u8/media_item'
+require 'm3u8/time_item'
 require 'm3u8/session_data_item'
+require 'm3u8/byte_range'
 require 'm3u8/reader'
 require 'm3u8/writer'
 require 'm3u8/error'
@@ -21,4 +24,11 @@ module M3u8
   def parse_yes_no(value)
     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
+  end
 end

data/lib/m3u8/byte_range.rb

@@ -0,0 +1,31 @@
+module M3u8
+  # ByteRange represents sub range of a resource
+  class ByteRange
+    attr_accessor :length, :start
+
+    def initialize(params = {})
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def self.parse(text)
+      values = text.split '@'
+      length_value = values[0].to_i
+      start_value = values[1].to_i unless values[1].nil?
+      options = { length: length_value, start: start_value }
+      ByteRange.new options
+    end
+
+    def to_s
+      "#{length}#{start_format}"
+    end
+
+    private
+
+    def start_format
+      return if start.nil?
+      "@#{start}"
+    end
+  end
+end

data/lib/m3u8/map_item.rb

@@ -0,0 +1,32 @@
+module M3u8
+  # MapItem represents a EXT-X-MAP tag which specifies how to obtain the Media
+  # Initialization Section
+  class MapItem
+    extend M3u8
+    include M3u8
+    attr_accessor :uri, :byterange
+
+    def initialize(params = {})
+      intialize_with_byterange(params)
+    end
+
+    def self.parse(text)
+      attributes = parse_attributes text
+      range_value = attributes['BYTERANGE']
+      range = ByteRange.parse(range_value) unless range_value.nil?
+      options = { uri: attributes['URI'], byterange: range }
+      MapItem.new options
+    end
+
+    def to_s
+      %(#EXT-X-MAP:URI="#{uri}"#{byterange_format})
+    end
+
+    private
+
+    def byterange_format
+      return if byterange.nil?
+      %(,BYTERANGE="#{byterange}")
+    end
+  end
+end

data/lib/m3u8/media_item.rb

@@ -1,7 +1,7 @@
 module M3u8
   # MediaItem represents a set of EXT-X-MEDIA attributes
   class MediaItem
-    include M3u8
+    extend M3u8
     attr_accessor :type, :group_id, :language, :assoc_language, :name,
                   :autoselect, :default, :uri, :forced
 
@@ -11,7 +11,7 @@ module M3u8
       end
     end
 
-    def parse(text)
+    def self.parse(text)
       attributes = parse_attributes text
       options = { type: attributes['TYPE'], group_id: attributes['GROUP-ID'],
                   language: attributes['LANGUAGE'],
@@ -21,7 +21,7 @@ module M3u8
                   default: parse_yes_no(attributes['DEFAULT']),
                   forced: parse_yes_no(attributes['FORCED']),
                   uri: attributes['URI'] }
-      initialize options
+      MediaItem.new options
     end
 
     def to_s
@@ -82,7 +82,7 @@ module M3u8
     end
 
     def to_yes_no(boolean)
-      boolean ==  true ? 'YES' : 'NO'
+      boolean == true ? 'YES' : 'NO'
     end
   end
 end

data/lib/m3u8/playlist.rb

@@ -69,11 +69,11 @@ module M3u8
     end
 
     def playlist_size
-      items.select { |item| item.is_a?(PlaylistItem) }.size
+      items.count { |item| item.is_a?(PlaylistItem) }
     end
 
     def segment_size
-      items.select { |item| item.is_a?(SegmentItem) }.size
+      items.count { |item| item.is_a?(SegmentItem) }
     end
   end
 end

data/lib/m3u8/playlist_item.rb

@@ -2,7 +2,7 @@ module M3u8
   # PlaylistItem represents a set of EXT-X-STREAM-INF or
   # EXT-X-I-FRAME-STREAM-INF attributes
   class PlaylistItem
-    include M3u8
+    extend M3u8
     attr_accessor :program_id, :width, :height, :codecs, :bandwidth,
                   :audio_codec, :level, :profile, :video, :audio, :uri,
                   :average_bandwidth, :subtitles, :closed_captions, :iframe
@@ -15,18 +15,20 @@ module M3u8
       end
     end
 
-    def parse(text)
+    def self.parse(text)
       attributes = parse_attributes text
+      resolution = parse_resolution attributes['RESOLUTION']
       average = parse_average_bandwidth attributes['AVERAGE-BANDWIDTH']
       options = { program_id: attributes['PROGRAM-ID'],
                   codecs: attributes['CODECS'],
+                  width: resolution[:width],
+                  height: resolution[:height],
                   bandwidth: attributes['BANDWIDTH'].to_i,
                   average_bandwidth: average,
                   video: attributes['VIDEO'], audio: attributes['AUDIO'],
                   uri: attributes['URI'], subtitles: attributes['SUBTITLES'],
                   closed_captions: attributes['CLOSED-CAPTIONS'] }
-      initialize options
-      parse_resolution attributes['RESOLUTION']
+      PlaylistItem.new options
     end
 
     def resolution
@@ -58,14 +60,17 @@ module M3u8
 
     private
 
-    def parse_average_bandwidth(value)
+    def self.parse_average_bandwidth(value)
       value.to_i unless value.nil?
     end
 
-    def parse_resolution(resolution)
-      return if resolution.nil?
-      self.width = resolution.split('x')[0].to_i
-      self.height = resolution.split('x')[1].to_i
+    def self.parse_resolution(resolution)
+      return { width: nil, height: nil } if resolution.nil?
+
+      values = resolution.split('x')
+      width = values[0].to_i
+      height = values[1].to_i
+      { width: width, height: height }
     end
 
     def validate

data/lib/m3u8/reader.rb

@@ -22,31 +22,33 @@ module M3u8
     private
 
     def basic_tags
-      { '#EXT-X-VERSION' => proc { |line| parse_version line } }
+      { '#EXT-X-VERSION' => ->(line) { parse_version line } }
     end
 
     def media_segment_tags
-      { '#EXTINF' => proc { |line| parse_segment line },
-        '#EXT-X-DISCONTINUITY' => proc { |line| parse_discontinuity line },
-        '#EXT-X-BYTERANGE' => proc { |line| parse_byterange line },
-        '#EXT-X-KEY' => proc { |line| parse_key line }
+      { '#EXTINF' => ->(line) { parse_segment line },
+        '#EXT-X-DISCONTINUITY' => ->(line) { parse_discontinuity line },
+        '#EXT-X-BYTERANGE' => ->(line) { parse_byterange line },
+        '#EXT-X-KEY' => ->(line) { parse_key line },
+        '#EXT-X-MAP' => ->(line) { parse_map line },
+        '#EXT-X-PROGRAM-DATE-TIME' => ->(line) { parse_time line }
       }
     end
 
     def media_playlist_tags
-      { '#EXT-X-MEDIA-SEQUENCE' => proc { |line| parse_sequence line },
-        '#EXT-X-ALLOW-CACHE' => proc { |line| parse_cache line },
-        '#EXT-X-TARGETDURATION' => proc { |line| parse_target line },
+      { '#EXT-X-MEDIA-SEQUENCE' => ->(line) { parse_sequence line },
+        '#EXT-X-ALLOW-CACHE' => ->(line) { parse_cache line },
+        '#EXT-X-TARGETDURATION' => ->(line) { parse_target line },
         '#EXT-X-I-FRAMES-ONLY' => proc { playlist.iframes_only = true },
-        '#EXT-X-PLAYLIST-TYPE' => proc { |line| parse_playlist_type line }
+        '#EXT-X-PLAYLIST-TYPE' => ->(line) { parse_playlist_type line }
       }
     end
 
     def master_playlist_tags
-      { '#EXT-X-MEDIA' => proc { |line| parse_media line },
-        '#EXT-X-SESSION-DATA' => proc { |line| parse_session_data line },
-        '#EXT-X-STREAM-INF' => proc { |line| parse_stream line },
-        '#EXT-X-I-FRAME-STREAM-INF' => proc { |line| parse_iframe_stream line }
+      { '#EXT-X-MEDIA' => ->(line) { parse_media line },
+        '#EXT-X-SESSION-DATA' => ->(line) { parse_session_data line },
+        '#EXT-X-STREAM-INF' => ->(line) { parse_stream line },
+        '#EXT-X-I-FRAME-STREAM-INF' => ->(line) { parse_iframe_stream line }
       }
     end
 
@@ -87,16 +89,14 @@ module M3u8
       self.master = true
       self.open = true
 
-      self.item = M3u8::PlaylistItem.new
-      item.parse line
+      self.item = M3u8::PlaylistItem.parse line
     end
 
     def parse_iframe_stream(line)
       self.master = true
       self.open = false
 
-      self.item = M3u8::PlaylistItem.new
-      item.parse line
+      self.item = M3u8::PlaylistItem.parse line
       item.iframe = true
       playlist.items.push item
     end
@@ -114,6 +114,11 @@ module M3u8
       playlist.items.push item
     end
 
+    def parse_map(line)
+      item = M3u8::MapItem.parse line
+      playlist.items.push item
+    end
+
     def parse_segment(line)
       self.item = M3u8::SegmentItem.new
       values = line.gsub('#EXTINF:', '').gsub("\n", ',').split(',')
@@ -125,9 +130,8 @@ module M3u8
     end
 
     def parse_byterange(line)
-      values = line.gsub('#EXT-X-BYTERANGE:', '').gsub("\n", ',').split '@'
-      item.byterange_length = values[0].to_i
-      item.byterange_start = values[1].to_i unless values[1].nil?
+      values = line.gsub('#EXT-X-BYTERANGE:', '').gsub("\n", ',')
+      item.byterange = M3u8::ByteRange.parse values
     end
 
     def parse_session_data(line)
@@ -137,11 +141,15 @@ module M3u8
 
     def parse_media(line)
       self.open = false
-      self.item = M3u8::MediaItem.new
-      item.parse line
+      self.item = M3u8::MediaItem.parse line
       playlist.items.push item
     end
 
+    def parse_time(line)
+      self.open = false
+      playlist.items.push M3u8::TimeItem.parse line
+    end
+
     def parse_next_line(line)
       value = line.gsub "\n", ''
       if master

data/lib/m3u8/segment_item.rb

@@ -2,13 +2,11 @@ module M3u8
   # SegmentItem represents EXTINF attributes with the URI that follows,
   # optionally allowing an EXT-X-BYTERANGE tag to be set.
   class SegmentItem
-    attr_accessor :duration, :segment, :comment, :byterange_length,
-                  :byterange_start
+    include M3u8
+    attr_accessor :duration, :segment, :comment, :byterange
 
     def initialize(params = {})
-      params.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
+      intialize_with_byterange(params)
     end
 
     def to_s
@@ -18,13 +16,8 @@ module M3u8
     private
 
     def byterange_format
-      return if byterange_length.nil?
-      "\n#EXT-X-BYTERANGE:#{byterange_length}#{byterange_start_format}"
-    end
-
-    def byterange_start_format
-      return if byterange_start.nil?
-      "@#{byterange_start}"
+      return if byterange.nil?
+      "\n#EXT-X-BYTERANGE:#{byterange}"
     end
   end
 end

data/lib/m3u8/time_item.rb

@@ -0,0 +1,30 @@
+module M3u8
+  # TimeItem represents EXT-X-PROGRAM-DATE-TIME
+  class TimeItem
+    extend M3u8
+    attr_accessor :time
+
+    def initialize(params = {})
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def self.parse(text)
+      time = text.gsub('#EXT-X-PROGRAM-DATE-TIME:', '')
+      options = { time: Time.parse(time) }
+      TimeItem.new options
+    end
+
+    def to_s
+      %(#EXT-X-PROGRAM-DATE-TIME:#{time_format})
+    end
+
+    private
+
+    def time_format
+      return time if time.is_a?(String)
+      time.iso8601
+    end
+  end
+end

data/lib/m3u8/version.rb

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

data/spec/byte_range_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe M3u8::ByteRange do
+  it 'should provide m3u8 format representation' do
+    hash = { length: 4500, start: 600 }
+    item = M3u8::ByteRange.new(hash)
+    output = item.to_s
+    expected = '4500@600'
+    expect(output).to eq expected
+
+    hash = { length: 3300 }
+    item = M3u8::ByteRange.new(hash)
+    output = item.to_s
+    expected = '3300'
+    expect(output).to eq expected
+  end
+
+  it 'should parse instance from string' do
+    input = '3500@300'
+    range = M3u8::ByteRange.parse(input)
+    expect(range.length).to eq 3500
+    expect(range.start).to eq 300
+
+    input = '4000'
+    range = M3u8::ByteRange.parse(input)
+    expect(range.length).to eq 4000
+    expect(range.start).to be_nil
+  end
+end

data/spec/fixtures/map_playlist.m3u8

@@ -0,0 +1,8 @@
+#EXTM3U
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-VERSION:5
+#EXT-X-MEDIA-SEQUENCE:1
+#EXT-X-ALLOW-CACHE:NO
+#EXT-X-TARGETDURATION:12
+#EXT-X-MAP:URI="frelo/prog_index.m3u8",BYTERANGE="4500@600"
+#EXT-X-ENDLIST

data/spec/fixtures/playlist.m3u8

@@ -11,6 +11,7 @@
 1080-7mbps00001.ts
 #EXTINF:7.507489,
 1080-7mbps00002.ts
+#EXT-X-PROGRAM-DATE-TIME:2010-02-19T14:54:23Z
 #EXTINF:11.261233,
 1080-7mbps00003.ts
 #EXTINF:11.261233,

data/spec/map_item_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe M3u8::MapItem do
+  it 'should provide m3u8 format representation' do
+    hash = { uri: 'frelo/prog_index.m3u8',
+             byterange: {
+               length: 4500,
+               start: 600
+             }
+           }
+    item = M3u8::MapItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-MAP:URI="frelo/prog_index.m3u8",' \
+               'BYTERANGE="4500@600"'
+    expect(output).to eq expected
+
+    hash = { uri: 'frehi/prog_index.m3u8' }
+    item = M3u8::MapItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-MAP:URI="frehi/prog_index.m3u8"'
+    expect(output).to eq expected
+  end
+
+  it 'should parse m3u8 text into instance' do
+    input = '#EXT-X-MAP:URI="frelo/prog_index.m3u8",' \
+            'BYTERANGE="3500@300"'
+
+    item = M3u8::MapItem.parse(input)
+
+    expect(item.uri).to eq 'frelo/prog_index.m3u8'
+    expect(item.byterange.length).to eq 3500
+    expect(item.byterange.start).to eq 300
+
+    input = '#EXT-X-MAP:URI="frelo/prog_index.m3u8"'
+
+    item = M3u8::MapItem.parse(input)
+
+    expect(item.uri).to eq 'frelo/prog_index.m3u8'
+    expect(item.byterange).to be_nil
+  end
+end

data/spec/media_item_spec.rb

@@ -27,8 +27,7 @@ describe M3u8::MediaItem do
     format = '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="fre",' \
              'ASSOC-LANGUAGE="spoken",NAME="Francais",AUTOSELECT=YES,' +
              %("DEFAULT=NO,URI="frelo/prog_index.m3u8",FORCED=YES\n")
-    item = M3u8::MediaItem.new
-    item.parse format
+    item = M3u8::MediaItem.parse format
 
     expect(item.type).to eq 'AUDIO'
     expect(item.group_id).to eq 'audio-lo'

data/spec/playlist_item_spec.rb

@@ -20,8 +20,7 @@ describe M3u8::PlaylistItem do
              %(PROGRAM-ID=1,RESOLUTION=1920x1080,) +
              %(AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",) +
              %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
-    item = M3u8::PlaylistItem.new
-    item.parse(format)
+    item = M3u8::PlaylistItem.parse(format)
     expect(item.program_id).to eq '1'
     expect(item.codecs).to eq 'avc'
     expect(item.bandwidth).to eq 540
@@ -37,8 +36,7 @@ describe M3u8::PlaylistItem do
     format = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
              %(PROGRAM-ID=1,AUDIO="test",VIDEO="test2",) +
              %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
-    item = M3u8::PlaylistItem.new
-    item.parse(format)
+    item = M3u8::PlaylistItem.parse(format)
     expect(item.program_id).to eq '1'
     expect(item.codecs).to eq 'avc'
     expect(item.bandwidth).to eq 540

data/spec/reader_spec.rb

@@ -68,7 +68,11 @@ describe M3u8::Reader do
     expect(item.duration).to eq 11.344644
     expect(item.comment).to be_nil
 
-    expect(playlist.items.size).to eq 139
+    item = playlist.items[4]
+    expect(item).to be_a(M3u8::TimeItem)
+    expect(item.time).to eq(Time.iso8601('2010-02-19T14:54:23Z'))
+
+    expect(playlist.items.size).to eq 140
   end
 
   it 'should parse I-Frame playlist' do
@@ -82,13 +86,13 @@ describe M3u8::Reader do
     item = playlist.items[0]
     expect(item).to be_a(M3u8::SegmentItem)
     expect(item.duration).to eq 4.12
-    expect(item.byterange_length).to eq 9400
-    expect(item.byterange_start).to eq 376
+    expect(item.byterange.length).to eq 9400
+    expect(item.byterange.start).to eq 376
     expect(item.segment).to eq 'segment1.ts'
 
     item = playlist.items[1]
-    expect(item.byterange_length).to eq 7144
-    expect(item.byterange_start).to be_nil
+    expect(item.byterange.length).to eq 7144
+    expect(item.byterange.start).to be_nil
   end
 
   it 'should parse segment playlist with comments' do
@@ -198,4 +202,18 @@ describe M3u8::Reader do
     expect(item.method).to eq 'AES-128'
     expect(item.uri).to eq 'https://priv.example.com/key.php?r=52'
   end
+
+  it 'should parse map (media intialization section) playlists' do
+    file = File.open 'spec/fixtures/map_playlist.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+
+    expect(playlist.items.size).to eq 1
+
+    item = playlist.items[0]
+    expect(item).to be_a M3u8::MapItem
+    expect(item.uri).to eq 'frelo/prog_index.m3u8'
+    expect(item.byterange.length).to eq 4500
+    expect(item.byterange.start).to eq 600
+  end
 end

data/spec/segment_item_spec.rb

@@ -7,13 +7,18 @@ describe M3u8::SegmentItem do
     expect(item.duration).to eq 10.991
     expect(item.segment).to eq 'test.ts'
     expect(item.comment).to be_nil
+    expect(item.byterange).to be_nil
 
     hash = { duration: 10.991, segment: 'test.ts', comment: 'anything',
-             byterange_length: 4500, byterange_start: 600 }
+             byterange: {
+               length: 4500,
+               start: 600
+             }
+           }
     item = M3u8::SegmentItem.new(hash)
     expect(item.duration).to eq 10.991
-    expect(item.byterange_length).to eq 4500
-    expect(item.byterange_start).to eq 600
+    expect(item.byterange.length).to eq 4500
+    expect(item.byterange.start).to eq 600
     expect(item.segment).to eq 'test.ts'
     expect(item.comment).to eq 'anything'
   end
@@ -32,14 +37,21 @@ describe M3u8::SegmentItem do
     expect(output).to eq expected
 
     hash = { duration: 10.991, segment: 'test.ts', comment: 'anything',
-             byterange_length: 4500, byterange_start: 600 }
+             byterange: {
+               length: 4500,
+               start: 600
+             }
+           }
     item = M3u8::SegmentItem.new(hash)
     output = item.to_s
     expected = "#EXTINF:10.991,anything\n#EXT-X-BYTERANGE:4500@600\ntest.ts"
     expect(output).to eq expected
 
     hash = { duration: 10.991, segment: 'test.ts', comment: 'anything',
-             byterange_length: 4500 }
+             byterange: {
+               length: 4500
+             }
+           }
     item = M3u8::SegmentItem.new(hash)
     output = item.to_s
     expected = "#EXTINF:10.991,anything\n#EXT-X-BYTERANGE:4500\ntest.ts"

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
 require 'm3u8'
-
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

data/spec/time_item_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe M3u8::TimeItem do
+  it 'should provide m3u8 format representation' do
+    options = { time: '2010-02-19T14:54:23.031' }
+    item = M3u8::TimeItem.new(options)
+    output = item.to_s
+    expected = '#EXT-X-PROGRAM-DATE-TIME:2010-02-19T14:54:23.031'
+    expect(output).to eq expected
+
+    options = { time: Time.iso8601('2010-02-19T14:54:23.031Z') }
+    item = M3u8::TimeItem.new(options)
+    output = item.to_s
+    expected = '#EXT-X-PROGRAM-DATE-TIME:2010-02-19T14:54:23Z'
+    expect(output).to eq expected
+  end
+
+  it 'should parse m3u8 text into instance' do
+    input = '#EXT-X-PROGRAM-DATE-TIME:2010-02-19T14:54:23.031Z'
+    item = M3u8::TimeItem.parse(input)
+    expect(item.time).to eq Time.iso8601('2010-02-19T14:54:23.031Z')
+  end
+end

data/spec/writer_spec.rb

@@ -116,7 +116,7 @@ describe M3u8::Writer do
              "1080-7mbps00000.ts\n" +
              %(#EXT-X-KEY:METHOD=AES-128,URI="http://test.key",) +
              %(IV=D512BBF,KEYFORMAT="identity",KEYFORMATVERSIONS="1/3"\n) +
-             "#EXTINF:11.261233,\n" +
+             "#EXTINF:11.261233,\n" \
              "1080-7mbps00001.ts\n" \
              "#EXT-X-ENDLIST\n"
     io = StringIO.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,21 +70,26 @@ files:
 - README.md
 - Rakefile
 - lib/m3u8.rb
+- lib/m3u8/byte_range.rb
 - lib/m3u8/discontinuity_item.rb
 - lib/m3u8/error.rb
 - lib/m3u8/key_item.rb
+- lib/m3u8/map_item.rb
 - lib/m3u8/media_item.rb
 - lib/m3u8/playlist.rb
 - lib/m3u8/playlist_item.rb
 - lib/m3u8/reader.rb
 - lib/m3u8/segment_item.rb
 - lib/m3u8/session_data_item.rb
+- lib/m3u8/time_item.rb
 - lib/m3u8/version.rb
 - lib/m3u8/writer.rb
 - m3u8.gemspec
+- spec/byte_range_spec.rb
 - spec/discontinuity_item_spec.rb
 - spec/fixtures/encrypted.m3u8
 - spec/fixtures/iframes.m3u8
+- spec/fixtures/map_playlist.m3u8
 - spec/fixtures/master.m3u8
 - spec/fixtures/master_iframes.m3u8
 - spec/fixtures/playlist.m3u8
@@ -94,6 +99,7 @@ files:
 - spec/fixtures/variant_audio.m3u8
 - spec/key_item_spec.rb
 - spec/m3u8_spec.rb
+- spec/map_item_spec.rb
 - spec/media_item_spec.rb
 - spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
@@ -101,6 +107,7 @@ files:
 - spec/segment_item_spec.rb
 - spec/session_data_item_spec.rb
 - spec/spec_helper.rb
+- spec/time_item_spec.rb
 - spec/writer_spec.rb
 homepage: https://github.com/sethdeckard/m3u8
 licenses:
@@ -122,14 +129,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
 test_files:
+- spec/byte_range_spec.rb
 - spec/discontinuity_item_spec.rb
 - spec/fixtures/encrypted.m3u8
 - spec/fixtures/iframes.m3u8
+- spec/fixtures/map_playlist.m3u8
 - spec/fixtures/master.m3u8
 - spec/fixtures/master_iframes.m3u8
 - spec/fixtures/playlist.m3u8
@@ -139,6 +148,7 @@ test_files:
 - spec/fixtures/variant_audio.m3u8
 - spec/key_item_spec.rb
 - spec/m3u8_spec.rb
+- spec/map_item_spec.rb
 - spec/media_item_spec.rb
 - spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
@@ -146,4 +156,5 @@ test_files:
 - spec/segment_item_spec.rb
 - spec/session_data_item_spec.rb
 - spec/spec_helper.rb
+- spec/time_item_spec.rb
 - spec/writer_spec.rb