danbarber/mpd-client
1
0
Fork 0
mirror of https://github.com/danbee/mpd-client synced 2025-03-04 08:39:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2 from leemachin/bugfix

Browse Source 
Fix some silly mistakes the tests didn't catch
This commit is contained in:
Daniel Barber 2013-12-12 12:02:31 -08:00
commit 290ff96b99
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
lib/mpd_client/server.rb
View File

1
lib/mpd_client/song.rb
View File

@ -2,7 +2,6 @@ module MPDClient
class Song class Song
include ClassToProc include ClassToProc
include Comparable
include Jsonable include Jsonable
extend Forwardable extend Forwardable

3
lib/mpd_client/webserver.rb
View File

@ -3,6 +3,7 @@ require 'sinatra/asset_pipeline'
require 'sass' require 'sass'
require 'cgi' require 'cgi'
require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/hash/keys'
module MPDClient module MPDClient
class Webserver < Sinatra::Base class Webserver < Sinatra::Base
@ -82,7 +83,7 @@ module MPDClient
get '/songs' do get '/songs' do
content_type 'application/json' content_type 'application/json'
if query = params.slice(:artist, :album) and !query.empty? if query = params.symbolize_keys.slice(:artist, :album) and !query.empty?
Song.by(**query).to_json Song.by(**query).to_json
else else
Song.all.sort.to_json Song.all.sort.to_json