ruby_onvif_client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eab26356c14952c85c3d6e821dd65fe11ec2a14
-  data.tar.gz: d83677fa347fa61e3463721b49de6d94159ddc9f
+  metadata.gz: 7d925e54ae7230bd1dc8766dffaf93c541ab4c9b
+  data.tar.gz: 06e9a94fa8a168044c9bd2ec15246d01277021f1
 SHA512:
-  metadata.gz: 5cae25ac8fd749a76cf7a21e066c1165127c9b041e69c1b2e0d00fe487e899cda2661e8a858b7f8956a7fe94a038b6bdac62e8469fdbca8223fea56105ce198b
-  data.tar.gz: fd7185f378d9d7d18d48812b76bd83531e4b18584c42fcbd279e2a0fe2d4381700c8024db8d3713900606c655ad65790c14cecbbd1d5ea31cb43474e91dd6e74
+  metadata.gz: a26873aa55f1a92ac246e362f870d748c6bfe4cb45aaa9d774272e35833f1166f373245fa563e94872dfd18a71bf4f1a4bfaf1cfb2523dcb40f0f983b22116a6
+  data.tar.gz: ddcc37f718ed1da46818e48de4280ba6524b6997ed3a76e2e7c7c32c19bedfbda97578c724eee8274b992add0e16ce95c4cd97ee8200ae998c1039cf55d4cbb6

data/lib/ruby_onvif_client/device_management/get_capabilities.rb

@@ -44,9 +44,9 @@ module ONVIF
 
             def _get_analytics xml_analytics
                 {
-                    x_addr: value(xml_analytics, '//tt:XAddr'),
-                    rule_support: value(xml_analytics, '//tt:RuleSupport'),
-                    ams: value(xml_analytics, '//tt:AnalyticsModuleSupport')
+                    x_addr: value(xml_analytics, 'tt:XAddr'),
+                    rule_support: value(xml_analytics, 'tt:RuleSupport'),
+                    ams: value(xml_analytics, 'tt:AnalyticsModuleSupport')
                 }
             end
 
@@ -60,21 +60,21 @@ module ONVIF
                     "UsernameToken", "HttpDigest", "RELToken", "SupportedEAPMethods"]
                 network = {}; system = {}; security = {}
                 network_keys.each do |key|
-                    network[key.underscore] = value(xml_device, '//tt:' + key) unless value(xml_device, '//tt:' + key) == ''
+                    network[key.underscore] = value(xml_device, 'tt:Network/tt:' + key) unless value(xml_device, 'tt:Network/tt:' + key) == ''
                 end
                 system_keys.each do |key|
-                    system[key.underscore] = value(xml_device, '//tt:' + key) unless value(xml_device, '//tt:' + key) == ''
+                    system[key.underscore] = value(xml_device, 'tt:System/tt:' + key) unless value(xml_device, 'tt:System/tt:' + key) == ''
                 end
                 security_keys.each do |key|
-                    security[key.underscore] = value(xml_device, '//tt:' + key) unless value(xml_device, '//tt:' + key) == ''
+                    security[key.underscore] = value(xml_device, 'tt:Security/tt:' + key) unless value(xml_device, 'tt:Security/tt:' + key) == ''
                 end
                 return {
-                    x_addr: value(xml_device, '//tt:XAddr'),
+                    x_addr: value(xml_device, 'tt:XAddr'),
                     network: network,
                     system: system,
                     io: {
-                        input_connectors: value(xml_device, '//tt:InputConnectors'),
-                        relay_outputs: value(xml_device, '//tt:RelayOutputs'),
+                        input_connectors: value(xml_device, 'tt:IO/tt:InputConnectors'),
+                        relay_outputs: value(xml_device, 'tt:IO/tt:RelayOutputs'),
                         extension: ""
                     },
                     security: security
@@ -83,26 +83,26 @@ module ONVIF
 
             def _get_events xml_events
                 {
-                    x_addr: value(xml_events, '//tt:XAddr'),
-                    wssubscription_policy_support: value(xml_events, '//tt:WSSubscriptionPolicySupport'),
-                    wspull_point_support: value(xml_events, '//tt:WSPullPointSupport'),
-                    wspsmis: value(xml_events, '//tt:WSPausableSubscriptionManagerInterfaceSupport')
+                    x_addr: value(xml_events, 'tt:XAddr'),
+                    wssubscription_policy_support: value(xml_events, 'tt:WSSubscriptionPolicySupport'),
+                    wspull_point_support: value(xml_events, 'tt:WSPullPointSupport'),
+                    wspsmis: value(xml_events, 'tt:WSPausableSubscriptionManagerInterfaceSupport')
                 }
             end
 
             def _get_imaging xml_imaging
                 {
-                    x_addr: value(xml_imaging, '//tt:XAddr')
+                    x_addr: value(xml_imaging, 'tt:XAddr')
                 }
             end
 
             def _get_media xml_media
                 {
-                    x_addr: value(xml_media, '//tt:XAddr'),
+                    x_addr: value(xml_media, 'tt:XAddr'),
                     streaming_capabilities: {
-                        rtp_multicast: value(xml_media, '//tt:RTPMulticast'),
-                        rtp_tcp: value(xml_media, '//tt:RTPMulticast'),
-                        rtp_rtsp_tcp: value(xml_media, '//tt:RTP_RTSP_TCP'),
+                        rtp_multicast: value(xml_media, 'tt:StreamingCapabilities/tt:RTPMulticast'),
+                        rtp_tcp: value(xml_media, 'tt:StreamingCapabilities/tt:RTPMulticast'),
+                        rtp_rtsp_tcp: value(xml_media, 'tt:StreamingCapabilities/tt:RTP_RTSP_TCP'),
                         extension: ""
                     },
                     extension: ""
@@ -110,7 +110,7 @@ module ONVIF
             end
 
             def _get_ptz xml_ptz
-                {x_addr: value(xml_ptz, '//tt:XAddr')}
+                {x_addr: value(xml_ptz, 'tt:XAddr')}
             end
         end
     end

data/ruby-onvif-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name        = 'ruby_onvif_client'
-    s.version     = '0.1.4'
+    s.version     = '0.1.5'
     s.date        = '2013-08-07'
     s.summary     = "Ruby实现的onvif客户端"
     s.description = "使用ruby实现的简单的onvif客户端"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_onvif_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - jimxl