ws_discovery 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26563c4c512bac506b4896e8815c73adec7e80e4
-  data.tar.gz: 30218e0afdce4d63cf9fab82b9856644a443d205
+  metadata.gz: 9f3a7ab66b4a19dd8e9e0492e05a9895083fca68
+  data.tar.gz: f8bfedf888aa44b5f97c8502db5c7d1699c403ba
 SHA512:
-  metadata.gz: 5d3b2d80a9b09c7452054d1f757b58ddd4816e4505e0ceaec28de186bce374e3bb2a3dbdf34b45a88acb2c895de4622fe659001dcc347c7fe17c78a6a63708f6
-  data.tar.gz: 20ba3f6c8d9a157b0bc8a948b5ff6c83f2dd7cb25a4cc57f733e0726815ea4f0956532f25ac489da686b93bb90cf2e13547a1f8b4547cbec0a6613ebb92635d6
+  metadata.gz: b461c7f2ea5a81c6fc38e9e66ccfc3e5b3f3b5ea3bd8eaf63b240f82a8d113695fb49e17a1371299932811c3399d33a14296bb8b629678f3fa4442f6719b2807
+  data.tar.gz: 71a05e59ffd0402b783808427caadd7b39a300e197a87b824a738488748fa7989eef348d76d0bdc6fd0e39630c9fb29b7a188ee834418a31a6be8f5ab5aaed4a

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.0.3 / 2013-07-29
+
+* Corrected errors with searching for devices of a specific type.
+
 === 0.0.2 / 2013-03-25
 
 * Updated to be compatible with Nori 2.0.0.

data/lib/ws_discovery/searcher.rb

@@ -73,7 +73,7 @@ class WSDiscovery::Searcher < WSDiscovery::MulticastConnection
       'xmlns:d' => 'http://schemas.xmlsoap.org/ws/2005/04/discovery',
       'xmlns:s' => 'http://www.w3.org/2003/05/soap-envelope'
     }
-    namespaces.merge options[:env_namespaces] if options[:env_namespaces]
+    namespaces.merge! options[:env_namespaces] if options[:env_namespaces]
 
     Builder::XmlMarkup.new.s(:Envelope, namespaces) do |xml|
       xml.s(:Header) do |xml|
@@ -83,8 +83,10 @@ class WSDiscovery::Searcher < WSDiscovery::MulticastConnection
       end
 
       xml.s(:Body) do |xml|
-        xml.d(:Types, options[:type_attributes], options[:types])
-        xml.d(:Scopes, options[:scope_attributes], options[:scopes])
+        xml.d(:Probe) do
+          xml.d(:Types, options[:type_attributes], options[:types])
+          xml.d(:Scopes, options[:scope_attributes], options[:scopes])
+        end
       end
     end
   end

data/lib/ws_discovery/version.rb

@@ -1,3 +1,3 @@
 module WSDiscovery
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/ws_discovery/searcher_spec.rb

@@ -8,7 +8,8 @@ describe WSDiscovery::Searcher do
       "ttp://www.w3.org/2003/05/soap-envelope\"><s:Header><a:Action>http://sch" +
       "emas.xmlsoap.org/ws/2005/04/discovery/Probe</a:Action><a:MessageID>uuid" +
       ":a-uuid</a:MessageID><a:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery" +
-      "</a:To></s:Header><s:Body><d:Types/><d:Scopes/></s:Body></s:Envelope>"
+      "</a:To></s:Header><s:Body><d:Probe><d:Types/><d:Scopes/></d:Probe></s:B" +
+      "ody></s:Envelope>"
   end
 
   around(:each) do |example|
@@ -77,8 +78,18 @@ describe WSDiscovery::Searcher do
   end
 
   describe "#probe" do
-    it "builds the MSEARCH string using the given parameters" do
-      subject.probe.should == default_probe
+    it "builds the probe string using the given parameters" do
+      subject.probe(
+        env_namespaces: { "xmlns:dn" => "http://www.onvif.org/ver10/network/wsdl" },
+        types: "dn:NetworkVideoTransmitter").should == <<-PROBE.strip
+<s:Envelope xmlns:a=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\" xmlns:\
+d=\"http://schemas.xmlsoap.org/ws/2005/04/discovery\" xmlns:s=\"http://www.w3.o\
+rg/2003/05/soap-envelope\" xmlns:dn=\"http://www.onvif.org/ver10/network/wsdl\"\
+><s:Header><a:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</a:A\
+ction><a:MessageID>uuid:a-uuid</a:MessageID><a:To>urn:schemas-xmlsoap-org:ws:20\
+05:04:discovery</a:To></s:Header><s:Body><d:Probe><d:Types>dn:NetworkVideoTrans\
+mitter</d:Types><d:Scopes/></d:Probe></s:Body></s:Envelope>
+      PROBE
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws_discovery
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tindron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Search for devices using WS-Discovery