easy_upnp 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9209faea08950a09fa2eef669db9699df33261ae
-  data.tar.gz: f5c2205e3f58bb10ebb08f704c606519f80f87da
+  metadata.gz: c66af83dcc88342a62f3853bc9645da68d853efe
+  data.tar.gz: 709d7760d76927f10218e1cc409d88881d28b6b1
 SHA512:
-  metadata.gz: 9151ea10e480a8323983dcf386d7977e32b4fb9b2a8a0bf1e075bd62dce7578258da25bb8ea52435fcc8f933a5319926486dd7a8a80240ce49b2e9f7540440ad
-  data.tar.gz: 0a11da3fb37f4a3d0fb7cc596ad680212ced68d3612ecc8e8d1a6be0642d7451fdc4767ffccd1690618a3eb492dc4875946597ea2ef25eb79e99d1a06770bb92
+  metadata.gz: 254d60281f8155868cc274cc367d2b1c3800384e01a4b371a43fdf1612d4cc07b58bda99f25275de66b1b1c1fb402deea785957283cff8b281498aaa9e9ef3b8
+  data.tar.gz: b4a9f81494418c9bb837fa09efb8f5f53d7d2f35bbae1137d458ebdb22c087893ef85ca325820ce166c95f63788adbe90bd66e0d133a67ea1313c0ca9e5ea7bd

data/lib/easy_upnp/control_point/client_wrapper.rb

@@ -1,5 +1,3 @@
-require_relative '../options_base'
-
 module EasyUpnp
   class ClientWrapper
     def initialize(endpoint,

data/lib/easy_upnp/control_point/device_control_point.rb

@@ -2,15 +2,13 @@ require 'nokogiri'
 require 'open-uri'
 require 'nori'
 
-require_relative '../options_base'
+require 'easy_upnp/control_point/validator_provider'
+require 'easy_upnp/control_point/client_wrapper'
+require 'easy_upnp/control_point/service_method'
 
-require_relative 'validator_provider'
-require_relative 'client_wrapper'
-require_relative 'service_method'
-
-require_relative '../events/event_client'
-require_relative '../events/http_listener'
-require_relative '../events/subscription_manager'
+require 'easy_upnp/events/event_client'
+require 'easy_upnp/events/http_listener'
+require 'easy_upnp/events/subscription_manager'
 
 module EasyUpnp
   class DeviceControlPoint

data/lib/easy_upnp/control_point/validator_provider.rb

@@ -1,4 +1,4 @@
-require_relative 'argument_validator'
+require 'easy_upnp/control_point/argument_validator'
 
 module EasyUpnp
   module ValidatorProvider

data/lib/easy_upnp/events/event_client.rb

@@ -1,7 +1,5 @@
 require 'net/http'
 
-require_relative '../options_base'
-
 module EasyUpnp
   class EventClient
     class SubscriptionError < StandardError; end

data/lib/easy_upnp/events/event_parser.rb

@@ -0,0 +1,14 @@
+require 'nokogiri'
+
+module EasyUpnp
+  class EventParser
+    def parse(event_xml)
+      x = Nokogiri::XML(event_xml)
+      prop_changes = x.xpath('//e:propertyset/e:property/*', e: 'urn:schemas-upnp-org:event-1-0').map do |n|
+        [n.name.to_sym, n.text]
+      end
+
+      Hash[prop_changes]
+    end
+  end
+end

data/lib/easy_upnp/events/http_listener.rb

@@ -1,7 +1,7 @@
 require 'webrick'
 require 'thread'
 
-require_relative '../options_base'
+require 'easy_upnp/events/event_parser'
 
 module EasyUpnp
   class HttpListener
@@ -15,8 +15,10 @@ module EasyUpnp
         # interfaces.
         bind_address: '0.0.0.0',
 
-        # By default, event callback just prints the request body
-        callback: ->(request) { puts request.body }
+        # By default, event callback just prints the changed state vars
+        callback: ->(state_vars) {
+          puts state_vars.inspect
+        }
       }
 
       def initialize(options)
@@ -67,10 +69,11 @@ module EasyUpnp
   class NotifyServlet < WEBrick::HTTPServlet::AbstractServlet
     def initialize(_server, block)
       @callback = block
+      @parser = EasyUpnp::EventParser.new
     end
 
     def do_NOTIFY(request, response)
-      @callback.call(request)
+      @callback.call(@parser.parse(request.body))
     end
   end
 end

data/lib/easy_upnp/events/subscription_manager.rb

@@ -1,5 +1,3 @@
-require_relative '../options_base'
-
 module EasyUpnp
   class Options < EasyUpnp::OptionsBase
     DEFAULTS = {

data/lib/easy_upnp/ssdp_searcher.rb

@@ -2,7 +2,7 @@ require 'socket'
 require 'ipaddr'
 require 'timeout'
 
-require_relative 'upnp_device'
+require 'easy_upnp/upnp_device'
 
 module EasyUpnp
   class SsdpSearcher

data/lib/easy_upnp/upnp_device.rb

@@ -3,7 +3,7 @@ require 'nokogiri'
 require 'open-uri'
 require 'savon'
 
-require_relative 'control_point/device_control_point'
+require 'easy_upnp/control_point/device_control_point'
 
 module EasyUpnp
   class UpnpDevice

data/lib/easy_upnp/version.rb

@@ -1,3 +1,3 @@
 module EasyUpnp
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/lib/easy_upnp.rb

@@ -0,0 +1,7 @@
+require 'easy_upnp/options_base'
+
+require 'easy_upnp/ssdp_searcher'
+require 'easy_upnp/upnp_device'
+require 'easy_upnp/version'
+
+require 'easy_upnp/control_point/device_control_point'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_upnp
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,12 +66,14 @@ files:
 - Rakefile
 - bin/upnp-list
 - easy_upnp.gemspec
+- lib/easy_upnp.rb
 - lib/easy_upnp/control_point/argument_validator.rb
 - lib/easy_upnp/control_point/client_wrapper.rb
 - lib/easy_upnp/control_point/device_control_point.rb
 - lib/easy_upnp/control_point/service_method.rb
 - lib/easy_upnp/control_point/validator_provider.rb
 - lib/easy_upnp/events/event_client.rb
+- lib/easy_upnp/events/event_parser.rb
 - lib/easy_upnp/events/http_listener.rb
 - lib/easy_upnp/events/subscription_manager.rb
 - lib/easy_upnp/options_base.rb