m3u8 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076a51812bf0e0b15592085e11cdbd8c16f891a0
-  data.tar.gz: deb1623d472e42656015eee0db7b98d065524db9
+  metadata.gz: 1b0a12ed7f44279220cc4ff7875ac7489d3acdd8
+  data.tar.gz: 6d402ff9367f418ba336d43b82fd31d3b53a713d
 SHA512:
-  metadata.gz: b60b8c3ac32179a37c3bbbc4ee5dbbfd15c31b37e8b0e24da79f831040effe821bb567f3bd99003dab2405ca3bc41d34a284b4431274ae772883227333292141
-  data.tar.gz: fc80b8e642ce134f7af812d421453d8a1fa198d00ea183b178ce217f8594512ca8c11754e8b073d635a5bb66f15239ac82080208fc07c62e7dda1a77c2ee3443
+  metadata.gz: 67e830b28ab20def54ceb22c1d37c4900faaf75888fcf6d64e84b5d0446a7f979c418935c20cf6ce0bba661a8bc3f28f1d4fa1dda86682096f08c0c939749a59
+  data.tar.gz: 120d949eee406b2770d9e216cf8436b1f3a79c64aaa2337fd5037d86bc027772404d18e7688ae4f7073866759bcc76185ebcd77f7ed23670a286d87d80925547

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,5 @@
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes

data/lib/m3u8/playlist_item.rb

@@ -34,8 +34,12 @@ module M3u8
 
     def to_s
       validate
-      "#EXT-X-STREAM-INF:PROGRAM-ID=#{program_id},#{resolution_format}" +
-        %(CODECS="#{codecs}",BANDWIDTH=#{bitrate}\n#{playlist})
+
+      attributes = [program_id_format,
+                    resolution_format,
+                    codecs_format,
+                    bandwidth_format].compact.join(',')
+      "#EXT-X-STREAM-INF:#{attributes}\n#{playlist}"
     end
 
     private
@@ -44,9 +48,22 @@ module M3u8
       fail MissingCodecError, MISSING_CODEC_MESSAGE if codecs.nil?
     end
 
+    def program_id_format
+      return if program_id.nil?
+      "PROGRAM-ID=#{program_id}"
+    end
+
     def resolution_format
       return if resolution.nil?
-      "RESOLUTION=#{resolution},"
+      "RESOLUTION=#{resolution}"
+    end
+
+    def codecs_format
+      "CODECS=\"#{codecs}\""
+    end
+
+    def bandwidth_format
+      "BANDWIDTH=#{bitrate}"
     end
 
     def audio_codec(audio)

data/lib/m3u8/version.rb

@@ -1,3 +1,3 @@
 module M3u8
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/playlist_spec.rb

@@ -8,6 +8,17 @@ describe M3u8::Playlist do
   end
 
   it 'should render master playlist' do
+    options = { playlist: 'playlist_url', bitrate: 6400,
+                audio: 'mp3' }
+    item = M3u8::PlaylistItem.new options
+    playlist = M3u8::Playlist.new
+    playlist.items.push item
+
+    output = "#EXTM3U\n" +
+             %(#EXT-X-STREAM-INF:CODECS="mp4a.40.34") +
+             ",BANDWIDTH=6400\nplaylist_url\n"
+    expect(playlist.to_s).to eq output
+
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
                 audio: 'mp3' }
     item = M3u8::PlaylistItem.new options

data/spec/writer_spec.rb

@@ -2,6 +2,21 @@ require 'spec_helper'
 
 describe M3u8::Writer do
   it 'should render master playlist' do
+    options = { playlist: 'playlist_url', bitrate: 6400,
+                audio: 'mp3' }
+    item = M3u8::PlaylistItem.new options
+    playlist = M3u8::Playlist.new
+    playlist.items.push item
+
+    output = "#EXTM3U\n" +
+             %(#EXT-X-STREAM-INF:CODECS="mp4a.40.34") +
+             ",BANDWIDTH=6400\nplaylist_url\n"
+
+    io = StringIO.open
+    writer = M3u8::Writer.new io
+    writer.write playlist
+    expect(io.string).to eq output
+
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
                 audio: 'mp3' }
     item = M3u8::PlaylistItem.new options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile