sonos 0.2.1 → 0.3.0

data/test/support/discovery_macros.rb

@@ -0,0 +1,7 @@
+module DiscoveryMacros
+  def stub_discovery
+    Sonos::Discovery.any_instance.stubs(:initialize_socket)
+    Sonos::Discovery.any_instance.stubs(:send_discovery_message)
+    Sonos::Discovery.any_instance.stubs(:listen_for_responses).returns('10.0.1.10')
+  end
+end

data/test/support/vcr.rb

@@ -0,0 +1,4 @@
+VCR.configure do |c|
+  c.cassette_library_dir = 'test/cassettes'
+  c.hook_into :fakeweb
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require :test
+require 'minitest/autorun'
+require 'mocha/setup'
+require 'sonos'
+
+# Support files
+Dir["#{File.expand_path(File.dirname(__FILE__))}/support/*.rb"].each do |file|
+  require file
+end
+
+class SonosTest < MiniTest::Unit::TestCase
+  include DiscoveryMacros
+end

data/test/units/system_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class SystemTest < SonosTest
+  def before_suites
+    super
+    stub_discovery
+  end
+
+  def test_singleton
+    VCR.use_cassette('topology', match_requests_on: [:path]) do
+      assert_equal Sonos.system.object_id, Sonos.system.object_id
+    end
+  end
+
+  def test_group_detection
+    VCR.use_cassette('topology', match_requests_on: [:path]) do
+      system = Sonos.system
+      assert_equal 1, system.groups.length
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -70,6 +70,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Changelog.markdown
 - Gemfile
 - LICENSE
@@ -78,18 +79,29 @@ files:
 - bin/sonos
 - lib/sonos.rb
 - lib/sonos/cli.rb
+- lib/sonos/device.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/content_directory.rb
 - lib/sonos/endpoint/device.rb
 - lib/sonos/endpoint/rendering.rb
-- lib/sonos/endpoint/transport.rb
-- lib/sonos/speaker.rb
-- lib/sonos/topology.rb
+- lib/sonos/group.rb
+- lib/sonos/system.rb
+- lib/sonos/topology_node.rb
 - lib/sonos/version.rb
 - sonos.gemspec
+- test/cassettes/topology.yml
+- test/support/discovery_macros.rb
+- test/support/vcr.rb
+- test/test_helper.rb
+- test/units/system_test.rb
 homepage: https://github.com/soffes/sonos
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,10 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2990383853655204370
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,12 +120,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2990383853655204370
+      hash: -1378351241916050478
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Control Sonos speakers with Ruby
-test_files: []
+test_files:
+- test/cassettes/topology.yml
+- test/support/discovery_macros.rb
+- test/support/vcr.rb
+- test/test_helper.rb
+- test/units/system_test.rb
 has_rdoc: 

data/lib/sonos/speaker.rb

@@ -1,44 +0,0 @@
-require 'savon'
-require 'open-uri'
-require 'sonos/endpoint'
-require 'sonos/topology'
-
-module Sonos
-  class Speaker
-    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
-
-    def initialize(ip)
-      @ip = ip
-
-      # Get the speaker's status
-      get_status
-    end
-
-    # URL for giant dump of device information
-    def device_description_url
-      "http://#{self.ip}:#{PORT}/xml/device_description.xml"
-    end
-
-  private
-
-    # Get information about the speaker.
-    def get_status
-      doc = Nokogiri::XML(open("http://#{@ip}:#{PORT}/status/zp"))
-
-      @zone_name = doc.xpath('.//ZoneName').inner_text
-      @zone_icon = doc.xpath('.//ZoneIcon').inner_text
-      @uid = doc.xpath('.//LocalUID').inner_text
-      @serial_number = doc.xpath('.//SerialNumber').inner_text
-      @software_version = doc.xpath('.//SoftwareVersion').inner_text
-      @hardware_version = doc.xpath('.//HardwareVersion').inner_text
-      @mac_address = doc.xpath('.//MACAddress').inner_text
-      self
-    end
-  end
-end

data/lib/sonos/topology.rb

@@ -1,35 +0,0 @@
-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