spec/spec_helper.rb in rupnp-0.2.0 vs spec/spec_helper.rb in rupnp-0.2.1

@@ -56,26 +56,42 @@
     responder.send_data response
   end
 end
 
 
-def generate_xml_device_description(uuid)
-  <<EOD
+def generate_xml_device_description(uuid, options={})
+  opt = {
+    :version_major => 1,
+    :version_minor => 1,
+    :device_type => :base,
+  }.merge(options)
+
+  desc=<<EOD
 <?xml version="1.0"?>
 <root xmlns="urn:schemas-upnp-org:device-1-0" configId="1">
   <specVersion>
-    <major>1</major>
-    <minor>1</minor>
+    <major>#{opt[:version_major]}</major>
+    <minor>#{opt[:version_minor]}</minor>
   </specVersion>
   <device>
-    <deviceType>urn:schemas-upnp-org:device:Base:1-0</deviceType>
+    <deviceType>urn:schemas-upnp-org:device:#{opt[:device_type].capitalize}:1-0</deviceType>
     <friendlyName>Friendly name</friendlyName>
     <manufacturer>RUPNP</manufacturer>
     <modelName>Model name</modelName>
     <UDN>uuid:#{uuid}</UDN>
-  </device>
-</root>
 EOD
+  if opt[:device_type] != :base
+    desc << <<EOD
+    <serviceList>
+      <service>
+        <serviceType>usrn:schemas-upnp-org:service:ContentDirectory:1</serviceType>
+        <serviceId>urn:upnp-org:serviceId:</serviceId>
+
+      </service>
+    </serviceList>
+EOD
+  end
+  desc << "  </device>\n</root>\n"
 end
 
 
 NOTIFY_REGEX = {
   :common => [