RubyGems - the_little_streamer - Versions diffs - 0.4.3 → 0.4.4 - Mend

the_little_streamer 0.4.3 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/the_little_streamer/music.rb +2 -4
data/lib/the_little_streamer/player.rb +6 -8
metadata +5 -6
data/lib/the_little_streamer/html.rb +0 -219
data/lib/the_little_streamer/searcher.rb +0 -21

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba04105936f88f2cea71bf565934e892590cbf6f
-  data.tar.gz: 7da1b197bfc2e8ddac3bf5f3cee5faad14a09b8a
+  metadata.gz: b03679acd1ab6444fbfc9cfc7a12bf121bfba39e
+  data.tar.gz: ce0b49c91defdfeb426e71a5f74908239b009edd
 SHA512:
-  metadata.gz: b8ba19974db05fc9e901b76a06945e6f01eac9954bff693baf50060a80593375b8456084967e585cee38c21e8defb4a93d522702f9bced89847ba7f9a87f359f
-  data.tar.gz: e249d40b2a7ab750448890d33c3226e5c16d038c574a9abb59f9aa8d973f6552e4b5d780212d3e1c4546a3af47123b54d3be0d20dc9d02219c6f83a28b629e64
+  metadata.gz: da677439965af7e19dce818aaf4154eaa14572e195164bf88a748a612c9d176e37000e34627ff95bb7acb44c06d15326f1dc2a20cb4e080eca4c45b203a955dd
+  data.tar.gz: 2af892f229291e69ef1f6d872836e2e1f0cdda49ea2265c04e3826c02524df2378081f83ddde69cc969b67620f8959b7bf7ca1cc83ea743988166e1eebec6de1

data/lib/the_little_streamer/music.rb CHANGED Viewed

@@ -1,4 +1,6 @@
 class TLS::Music
+  attr_reader :songs
   def initialize finder
     #Hash three levels deep for artist, album, and song
     @music = Hash.new do |h,k|
@@ -29,10 +31,6 @@ class TLS::Music
     end
   end
-  def all_songs
-    @songs
-  end
   def has? artist, album = nil, title = nil
     not self[artist, album, title].empty?
   end

data/lib/the_little_streamer/player.rb CHANGED Viewed

@@ -8,9 +8,9 @@ class TLS::Player
   def play_all limit = 100, order = "normal"
     case order
     when "random"
-      songs = @music.all_songs.shuffle
+      songs = @music.songs.shuffle
     else
-      songs = @music.all_songs
+      songs = @music.songs
     end
     player_html songs[0..limit.to_i]
@@ -82,7 +82,6 @@ class TLS::Player
     #{link("/", "all", "10", :limit => 10, :order => :random)}
     #{link("/", "all", "50", :limit => 50, :order => :random) }
     #{link("/", "all", "100", :limit => 100, :order => :random) })
-    #{search_box}
     <br/><hr/>
     #{@music.artist_names.map { |a| link path, a }.join "<br/>"}
     <br/><br/>
@@ -93,13 +92,16 @@ class TLS::Player
     if @music.has? artist
       path = "/artist/#{artist}/album/"
-      page <<-HTML
+      puts "making page"
+      x = 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
     else
       artist_not_found artist
     end
@@ -120,8 +122,4 @@ class TLS::Player
       album_not_found artist, album
     end
   end
-  def list_search search
-    songs = @music.find search
-  end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_little_streamer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Justin Collins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -50,13 +50,12 @@ files:
 - README.md
 - lib/the_little_streamer.rb
 - lib/the_little_streamer/finder.rb
-- lib/the_little_streamer/html.rb
-- lib/the_little_streamer/searcher.rb
 - lib/the_little_streamer/player.rb
 - lib/the_little_streamer/music.rb
 - lib/the_little_streamer/song.rb
 homepage: http://github.com/presidentbeef/the_little_streamer
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -74,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key:
 specification_version: 4
 summary: Simple Sinatra application for streaming music.

data/lib/the_little_streamer/html.rb DELETED Viewed

@@ -1,219 +0,0 @@
-module TLS::HTML
-  #Wrap up in HTML
-  def page body = nil
-    if block_given?
-      body = yield
-    end
-    <<-HTML
-    <html>
-      <head>
-        <style type="text/css">
-    #{css}
-        </style>
-        <title>The Little Streamer</title>
-      </head>
-      <body>
-    #{body}
-      </body>
-      <script>
-      if(document.getElementById('artist')) {
-        window.onload = function() {
-         var artist = document.getElementById('artist').firstChild.innerText;
-         var title = document.getElementById('title').innerHTML;
-         document.title = title + " by " + artist;
-        }
-      }
-      </script>
-    </html>
-    HTML
-  end
-  def css
-    @css ||= <<-CSS
-  body {
-    font-family: Helvetica,Verdana,Arial,sans-serif;
-    font-size: 13pt;
-  }
-  span#title {
-    font-size: 14pt;
-    font-weight: bold;
-  }
-  span#artist {
-    font-size: 14pt;
-    font-weight: bold;
-  }
-  span#artist a {
-    text-decoration: none;
-    color: black;
-   }
-  span#artist a:hover {
-    text-decoration: underline;
-  }
-  span#album {
-    font-style: italic;
-  }
-  span#album a {
-    text-decoration: none;
-    color: black;
-  }
-  span#album a:hover {
-    text-decoration: underline;
-  }
-  div#playlist {
-    float: left;
-    margin-top: 15px;
-    height: 80%;
-    overflow: auto;
-    text-align: left;
-  }
-  div#playerbox {
-    float: left;
-    text-align: center;
-  }
-    CSS
-    @css
-  end
-  #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>"
-  end
-  #Some navigation
-  def title artist, album = nil
-    if album
-      "<h3>#{link "/", "", "Music"} : #{link "/artist/", artist, artist} : #{album}</h3>"
-    else
-      "<h3>#{link "/", "", "Music"} : #{artist}</h3>"
-    end
-  end
-  #Audio tag
-  def audio path
-    <<-HTML
-  <audio id='player' onEnded='javascript:play_next()' src=#{("/" << URI.escape(path)).inspect} autobuffer controls autoplay >
-    You need the power of HTML5!
-  </audio>
-  <script type="text/javascript">
-    document.getElementById('player').volume = 0.3;
-  </script>
-    HTML
-  end
-  #HTML for displaying playlist
-  def playlist_html songs
-    list = []
-    songs.each_with_index do |song, i|
-      list << "<li><a href=\"javascript:play_index(#{i})\">#{song.artist} - #{song.title}</a></li>"
-    end
-    <<-HTML
-    <div style="clear:both">&nbsp;</div>
-    <div id="playlist">
-      <ol>
-    #{list.join}
-      </ol>
-    </div>
-    HTML
-  end
-  #Javascript for playlist
-  def playlist_js songs
-    <<-JAVASCRIPT
-  <script type="text/javascript">
-    var player = document.getElementById('player');
-    var artist = document.getElementById('artist');
-    var album = document.getElementById('album');
-    var title = document.getElementById('title');
-    var playlist = [#{songs.map { |s| song_to_js s }.join "," }]
-    var current_song = 0;
-    play_next = function(reverse) {
-      if(reverse && current_song > 0)
-        current_song--;
-      else if(!reverse && current_song < playlist.length)
-        current_song++;
-      else
-        return;
-      play_current();
-    }
-    play_current = function() {
-      var song = playlist[current_song];
-      player.src = song.path;
-      artist.innerHTML = song.artist
-      album.innerHTML = song.album
-      title.innerHTML = song.title
-      document.title = song.title + " by " + artist.firstChild.innerText;
-      player.play();
-    }
-    play_index = function(index) {
-      current_song = index;
-      play_current();
-    }
-  </script>
-    JAVASCRIPT
-  end
-  #Javascript for a song
-  def song_to_js song
-    <<-JAVASCRIPT
-  { 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} }
-    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>"
-  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
-  end
-  #Output HTML for player
-  def player_html songs
-    page <<-HTML
-    <div id="playerbox">
-    #{song_info songs.first}<br/>
-    #{audio songs.first.path}<br/>
-    #{prev_and_next if songs.length > 1}
-    #{playlist_js songs}
-    #{playlist_html songs if songs.length > 1}
-      <div style="clear:both">#{link "/", "", "Back to All Music"}</div>
-    </div>
-    HTML
-  end
-  def search_box
-    <<-HTML
-    <div id="searchbox">
-      <form action="/search">
-        <label for="search">Search:</label>
-        <input type="text" />
-      </form>
-    </div>
-    HTML
-  end
-end

data/lib/the_little_streamer/searcher.rb DELETED Viewed

@@ -1,21 +0,0 @@
-module TLS
-  class Searcher
-    def initialize music
-      @music = music
-    end
-    def find_all search
-      search = normalize search
-      @music.all_songs.select do |song|
-        song.title.downcase.include? search or
-        song.album.downcase.include? search or
-        song.artist.downcase.include? search
-      end
-    end
-    def normalize search
-      search.strip.gsub(/\s{2,}/, ' ').downcase
-    end
-  end
-end