sonice 2.1.0 → 2.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 085515e77678d7661159be8f83aafaac2624452d
+  data.tar.gz: 32d2d8074a1210561c850871698aae447a001b6c
+SHA512:
+  metadata.gz: 18e19b550620b93d47206020fa765c7b714d17b2c9540766c07a4b08a4bc0d68659a368d3e22287d3a84d4f06d975c9ea3d3276bd2934e98f1bfc8a204c15cc8
+  data.tar.gz: 3b49fa23978e7d58e79393a1076aa9c6e30a6cc22078014bb90d54e303266aa20f0c050e0293dc85c3fb60952953e6b0771b32b4a9786fb8c3344c94909254f6

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/StringLiterals:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+Changelog
+=========
+
+So Nice tries its best to follow Semantic Versioning.
+
+## Latest branch
+
+## v2.1.1
+
+Bugfixes :
+
+- Fix LastFM JavaScript (thanks @datagutt)
+- Fix Thin dependency with Sinatra
+
+## v2.1.0 (2013-12-18)
+
+First Gem version.

data/Gemfile.lock

@@ -1,34 +1,35 @@
 PATH
   remote: .
   specs:
-    sonice (2.1.0)
+    sonice (2.1.1)
       anyplayer (> 1.1.1)
       haml
       sinatra
-      thin
+      thin (>= 1.6.0)
       xml-simple
 
 GEM
   remote: http://rubygems.org/
   specs:
-    anyplayer (1.1.2)
+    anyplayer (1.1.4)
       ruby-mpd (~> 0.3.0)
     daemons (1.1.9)
     eventmachine (1.0.3)
-    haml (4.0.3)
+    haml (4.0.5)
       tilt
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
-    ruby-mpd (0.3.0)
-    sinatra (1.4.3)
+    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.5.1)
+    thin (1.6.0)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.5.0)
     tilt (1.4.1)
     xml-simple (1.1.2)
 
@@ -36,5 +37,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rack
+  rake
   sonice!

data/README.md

@@ -1,9 +1,9 @@
 So Nice ♫
 =======
 
-> Everynight with my star friends
->
-> We eat caviar and drink champage
+[![Gem Version](https://badge.fury.io/rb/sonice.png)](http://badge.fury.io/rb/sonice)
+
+> “Everynight with my star friends, we eat caviar and drink champage”
 
 A small Web interface to play, pause, change volume or skip the currently
 playing song in iTunes Mac, iTunes Windows, Spotify Mac, MPD, Rhythmbox, Amarok and XMMS2.
@@ -14,7 +14,7 @@ playing song in iTunes Mac, iTunes Windows, Spotify Mac, MPD, Rhythmbox, Amarok
 Install
 -------
 
-Make sure you have Ruby and Rubygems installed. You can then type in a terminal:
+Make sure you have Ruby > 1.9 and Rubygems installed. You can then type in a terminal:
 
 ```bash
 $ gem install sonice

data/Rakefile

@@ -1,4 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'bundler'
-require 'rake/testtask'
 
 Bundler::GemHelper.install_tasks

data/bin/sonice

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

data/lib/sonice.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 # Standard library
 require 'open-uri'
 

data/lib/sonice/app.rb

@@ -1,4 +1,6 @@
+# -*- encoding: utf-8 -*-
 module Sonice
+  # Sinatra application
   class App < Sinatra::Base
     set :port, ENV['SONICE_PORT'] || 3000
     set :controls, ENV['SONICE_CONTROLS'] != '0'
@@ -12,29 +14,29 @@ module Sonice
     set :haml, format: :html5
     set :protection, except: :frame_options
 
+    def initialize
+      @player = player
+    end
+
     def player
-      @@player ||= begin
+      @player ||= begin
         puts "Looking for a player..."
         player = Anyplayer::Selector.new.player
-        abort "Error: no music player launched!" if !player
+        abort "Error: no music player launched!" unless player
         puts "Connected to #{player.name}"
         player
       end
     end
 
     put '/player' do
-      if settings.voting
-        player.vote if params['vote']
-      end
+      player.vote if settings.voting && params['vote']
 
       if settings.controls
         methods = %w(playpause prev next voldown volup) & params.keys
         methods.each { |method| player.send(method) }
       end
 
-      if !request.xhr?
-        redirect '/'
-      end
+      redirect "/" unless request.xhr?
     end
 
     get '/' do
@@ -43,11 +45,10 @@ module Sonice
       @album = player.album
       if request.xhr?
         content_type :json
-        { :title => @title, :artist => @artist, :album => @album }.to_json
+        { title: @title, artist: @artist, album: @album }.to_json
       else
         haml :index
       end
     end
-
   end
 end

data/lib/sonice/command_line.rb

@@ -1,9 +1,11 @@
+# -*- encoding: utf-8 -*-
 require "sonice"
 require 'sonice/version'
 
 module Sonice
+  # Module CommandLine
   module CommandLine
-    extend self
+    module_function
 
     def parse(argv)
       case argv
@@ -19,7 +21,6 @@ module Sonice
         puts "Usage: sonice [--version]"
         exit(1)
       end
-
     end
   end
 end

data/lib/sonice/public/script.js

@@ -35,37 +35,37 @@ $.fn.keyboardShortcut = function() {
 // 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) {
-  // Commented out because Last.fm does not support this URL anymore.
-
-  // 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.getimages&artist=%s&api_key=5636ca9fea36d0323a76638385aab1f3"
-  // $.ajax({
-  //   url: last_fm_uri.replace('%s', artist),
-  //   dataType: 'jsonp',
-  //   success: function(obj) {
-  //     if (obj.images.image) {
-  //       cache[artist] = $.map(obj.images.image, function(img) {
-  //         return img.sizes.size[0]['#text']
-  //       })
-  //       cb()
-  //     } else {
-  //       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 = {}
 
@@ -141,4 +141,3 @@ $(function() {
   $('input').keyboardShortcut()
 
 })
-

data/lib/sonice/version.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+# Module Sonice
 module Sonice
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/sonice.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require "sonice/version"
 
 Gem::Specification.new do |s|
@@ -9,19 +9,21 @@ Gem::Specification.new do |s|
   s.authors     = ["Sunny Ripert"]
   s.email       = ["sunny@sunfox.org"]
   s.homepage    = "http://github.com/sunny/so-nice"
-  s.summary     = %q{Web interface to control your current music player}
-  s.description = %q{Small Web interface to control iTunes, Spotify, Rdio, MPD, Rhythmbox, Amarok and XMMS2. ♫}
-  s.license     = 'WTFPL'
+  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.require_paths = ["lib"]
+  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 'sinatra'
   s.add_runtime_dependency 'haml'
   s.add_runtime_dependency 'xml-simple'
-  s.add_runtime_dependency 'thin'
-  s.add_development_dependency 'rack'
+  s.add_runtime_dependency 'thin', '>= 1.6.0'
+  s.add_development_dependency 'rake'
 end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: sonice
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Sunny Ripert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyplayer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Small Web interface to control iTunes, Spotify, Rdio, MPD, Rhythmbox,
@@ -116,7 +103,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -136,26 +125,25 @@ files:
 homepage: http://github.com/sunny/so-nice
 licenses:
 - WTFPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Web interface to control your current music player
 test_files: []