hydra_hls 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32e4c406781d813aaee77d4af330e021b4b526f
-  data.tar.gz: c39f8ec36f2967a31d468944575a956051c3156c
+  metadata.gz: a3586cd6caaef6a3efbf1ac9367298c006409e08
+  data.tar.gz: 3b63cd3824a4bfc4e2313bfd642764bdde10918c
 SHA512:
-  metadata.gz: 24ec6986e2a6f3b20e58c8391d4998606b860f4ab1712e0dc2c500589e22ce4dd5276ad94ea0cbfc5b86eb114df0a0ad0c7b35e418c9b4b21d71f46dc084d6b4
-  data.tar.gz: c41ccd0fa7f7259da38e92ce41e8773a2f641cdb0f1abee7fca41ec37702f1f2e8535fbd3eb321258123936ff76fff51424a6ab142c9557c4b603736b2115c3d
+  metadata.gz: e20c3c8b06d5de1ff4081362baa791d80579ed966ff567f7d41466eed9ba5695728a60b6b52fe1af429c4b4d474aec05c12a02e06aff97401dea5b02101379e3
+  data.tar.gz: 67e4a8f244fad1357c3df667cbeee66962b8db5b2b9b09b5f63b33222a5495aaaf5e6eb3b9d10b67aa6146023f31393cb45cbc652aad9c14a49499af49f45aa0

data/app/assets/javascripts/embed.js

@@ -12,5 +12,6 @@
 //
 //= require jquery
 //= require mediaelement-and-player
+//= require mep-feature-playlist
 //= require hls_initialize
 

data/app/assets/javascripts/hls_initialize.js.erb

@@ -1,5 +1,16 @@
 $(document).ready(function(){
-     $(".hls-media").mediaelementplayer({
-         flashName: "<%= asset_path("flashmediaelement.swf")  %>"
-     });
+    if(isPlaylist) {
+        $(".hls-media").mediaelementplayer({
+            loop: true,
+            shuffle: false  ,
+            playlist: true,
+            playlistposition: 'bottom',
+            features: ['playlistfeature', 'prevtrack', 'playpause', 'nexttrack', 'loop', 'shuffle', 'playlist', 'current', 'progress', 'duration', 'volume'],
+            flashName: "<%= asset_path("flashmediaelement.swf")  %>"
+        });
+    } else {
+        $(".hls-media").mediaelementplayer({
+            flashName: "<%= asset_path("flashmediaelement.swf")  %>"
+        });
+    }
  });

data/app/assets/stylesheets/embed.css

@@ -11,4 +11,5 @@
  * file per style scope.
  *
  *= require mediaelementplayer.min
+ *= require mep-feature-playlist
  */

data/app/models/concerns/hydra_hls/file_set_behavior.rb

@@ -59,6 +59,18 @@ module HydraHls
       playlist
     end
 
+
+    module ClassMethods
+
+      def audio_mime_types
+        # audio/x-wave is the mime type that fits 0.6.0 returns for a wav file.
+        # audio/mpeg is the mime type that fits 0.6.0 returns for an mp3 file.
+        ['audio/mp3', 'audio/mpeg', 'audio/wav', 'audio/x-wave', 'audio/x-wav', 'audio/ogg', 'audio/flac','audio/x-flac', 'audio/x-aiff', 'audio/aiff', ]
+      end
+    end
+
+
+
     private
 
     def segment_url_base

data/app/views/_playlist.html.erb

@@ -0,0 +1,7 @@
+<audio controls="controls" class="hls-media" preload="auto">
+    <% file_sets.each do |file_set| %>
+        <source src="<%= File.join(request.base_url,"file_set",file_set.id,"hls.m3u8") %>" type="application/x-mpegurl"/>
+    <%end %>
+        Your browser does not support the audio tag.
+</audio>
+<script type="text/javascript">isPlaylist = true</script>

data/lib/hydra_hls/version.rb

@@ -1,3 +1,3 @@
 module HydraHls
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: hydra_hls
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.6
 description: This gem allows a hydra application to create hls derivative media files
@@ -42,6 +42,7 @@ files:
 - app/controllers/concerns/hydra_hls/file_sets_controller_behavior.rb
 - app/models/concerns/hydra_hls/file_set_behavior.rb
 - app/services/hydra_hls/hls_output_file_service.rb
+- app/views/_playlist.html.erb
 - app/views/curation_concerns/file_sets/embed.html.erb
 - app/views/curation_concerns/file_sets/media_display/_audio_hls.html.erb
 - app/views/curation_concerns/file_sets/media_display/_video_hls.html.erb
@@ -122,38 +123,38 @@ signing_key:
 specification_version: 4
 summary: An engine to add hls adaptive streaming to a hydra based application.
 test_files:
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
 - spec/dummy/config.ru
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
+- spec/dummy/README.rdoc
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/Rakefile
 - spec/dummy/config/routes.rb
-- spec/dummy/config/application.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/database.yml
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
 - spec/test_app_templates/lib/generators/test_app_generator.rb