easy_upnp 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06b0e0d67f895da180b202c270c0407761dfaad
-  data.tar.gz: 199921fe3b7074fa1a1049e13649fe12a7c3b592
+  metadata.gz: 017b7021b1d9c35fab09ff9f670a660c96758443
+  data.tar.gz: 793f938414da9e550a12b94aa90a05ba0de81480
 SHA512:
-  metadata.gz: 183c88f2434861fe2ece10d326e6d7917c17ddc1a6d1c2dfc0547e7f1e5cfd4e986411e51529252ab94c0f780a6a1429fa289e0124ba9e4c54469501521adfe3
-  data.tar.gz: 8abb23495b5cc314f310daac1999a0ce55519176250d5121a134e93939cafc44b9390dbda3ff250513dc391f58ef2cceaa51d0555f02f4db84ef0dff29853145
+  metadata.gz: 71e31a046b94b3e99cb6f79d87da6f2ee92fd06f209960ae67d0cb7457864bac839dfda9312ce8205b5fb4d8ac57d6c81f6673643343c6f84f044ff15b4e45ac
+  data.tar.gz: 689804ce65c657638e8098403d7ea33571b0b6ca69bfc2cc16f63488fcc9d74b3639eb03d0da63facf86a1fc11bdfbf8f05871123e81ce048091f970a4ae561b

data/Rakefile

@@ -0,0 +1,7 @@
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
+task default: :spec
+task test: :spec

data/lib/easy_upnp/ssdp_searcher.rb

@@ -10,8 +10,6 @@ module EasyUpnp
     MULTICAST_PORT = 1900
 
     DEFAULT_OPTIONS = {
-        :bind_addr => '0.0.0.0',
-
         # Number of seconds to wait for responses
         :timeout => 2,
 
@@ -35,13 +33,12 @@ module EasyUpnp
     end
 
     def search urn
-      listen_socket = build_listen_socket
-      send_socket = build_send_socket
+      socket = build_socket
       packet = construct_msearch_packet(urn)
 
       # Send M-SEARCH packet over UDP socket
       option(:repeat_queries).times do
-        send_socket.send packet, 0, MULTICAST_ADDR, MULTICAST_PORT
+        socket.send packet, 0, MULTICAST_ADDR, MULTICAST_PORT
       end
 
       raw_messages = []
@@ -50,14 +47,13 @@ module EasyUpnp
       begin
         Timeout::timeout(option :timeout) do
           loop do
-            raw_messages.push(send_socket.recv(4196))
+            raw_messages.push(socket.recv(4196))
           end
         end
       rescue Timeout::Error
         # This is expected
       ensure
-        send_socket.close
-        listen_socket.close
+        socket.close
       end
 
       # Parse messages (extract HTTP headers)
@@ -101,22 +97,7 @@ ST: #{urn}\r
 
     private
 
-    def build_listen_socket
-      socket = UDPSocket.new
-      socket.do_not_reverse_lookup = true
-
-      membership = IPAddr.new(MULTICAST_ADDR).hton + IPAddr.new(option :bind_addr).hton
-
-      socket.setsockopt(:IPPROTO_IP, :IP_ADD_MEMBERSHIP, membership)
-      socket.setsockopt(:SOL_SOCKET, :SO_REUSEADDR, true)
-      socket.setsockopt(:IPPROTO_IP, :IP_TTL, 1)
-
-      socket.bind(option(:bind_addr), MULTICAST_PORT)
-
-      socket
-    end
-
-    def build_send_socket
+    def build_socket
       socket = UDPSocket.open
       socket.do_not_reverse_lookup = true
 
@@ -126,4 +107,4 @@ ST: #{urn}\r
       socket
     end
   end
-  end
+end

data/lib/easy_upnp/upnp_device.rb

@@ -27,12 +27,17 @@ module EasyUpnp
           end
 
       # Download one of the definitions to get the name of this device
-      service_location = @service_definitions.first[:location]
+      if @service_definitions.any?
+        service_location = @service_definitions.first[:location]
 
-      xml = Nokogiri::XML(open(service_location))
-      xml.remove_namespaces!
-      @name = xml.xpath('//device/friendlyName').text
-      @host = URI.parse(service_location).host
+        xml = Nokogiri::XML(open(service_location))
+        xml.remove_namespaces!
+        @name = xml.xpath('//device/friendlyName').text
+        @host = URI.parse(service_location).host
+      else
+        @name = 'UNKNOWN'
+        @host = 'UNKNOWN'
+      end
     end
 
     def all_services

data/lib/easy_upnp/version.rb

@@ -1,3 +1,3 @@
 module EasyUpnp
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_upnp
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,6 +90,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - easy_upnp.gemspec
 - lib/easy_upnp/device_control_point.rb
 - lib/easy_upnp/ssdp_searcher.rb