sonos 0.2.0 → 0.2.1

data/Changelog.markdown

@@ -1,3 +1,7 @@
+### Version 0.2.1 — December 24, 2012
+
+* Fix album art in now playing
+
 ### Version 0.2.0 — December 24, 2012
 
 * Add Loudness setting

data/Readme.markdown

@@ -64,21 +64,49 @@ There is a very limited CLI right now. You can run `sonos discover` to get the I
 
 ## To Do
 
+### General
+
 * Refactor all of the things
 * Nonblocking calls with Celluloid::IO
 * List other speakers
-* Loudness
-* Alarm clock
-* Group management
-    * Party Mode
-    * Join
-* Line-in (I don't have a PLAY:5, so I'll need help testing this one)
 * Handle errors better
-* Fix album art in `now_playing`
 * Handle line-in in `now_playing`
 * Better support for stero pairs
 * CLI client for everything
 
+### Features
+
+* Alarm clock
+* Pause all (there is no play all in the controller, we could loop through and do it though)
+* Group management
+    * Party Mode
+    * Join
+* Line-in
+* Toggle cross fade
+* Toggle shuffle
+* Set repeat mode
+* Scrub
+* Search music library
+* Browse music library
+* Add songs to queue
+* Skip to song in queue
+* Sleep timer
+
+### Maybe
+
+If we are implementing everything the official Sonos Controller does, here's some more stuff:
+
+* Set zone name and icon
+* Create stero pair
+* Support for BRIDGE
+* Support for DOCK
+* Manage services
+* Date and time
+* Wireless channel
+* Audio compression
+* Automatically check for updates (not sure if this is a controller only preference)
+* Local music servers
+
 ## Contributing
 
 1. Fork it

data/lib/sonos/endpoint/transport.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Sonos::Endpoint::Transport
   TRANSPORT_ENDPOINT = '/MediaRenderer/AVTransport/Control'
   TRANSPORT_XMLNS = 'urn:schemas-upnp-org:service:AVTransport:1'
@@ -9,6 +11,11 @@ module Sonos::Endpoint::Transport
     body = response.body[:get_position_info_response]
     doc = Nokogiri::XML(body[:track_meta_data])
 
+    art_path = doc.xpath('//upnp:albumArtURI').inner_text
+
+    # TODO: No idea why this is necessary. Maybe its a Nokogiri thing
+    art_path.sub!('/getaa?s=1=x-sonos-http', '/getaa?s=1&u=x-sonos-http')
+
     {
       title: doc.xpath('//dc:title').inner_text,
       artist: doc.xpath('//dc:creator').inner_text,
@@ -17,7 +24,7 @@ module Sonos::Endpoint::Transport
       track_duration: body[:track_duration],
       current_position: body[:rel_time],
       uri: body[:track_uri],
-      album_art: "http://#{self.ip}:#{PORT}#{doc.xpath('//upnp:albumArtURI').inner_text}"
+      album_art: "http://#{self.ip}:#{Sonos::PORT}#{art_path}"
     }
   end
 

data/lib/sonos/version.rb

@@ -1,3 +1,3 @@
 module Sonos
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/sonos.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'savon', '~> 2.0.2'
+  gem.add_dependency 'nokogiri'
   gem.add_dependency 'thor'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -28,6 +28,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1695773237927316888
+      hash: -2990383853655204370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1695773237927316888
+      hash: -2990383853655204370
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23