sonos 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9944fdb181f7e979b67372e6457be32ddb7995
-  data.tar.gz: b865559508e5b6ddf95a92b3d34a8935a659af3e
+  metadata.gz: f3ea780abc6b1575275463a67745acf4283db680
+  data.tar.gz: 7be54b8d1474a567b8e069f95b46ddd7b168b928
 SHA512:
-  metadata.gz: 23639b6d07de2b63b13ac2b7a4f40be1a22ffc421595cc781dcdcdb4150ec0d00f95586d48b8a13fed8f4929d864665e3d015be8b912d1921be788b31fa35028
-  data.tar.gz: ffc6f16907f7d7c2e010f193c5254cf4e7228cff3e37bb938f15981816ab6c88d50438df9c6686be87bab32bbe2c116991294e589112f1fcca9ec565c5799ae6
+  metadata.gz: 4c31701f021123f74e93189c7348e5a79ce774384fd2c87613f919fcd8b9a3387c5fe1eaaeeeb3c0e3e3f6c33f5fdb09462fb3e9046cbb20ca3b6fe0adf2460f
+  data.tar.gz: 92b8c154f0c759f54e4d24fb51580668bad8b727244c8b51f1594b3f733081fec13d6d3de43592bd0058f3c3ad7826c181b7783f5d95355a62ab2e4d1902aa6e

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -15,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Sam Soffes
+Copyright (c) 2012-2013 Sam Soffes, http://soff.es
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -5,4 +5,14 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
 end
+
+desc "Open an irb session preloaded with this API"
+task :console do
+  $:.unshift(File.expand_path('../lib', __FILE__))
+  require 'sonos'
+  require 'irb'
+  ARGV.clear
+  IRB.start
+end
+
 task default: :test

data/Readme.markdown

@@ -1,10 +1,10 @@
 # Sonos
 
-Control Sonos speakers with Ruby.
+Control [Sonos](https://refer.sonos.com/raf/invite?code=k8k8mq9hg) speakers with Ruby.
 
 Huge thanks to [Rahim Sonawalla](https://github.com/rahims) for making [SoCo](https://github.com/rahims/SoCo). This gem would not be possible without his work.
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/soffes/sonos) [![Dependency Status](https://gemnasium.com/soffes/sonos.png)](https://gemnasium.com/soffes/sonos)
+[![Code Climate](https://codeclimate.com/github/soffes/sonos.png)](https://codeclimate.com/github/soffes/sonos)
 
 ## Installation
 

data/lib/sonos/cli.rb

@@ -58,6 +58,36 @@ module Sonos
       speakers.each { |s| s.send command, *args }
     end
 
+    desc 'list_alarms', 'List all alarms.'
+    def list_alarms
+      puts speakers[0].list_alarms
+    end
+
+    desc 'is_alarm_enabled? [alarm_id]', 'Check if an alarm is enabled.'
+    def is_alarm_enabled?(alarm_id)
+      puts speakers[0].is_alarm_enabled?(alarm_id)
+    end
+
+    desc 'enable_alarm [alarm_id]', 'Enable an alarm.'
+    def enable_alarm(alarm_id)
+      speakers[0].enable_alarm(alarm_id)
+    end
+
+    desc 'disable_alarm [alarm_id]', 'Disable an alarm.'
+    def disable_alarm(alarm_id)
+      speakers[0].disable_alarm(alarm_id)
+    end
+
+    desc 'set_alarm_volume [alarm_id] [volume]', 'Set the volume for an alarm.'
+    def set_alarm_volume(alarm_id, volume)
+      speakers[0].set_alarm_volume(alarm_id, volume)
+    end
+
+    desc 'destroy_alarm [alarm_id]', 'Destroy an alarm.'
+    def destroy_alarm(alarm_id)
+      speakers[0].destroy_alarm(alarm_id)
+    end
+
   private
 
     def system

data/lib/sonos/device.rb

@@ -5,4 +5,4 @@ end
 
 require 'sonos/device/base'
 require 'sonos/device/speaker'
-require 'sonos/device/bridge'
+require 'sonos/device/accessory'

data/lib/sonos/device/accessory.rb

@@ -0,0 +1,20 @@
+require 'savon'
+require 'sonos/endpoint'
+
+module Sonos::Device
+
+  # Used for non-speaker Sonos devices
+  class Accessory < Base
+
+    MODELS = {
+      :'CR100' => 'CR100',   # Released Jan 2005
+      :'CR200' => 'CONTROL', # Released Jul 2009
+      :'WD100' => 'DOCK',
+      :'ZB100' => 'BRIDGE'   # Released Oct 2007
+    }.freeze
+
+    def self.models
+      MODELS
+    end
+  end
+end

data/lib/sonos/device/base.rb

@@ -3,15 +3,19 @@ require 'nokogiri'
 
 module Sonos::Device
   class Base
-    attr_reader :ip, :name, :uid, :serial_number, :software_version, :hardware_version, :mac_address, :group
+    attr_reader :ip, :name, :uid, :serial_number, :software_version, :hardware_version,
+      :zone_type, :model_number, :mac_address, :group, :icon
+
+    attr_accessor :group_master
 
     def self.detect(ip)
       data = retrieve_information(ip)
       model_number = data[:model_number]
 
-      if Bridge.model_numbers.include?(model_number)
-        Bridge.new(ip, data)
-      elsif Speaker.model_numbers.include?(model_number)
+      # TODO: Clean up
+      if Accessory.models.keys.include?(model_number.to_sym)
+        Accessory.new(ip, data)
+      elsif Speaker.models.keys.include?(model_number.to_sym)
         Speaker.new(ip, data)
       else
         raise ArgumentError.new("#{data[:model_number]} not supported")
@@ -50,6 +54,12 @@ module Sonos::Device
       }
     end
 
+    # Get the device's model
+    # @return [String] a string representation of the device's model
+    def model
+      self.class.models[@model_number.to_sym]
+    end
+
     # Can this device play music?
     # @return [Boolean] a boolean indicating if it can play music
     def speaker?

data/lib/sonos/device/speaker.rb

@@ -3,23 +3,94 @@ require 'sonos/endpoint'
 
 module Sonos::Device
 
-  # Used for PLAY:3, PLAY:5, and CONNECT
+  # Used for PLAY:3, PLAY:5, PLAYBAR, SUB, CONNECT and CONNECT:AMP
   class Speaker < Base
     include Sonos::Endpoint::AVTransport
     include Sonos::Endpoint::Rendering
     include Sonos::Endpoint::Device
     include Sonos::Endpoint::ContentDirectory
+    include Sonos::Endpoint::Upnp
+    include Sonos::Endpoint::Alarm
 
-    MODEL_NUMBERS = ['S3', 'S5', 'S9', 'ZP90', 'Sub']
+    MODELS = {
+      :'S1'    => 'PLAY:1',     # Released Oct 2013
+      :'S3'    => 'PLAY:3',     # Released Jul 2011
+      :'S5'    => 'PLAY:5',     # Released Nov 2009
+      :'S9'    => 'PLAYBAR',    # Released Feb 2013
+      :'Sub'   => 'SUB',        # Released May 2012
+      :'ZP80'  => 'ZP80',       # Released Apr 2006
+      :'ZP90'  => 'CONNECT',    # Released Aug 2008
+      :'ZP100' => 'ZP100',      # Released Jan 2005
+      :'ZP120' => 'CONNECT:AMP' # Released Aug 2008
+    }.freeze
 
-    attr_reader :icon
-
-    def self.model_numbers
-      MODEL_NUMBERS
+    def self.models
+      MODELS
     end
 
     def speaker?
       true
     end
+
+    def shuffle_on
+      shuffle_repeat_change("shuffle_on")
+    end
+
+    def shuffle_off
+      shuffle_repeat_change("shuffle_off")
+    end
+
+    def repeat_on
+      shuffle_repeat_change("repeat_on")
+    end
+
+    def repeat_off
+      shuffle_repeat_change("repeat_off")
+    end
+
+    def crossfade_on
+      set_crossfade(true)
+    end
+
+    def crossfade_off
+      set_crossfade(false)
+    end
+
+    def shuffle_repeat_change(command)
+      status = get_playmode
+      case command
+      when "shuffle_on"
+        status[:shuffle] = true;
+      when "shuffle_off"
+        status[:shuffle] = false;
+      when "repeat_on"
+        status[:repeat] = true;
+      when "repeat_off"
+        status[:repeat] = false;
+      end
+      set_playmode(status)
+    end
+
+    def set_playmode(status = {:shuffle => false, :repeat => false})
+      send_transport_message('SetPlayMode', "<NewPlayMode>SHUFFLE</NewPlayMode>")           if (status[:shuffle]  && status[:repeat] )
+      send_transport_message('SetPlayMode', "<NewPlayMode>SHUFFLE_NOREPEAT</NewPlayMode>")  if (status[:shuffle]  && !status[:repeat])
+      send_transport_message('SetPlayMode', "<NewPlayMode>REPEAT_ALL</NewPlayMode>")        if (!status[:shuffle] && status[:repeat] )
+      send_transport_message('SetPlayMode', "<NewPlayMode>NORMAL</NewPlayMode>")            if (!status[:shuffle] && !status[:repeat])
+    end
+
+    def set_crossfade(crossfade)
+      crossfade_value = crossfade ? 1 : 0
+      send_transport_message('SetCrossfadeMode', "<InstanceID>0</InstanceID><CrossfadeMode>#{crossfade_value}</CrossfadeMode>")
+    end
+
+    def get_playmode
+      doc = Nokogiri::XML(open("http://#{self.group_master.ip}:#{Sonos::PORT}/status/playmode"))
+      playmode = {}
+      playmode[:shuffle] = doc.xpath('//Shuffle').inner_text == "On"
+      playmode[:repeat] = doc.xpath('//Repeat').inner_text == "On"
+      playmode[:crossfade] = doc.xpath('//Crossfade').inner_text == "On"
+      playmode
+    end
+
   end
 end

data/lib/sonos/discovery.rb

@@ -40,6 +40,7 @@ module Sonos
     # @return [Array] an array of TopologyNode objects
     def topology
       self.discover unless @first_device_ip
+      return [] unless @first_device_ip
 
       doc = Nokogiri::XML(open("http://#{@first_device_ip}:#{Sonos::PORT}/status/topology"))
       doc.xpath('//ZonePlayers/ZonePlayer').map do |node|

data/lib/sonos/endpoint.rb

@@ -7,3 +7,5 @@ require 'sonos/endpoint/content_directory'
 require 'sonos/endpoint/device'
 require 'sonos/endpoint/rendering'
 require 'sonos/endpoint/a_v_transport'
+require 'sonos/endpoint/upnp'
+require 'sonos/endpoint/alarm'

data/lib/sonos/endpoint/a_v_transport.rb

@@ -71,9 +71,7 @@ module Sonos::Endpoint::AVTransport
   def seek(seconds = 0)
     # Must be sent in the format of HH:MM:SS
     timestamp = Time.at(seconds).utc.strftime('%H:%M:%S')
-
     send_transport_message('Seek', "<Unit>REL_TIME</Unit><Target>#{timestamp}</Target>")
-
   end
 
   # Clear the queue
@@ -130,7 +128,7 @@ module Sonos::Endpoint::AVTransport
   end
 
   def transport_client
-    @transport_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{TRANSPORT_ENDPOINT}", namespace: Sonos::NAMESPACE
+    @transport_client ||= Savon.client endpoint: "http://#{self.group_master.ip}:#{Sonos::PORT}#{TRANSPORT_ENDPOINT}", namespace: Sonos::NAMESPACE, log_level: :error
   end
 
   def send_transport_message(name, part = '<Speed>1</Speed>')

data/lib/sonos/endpoint/alarm.rb

@@ -0,0 +1,125 @@
+# POST /AlarmClock/Control HTTP/1.1
+# SOAPACTION: "urn:schemas-upnp-org:service:AlarmClock:1#ListAlarms"
+
+# Request
+#<?xml version="1.0" encoding="UTF-8"?>
+#<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+#    <s:Body>
+#      <u:ListAlarms xmlns:u="urn:schemas-upnp-org:service:AlarmClock:1" />
+#    </s:Body>
+#</s:Envelope>
+
+# Response
+#<?xml version="1.0" encoding="UTF-8"?>
+#<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+#  <s:Body>
+#    <u:ListAlarmsResponse xmlns:u="urn:schemas-upnp-org:service:AlarmClock:1">
+#      <CurrentAlarmList>&lt;Alarms&gt;&lt;Alarm ID="8" StartTime="19:21:00" Duration="02:00:00" Recurrence="ONCE" Enabled="0" RoomUUID="RINCON_000E583564A601400" ProgramURI="x-rincon-buzzer:0" ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" Volume="25" IncludeLinkedZones="0"/&gt;&lt;/Alarms&gt;</CurrentAlarmList>
+#      <CurrentAlarmListVersion>RINCON_000E583564A601400:26</CurrentAlarmListVersion>
+#    </u:ListAlarmsResponse>
+#  </s:Body>
+#</s:Envelope>
+
+module Sonos::Endpoint::Alarm
+  ALARM_CLOCK_ENDPOINT = '/AlarmClock/Control'
+  ALARM_CLOCK_XMLNS = 'urn:schemas-upnp-org:service:AlarmClock:1'
+
+  # List the alarms that have been defined
+  def list_alarms
+    hash_of_alarm_hashes = {}
+    response = send_alarm_message('ListAlarms')
+    alarm_list_reader = Nokogiri::XML::Reader(response.to_hash[:list_alarms_response][:current_alarm_list])
+    alarm_list_reader.each do |alarm_node|
+      id = alarm_node.attribute('ID')
+      unless id.nil?
+        alarm_hash = {
+            :ID => id,
+            # UpdateAlarm expects 'StartLocalTime', but the ListAlarm response attribute is 'StartTime'
+            :StartLocalTime => alarm_node.attribute('StartTime'),
+            :Duration => alarm_node.attribute('Duration'),
+            :Recurrence => alarm_node.attribute('Recurrence'),
+            :Enabled => alarm_node.attribute('Enabled'),
+            :RoomUUID => alarm_node.attribute('RoomUUID'),
+            :PlayMode => alarm_node.attribute('PlayMode'),
+            :Volume => alarm_node.attribute('Volume'),
+            :IncludeLinkedZones => alarm_node.attribute('IncludeLinkedZones'),
+            :ProgramURI => alarm_node.attribute('ProgramURI'),
+            :ProgramMetaData => alarm_node.attribute('ProgramMetaData')
+        }
+        hash_of_alarm_hashes[id] = alarm_hash
+      end
+    end
+    return hash_of_alarm_hashes
+  end
+
+  def create_alarm(startLocalTime, duration, recurrence, enabled, roomUuid, playMode, volume, includeLinkedZones, programUri, programMetaData)
+    options = {:StartLocalTime => startLocalTime, :Duration => duration,
+               :Recurrence => recurrence, :Enabled => enabled, :RoomUUID => roomUuid,
+               :PlayMode => playMode, :Volume => volume, :IncludeLinkedZones => includeLinkedZones,
+               :ProgramURI => programUri, :ProgramMetaData => programMetaData}
+    #options = {:StartLocalTime => '13:19:00', :Duration => '02:00:00',
+    #           :Recurrence => 'ONCE', :Enabled => 1, :RoomUUID => 'RINCON_000E583564A601400',
+    #           :PlayMode => 'SHUFFLE_NOREPEAT', :Volume => 25, :IncludeLinkedZones => 0,
+    #           :ProgramURI => 'x-rincon-buzzer:0', :ProgramMetaData => ""}
+    send_alarm_message('CreateAlarm', convert_hash_to_xml(options))
+  end
+
+  def destroy_alarm(id)
+    send_alarm_message('DestroyAlarm', "<ID>#{id}</ID>")
+  end
+
+  def update_alarm(id, startLocalTime, duration, recurrence, enabled, roomUuid, playMode, volume, includeLinkedZones, programUri, programMetaData)
+    alarm_hash = {:ID => id, :StartLocalTime => startLocalTime, :Duration => duration,
+                  :Recurrence => recurrence, :Enabled => enabled, :RoomUUID => roomUuid,
+                  :PlayMode => playMode, :Volume => volume, :IncludeLinkedZones => includeLinkedZones,
+                  :ProgramURI => programUri, :ProgramMetaData => programMetaData}
+    #options = {:ID => 8, :StartLocalTime => '13:19:00', :Duration => '02:00:00',
+    #           :Recurrence => 'ONCE', :Enabled => 1, :RoomUUID => 'RINCON_000E583564A601400',
+    #           :PlayMode => 'SHUFFLE_NOREPEAT', :Volume => 25, :IncludeLinkedZones => 0,
+    #           :ProgramURI => 'x-rincon-buzzer:0', :ProgramMetaData => ""}
+    send_alarm_message('UpdateAlarm', convert_hash_to_xml(alarm_hash))
+  end
+
+  def is_alarm_enabled?(id)
+    list_alarms[id][:Enabled]
+  end
+
+  def enable_alarm(id)
+    alarm_hash = list_alarms[id]
+    alarm_hash[:Enabled] = '1'
+    send_alarm_message('UpdateAlarm', convert_hash_to_xml(alarm_hash))
+  end
+
+  def disable_alarm(id)
+    alarm_hash = list_alarms[id]
+    alarm_hash[:Enabled] = '0'
+    send_alarm_message('UpdateAlarm', convert_hash_to_xml(alarm_hash))
+  end
+
+  def set_alarm_volume(id, volume)
+    alarm_hash = list_alarms[id]
+    alarm_hash[:Volume] = volume
+    send_alarm_message('UpdateAlarm', convert_hash_to_xml(alarm_hash))
+  end
+
+  private
+
+  def alarm_client
+    @alarm_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{ALARM_CLOCK_ENDPOINT}", namespace: Sonos::NAMESPACE
+  end
+
+  def send_alarm_message(name, part = '')
+    action = "#{ALARM_CLOCK_XMLNS}##{name}"
+    message = %Q{<u:#{name} xmlns:u="#{ALARM_CLOCK_XMLNS}">#{part}</u:#{name}>}
+    alarm_client.call(name, soap_action: action, message: message)
+  end
+
+  def convert_hash_to_xml(options = {})
+    updatePart = ''
+    options.each do |optionKey, optionValue|
+      updatePart += "<#{optionKey}>#{optionValue}</#{optionKey}>"
+    end
+    updatePart
+  end
+
+end

data/lib/sonos/endpoint/content_directory.rb

@@ -31,7 +31,7 @@ module Sonos::Endpoint::ContentDirectory
   private
 
   def content_directory_client
-    @content_directory_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{CONTENT_DIRECTORY_ENDPOINT}", namespace: Sonos::NAMESPACE
+    @content_directory_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{CONTENT_DIRECTORY_ENDPOINT}", namespace: Sonos::NAMESPACE, log_level: :error
   end
 
   def parse_items(string)

data/lib/sonos/endpoint/device.rb

@@ -11,7 +11,7 @@ module Sonos::Endpoint::Device
 private
 
   def device_client
-    @device_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{DEVICE_ENDPOINT}", namespace: Sonos::NAMESPACE
+    @device_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{DEVICE_ENDPOINT}", namespace: Sonos::NAMESPACE, log_level: :error
   end
 
   def send_device_message(name, value)

data/lib/sonos/endpoint/rendering.rb

@@ -82,7 +82,7 @@ private
   end
 
   def rendering_client
-    @rendering_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{RENDERING_ENDPOINT}", namespace: Sonos::NAMESPACE
+    @rendering_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{RENDERING_ENDPOINT}", namespace: Sonos::NAMESPACE, log_level: :error
   end
 
   def send_rendering_message(name, value = nil)

data/lib/sonos/endpoint/upnp.rb

@@ -0,0 +1,79 @@
+require 'httpclient'
+
+module Sonos::Endpoint::Upnp
+  UPNP_TIMEOUT = 600
+
+  ENDPOINT = {
+    content_directory: '/MediaServer/ContentDirectory/Event',
+    av_transport: '/MediaRenderer/AVTransport/Event',
+    zone_group_topology: '/ZoneGroupTopology/Event',
+    device_properties: '/DeviceProperties/Event',
+    group_management: '/GroupManagement/Event',
+    group_rendering_control: '/MediaRenderer/GroupRenderingControl/Event',
+    rendering_control: '/MediaRenderer/RenderingControl/Event',
+    connection_manager: '/MediaRenderer/ConnectionManager/Event',
+    queue: '/MediaRenderer/Queue/Event',
+    alarm_clock: '/AlarmClock/Event',
+    music_services: '/MusicServices/Event',
+    system_properties: '/SystemProperties/Event'
+  }.freeze
+
+  # Subscribes to UPNP events, with callbacks being sent to the provided URL
+  # @param [String] The URL to receive http callbacks from the device
+  # @param [Symbol] The [Sonos::Endpoint::Upnp::ENDPOINT] to subscribe to
+  # @return [Hash] Returns the timeout for the HTTP listener as well as the device SID
+  def subscribe_to_upnp_events(callback_url, event)
+    client = HTTPClient.new
+
+    request_headers = {
+      # The URL to be requested when a callback happens
+      'CALLBACK' => "<#{callback_url}>",
+      # Apparently required in order to appease the UPNP gods
+      'NT' => 'upnp:event',
+      # The timeout for the subscription - set to 10 minutes
+      'TIMEOUT' => "Second-#{UPNP_TIMEOUT}"
+    }
+
+    response = client.request(:subscribe, event_url(event), header: request_headers)
+
+    # Convert the resulting headers into something less shouty
+    result_headers = response.header.all.inject({}) do |result, item|
+      result[item[0].downcase.to_sym] = item[1]
+      result
+    end
+
+    # Return all the information you'd need in order to do an unsusbscribe
+    Subscription.new({
+      timeout: result_headers[:timeout][/(\d+)/].to_i,
+      sid: result_headers[:sid],
+      event: event
+    })
+  end
+
+  # Unsubscribes an existing UPNP event
+  # @param [String] The subscription ID that you wish to cancel
+  # @param [Symbol] The [Sonos::Endpoint::Upnp::ENDPOINT] to which it belongs
+  def unsubscribe_from_upnp_events(subscription)
+    HTTPClient.new.request(:unsubscribe, event_url(subscription.event), header: {'SID' => subscription.sid })
+  end
+
+  # Simple class structure for describing an active subscription
+  class Subscription
+    attr_accessor :timeout
+    attr_accessor :sid
+    attr_accessor :event
+
+    def initialize(hash)
+      hash.each do |k, v|
+        self.send("#{k}=", v) if respond_to?(k)
+      end
+    end
+  end
+
+  private
+
+  def event_url(event)
+    "http://#{self.ip}:#{Sonos::PORT}#{ENDPOINT[event]}"
+  end
+
+end

data/lib/sonos/system.rb

@@ -73,26 +73,38 @@ module Sonos
       @devices = @topology.collect(&:device)
 
       construct_groups
+
+      speakers.each do |speaker|
+        speaker.group_master = speaker
+        @groups.each do |group|
+          speaker.group_master = group.master_speaker if group.master_speaker.uid == speaker.uid
+          group.slave_speakers.each do |slave|
+            speaker.group_master = group.master_speaker if slave.uid == speaker.uid
+          end
+        end
+      end
     end
-    
+
   private
 
     def construct_groups
       # Loop through all of the unique groups
       @topology.collect(&:group).uniq.each do |group_uid|
-        master_uuid = group_uid.split(':').first
-        nodes = []
-        master = nil
 
+        # set group's master nade using topology's coordinator parameter
+        master = nil
         @topology.each do |node|
-          # Select all of the nodes with this group uid
+          # Select only the nodes with this group uid
           next unless node.group == group_uid
+          master = node if node.coordinator == "true"
+        end
 
-          if node.uuid == master_uuid
-            master = node
-          else
-            nodes << node
-          end
+        # register other nodes in groups as slave nodes
+        nodes = []
+        @topology.each do |node|
+          # Select only the nodes with this group uid
+          next unless node.group == group_uid
+          nodes << node unless node.uuid == master.uuid
         end
 
         # Skip this group if there are no nodes or master

data/lib/sonos/version.rb

@@ -1,3 +1,3 @@
 module Sonos
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/sonos.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.required_ruby_version = '>= 1.9.2'
-  gem.add_dependency 'savon', '~> 2.0.2'
+  gem.add_dependency 'savon', '~> 2.0'
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'thor'
+  gem.add_dependency 'httpclient'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Sam Soffes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Control Sonos speakers with Ruby
 email:
 - sam@soff.es
@@ -63,7 +77,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .ruby-version
 - .travis.yml
 - Changelog.markdown
 - Gemfile
@@ -74,15 +87,17 @@ files:
 - lib/sonos.rb
 - lib/sonos/cli.rb
 - lib/sonos/device.rb
+- lib/sonos/device/accessory.rb
 - lib/sonos/device/base.rb
-- lib/sonos/device/bridge.rb
 - lib/sonos/device/speaker.rb
 - lib/sonos/discovery.rb
 - lib/sonos/endpoint.rb
 - lib/sonos/endpoint/a_v_transport.rb
+- lib/sonos/endpoint/alarm.rb
 - lib/sonos/endpoint/content_directory.rb
 - lib/sonos/endpoint/device.rb
 - lib/sonos/endpoint/rendering.rb
+- lib/sonos/endpoint/upnp.rb
 - lib/sonos/group.rb
 - lib/sonos/system.rb
 - lib/sonos/topology_node.rb
@@ -113,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Control Sonos speakers with Ruby

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p195

data/lib/sonos/device/bridge.rb

@@ -1,17 +0,0 @@
-require 'savon'
-require 'sonos/endpoint'
-
-module Sonos::Device
-
-  # Used for Zone Bridge
-  class Bridge < Base
-
-    MODEL_NUMBERS = ['ZB100','ZP80']
-
-    attr_reader :icon
-
-    def self.model_numbers
-      MODEL_NUMBERS
-    end
-  end
-end