sonice 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d69c6f182616c9a50f8e35d05b8e6ac5e98188e
-  data.tar.gz: ccc761a1759929d4a1fa9b906db1842c009a4b8d
+SHA256:
+  metadata.gz: c1c7a1deda335995e891d6f54421d20eaa907ba9cae2a9c93355c48a0c8632d4
+  data.tar.gz: e3288af2d916f33b6967294dbbc6be4c72f841a9929916a592d43b30543e35e4
 SHA512:
-  metadata.gz: fe6b5518311af519a0dfef2e7d21cfbfa1e648ffdf97d3b1846aa09da18e28f16e2dd35d3106a6fdec377126e9f2f9cf9280bb18a0e8d74c041b437e69a2136e
-  data.tar.gz: 1085e0c3bb106e827e5e480ecbeeb2e4046daab40ade85966eab8bd703db52daaed88cda940aac545a2f532dc05745966400b6cfafc68bc21c9ff25e6272b649
+  metadata.gz: 310128496854d2a199b5f9d24cf2b4cbcaa559912f298198931dbce6b19f7f4b90a24e51a6178ec03b8e7f5269dfa616e5f8946cc9aa9df6ef8263e9f69ca024
+  data.tar.gz: 7356fa01c4b96809bfd9ff5071069cf840895a8e35445969f5ed0e385d90321ba074ce64f3c316f0fec026e7d0d421b8d363acb16daa733addc5098b0958a39b

data/.rubocop.yml

@@ -1,2 +1,105 @@
 Style/StringLiterals:
   Enabled: false
+
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+Layout/EmptyLinesAroundAttributeAccessor: # (new in 0.83)
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator: # (new in 0.82)
+  Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands: # (new in 0.89)
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant: # (new in 0.84)
+  Enabled: true
+Lint/DuplicateElsifCondition: # (new in 0.88)
+  Enabled: true
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+Lint/DuplicateRescueException: # (new in 0.89)
+  Enabled: true
+Lint/EmptyConditionalBody: # (new in 0.89)
+  Enabled: true
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+Lint/FloatComparison: # (new in 0.89)
+  Enabled: true
+Lint/HashCompareByIdentity: # (new in 0.93)
+  Enabled: true
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+Lint/MissingSuper: # (new in 0.89)
+  Enabled: true
+Lint/MixedRegexpCaptureTypes: # (new in 0.85)
+  Enabled: true
+Lint/OutOfRangeRegexpRef: # (new in 0.89)
+  Enabled: true
+Lint/RaiseException: # (new in 0.81)
+  Enabled: true
+Lint/RedundantSafeNavigation: # (new in 0.93)
+  Enabled: true
+Lint/SelfAssignment: # (new in 0.89)
+  Enabled: true
+Lint/StructNewOverride: # (new in 0.81)
+  Enabled: true
+Lint/TopLevelReturnWithArgument: # (new in 0.89)
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+Lint/UnreachableLoop: # (new in 0.89)
+  Enabled: true
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+Style/AccessorGrouping: # (new in 0.87)
+  Enabled: true
+Style/BisectedAttrAccessor: # (new in 0.87)
+  Enabled: true
+Style/CaseLikeIf: # (new in 0.88)
+  Enabled: true
+Style/ClassEqualityComparison: # (new in 0.93)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+Style/ExplicitBlockArgument: # (new in 0.89)
+  Enabled: true
+Style/ExponentialNotation: # (new in 0.82)
+  Enabled: true
+Style/GlobalStdStream: # (new in 0.89)
+  Enabled: true
+Style/HashAsLastArrayItem: # (new in 0.88)
+  Enabled: true
+Style/HashEachMethods: # (new in 0.80)
+  Enabled: true
+Style/HashLikeCase: # (new in 0.88)
+  Enabled: true
+Style/HashTransformKeys: # (new in 0.80)
+  Enabled: true
+Style/HashTransformValues: # (new in 0.80)
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+Style/OptionalBooleanParameter: # (new in 0.89)
+  Enabled: true
+Style/RedundantAssignment: # (new in 0.87)
+  Enabled: true
+Style/RedundantFetchBlock: # (new in 0.86)
+  Enabled: true
+Style/RedundantFileExtensionInRequire: # (new in 0.88)
+  Enabled: true
+Style/RedundantRegexpCharacterClass: # (new in 0.85)
+  Enabled: true
+Style/RedundantRegexpEscape: # (new in 0.85)
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+Style/SingleArgumentDig: # (new in 0.89)
+  Enabled: true
+Style/SlicingWithRange: # (new in 0.83)
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
+Style/StringConcatenation: # (new in 0.89)
+  Enabled: true

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/CHANGELOG.md

@@ -3,14 +3,31 @@ Changelog
 
 So Nice tries its best to follow Semantic Versioning.
 
+## Unreleased
+
+## v2.2.0
+
+Fixes:
+
+- Remove background image since LastFM API doesn’t contain images
+
+Dependencies:
+
+- Bump anyplayer dependency
+- Remove Haml dependency
+- Bump Sinatra dependency
+- Replace Thin by Webrick
+
 ## v2.1.2
 
-- Fix Sinatra upgrade [#22]
+Dependencies:
+
+- Fix Sinatra upgrade (#22)
 - Fix Thin dependency so as not to break with thin versions > 2
 
 ## v2.1.1
 
-Bugfixes :
+Fixes:
 
 - Fix LastFM JavaScript (thanks @datagutt)
 - Fix Thin dependency with Sinatra

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 # Gem dependencies in gemspec

data/Gemfile.lock

@@ -1,41 +1,61 @@
 PATH
   remote: .
   specs:
-    sonice (2.1.2)
-      anyplayer (> 1.1.1)
-      haml
+    sonice (2.2.0)
+      anyplayer (>= 1.2.0)
       sinatra
-      thin (~> 1.6.3)
+      webrick
       xml-simple
 
 GEM
   remote: http://rubygems.org/
   specs:
-    anyplayer (1.1.4)
+    anyplayer (1.2.0)
       ruby-mpd (~> 0.3.0)
-    daemons (1.1.9)
-    eventmachine (1.0.3)
-    haml (4.0.5)
-      tilt
-    rack (1.5.2)
-    rack-protection (1.5.3)
+    ast (2.4.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rake (10.3.2)
-    ruby-mpd (0.3.1)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    tilt (1.4.1)
-    xml-simple (1.1.4)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.1)
+    rexml (3.2.4)
+    rubocop (0.93.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
+    ruby-mpd (0.3.3)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    tilt (2.0.10)
+    unicode-display_width (1.7.0)
+    webrick (1.6.1)
+    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake
+  rubocop
   sonice!
+
+BUNDLED WITH
+   2.1.4

data/Rakefile

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'bundler'
 
 Bundler::GemHelper.install_tasks

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sonice

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'sonice/command_line'
 Sonice::CommandLine.parse(ARGV)

data/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # You can start sonice using this configuration file by typing:
 #     bundle exec thin start
 
@@ -8,4 +10,3 @@
 
 require "sonice"
 run Sonice::App
-

data/lib/sonice.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 # Standard library
 require 'open-uri'
@@ -6,10 +6,9 @@ require 'open-uri'
 # Gems
 require 'anyplayer'
 require 'sinatra'
-require 'haml'
 require 'xmlsimple' # xml-simple gem
 require 'json'
-require 'thin'
 
 # So Nice
+require 'sonice/noplayer'
 require 'sonice/app'

data/lib/sonice/app.rb

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 module Sonice
   # Sinatra application
   class App < Sinatra::Base
@@ -9,31 +10,24 @@ module Sonice
 
     set :logging, true
     set :static, true
-    set :public_dir, File.expand_path('../public', __FILE__)
-    set :views, File.expand_path('../views', __FILE__)
-    set :haml, format: :html5
+    set :public_dir, File.expand_path('public', __dir__)
+    set :views, File.expand_path('views', __dir__)
     set :protection, except: :frame_options
+    set :server, :webrick
 
-    def initialize
-      player
-      super
-    end
+    def player_instance
+      return @player if @player&.launched?
 
-    def player
-      @player ||= begin
-        puts "Looking for a player..."
-        player = Anyplayer::Selector.new.player
-        abort "Error: no music player launched!" unless player
-        puts "Connected to #{player.name}"
-        player
-      end
+      @player = Anyplayer::Selector.new.player || Noplayer.new
     end
 
     put '/player' do
+      player = player_instance
+
       player.vote if settings.voting && params['vote']
 
       if settings.controls
-        methods = %w(playpause prev next voldown volup) & params.keys
+        methods = %w[playpause prev next voldown volup] & params.keys
         methods.each { |method| player.send(method) }
       end
 
@@ -41,14 +35,21 @@ module Sonice
     end
 
     get '/' do
+      player = player_instance
+
       @title = player.track
       @artist = player.artist
       @album = player.album
+      @connected = player.launched?
+
       if request.xhr?
         content_type :json
-        { title: @title, artist: @artist, album: @album }.to_json
+        { title: @title,
+          artist: @artist,
+          album: @album,
+          connected: @connected }.to_json
       else
-        haml :index
+        erb :index
       end
     end
   end

data/lib/sonice/command_line.rb

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require "sonice"
 require 'sonice/version'
 

data/lib/sonice/noplayer.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Sonice
+  # A null-object that represents a player when none was found.
+  class Noplayer < Anyplayer::Player
+    def playing?
+      false
+    end
+
+    def play; end
+
+    def pause; end
+
+    def voldown; end
+
+    def volup; end
+
+    def volume; end
+
+    def track
+      nil
+    end
+
+    def artist
+      nil
+    end
+
+    def album
+      nil
+    end
+
+    def launched?
+      false
+    end
+
+    def name
+      "no player"
+    end
+  end
+end

data/lib/sonice/public/script.js

@@ -8,11 +8,6 @@ Array.prototype.random = function() {
 
 /* jQuery helpers */
 
-// Change CSS background image
-$.fn.background = function(bg) {
-  return $(this).css('backgroundImage', bg ? 'url('+bg+')' : 'none')
-}
-
 // Assigns keyboard keys to elements and adds them to the title attributes
 // Needs the data-keyboard-key attribute on elements and optionally accepts
 // the data-keyboard-name attribute
@@ -29,47 +24,6 @@ $.fn.keyboardShortcut = function() {
   })
 }
 
-
-/* So nice helpers */
-
-// Get a new artist image from Last.fm via jsonp
-// When found calls the `callback` with the image url as the first argument
-function artistImage(artist, callback) {
-   if (!artist)
-     return callback()
-   var cb = function() { callback(cache[artist].random()) },
-   cache = artistImage.cache
-   artist = encodeURI(artist)
-
-   // Deliver from cache
-   if (cache.hasOwnProperty(artist)) {
-     // execute the callback asynchronously to minimize codepaths
-     setTimeout(cb, 10)
-     return
-   }
-
-   // Load
-   var last_fm_uri = "http://ws.audioscrobbler.com/2.0/?format=json&method=artist.getinfo&artist=%s&api_key=5636ca9fea36d0323a76638385aab1f3"
-   $.ajax({
-     url: last_fm_uri.replace('%s', artist),
-     dataType: 'jsonp',
-     success: function(obj) {
-       if (obj.artist.image) {
-         cache[artist] = $.map(obj.artist.image, function(img) {
-           if (img.size == 'mega') {
-             return img['#text']
-           }
-         })
-         cb()
-       } else {
-         callback()
-       }
-     }
-   })
-}
-artistImage.cache = {}
-
-
 $(function() {
   // Object that contains all the song info
   var currentSong = {}
@@ -81,12 +35,15 @@ $(function() {
     currentSong = obj = obj || {}
 
     var artist = obj.artist || '',
-    album  = obj.album  || '',
-    title  = obj.title  || ''
+        album = obj.album || '',
+        title = obj.title || '',
+        connected = !!obj.connected
 
     $('#title' ).text(title)
     $('#artist').text(artist)
     $('#album' ).text(album)
+    $('[data-sonice-show-if-connected]')[connected ? 'show' : 'hide']()
+    $('[data-sonice-hide-if-connected]')[connected ? 'hide' : 'show']()
 
     if (!title)
       $('title').text('So nice')
@@ -95,16 +52,6 @@ $(function() {
 
     if (artistChange || songChange)
       $('#vote').removeAttr('disabled').show()
-
-    if (artistChange)
-      changeBackground()
-  }
-
-  // Change background on the body regularly
-  var changeBackground = function(){
-    artistImage(currentSong.artist, function(url) {
-      $('body').background(url)
-    })
   }
 
   // XHR updating the text regularly
@@ -118,7 +65,7 @@ $(function() {
 
   // XHR overriding the buttons
   $(document).on('click', 'input', function(e) {
-    e.preventDefault();
+    e.preventDefault()
 
     $.ajax({
       type: 'put',
@@ -133,11 +80,10 @@ $(function() {
     $(this).attr('disabled', true).fadeOut(500)
   })
 
-  update();
+  update()
   setInterval(update, 500)
-  setInterval(changeBackground, 10000)
 
   // Keyboard shortcuts
-  $('input').keyboardShortcut()
+  $('[data-key]').keyboardShortcut()
 
 })

data/lib/sonice/public/stylesheet.css

@@ -1,13 +1,15 @@
 body {
   padding: 2em;
   margin: 0;
-  background-color: black;
+  background-color: #555;
+  color: white;
+  font: 1.5em Helvetica, sans-serif;
+
+  /* Prepare for having a background-image */
   background-position: center center fixed no-repeat;
-  background-repeat: bo-repeat;
+  background-repeat: no-repeat;
   background-attachment: fixed;
   background-size: cover;
-  color: white;
-  font: 1.5em Helvetica, sans-serif;
 }
 
 /* Overlay image */
@@ -31,19 +33,19 @@ h1, h2, h3 {
   text-shadow: black 0 0 7px;
 }
 
-  h1 {
-    font-size: 230%;
-  }
+h1 {
+  font-size: 230%;
+}
 
-  h2 {
-    font-size: 150%;
-  }
+h2 {
+  font-size: 150%;
+}
 
-  h3 {
-    font-size: 100%;
-    margin-top: 1ex;
-    font-weight: normal;
-  }
+h3 {
+  font-size: 100%;
+  margin-top: 1ex;
+  font-weight: normal;
+}
 
 form {
   opacity: .5;
@@ -52,35 +54,33 @@ form {
   left: 42px;
 }
 
-  form:hover {
-    opacity: 1;
-  }
-
-  input {
-    font-size: 1em;
-    color: inherit;
-    text-decoration: none;
-    padding: .2em .3em;
-    background: #222;
-    color: #aaa;
-    -webkit-border-radius: .4em;
-    -moz-border-radius: .4em;
-    -o-border-radius: .4em;
-    border-radius: .4em;
-    border: .1em solid #222;
-    cursor: pointer;
-    width: 2em;
-    height: 2em;
-
-  }
+form:hover {
+  opacity: 1;
+}
 
-    input:hover {
-      border-color: inherit;
-    }
+input {
+  font-size: 1em;
+  color: inherit;
+  text-decoration: none;
+  padding: .2em .3em;
+  background: #222;
+  color: #aaa;
+  -webkit-border-radius: .4em;
+  -moz-border-radius: .4em;
+  -o-border-radius: .4em;
+  border-radius: .4em;
+  border: .1em solid #222;
+  cursor: pointer;
+  width: 2em;
+  height: 2em;
+}
 
-    @media (max-width:800px) {
-      input {
-	      font-size: 2em;
-	    }
-    }
+input:hover {
+  border-color: inherit;
+}
 
+@media (max-width:800px) {
+  input {
+    font-size: 2em;
+  }
+}

data/lib/sonice/version.rb

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 # Module Sonice
 module Sonice
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/lib/sonice/views/index.erb

@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+    <% if !@artist && !@title %>
+      So Nice ♫
+    <% else %>
+      <%= [@artist, @title].compact.join(" — ") %>
+    <% end %>
+  </title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <link rel="stylesheet" href="/stylesheet.css" />
+</head>
+<body>
+  <h1 id="title"><%= @title %></h1>
+  <h2 id="artist"><%= @artist %></h2>
+  <h3 id="album"><%= @album %></h3>
+
+  <h1 style="display:none" data-sonice-hide-if-connected>Connecting…</h1>
+
+  <form method="post" action="player" data-sonice-show-if-connected>
+    <input name="_method" type="hidden" value="put">
+    <% if settings.controls %>
+      <input
+        type="button"
+        value="▶"
+        id="playpause"
+        name="playpause"
+        title="Play/Pause"
+        data-key-name="space"
+        data-key=" "
+      />
+      <input
+        type="button"
+        value="←"
+        id="prev"
+        name="prev"
+        title="Previous"
+        data-key="p"
+      />
+      <input
+        type="button"
+        value="→"
+        id="next"
+        name="next"
+        title="Next"
+        data-key="n"
+      />
+      <input
+        type="button"
+        value="♪"
+        id="voldown"
+        name="voldown"
+        title="Quieter"
+        data-key="-"
+      />
+      <input
+        type="button"
+        value="♫"
+        id="volup"
+        name="volup"
+        title="Louder"
+        data-key="+"
+      />
+    <% end %>
+    <% if settings.voting %>
+      <input
+        type="button"
+        value="↡"
+        id="vote"
+        name="vote"
+        title="Vote to Skip"
+        data-key="s"
+      />
+    <% end %>
+  </form>
+  <script src="/jquery.min.js"></script>
+  <script src="/script.js"></script>
+</body>
+</html>

data/sonice.gemspec

@@ -1,29 +1,32 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require "sonice/version"
 
 Gem::Specification.new do |s|
-  s.name        = "sonice"
-  s.version     = Sonice::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Sunny Ripert"]
-  s.email       = ["sunny@sunfox.org"]
-  s.homepage    = "http://github.com/sunny/so-nice"
-  s.summary     = "Web interface to control your current music player"
-  s.description = "Small Web interface to control iTunes, Spotify, " + \
-                  "Rdio, MPD, Rhythmbox, Amarok and XMMS2. ♫"
-  s.license     = "WTFPL"
+  s.name = "sonice"
+  s.version = Sonice::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Sunny Ripert"]
+  s.email = ["sunny@sunfox.org"]
+  s.homepage = "http://github.com/sunny/so-nice"
+  s.summary = "Web interface to control your current music player"
+  s.description =
+    "Small Web interface to control iTunes, Spotify, Rdio, MPD, Rhythmbox, " \
+    "Amarok and XMMS2. ♫"
+  s.license = "WTFPL"
 
   s.require_paths = ["lib"]
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n")
-                                           .map { |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables =
+    `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-  s.add_runtime_dependency 'anyplayer', '> 1.1.1'
+  s.add_runtime_dependency 'anyplayer', '>= 1.2.0'
   s.add_runtime_dependency 'sinatra'
-  s.add_runtime_dependency 'haml'
+  s.add_runtime_dependency 'webrick'
   s.add_runtime_dependency 'xml-simple'
-  s.add_runtime_dependency 'thin', '~> 1.6.3'
+
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubocop'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sonice
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyplayer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -99,28 +99,32 @@ description: Small Web interface to control iTunes, Spotify, Rdio, MPD, Rhythmbo
 email:
 - sunny@sunfox.org
 executables:
+- rake
 - sonice
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/rake
 - bin/sonice
 - config.ru
 - lib/sonice.rb
 - lib/sonice/app.rb
 - lib/sonice/command_line.rb
+- lib/sonice/noplayer.rb
 - lib/sonice/public/favicon.ico
 - lib/sonice/public/jquery.min.js
 - lib/sonice/public/script.js
 - lib/sonice/public/stylesheet.css
 - lib/sonice/version.rb
-- lib/sonice/views/index.haml
+- lib/sonice/views/index.erb
 - sonice.gemspec
 homepage: http://github.com/sunny/so-nice
 licenses:
@@ -141,10 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Web interface to control your current music player
 test_files: []
-has_rdoc: 

data/lib/sonice/views/index.haml

@@ -1,31 +0,0 @@
-!!! 5
-%html
-  %head
-    %title
-      - if !@artist && !@title
-        So nice
-      - else
-        = [@artist, @title].compact.join(" — ")
-    %meta{'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8'}
-    %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1.0' }
-    %link{:rel => 'stylesheet', :href => '/stylesheet.css'}
-
-  %body{:style => @image_uri ? "background-image:url(#{@image_uri})" : nil }
-    %h1#title= @title
-    %h2#artist= @artist
-    %h3#album= @album
-
-    %form{:method => 'post', :action => 'player'}
-      %input{:type => "hidden", :name => "_method", :value => "put"}
-      - if settings.controls
-        %input#playpause{:type=>'button', :value=>'▸', :name=>'playpause', :title=>"Play/Pause", :'data-key'=>" ", :'data-key-name'=>"space"}
-        %input#prev{     :type=>'button', :value=>'←', :name=>'prev',      :title=>"Previous",   :'data-key'=>"p"}
-        %input#next{     :type=>'button', :value=>'→', :name=>'next',      :title=>"Next",       :'data-key'=>"n"}
-        %input#voldown{  :type=>'button', :value=>'♪', :name=>'voldown',   :title=>"Quieter",    :'data-key'=>"-"}
-        %input#volup{    :type=>'button', :value=>'♫', :name=>'volup',     :title=>"Louder",     :'data-key'=>"+"}
-      - if settings.voting
-        %input#vote{     :type=>'button', :value=>'↡', :name=>'vote',      :title=>"Vote to Skip", :'data-key' => "s" }
-
-    %script{:src => '/jquery.min.js'}
-    %script{:src => '/script.js'}
-