sonos 0.1.1 → 0.2.0

data/Changelog.markdown

@@ -1,28 +1,35 @@
-### Version 0.1.1 — Unreleased
+### Version 0.2.0 — December 24, 2012
 
-* **Feature:** Queue
-* **Feature:** Clear Queue
-* **Feature:** Save Queue
-* **Feature:** Device Description URL
+* Add Loudness setting
+* Moved `sonos-discover` to `sonos discover`
+* Moved `sonos-discover-multiple` to `sonos discover --all`
+* Cleaned up enpoints
+
+### Version 0.1.1 — December 24, 2012
+
+* Add Queue
+* Add Clear Queue
+* Add Save Queue
+* Add Device Description URL
 
 ### Version 0.1.0 — December 24, 2012
 
-* **Feature:** Stop
-* **Feature:** Next
-* **Feature:** Previous
-* **Feature:** Mute
-* **Feature:** Status Light
-* **Feature:** Bass
-* **Feature:** Treble
+* Add Stop
+* Add Next
+* Add Previous
+* Add Mute
+* Add Status Light
+* Add Bass
+* Add Treble
 * Remove some method aliases
 
 ### Version 0.0.1 — December 23, 2012
 
 Initial release.
 
-* **Feature:** Volume
-* **Feature:** Play
-* **Feature:** Play Stream
-* **Feature:** Pause
-* **Feature:** Now Playing
+* Add Volume
+* Add Play
+* Add Play Stream
+* Add Pause
+* Add Now Playing
 

data/Readme.markdown

@@ -26,7 +26,7 @@ $ gem install sonos
 
 ## Usage
 
-I'm working on a CLI client. For now, we'll use IRB. You will need the IP address of a speaker (auto-detection is on my list too). To get the IP of a speaker, one of your Sonos controllers and go to "About My Sonos System".
+I'm working on a CLI client. For now, we'll use IRB.
 
 ``` shell
 $ gem install sonos
@@ -36,7 +36,7 @@ $ irb
 ``` ruby
 require 'rubygems'
 require 'sonos'
-speaker = Sonos::Speaker('10.0.1.10') # or whatever the IP is
+speaker = Sonos.discover
 ```
 
 Now that we have a reference to the speaker, we can do all kinds of stuff.
@@ -49,20 +49,35 @@ speaker.now_playing
 speaker.volume
 speaker.volume = 70
 speaker.volume -= 10
+speaker.queue
+speaker.save_queue 'Jams'
+speaker.clear_queue
 ```
 
+### Topology
+
+`Sonos.discover` finds the first speaker it can. We can get all of the Sonos devices (including Bridges, etc) by calling `speaker.topology`. This is going to get refactored a bit. Right now everything is nested under speaker which is kinda messy and confusing.
+
+### CLI
+
+There is a very limited CLI right now. You can run `sonos discover` to get the IP of one of your devices. Run `sonos discover --all` to get all of them.
+
 ## To Do
 
+* Refactor all of the things
+* Nonblocking calls with Celluloid::IO
+* List other speakers
 * Loudness
-* Party Mode
-* Join
-* Line-in
+* 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`
-* Auto-discovery
 * Better support for stero pairs
-* CLI client
+* CLI client for everything
 
 ## Contributing
 

data/bin/sonos

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sonos/cli'
+
+Sonos::Cli.start

data/lib/sonos.rb

@@ -1,5 +1,6 @@
 require 'sonos/version'
 require 'sonos/speaker'
+require 'sonos/discovery'
 
 module Sonos
   PORT = 1400
@@ -8,4 +9,8 @@ module Sonos
   def self.Speaker(ip)
     Speaker.new(ip)
   end
+
+  def self.discover
+    Sonos::Discovery.new.discover
+  end
 end

data/lib/sonos/cli.rb

@@ -0,0 +1,20 @@
+require 'thor'
+require 'sonos'
+
+module Sonos
+  class Cli < Thor
+    desc 'discover', 'Finds the IP address of a Sonos device on your network'
+    method_option :all, type: :boolean, aliases: '-a', desc: 'Find all of the IP address instead of the first one discoverd'
+    def discover
+      speaker = Sonos.discover
+
+      if options[:all]
+        speaker.topology.each do |node|
+          puts "#{node.name.ljust(20)} #{node.ip}"
+        end
+      else
+        puts "#{speaker.zone_name.ljust(20)} #{speaker.ip}"
+      end
+    end
+  end
+end

data/lib/sonos/discovery.rb

@@ -0,0 +1,73 @@
+require 'socket'
+require 'ipaddr'
+require 'timeout'
+
+#
+# Inspired by https://github.com/rahims/SoCo, https://github.com/turboladen/upnp,
+# and http://onestepback.org/index.cgi/Tech/Ruby/MulticastingInRuby.red.
+#
+# Turboladen's uPnP work is super-smart, but doesn't seem to work with 1.9.3 due to soap4r dep's.
+#
+# Some day this nonsense should be asynchronous / nonblocking / decorated with rainbows.
+#
+
+module Sonos
+  class Discovery
+    MULTICAST_ADDR = '239.255.255.250'
+    MULTICAST_PORT = 1900
+    DEFAULT_TIMEOUT = 1
+
+    attr_reader :timeout
+
+    def initialize(timeout = nil)
+      @timeout = timeout || DEFAULT_TIMEOUT
+
+      initialize_socket
+    end
+
+    def discover
+      send_discovery_message
+      result = listen_for_responses
+      Sonos::Speaker.new(result) if result
+    end
+
+  private
+
+    def send_discovery_message
+      # Request announcements
+      @socket.send(search_message, 0, MULTICAST_ADDR, MULTICAST_PORT)
+    end
+
+    def listen_for_responses
+      begin
+        Timeout::timeout(timeout) do
+          loop do
+            message, info = @socket.recvfrom(2048)
+            # return the IP address
+            return info[2]
+          end
+        end
+      rescue Timeout::Error => ex
+        nil
+      end
+    end
+
+    def initialize_socket
+      # Create a socket
+      @socket = UDPSocket.open
+
+      # We're going to use IP with the multicast TTL. Mystery third parameter is a mystery.
+      @socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_MULTICAST_TTL, 2)
+    end
+
+    def search_message
+     [
+        'M-SEARCH * HTTP/1.1',
+        "HOST: #{MULTICAST_ADDR}:reservedSSDPport",
+        'MAN: ssdp:discover',
+        "MX: #{timeout}",
+        "ST: urn:schemas-upnp-org:device:ZonePlayer:1"
+      ].join("\n")
+    end
+  end
+end

data/lib/sonos/endpoint.rb

@@ -0,0 +1,9 @@
+module Sonos
+  module Endpoint
+  end
+end
+
+require 'sonos/endpoint/content_directory'
+require 'sonos/endpoint/device'
+require 'sonos/endpoint/rendering'
+require 'sonos/endpoint/transport'

data/lib/sonos/endpoint/content_directory.rb

@@ -0,0 +1,53 @@
+module Sonos::Endpoint::ContentDirectory
+  CONTENT_DIRECTORY_ENDPOINT = '/MediaServer/ContentDirectory/Control'
+  CONTENT_DIRECTORY_XMLNS = 'urn:schemas-upnp-org:service:ContentDirectory:1'
+
+  # Get the current queue
+  def queue(starting_index = 0, requested_count = 100)
+    name = 'Browse'
+    action = "#{CONTENT_DIRECTORY_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{CONTENT_DIRECTORY_XMLNS}"><ObjectID>Q:0</ObjectID><BrowseFlag>BrowseDirectChildren</BrowseFlag><Filter>dc:title,res,dc:creator,upnp:artist,upnp:album,upnp:albumArtURI</Filter><StartingIndex>#{starting_index}</StartingIndex><RequestedCount>#{requested_count}</RequestedCount><SortCriteria></SortCriteria></u:Browse>}
+    result = content_directory_client.call name, soap_action: action, message: message
+    body = result.body[:browse_response]
+
+    hash = {
+      total: body[:total_matches].to_i,
+      items: parse_items(body[:result])
+    }
+
+    # Paginate
+    # TODO: This is ugly and inflexible
+    if starting_index == 0
+      start = starting_index
+      while hash[:items].count < hash[:total]
+        start += requested_count
+        hash[:items] += browse(start, requested_count)[:items]
+      end
+    end
+
+    hash
+  end
+
+private
+
+  def content_directory_client
+    @content_directory_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{CONTENT_DIRECTORY_ENDPOINT}", namespace: Sonos::NAMESPACE
+  end
+
+  def parse_items(string)
+    result = []
+    doc = Nokogiri::XML(string)
+    doc.css('item').each do |item|
+      res = item.css('res').first
+      result << {
+        title: item.xpath('dc:title').inner_text,
+        artist: item.xpath('dc:creator').inner_text,
+        album: item.xpath('upnp:album').inner_text,
+        album_art: "http://#{self.ip}:#{PORT}#{item.xpath('upnp:albumArtURI').inner_text}",
+        duration: res['duration'],
+        id: res.inner_text
+      }
+    end
+    result
+  end
+end

data/lib/sonos/endpoint/device.rb

@@ -0,0 +1,23 @@
+module Sonos::Endpoint::Device
+  DEVICE_ENDPOINT = '/DeviceProperties/Control'
+  DEVICE_XMLNS = 'urn:schemas-upnp-org:service:DeviceProperties:1'
+
+  # Turn the white status light on or off
+  # @param [Boolean] True to turn on the light. False to turn off the light.
+  def status_light_enabled=(enabled)
+    send_device_message('SetLEDState', enabled ? 'On' : 'Off')
+  end
+
+private
+
+  def device_client
+    @device_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{DEVICE_ENDPOINT}", namespace: Sonos::NAMESPACE
+  end
+
+  def send_device_message(name, value)
+    action = "#{DEVICE_XMLNS}##{name}"
+    attribute = name.sub('Set', '')
+    message = %Q{<u:#{name} xmlns:u="#{DEVICE_XMLNS}"><Desired#{attribute}>#{value}</Desired#{attribute}>}
+    device_client.call(name, soap_action: action, message: message)
+  end
+end

data/lib/sonos/endpoint/rendering.rb

@@ -0,0 +1,99 @@
+module Sonos::Endpoint::Rendering
+  RENDERING_ENDPOINT = '/MediaRenderer/RenderingControl/Control'
+  RENDERING_XMLNS = 'urn:schemas-upnp-org:service:RenderingControl:1'
+
+  # Get the current volume.
+  # @return [Fixnum] the volume from 0 to 100
+  def volume
+    response = send_rendering_message('GetVolume')
+    response.body[:get_volume_response][:current_volume].to_i
+  end
+
+  # Set the volume from 0 to 100.
+  # @param [Fixnum] the desired volume from 0 to 100
+  def volume=(value)
+    send_rendering_message('SetVolume', value)
+  end
+
+  # Get the current bass EQ.
+  # @return [Fixnum] the base EQ from -10 to 10
+  def bass
+    response = send_rendering_message('GetBass')
+    response.body[:get_bass_response][:current_bass].to_i
+  end
+
+  # Set the bass EQ from -10 to 10.
+  # @param [Fixnum] the desired bass EQ from -10 to 10
+  def bass=(value)
+    send_rendering_message('SetBass', value)
+  end
+
+  # Get the current treble EQ.
+  # @return [Fixnum] the treble EQ from -10 to 10
+  def treble
+    response = send_rendering_message('GetTreble')
+    response.body[:get_treble_response][:current_treble].to_i
+  end
+
+  # Set the treble EQ from -10 to 10.
+  # @param [Fixnum] the desired treble EQ from -10 to 10
+  def treble=(value)
+    send_rendering_message('SetTreble', value)
+  end
+
+  # Mute the speaker
+  def mute
+    set_mute(true)
+  end
+
+  # Unmute the speaker
+  def unmute
+    set_mute(false)
+  end
+
+  # Is the speaker muted?
+  # @return [Boolean] true if the speaker is muted and false if it is not
+  def muted?
+    response = send_rendering_message('GetMute')
+    response.body[:get_mute_response][:current_mute] == '1'
+  end
+
+  # Get the loudness compenstation setting
+  # @return [Boolean] true if the speaker has loudness on and false if it is not
+  def loudness
+    response = send_rendering_message('GetLoudness')
+    response.body[:get_loudness_response][:current_loudness] == '1'
+  end
+
+  # Set the loudness compenstation setting
+  # @param [Boolean] if the speaker has loudness on or not
+  def loudness=(value)
+    send_rendering_message('SetLoudness', value ? 1 : 0)
+  end
+
+private
+
+  # Sets the speaker's mute
+  # @param [Boolean] if the speaker is muted or not
+  def set_mute(value)
+    send_rendering_message('SetMute', value ? 1 : 0)
+  end
+
+  def rendering_client
+    @rendering_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{RENDERING_ENDPOINT}", namespace: Sonos::NAMESPACE
+  end
+
+  def send_rendering_message(name, value = nil)
+    action = "#{RENDERING_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{RENDERING_XMLNS}"><InstanceID>0</InstanceID><Channel>Master</Channel>}
+
+    if value
+      attribute = name.sub('Set', '')
+      message += %Q{<Desired#{attribute}>#{value}</Desired#{attribute}></u:#{name}>}
+    else
+      message += %Q{</u:#{name}>}
+    end
+
+    rendering_client.call(name, soap_action: action, message: message)
+  end
+end

data/lib/sonos/endpoint/transport.rb

@@ -0,0 +1,87 @@
+module Sonos::Endpoint::Transport
+  TRANSPORT_ENDPOINT = '/MediaRenderer/AVTransport/Control'
+  TRANSPORT_XMLNS = 'urn:schemas-upnp-org:service:AVTransport:1'
+
+  # Get information about the currently playing track.
+  # @return [Hash] information about the current track.
+  def now_playing
+    response = send_transport_message('GetPositionInfo')
+    body = response.body[:get_position_info_response]
+    doc = Nokogiri::XML(body[:track_meta_data])
+
+    {
+      title: doc.xpath('//dc:title').inner_text,
+      artist: doc.xpath('//dc:creator').inner_text,
+      album: doc.xpath('//upnp:album').inner_text,
+      playlist_position: body[:track],
+      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}"
+    }
+  end
+
+  # Pause the currently playing track.
+  def pause
+    send_transport_message('Pause')
+  end
+
+  # Play the currently selected track or play a stream.
+  # @param [String] optional uri of the track to play. Leaving this blank, plays the current track.
+  def play(uri = nil)
+    # Play a song from the uri
+    set_av_transport_uri(uri) and return if uri
+
+    # Play the currently selected track
+    send_transport_message('Play')
+  end
+
+  # Stop playing.
+  def stop
+    send_transport_message('Stop')
+  end
+
+  # Play the next track.
+  def next
+    send_transport_message('Next')
+  end
+
+  # Play the previous track.
+  def previous
+    send_transport_message('Previous')
+  end
+
+  # Clear the queue
+  def clear_queue
+    send_transport_message('RemoveAllTracksFromQueue')
+  end
+
+  # Save queue
+  def save_queue(title)
+    name = 'SaveQueue'
+    action = "#{TRANSPORT_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><Title>#{title}</Title><ObjectID></ObjectID></u:#{name}>}
+    transport_client.call(name, soap_action: action, message: message)
+  end
+
+private
+
+  # Play a stream.
+  def set_av_transport_uri(uri)
+    name = 'SetAVTransportURI'
+    action = "#{TRANSPORT_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><CurrentURI>#{uri}</CurrentURI><CurrentURIMetaData></CurrentURIMetaData></u:#{name}>}
+    transport_client.call(name, soap_action: action, message: message)
+    self.play
+  end
+
+  def transport_client
+    @transport_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{TRANSPORT_ENDPOINT}", namespace: Sonos::NAMESPACE
+  end
+
+  def send_transport_message(name)
+    action = "#{TRANSPORT_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><Speed>1</Speed></u:#{name}>}
+    transport_client.call(name, soap_action: action, message: message)
+  end
+end

data/lib/sonos/speaker.rb

@@ -1,15 +1,15 @@
 require 'savon'
-require 'sonos/transport'
-require 'sonos/rendering'
-require 'sonos/device'
-require 'sonos/content_directory'
+require 'open-uri'
+require 'sonos/endpoint'
+require 'sonos/topology'
 
 module Sonos
   class Speaker
-    include Transport
-    include Rendering
-    include Device
-    include ContentDirectory
+    include Endpoint::Transport
+    include Endpoint::Rendering
+    include Endpoint::Device
+    include Endpoint::ContentDirectory
+    include Topology
 
     attr_reader :ip, :zone_name, :zone_icon, :uid, :serial_number, :software_version, :hardware_version, :mac_address
 
@@ -29,7 +29,7 @@ module Sonos
 
     # Get information about the speaker.
     def get_status
-      doc = Nokogiri::XML(open("http://#{@ip}:1400/status/zp"))
+      doc = Nokogiri::XML(open("http://#{@ip}:#{PORT}/status/zp"))
 
       @zone_name = doc.xpath('.//ZoneName').inner_text
       @zone_icon = doc.xpath('.//ZoneIcon').inner_text

data/lib/sonos/topology.rb

@@ -0,0 +1,35 @@
+require 'uri'
+
+module Sonos
+  module Topology
+    def topology
+      doc = Nokogiri::XML(open("http://#{@ip}:#{PORT}/status/topology"))
+
+      doc.xpath('//ZonePlayers/ZonePlayer').map do |node|
+        Node.new(node)
+      end
+    end
+
+  protected
+
+    class Node
+      attr_accessor :name, :group, :coordinator, :location, :version, :uuid
+
+      def initialize(node)
+        node.attributes.each do |k, v|
+          self.send("#{k}=", v) if self.respond_to?(k.to_sym)
+        end
+
+        self.name = node.inner_text
+      end
+
+      def ip
+        @ip ||= URI.parse(location).host
+      end
+
+      def speaker
+        @speaker || Sonos::Speaker.new(ip)
+      end
+    end
+  end
+end

data/lib/sonos/version.rb

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

data/sonos.gemspec

@@ -6,8 +6,8 @@ require 'sonos/version'
 Gem::Specification.new do |gem|
   gem.name          = 'sonos'
   gem.version       = Sonos::VERSION
-  gem.authors       = ['Sam Soffes']
-  gem.email         = ['sam@soff.es']
+  gem.authors       = ['Sam Soffes', 'Aaron Gotwalt']
+  gem.email         = ['sam@soff.es', 'gotwalt@gmail.com']
   gem.description   = 'Control Sonos speakers with Ruby'
   gem.summary       = gem.description
   gem.homepage      = 'https://github.com/soffes/sonos'
@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'savon', '~> 2.0.2'
+  gem.add_dependency 'thor'
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
 - Sam Soffes
+- Aaron Gotwalt
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -27,10 +28,28 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  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'
 description: Control Sonos speakers with Ruby
 email:
 - sam@soff.es
-executables: []
+- gotwalt@gmail.com
+executables:
+- sonos
 extensions: []
 extra_rdoc_files: []
 files:
@@ -40,12 +59,17 @@ files:
 - LICENSE
 - Rakefile
 - Readme.markdown
+- bin/sonos
 - lib/sonos.rb
-- lib/sonos/content_directory.rb
-- lib/sonos/device.rb
-- lib/sonos/rendering.rb
+- lib/sonos/cli.rb
+- lib/sonos/discovery.rb
+- lib/sonos/endpoint.rb
+- lib/sonos/endpoint/content_directory.rb
+- lib/sonos/endpoint/device.rb
+- lib/sonos/endpoint/rendering.rb
+- lib/sonos/endpoint/transport.rb
 - lib/sonos/speaker.rb
-- lib/sonos/transport.rb
+- lib/sonos/topology.rb
 - lib/sonos/version.rb
 - sonos.gemspec
 homepage: https://github.com/soffes/sonos
@@ -62,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -921214504657487484
+      hash: -1695773237927316888
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -921214504657487484
+      hash: -1695773237927316888
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/sonos/content_directory.rb

@@ -1,55 +0,0 @@
-module Sonos
-  module ContentDirectory
-    CONTENT_DIRECTORY_ENDPOINT = '/MediaServer/ContentDirectory/Control'
-    CONTENT_DIRECTORY_XMLNS = 'urn:schemas-upnp-org:service:ContentDirectory:1'
-
-    # Get the current queue
-    def queue(starting_index = 0, requested_count = 100)
-      name = 'Browse'
-      action = "#{CONTENT_DIRECTORY_XMLNS}##{name}"
-      message = %Q{<u:#{name} xmlns:u="#{CONTENT_DIRECTORY_XMLNS}"><ObjectID>Q:0</ObjectID><BrowseFlag>BrowseDirectChildren</BrowseFlag><Filter>dc:title,res,dc:creator,upnp:artist,upnp:album,upnp:albumArtURI</Filter><StartingIndex>#{starting_index}</StartingIndex><RequestedCount>#{requested_count}</RequestedCount><SortCriteria></SortCriteria></u:Browse>}
-      result = content_directory_client.call name, soap_action: action, message: message
-      body = result.body[:browse_response]
-
-      hash = {
-        total: body[:total_matches].to_i,
-        items: parse_items(body[:result])
-      }
-
-      # Paginate
-      # TODO: This is ugly and inflexible
-      if starting_index == 0
-        start = starting_index
-        while hash[:items].count < hash[:total]
-          start += requested_count
-          hash[:items] += browse(start, requested_count)[:items]
-        end
-      end
-
-      hash
-    end
-
-  private
-
-    def content_directory_client
-      @content_directory_client ||= Savon.client endpoint: "http://#{self.ip}:#{PORT}#{CONTENT_DIRECTORY_ENDPOINT}", namespace: NAMESPACE
-    end
-
-    def parse_items(string)
-      result = []
-      doc = Nokogiri::XML(string)
-      doc.css('item').each do |item|
-        res = item.css('res').first
-        result << {
-          title: item.xpath('dc:title').inner_text,
-          artist: item.xpath('dc:creator').inner_text,
-          album: item.xpath('upnp:album').inner_text,
-          album_art: "http://#{self.ip}:#{PORT}#{item.xpath('upnp:albumArtURI').inner_text}",
-          duration: res['duration'],
-          id: res.inner_text
-        }
-      end
-      result
-    end
-  end
-end

data/lib/sonos/device.rb

@@ -1,25 +0,0 @@
-module Sonos
-  module Device
-    DEVICE_ENDPOINT = '/DeviceProperties/Control'
-    DEVICE_XMLNS = 'urn:schemas-upnp-org:service:DeviceProperties:1'
-
-    # Turn the white status light on or off
-    # @param [Boolean] True to turn on the light. False to turn off the light.
-    def status_light_enabled=(enabled)
-      send_device_message('SetLEDState', enabled ? 'On' : 'Off')
-    end
-
-  private
-
-    def device_client
-      @device_client ||= Savon.client endpoint: "http://#{self.ip}:#{PORT}#{DEVICE_ENDPOINT}", namespace: NAMESPACE
-    end
-
-    def send_device_message(name, value)
-      action = "#{DEVICE_XMLNS}##{name}"
-      attribute = name.sub('Set', '')
-      message = %Q{<u:#{name} xmlns:u="#{DEVICE_XMLNS}"><Desired#{attribute}>#{value}</Desired#{attribute}>}
-      device_client.call(name, soap_action: action, message: message)
-    end
-  end
-end

data/lib/sonos/rendering.rb

@@ -1,88 +0,0 @@
-module Sonos
-  module Rendering
-    RENDERING_ENDPOINT = '/MediaRenderer/RenderingControl/Control'
-    RENDERING_XMLNS = 'urn:schemas-upnp-org:service:RenderingControl:1'
-
-    # Get the current volume.
-    # @return [Fixnum] the volume from 0 to 100
-    def volume
-      response = send_rendering_message('GetVolume')
-      response.body[:get_volume_response][:current_volume].to_i
-    end
-
-    # Set the volume from 0 to 100.
-    # @param [Fixnum] the desired volume from 0 to 100
-    def volume=(value)
-      send_rendering_message('SetVolume', value)
-    end
-
-    # Get the current bass EQ.
-    # @return [Fixnum] the base EQ from -10 to 10
-    def bass
-      response = send_rendering_message('GetBass')
-      response.body[:get_bass_response][:current_bass].to_i
-    end
-
-    # Set the bass EQ from -10 to 10.
-    # @param [Fixnum] the desired bass EQ from -10 to 10
-    def bass=(value)
-      send_rendering_message('SetBass', value)
-    end
-
-    # Get the current treble EQ.
-    # @return [Fixnum] the treble EQ from -10 to 10
-    def treble
-      response = send_rendering_message('GetTreble')
-      response.body[:get_treble_response][:current_treble].to_i
-    end
-
-    # Set the treble EQ from -10 to 10.
-    # @param [Fixnum] the desired treble EQ from -10 to 10
-    def treble=(value)
-      send_rendering_message('SetTreble', value)
-    end
-
-    # Mute the speaker
-    def mute
-      set_mute(true)
-    end
-
-    # Unmute the speaker
-    def unmute
-      set_mute(false)
-    end
-
-    # Is the speaker muted?
-    # @return [Boolean] true if the speaker is muted and false if it is not
-    def muted?
-      response = send_rendering_message('GetMute')
-      response.body[:get_mute_response][:current_mute] == '1'
-    end
-
-  private
-
-    # Sets the speaker's mute
-    # @param [Boolean] if the speaker is muted or not
-    def set_mute(value)
-      send_rendering_message('SetMute', value ? 1 : 0)
-    end
-
-    def rendering_client
-      @rendering_client ||= Savon.client endpoint: "http://#{self.ip}:#{PORT}#{RENDERING_ENDPOINT}", namespace: NAMESPACE
-    end
-
-    def send_rendering_message(name, value = nil)
-      action = "#{RENDERING_XMLNS}##{name}"
-      message = %Q{<u:#{name} xmlns:u="#{RENDERING_XMLNS}"><InstanceID>0</InstanceID><Channel>Master</Channel>}
-
-      if value
-        attribute = name.sub('Set', '')
-        message += %Q{<Desired#{attribute}>#{value}</Desired#{attribute}></u:#{name}>}
-      else
-        message += %Q{</u:#{name}>}
-      end
-
-      rendering_client.call(name, soap_action: action, message: message)
-    end
-  end
-end

data/lib/sonos/transport.rb

@@ -1,89 +0,0 @@
-module Sonos
-  module Transport
-    TRANSPORT_ENDPOINT = '/MediaRenderer/AVTransport/Control'
-    TRANSPORT_XMLNS = 'urn:schemas-upnp-org:service:AVTransport:1'
-
-    # Get information about the currently playing track.
-    # @return [Hash] information about the current track.
-    def now_playing
-      response = send_transport_message('GetPositionInfo')
-      body = response.body[:get_position_info_response]
-      doc = Nokogiri::XML(body[:track_meta_data])
-
-      {
-        title: doc.xpath('//dc:title').inner_text,
-        artist: doc.xpath('//dc:creator').inner_text,
-        album: doc.xpath('//upnp:album').inner_text,
-        playlist_position: body[:track],
-        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}"
-      }
-    end
-
-    # Pause the currently playing track.
-    def pause
-      send_transport_message('Pause')
-    end
-
-    # Play the currently selected track or play a stream.
-    # @param [String] optional uri of the track to play. Leaving this blank, plays the current track.
-    def play(uri = nil)
-      # Play a song from the uri
-      set_av_transport_uri(uri) and return if uri
-
-      # Play the currently selected track
-      send_transport_message('Play')
-    end
-
-    # Stop playing.
-    def stop
-      send_transport_message('Stop')
-    end
-
-    # Play the next track.
-    def next
-      send_transport_message('Next')
-    end
-
-    # Play the previous track.
-    def previous
-      send_transport_message('Previous')
-    end
-
-    # Clear the queue
-    def clear_queue
-      send_transport_message('RemoveAllTracksFromQueue')
-    end
-
-    # Save queue
-    def save_queue(title)
-      name = 'SaveQueue'
-      action = "#{TRANSPORT_XMLNS}##{name}"
-      message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><Title>#{title}</Title><ObjectID></ObjectID></u:#{name}>}
-      transport_client.call(name, soap_action: action, message: message)
-    end
-
-  private
-
-    # Play a stream.
-    def set_av_transport_uri(uri)
-      name = 'SetAVTransportURI'
-      action = "#{TRANSPORT_XMLNS}##{name}"
-      message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><CurrentURI>#{uri}</CurrentURI><CurrentURIMetaData></CurrentURIMetaData></u:#{name}>}
-      transport_client.call(name, soap_action: action, message: message)
-      self.play
-    end
-
-    def transport_client
-      @transport_client ||= Savon.client endpoint: "http://#{self.ip}:#{PORT}#{TRANSPORT_ENDPOINT}", namespace: NAMESPACE
-    end
-
-    def send_transport_message(name)
-      action = "#{TRANSPORT_XMLNS}##{name}"
-      message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID><Speed>1</Speed></u:#{name}>}
-      transport_client.call(name, soap_action: action, message: message)
-    end
-  end
-end