easy_upnp 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020e9f4c2353eeff4aa98f9027fdb2a2dfbd383f960cfa09786e65a34935a9d1
-  data.tar.gz: 51f151092a004bcd54e5774cea2633aa126b592165a2ee25599511697072c629
+  metadata.gz: 217e192e49ffaeda07523f9d727be2ad627a027c64b45693e50c9efb4058f46f
+  data.tar.gz: 62042fd87475783b47e1e4a3b0ebf76e2a7c804200a114c20631f8189c8546a1
 SHA512:
-  metadata.gz: d482a6a9acc22cbc7750ec890b733156234ba7d8af6afde8aafd60182c62d22ce0ae2b5889649f16a607970ebccb30318cc779c899a810bc271cf5f506d08581
-  data.tar.gz: 26cb2b3c2d07ed6f30c5554490824e486b47a20b7a1d915d1a9594a07b3d09157b1c01aea1f9d84c56843e6b187fdca9d622368d0194e1228dbf44932feaca32
+  metadata.gz: 9d2b91ed872a3176d78a1ef17225ded757500576ad830a177b8c571b4ee13f2204dd26d4a2e02066b62d487eabae2227d30c832df3d2dd2b09ca743d1dbc3e69
+  data.tar.gz: 3cf3e2649d7d2eff1a3ece29e6db5866cf943fd35e7c0a222f39319b86a325527c981122ffcfb857cdb3c7b9a83028aaced5f91a7295a94033bb70f0153af4d2

data/README.md

@@ -55,6 +55,22 @@ service.GetSystemUpdateID
 # => {:Id=>"207"}
 ```
 
+#### Get information about a specific device
+
+```ruby
+device.description
+# => { ... } # all available information
+
+device.description['friendlyName']
+# => "WeMo Switch"
+
+device.description['deviceType']
+# => "urn:Belkin:device:controllee:1"
+
+device.description['serialNumber']
+# => "221520K1100836"
+```
+
 ## Static client construction
 
 After you've constructed a client (`DeviceControlPoint`), you probably don't want to have to use SSDP to construct it again the next time you use it. `DeviceControlPoint` is equipped with `#to_params` and `#from_params` methods to make this easy.

data/bin/upnp-list

@@ -35,7 +35,7 @@ if devices.any?
   printf "%30s %45s %s\n", "Name", "UUID", "Services"
 
   devices.each do |device|
-    name = device.device_name rescue '*** Error fetching name ***'
+    name = device.description[:friendlyName] rescue '*** Error fetching name ***'
 
     printf "%30s %45s ", name, device.uuid
 

data/easy_upnp.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rake'
   gem.add_dependency 'savon', '~> 2.11'
   gem.add_dependency 'nokogiri', '~> 1.8'
+  gem.add_dependency 'nori', '~> 2.6'
   gem.add_dependency 'rubyntlm', '~> 0.3'
 
   gem.required_ruby_version = '>= 2.1.0'

data/lib/easy_upnp/upnp_device.rb

@@ -1,5 +1,5 @@
 require 'uri'
-require 'nokogiri'
+require 'nori'
 require 'open-uri'
 require 'savon'
 
@@ -37,8 +37,14 @@ module EasyUpnp
       @host ||= URI.parse(@service_definitions.first[:location]).host
     end
 
+    def description
+      @description ||= fetch_description
+    end
+
+    # @deprecated Use {#description['friendlyName']} instead of this method.
+    #   It will be removed in the next major release.
     def device_name
-      @device_name ||= fetch_device_name
+      @device_name ||= description['friendlyName']
     end
 
     def all_services
@@ -65,16 +71,14 @@ module EasyUpnp
 
     private
 
-    def fetch_device_name
+    # @return [Hash]
+    def fetch_description
       if all_services.empty?
-        raise RuntimeError, "Couldn't resolve device name because no endpoints are defined"
+        raise RuntimeError, "Couldn't resolve device description because no endpoints are defined"
       end
 
-      document = open(service_definition(all_services.first)[:location]) { |f| f.read }
-      xml = Nokogiri::XML(document)
-      xml.remove_namespaces!
-
-      xml.xpath("//device/friendlyName").text
+      location = service_definition(all_services.first)[:location]
+      Nori.new.parse(open(location) { |f| f.read })['root']['device']
     end
   end
 end

data/lib/easy_upnp/version.rb

@@ -1,3 +1,3 @@
 module EasyUpnp
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_upnp
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: nori
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement