the_little_streamer 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51105a77ed843dde2841f3dcdf07fec04e2b16c6
-  data.tar.gz: 4897f52dd669382e145ad146e718ad9fe4b8b05e
+SHA256:
+  metadata.gz: 00baf48d663ad7871febe31a46a942007a5eb3bc4c8e84dd94ed5c98d0b849fc
+  data.tar.gz: ae7758504a37d8142f001d6ccd6cce225a66a185afb7b55b5785e38c007b0d23
 SHA512:
-  metadata.gz: 0183101cbdcf9f3efa30dcdbed1cd8fd3f49ef8b38090341c351bda1e6d554c0021e76083178dba4a8469e5b7f6b3b23fd6a369c9e8cde8abbdcf4a19f2827e2
-  data.tar.gz: 6083e64a11d887896d174475aee1a6da6aa91936edd5305533cc91f2aafea7d278d5e15f8b60873f37b3ef8b565ca7a271b0c7efed140ceab3b314ffc6bea458
+  metadata.gz: a4f511005bdbe85b98ae85d936c9894e4c0804f9c742cd78278af3495994b9d9699a33424ae89797a58e6adaa5dacb559090b184529a55a7832ee02b77f1544a
+  data.tar.gz: ede209515d4f3c8c0cdb7f7d73b57403e0bd50aa404fa19378fdb20254d7b7efd53b29c6290597216d512d0633f2c96142660f93e24ea346910ed3724a13b597

data/lib/the_little_streamer/html.rb

@@ -87,9 +87,10 @@ module TLS::HTML
 
   #Create a link
   def link root, path, text = path, params = {}
-    full_path = root.split('/').map! {|r| URI.escape r }.join('/') << "/" << URI.escape(path)
-    params = params.map { |k, v| "#{k}=#{v}" }.join "&"
-    "<a href=\"#{full_path}?#{params}\">#{text}</a>"
+    full_path = root.split('/').map! {|r| ue r }.join('/') << "/" << ue(path)
+    params = params.map { |k, v| "#{ue(k)}=#{ue(v)}" }.join "&"
+
+    "<a href=\"#{full_path}?#{params}\">#{e text}</a>"
   end
 
   #Some navigation
@@ -104,7 +105,7 @@ module TLS::HTML
   #Audio tag
   def audio path
     <<-HTML
-  <audio id='player' onEnded='javascript:play_next()' src=#{("/" << URI.escape(path)).inspect} autobuffer controls autoplay >
+  <audio id="player" onEnded="javascript:play_next()" src="#{("/" << ue(path))}" autobuffer controls autoplay >
     You need the power of HTML5!
   </audio>
   <script type="text/javascript">
@@ -118,7 +119,7 @@ module TLS::HTML
     list = []
 
     songs.each_with_index do |song, i|
-      list << "<li><a href=\"javascript:play_index(#{i})\">#{song.artist} - #{song.title}</a></li>"
+      list << "<li><a href=\"javascript:play_index(#{i})\">#{e song.artist} - #{e song.title}</a></li>"
     end
 
     <<-HTML
@@ -177,18 +178,18 @@ module TLS::HTML
   { artist: #{link("/artist", song.artist, song.artist).inspect},
     album: #{link("/artist/#{song.artist}/album/", song.album, song.album).inspect},
     title: #{song.title.inspect},
-    path: #{(CGI.escapeHTML "/" << CGI.escape(song.path)).inspect} }
+    path: #{("/" << ue(song.path)).inspect} }
     JAVASCRIPT
   end
 
   #HTML for song information header
   def song_info song
-    "<span id='title'>#{song.title}</span> by <span id='artist'>#{link "/artist/", song.artist}</span><br/><span id='album'>#{link "/artist/#{song.artist}/album", song.album}</span>"
+    "<span id='title'>#{e song.title}</span> by <span id='artist'>#{link "/artist/", song.artist}</span><br/><span id='album'>#{link "/artist/#{song.artist}/album", song.album}</span>"
   end
 
   #Back/forward links
   def prev_and_next
-    @prev_and_next ||= "<a href='javascript:play_next(true)'>Prev</a>&nbsp;&nbsp;&nbsp;<a href='javascript:play_next()'>Next</a>"
+    @prev_and_next ||= '<a href="javascript:play_next(true)">Prev</a>&nbsp;&nbsp;&nbsp;<a href="javascript:play_next()">Next</a>'
     @prev_and_next
   end
 
@@ -205,4 +206,12 @@ module TLS::HTML
     </div>
     HTML
   end
+
+  def e str
+    CGI.escapeHTML str.to_s
+  end
+
+  def ue str
+    URI.escape str.to_s
+  end
 end

data/lib/the_little_streamer/player.rb

@@ -92,16 +92,13 @@ class TLS::Player
     if @music.has? artist
       path = "/artist/#{artist}/album/"
 
-      puts "making page"
-      x = page <<-HTML
+      page <<-HTML
         #{title(artist)}
         #{@music.album_names_by(artist).map { |a| link path, a }.join("<br/>")}
         <br/><br/>
         #{link("/artist/#{artist}/", "play", "Play All")} - 
         #{link("/artist/#{artist}/", "play", "Randomly", :order => :random)}
-        HTML
-        puts "down"
-        x
+      HTML
     else
       artist_not_found artist
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_little_streamer
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Collins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -55,7 +55,8 @@ files:
 - lib/the_little_streamer/player.rb
 - lib/the_little_streamer/song.rb
 homepage: http://github.com/presidentbeef/the_little_streamer
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple Sinatra application for streaming music.