m3u8 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bead9657f94696922af4e09d7f19800b80572ff
-  data.tar.gz: b654a6d47b3cfad36b08f58cb95ffd12e46c3b66
+  metadata.gz: 113427414ddf5ec31124dbcc67b905d8f4d29ab9
+  data.tar.gz: 0aa8693ced40c395ade39b026ffce25f99fe49d1
 SHA512:
-  metadata.gz: fc8d26287b07199eaba044e66330f519a6c96b44b52e607ea48cafb286d4a005e22d1f43cdfb2d353c9ccc79e4ea92fd188ed7e4cdee570580110b7b23ff5f6f
-  data.tar.gz: 9b82bbb066aa4ccbb6e3f9827ec7ca56fbb845f56ac57826fbe29d37bdd06631bf1800b43cd42e28b582630c5fd50a6c91818af1c87b223e76cac54ed71b0062
+  metadata.gz: 12f12fe680621b9bd4bdb8eca4f5042de4f063772fff5ac331db34f12458131e47f1f8420a40af7072f85ed835e623ed4a6324cfb1a912f2e6d251ea11a3a3dc
+  data.tar.gz: 038002c0468e4c332ad06d6b38ff748aa6bdead131e0b5eb356da563c85648a5609c87fe233a1343768a532aebe99e12a3b7853b4843d487997fe89193eb9640

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   Exclude:
     - 'spec/spec_helper.rb'
+    - 'm3u8.gemspec'
 Style/StringLiterals:
-  EnforcedStyle: single_quotes
+  EnforcedStyle: single_quotes

data/.ruby-version

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

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
+sudo: false
 rvm:
+- 2.2.3
+- 2.1.7
 - 2.0.0
-- 1.9.3
-- jruby-19mode
 
-script: rspec spec
+script: rspec spec

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+#### 0.6.2 (2/16/2016) - Added support for EXT-X-SESSION-KEY tags. Merged pulled request #6 from [jviney](https://github.com/jviney), fixing bug with codec string value.
+
 #### 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).

data/Gemfile

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

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/README.md

@@ -27,17 +27,19 @@ Or install it yourself as:
 ## Usage (creating playlists)
     
 Create a master playlist and add child playlists for adaptive bitrate streaming:
+
 ```ruby
 require 'm3u8'
 playlist = M3u8::Playlist.new
 ```
 
 Create a new playlist item with options:
+
 ```ruby
 options = { width: 1920, height: 1080, profile: 'high', level: 4.1,
             audio_codec: 'aac-lc', bandwidth: 540, uri: 'test.url' }
-item = M3u8::PlaylistItem.new options
-playlist.items.push item
+item = M3u8::PlaylistItem.new(options)
+playlist.items << item
 ```    
  
 Add alternate audio, camera angles, closed captions and subtitles by creating MediaItem instances and adding them to the Playlist:
@@ -47,42 +49,51 @@ hash = { type: 'AUDIO', group_id: 'audio-lo', language: 'fre',
          assoc_language: 'spoken', name: 'Francais', autoselect: true,
          default: false, forced: true, uri: 'frelo/prog_index.m3u8' }
 item = M3u8::MediaItem.new(hash)
-playlist.items.push item
+playlist.items << item
 ```
   
 Create a standard playlist and add MPEG-TS segments via SegmentItem. You can also specify options for this type of playlist, however these options are ignored if playlist becomes a master playlist (anything but segments added):
+
 ```ruby
 options = { version: 1, cache: false, target: 12, sequence: 1 }
-playlist = M3u8::Playlist.new options
+playlist = M3u8::Playlist.new(options)
 
-item = M3u8::SegmentItem.new duration: 11, segment: 'test.ts'
-playlist.items.push item
+item = M3u8::SegmentItem.new(duration: 11, segment: 'test.ts')
+playlist.items << item
 ```
     
 You can pass an IO object to the write method:
+
 ```ruby
 require 'tempfile'
-f = Tempfile.new 'test'
-playlist.write f
+file = Tempfile.new('test')
+playlist.write(file)
 ```
+
 You can also access the playlist as a string:
+
 ```ruby
 playlist.to_s
 ``` 
+
 M3u8::Writer is the class that handles generating the playlist output.
 
 Alternatively you can set codecs rather than having it generated automatically:
+
 ```ruby
 options = { width: 1920, height: 1080, codecs: 'avc1.66.30,mp4a.40.2',
             bandwidth: 540, uri: 'test.url' }
-item = M3u8::PlaylistItem.new options
+item = M3u8::PlaylistItem.new(options)
 ```
+
 Just get the codec string for custom use:
+
 ```ruby
 options = { profile: 'baseline', level: 3.0, audio_codec: 'aac-lc' }
-codecs = M3u8::Playlist.codecs options
+codecs = M3u8::Playlist.codecs(options)
 # => "avc1.66.30,mp4a.40.2"
-```        
+```  
+      
 Values for audio_codec (codec name): aac-lc, he-aac, mp3
     
 Possible values for profile (H.264 Profile): baseline, main, high.
@@ -95,50 +106,81 @@ Not all Levels and Profiles can be combined, consult H.264 documentation
 
 ```ruby
 file = File.open 'spec/fixtures/master.m3u8'
-playlist = M3u8::Playlist.read file
+playlist = M3u8::Playlist.read(file)
 playlist.master?
 # => true
 ```
-Acess items in playlist:
+
+Access items in playlist:
+
 ```ruby
 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">
 ```
+
 Create a new playlist item with options:
+
 ```ruby
 options = { width: 1920, height: 1080, profile: 'high', level: 4.1,
             audio_codec: 'aac-lc', bandwidth: 540, uri: 'test.url' }
-item = M3u8::PlaylistItem.new options
+item = M3u8::PlaylistItem.new(options)
 #add it to the top of the playlist
-playlist.items.insert 0, item
+playlist.items.unshift(item)
 ```
+
 M3u8::Reader is the class handles parsing if you want more control over the process.
     
 ## Features
 * 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.
+* Automatically generates the audio/video codec string based on names and options you are familiar with.
 * Provides validation of input when adding playlists or segments.
 * Allows all options to be configured on a playlist (caching, version, etc.)
-* Supports I-Frames (Intra frames) and Byte Ranges in Segments.
-* Supports subtitles, closed captions, alternate audio and video, and comments.
-# Supports Session Data in master playlists.
-* Supports keys for encrypted media segments (EXT-X-KEY).
-* Supports EXT-X-DISCONTINUITY in media segments.
 * 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.
 * Any tag or attribute supported by the object model is supported both parsing and generation of m3u8 playlists.
-
-## Missing (but planned) Features 
+* Supports I-frames (Intra frames) and byte ranges in Segments.
+* Supports subtitles, closed captions, alternate audio and video, and comments.
+* Supports session data in master playlists.
+* Supports keys for encrypted media segments (EXT-X-KEY, EXT-SESSION-KEY).
+
+## HLS Spec Status (version 17)
+### Implemented:
+* EXTM3U
+* EXT-X-VERSION
+* EXTINF  
+* EXT-X-BYTERANGE
+* EXT-X-DISCONTINUITY
+* EXT-X-KEY
+* EXT-X-MAP
+* EXT-X-PROGRAM-DATE-TIME
+* EXT-X-TARGETDURATION
+* EXT-X-MEDIA-SEQUENCE
+* EXT-X-ENDLIST
+* EXT-X-PLAYLIST-TYPE
+* EXT-X-I-FRAMES-ONLY
+* EXT-X-MEDIA
+* EXT-X-STREAM-INF
+* EXT-X-I-FRAME-STREAM-INF
+* EXT-X-SESSION-DATA
+* EXT-X-SESSION-KEY
+
+### TODO:
+* EXT-X-DISCONTINUITY-SEQUENCE
+* EXT-X-INDEPENDENT-SEGMENTS
+* EXT-X-START
+
+## Roadmap 
+* Add the last remaining tags for latest version of the spec.
 * Validation of all attributes and their values to match the rules defined in the spec.
-* Still missing support for a few tags and attributes.
+* Support for different versions of spec, defaulting to latest.
 
 ## Contributing
 
 1. Fork it ( https://github.com/sethdeckard/m3u8/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Run the specs, make sure they pass and that new features are covered
+3. Run the specs, make sure they pass and that new features are covered. Code coverage should be 100%.
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request

data/lib/m3u8.rb

@@ -1,24 +1,11 @@
 require 'stringio'
-require 'm3u8/version'
-require 'm3u8/playlist'
-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'
+Dir[File.dirname(__FILE__) + '/m3u8/*.rb'].each { |file| require file }
 
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
   def parse_attributes(line)
-    array = line.gsub("\n", '').scan(/([A-z-]+)\s*=\s*("[^"]*"|[^,]*)/)
-    Hash[array.map { |key, value| [key, value.gsub('"', '')] }]
+    array = line.delete("\n").scan(/([A-z-]+)\s*=\s*("[^"]*"|[^,]*)/)
+    Hash[array.map { |key, value| [key, value.delete('"')] }]
   end
 
   def parse_yes_no(value)

data/lib/m3u8/encryptable.rb

@@ -0,0 +1,50 @@
+module M3u8
+  # Encapsulates logic common to encryption key tags
+  module Encryptable
+    def self.included(base)
+      base.send :attr_accessor, :method
+      base.send :attr_accessor, :uri
+      base.send :attr_accessor, :iv
+      base.send :attr_accessor, :key_format
+      base.send :attr_accessor, :key_format_versions
+    end
+
+    def attributes_to_s
+      [method_format,
+       uri_format,
+       iv_format,
+       key_format_format,
+       key_format_versions_format].compact.join(',')
+    end
+
+    def convert_key_names(attributes)
+      { method: attributes['METHOD'], uri: attributes['URI'],
+        iv: attributes['IV'], key_format: attributes['KEYFORMAT'],
+        key_format_versions: attributes['KEYFORMATVERSIONS'] }
+    end
+
+    private
+
+    def method_format
+      "METHOD=#{method}"
+    end
+
+    def uri_format
+      %(URI="#{uri}") unless uri.nil?
+    end
+
+    def iv_format
+      "IV=#{iv}" unless iv.nil?
+    end
+
+    def key_format_format
+      %(KEYFORMAT="#{key_format}") unless key_format.nil?
+    end
+
+    def key_format_versions_format
+      return if key_format_versions.nil?
+
+      %(KEYFORMATVERSIONS="#{key_format_versions}")
+    end
+  end
+end

data/lib/m3u8/key_item.rb

@@ -1,54 +1,23 @@
 module M3u8
   # KeyItem represents a set of EXT-X-KEY attributes
   class KeyItem
+    include Encryptable
     extend M3u8
-    attr_accessor :method, :uri, :iv, :key_format, :key_format_versions
 
     def initialize(params = {})
-      params.each do |key, value|
+      options = convert_key_names(params)
+      options.merge(params).each do |key, value|
         instance_variable_set("@#{key}", value)
       end
     end
 
     def self.parse(text)
-      attributes = parse_attributes text
-      options = { method: attributes['METHOD'], uri: attributes['URI'],
-                  iv: attributes['IV'], key_format: attributes['KEYFORMAT'],
-                  key_format_versions: attributes['KEYFORMATVERSIONS'] }
-      KeyItem.new options
+      attributes = parse_attributes(text)
+      KeyItem.new(attributes)
     end
 
     def to_s
-      attributes = [method_format,
-                    uri_format,
-                    iv_format,
-                    key_format_format,
-                    key_format_versions_format].compact.join(',')
-      "#EXT-X-KEY:#{attributes}"
-    end
-
-    private
-
-    def method_format
-      "METHOD=#{method}"
-    end
-
-    def uri_format
-      %(URI="#{uri}") unless uri.nil?
-    end
-
-    def iv_format
-      "IV=#{iv}" unless iv.nil?
-    end
-
-    def key_format_format
-      %(KEYFORMAT="#{key_format}") unless key_format.nil?
-    end
-
-    def key_format_versions_format
-      return if key_format_versions.nil?
-
-      %(KEYFORMATVERSIONS="#{key_format_versions}")
+      "#EXT-X-KEY:#{attributes_to_s}"
     end
   end
 end

data/lib/m3u8/playlist_item.rb

@@ -148,15 +148,27 @@ module M3u8
     def video_codec(profile, level)
       return if profile.nil? || level.nil?
 
-      profile = profile.downcase
-      return 'avc1.66.30' if profile == 'baseline' && level == 3.0
-      return 'avc1.42001f' if profile == 'baseline' && level == 3.1
-      return 'avc1.77.30' if profile == 'main' && level == 3.0
-      return 'avc1.4d001f' if profile == 'main' && level == 3.1
-      return 'avc1.4d0028' if profile == 'main' && level == 4.0
-      return 'avc1.64001f' if profile == 'high' && level == 3.1
-      return 'avc1.640028' if profile == 'high' &&
-                              (level == 4.0 || level == 4.1)
+      profile.downcase!
+      return baseline_codec_string(level) if profile == 'baseline'
+      return main_codec_string(level) if profile == 'main'
+      return high_codec_string(level) if profile == 'high'
+    end
+
+    def baseline_codec_string(level)
+      return 'avc1.66.30' if level == 3.0
+      return 'avc1.42001f' if level == 3.1
+    end
+
+    def main_codec_string(level)
+      return 'avc1.77.30' if level == 3.0
+      return 'avc1.4d001f' if level == 3.1
+      return 'avc1.4d0028' if level == 4.0
+    end
+
+    def high_codec_string(level)
+      return 'avc1.64001f' if level == 3.1
+      return 'avc1.640028' if level == 4.0
+      return 'avc1.640029' if level == 4.1
     end
   end
 end

data/lib/m3u8/reader.rb

@@ -22,45 +22,46 @@ module M3u8
     private
 
     def basic_tags
-      { '#EXT-X-VERSION' => ->(line) { parse_version line } }
+      { '#EXT-X-VERSION' => ->(line) { parse_version(line) } }
     end
 
     def media_segment_tags
-      { '#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 }
+      { '#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' => ->(line) { parse_sequence line },
-        '#EXT-X-ALLOW-CACHE' => ->(line) { parse_cache line },
-        '#EXT-X-TARGETDURATION' => ->(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' => ->(line) { parse_playlist_type line }
+        '#EXT-X-PLAYLIST-TYPE' => ->(line) { parse_playlist_type(line) }
       }
     end
 
     def master_playlist_tags
-      { '#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 }
+      { '#EXT-X-MEDIA' => ->(line) { parse_media(line) },
+        '#EXT-X-SESSION-DATA' => ->(line) { parse_session_data(line) },
+        '#EXT-X-SESSION-KEY' => ->(line) { parse_session_key(line) },
+        '#EXT-X-STREAM-INF' => ->(line) { parse_stream(line) },
+        '#EXT-X-I-FRAME-STREAM-INF' => ->(line) { parse_iframe_stream(line) }
       }
     end
 
     def parse_line(line)
       return if match_tag(line)
-      parse_next_line line if !item.nil? && open
+      parse_next_line(line) if !item.nil? && open
     end
 
     def match_tag(line)
       tag = @tags.select { |key| line.start_with? key }
       return unless tag.values.first
-      tag.values.first.call line
+      tag.values.first.call(line)
       true
     end
 
@@ -89,16 +90,16 @@ module M3u8
       self.master = true
       self.open = true
 
-      self.item = M3u8::PlaylistItem.parse line
+      self.item = M3u8::PlaylistItem.parse(line)
     end
 
     def parse_iframe_stream(line)
       self.master = true
       self.open = false
 
-      self.item = M3u8::PlaylistItem.parse line
+      self.item = M3u8::PlaylistItem.parse(line)
       item.iframe = true
-      playlist.items.push item
+      playlist.items << item
     end
 
     def parse_discontinuity(*)
@@ -106,22 +107,22 @@ module M3u8
       self.open = false
 
       self.item = M3u8::DiscontinuityItem.new
-      playlist.items.push item
+      playlist.items << item
     end
 
     def parse_key(line)
-      item = M3u8::KeyItem.parse line
-      playlist.items.push item
+      item = M3u8::KeyItem.parse(line)
+      playlist.items << item
     end
 
     def parse_map(line)
-      item = M3u8::MapItem.parse line
-      playlist.items.push item
+      item = M3u8::MapItem.parse(line)
+      playlist.items << item
     end
 
     def parse_segment(line)
       self.item = M3u8::SegmentItem.new
-      values = line.gsub('#EXTINF:', '').gsub("\n", ',').split(',')
+      values = line.gsub('#EXTINF:', '').tr("\n", ',').split(',')
       item.duration = values[0].to_f
       item.comment = values[1] unless values[1].nil?
 
@@ -130,34 +131,39 @@ module M3u8
     end
 
     def parse_byterange(line)
-      values = line.gsub('#EXT-X-BYTERANGE:', '').gsub("\n", ',')
+      values = line.gsub('#EXT-X-BYTERANGE:', '').delete("\n")
       item.byterange = M3u8::ByteRange.parse values
     end
 
     def parse_session_data(line)
-      item = M3u8::SessionDataItem.parse line
-      playlist.items.push item
+      item = M3u8::SessionDataItem.parse(line)
+      playlist.items << item
+    end
+
+    def parse_session_key(line)
+      item = M3u8::SessionKeyItem.parse(line)
+      playlist.items << item
     end
 
     def parse_media(line)
       self.open = false
-      self.item = M3u8::MediaItem.parse line
-      playlist.items.push item
+      self.item = M3u8::MediaItem.parse(line)
+      playlist.items << item
     end
 
     def parse_time(line)
       self.open = false
-      playlist.items.push M3u8::TimeItem.parse line
+      playlist.items << M3u8::TimeItem.parse(line)
     end
 
     def parse_next_line(line)
-      value = line.gsub "\n", ''
+      value = line.delete("\n")
       if master
         item.uri = value
       else
         item.segment = value
       end
-      playlist.items.push item
+      playlist.items << item
       self.open = false
     end
   end

data/lib/m3u8/session_key_item.rb

@@ -0,0 +1,23 @@
+module M3u8
+  # KeyItem represents a set of EXT-X-SESSION-KEY attributes
+  class SessionKeyItem
+    include Encryptable
+    extend M3u8
+
+    def initialize(params = {})
+      options = convert_key_names(params)
+      options.merge(params).each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def self.parse(text)
+      attributes = parse_attributes(text)
+      SessionKeyItem.new(attributes)
+    end
+
+    def to_s
+      "#EXT-X-SESSION-KEY:#{attributes_to_s}"
+    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.6.1'
+  VERSION = '0.6.2'
 end

data/m3u8.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '>= 2.11'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.3'
 end

data/spec/fixtures/master.m3u8

@@ -1,4 +1,5 @@
 #EXTM3U
+#EXT-X-SESSION-KEY:METHOD=AES-128,URI="https://priv.example.com/key.php?r=52"
 #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/{playlist_item_spec.rb → lib/m3u8/playlist_item_spec.rb}

@@ -162,7 +162,7 @@ describe M3u8::PlaylistItem do
 
     options = { profile: 'high', level: 4.1 }
     item = M3u8::PlaylistItem.new options
-    expect(item.codecs).to eq 'avc1.640028'
+    expect(item.codecs).to eq 'avc1.640029'
   end
 
   it 'should raise error if codecs are missing' do

data/spec/{playlist_spec.rb → lib/m3u8/playlist_spec.rb}

@@ -39,7 +39,7 @@ describe M3u8::Playlist do
 
     output = "#EXTM3U\n" \
              '#EXT-X-STREAM-INF:PROGRAM-ID=2,RESOLUTION=1920x1080,' +
-             %(CODECS="avc1.640028,mp4a.40.2",BANDWIDTH=50000\n) +
+             %(CODECS="avc1.640029,mp4a.40.2",BANDWIDTH=50000\n) +
              "playlist_url\n"
 
     expect(playlist.to_s).to eq output
@@ -58,7 +58,7 @@ describe M3u8::Playlist do
     output = "#EXTM3U\n" +
              %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="mp4a.40.34") +
              ",BANDWIDTH=6400\nplaylist_url\n#EXT-X-STREAM-INF:PROGRAM-ID=2," +
-             %(RESOLUTION=1920x1080,CODECS="avc1.640028,mp4a.40.2") +
+             %(RESOLUTION=1920x1080,CODECS="avc1.640029,mp4a.40.2") +
              ",BANDWIDTH=50000\nplaylist_url\n"
     expect(playlist.to_s).to eq output
   end
@@ -208,7 +208,7 @@ describe M3u8::Playlist 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 6
+    expect(playlist.items.size).to eq(7)
   end
 
   it 'should return the total duration of a playlist' do
@@ -222,6 +222,6 @@ describe M3u8::Playlist do
     item = M3u8::SegmentItem.new(duration: 8.790, segment: 'test_04.ts')
     playlist.items.push item
 
-    expect(playlist.duration.round(3)).to eq 40.228
+    expect(playlist.duration.round(3)).to eq(40.228)
   end
 end

data/spec/{reader_spec.rb → lib/m3u8/reader_spec.rb}

@@ -8,6 +8,11 @@ describe M3u8::Reader do
     expect(playlist.master?).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::PlaylistItem)
     expect(item.uri).to eq('hls/1080-7mbps/1080-7mbps.m3u8')
     expect(item.program_id).to eq('1')
@@ -19,7 +24,7 @@ describe M3u8::Reader do
     expect(item.iframe).to be false
     expect(item.average_bandwidth).to be_nil
 
-    item = playlist.items[5]
+    item = playlist.items[6]
     expect(item).to be_a(M3u8::PlaylistItem)
     expect(item.uri).to eq('hls/64k/64k.m3u8')
     expect(item.program_id).to eq('1')
@@ -31,7 +36,7 @@ describe M3u8::Reader do
     expect(item.iframe).to be false
     expect(item.average_bandwidth).to be_nil
 
-    expect(playlist.items.size).to eq 6
+    expect(playlist.items.size).to eq(7)
 
     item = playlist.items.last
     expect(item.resolution).to be_nil
@@ -43,7 +48,7 @@ describe M3u8::Reader do
     playlist = reader.read file
     expect(playlist.master?).to be true
 
-    expect(playlist.items.size).to eq 7
+    expect(playlist.items.size).to eq(7)
 
     item = playlist.items[1]
     expect(item).to be_a(M3u8::PlaylistItem)
@@ -169,12 +174,12 @@ describe M3u8::Reader do
     reader = M3u8::Reader.new
     playlist = reader.read file
 
-    expect(playlist.items.size).to eq 6
+    expect(playlist.items.size).to eq(7)
 
     file = File.open 'spec/fixtures/master.m3u8'
     playlist = reader.read file
 
-    expect(playlist.items.size).to eq 6
+    expect(playlist.items.size).to eq(7)
   end
 
   it 'should parse playlist with session data' do

data/spec/lib/m3u8/session_key_item_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe M3u8::SessionKeyItem do
+  it 'should initialize with hash' do
+    hash = { method: 'AES-128', uri: 'http://test.key',
+             iv: 'D512BBF', key_format: 'identity',
+             key_format_versions: '1/3' }
+    item = M3u8::SessionKeyItem.new(hash)
+    expect(item.method).to eq 'AES-128'
+    expect(item.uri).to eq 'http://test.key'
+    expect(item.iv).to eq 'D512BBF'
+    expect(item.key_format).to eq 'identity'
+    expect(item.key_format_versions).to eq '1/3'
+  end
+
+  it 'should provide m3u8 format representation' do
+    hash = { method: 'AES-128', uri: 'http://test.key',
+             iv: 'D512BBF', key_format: 'identity',
+             key_format_versions: '1/3' }
+    item = M3u8::SessionKeyItem.new(hash)
+    expected = %(#EXT-X-SESSION-KEY:METHOD=AES-128,URI="http://test.key",) +
+               %(IV=D512BBF,KEYFORMAT="identity",KEYFORMATVERSIONS="1/3")
+    expect(item.to_s).to eq expected
+
+    hash = { method: 'AES-128', uri: 'http://test.key' }
+    item = M3u8::SessionKeyItem.new(hash)
+    expected = %(#EXT-X-SESSION-KEY:METHOD=AES-128,URI="http://test.key")
+    expect(item.to_s).to eq expected
+
+    hash = { method: 'NONE' }
+    item = M3u8::SessionKeyItem.new(hash)
+    expected = '#EXT-X-SESSION-KEY:METHOD=NONE'
+    expect(item.to_s).to eq expected
+  end
+
+  it 'should parse m3u8 format into instance' do
+    format = %(#EXT-X-SESSION-KEY:METHOD=AES-128,URI="http://test.key",) +
+             %(IV=D512BBF,KEYFORMAT="identity",KEYFORMATVERSIONS="1/3")
+    item = M3u8::KeyItem.parse format
+    expect(item.method).to eq 'AES-128'
+    expect(item.uri).to eq 'http://test.key'
+    expect(item.iv).to eq 'D512BBF'
+    expect(item.key_format).to eq 'identity'
+    expect(item.key_format_versions).to eq '1/3'
+  end
+end

data/spec/{writer_spec.rb → lib/m3u8/writer_spec.rb}

@@ -41,7 +41,7 @@ describe M3u8::Writer do
 
     output = "#EXTM3U\n" \
              '#EXT-X-STREAM-INF:PROGRAM-ID=2,RESOLUTION=1920x1080,' +
-             %(CODECS="avc1.640028,mp4a.40.2",BANDWIDTH=50000\n) +
+             %(CODECS="avc1.640029,mp4a.40.2",BANDWIDTH=50000\n) +
              "playlist_url\n"
 
     io = StringIO.open
@@ -67,7 +67,7 @@ describe M3u8::Writer do
     output = "#EXTM3U\n" +
              %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="mp4a.40.34") +
              ",BANDWIDTH=6400\nplaylist_url\n#EXT-X-STREAM-INF:PROGRAM-ID=2," +
-             %(RESOLUTION=1920x1080,CODECS="avc1.640028,mp4a.40.2") +
+             %(RESOLUTION=1920x1080,CODECS="avc1.640029,mp4a.40.2") +
              ",BANDWIDTH=50000\nplaylist_url\n" +
              %(#EXT-X-SESSION-DATA:DATA-ID="com.test.movie.title",) +
              %(VALUE="Test",URI="http://test",LANGUAGE="en"\n)

data/spec/spec_helper.rb

@@ -2,10 +2,10 @@ require 'm3u8'
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
-]
+])
 SimpleCov.start
 
 # This file was generated by the `rspec --init` command. Conventionally, all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.3'
 description: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
 email:
 - seth@deckard.me
@@ -63,15 +63,18 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/m3u8.rb
 - lib/m3u8/byte_range.rb
 - lib/m3u8/discontinuity_item.rb
+- lib/m3u8/encryptable.rb
 - lib/m3u8/error.rb
 - lib/m3u8/key_item.rb
 - lib/m3u8/map_item.rb
@@ -81,12 +84,11 @@ files:
 - lib/m3u8/reader.rb
 - lib/m3u8/segment_item.rb
 - lib/m3u8/session_data_item.rb
+- lib/m3u8/session_key_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
@@ -97,18 +99,21 @@ files:
 - spec/fixtures/session_data.m3u8
 - spec/fixtures/variant_angles.m3u8
 - 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
-- spec/reader_spec.rb
-- spec/segment_item_spec.rb
-- spec/session_data_item_spec.rb
+- spec/lib/m3u8/byte_range_spec.rb
+- spec/lib/m3u8/discontinuity_item_spec.rb
+- spec/lib/m3u8/key_item_spec.rb
+- spec/lib/m3u8/map_item_spec.rb
+- spec/lib/m3u8/media_item_spec.rb
+- spec/lib/m3u8/playlist_item_spec.rb
+- spec/lib/m3u8/playlist_spec.rb
+- spec/lib/m3u8/reader_spec.rb
+- spec/lib/m3u8/segment_item_spec.rb
+- spec/lib/m3u8/session_data_item_spec.rb
+- spec/lib/m3u8/session_key_item_spec.rb
+- spec/lib/m3u8/time_item_spec.rb
+- spec/lib/m3u8/writer_spec.rb
+- spec/lib/m3u8_spec.rb
 - spec/spec_helper.rb
-- spec/time_item_spec.rb
-- spec/writer_spec.rb
 homepage: https://github.com/sethdeckard/m3u8
 licenses:
 - MIT
@@ -129,13 +134,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 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
@@ -146,15 +149,18 @@ test_files:
 - spec/fixtures/session_data.m3u8
 - spec/fixtures/variant_angles.m3u8
 - 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
-- spec/reader_spec.rb
-- spec/segment_item_spec.rb
-- spec/session_data_item_spec.rb
+- spec/lib/m3u8/byte_range_spec.rb
+- spec/lib/m3u8/discontinuity_item_spec.rb
+- spec/lib/m3u8/key_item_spec.rb
+- spec/lib/m3u8/map_item_spec.rb
+- spec/lib/m3u8/media_item_spec.rb
+- spec/lib/m3u8/playlist_item_spec.rb
+- spec/lib/m3u8/playlist_spec.rb
+- spec/lib/m3u8/reader_spec.rb
+- spec/lib/m3u8/segment_item_spec.rb
+- spec/lib/m3u8/session_data_item_spec.rb
+- spec/lib/m3u8/session_key_item_spec.rb
+- spec/lib/m3u8/time_item_spec.rb
+- spec/lib/m3u8/writer_spec.rb
+- spec/lib/m3u8_spec.rb
 - spec/spec_helper.rb
-- spec/time_item_spec.rb
-- spec/writer_spec.rb