ssdp 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a022bdf308b1a26cb8e290067a9882f97e0d15
-  data.tar.gz: c5b651cee29b9a61788da711ec6e9797fef72c2d
+  metadata.gz: f03eee0dcccb30c07cbfd0c3de98dc9c64cb62a3
+  data.tar.gz: d09d282461776840021fa715b597d6d584baf08f
 SHA512:
-  metadata.gz: 60672a24ffd30f738f26773195cd2956be4c860a5580f5d79d4bea223e83d45587f4d38e5f114490f01e378da9fa1586eedb5ea575b090c9a69ad56d485d2257
-  data.tar.gz: fd617fa6bc5d97013297fb7542cd58ebd5e6e9d2178d0f3534d3117f7ba5d12b45ab0a302c10207d893bad4f551cd80936b8bca25ade21c35e887069662660a1
+  metadata.gz: 9e918f1d49fa782311a04e99208e83b6708184294d923205f5d944519e7e23a689fcabc6ac7486fa7a423379cffa795c593dd3af0ab06e17bdf70b206483b86a
+  data.tar.gz: 33b923a275f71806812722350e1d5f25a05a2694fb33e47a26d947c6cd2d93736969f1a00bd65b69b8e406bb5fb33d0427aef2c39d5e8e74b9c05e9d48fb7c66

data/lib/ssdp.rb

@@ -61,5 +61,4 @@ module SSDP
     broadcaster
   end
   module_function :create_broadcaster
-
 end

data/lib/ssdp/consumer.rb

@@ -3,7 +3,7 @@ require 'ssdp'
 
 module SSDP
   class Consumer
-    def initialize(options = {})
+    def initialize(options={})
       @options = SSDP::DEFAULTS.merge options
       @search_socket = SSDP.create_broadcaster
       @watch = {
@@ -13,13 +13,13 @@ module SSDP
       }
     end
 
-    def search(options = {}, &block)
+    def search(options={}, &block)
       options = @options.merge options
       options[:callback] ||= block unless block.nil?
-      fail "SSDP consumer async search missing callback." if (options[:synchronous] == false) && options[:callback].nil?
-      fail "SSDP consumer search accepting multiple responses must specify a timeout value." if (options[:first_only] == false) && (options[:timeout].to_i < 1)
-      warn "Warning: Calling SSDP search without a service specified." if options[:service].nil? && (options[:no_warnings] != true)
-      warn "Warning: Calling SSDP search without a timeout value." if (options[:timeout].to_i < 1) && (options[:no_warnings] != true)
+      fail 'SSDP consumer async search missing callback.' if (options[:synchronous] == false) && options[:callback].nil?
+      fail 'SSDP consumer search accepting multiple responses must specify a timeout value.' if (options[:first_only] == false) && (options[:timeout].to_i < 1)
+      warn 'Warning: Calling SSDP search without a service specified.' if options[:service].nil? && (options[:no_warnings] != true)
+      warn 'Warning: Calling SSDP search without a timeout value.' if (options[:timeout].to_i < 1) && (options[:no_warnings] != true)
 
       @search_socket.send compose_search(options), 0, options[:broadcast], options[:port]
 
@@ -37,12 +37,12 @@ module SSDP
 
     def stop_watching_type(type)
       @watch[:services].delete type
-      stop_watch if (@watch[:services].count == 0) && (@watch[:thread] != nil)
+      stop_watch if (@watch[:services].count == 0) && @watch[:thread]
     end
 
     def stop_watching_all
       @watch[:services] = {}
-      stop_watch if @watch[:thread] != nil
+      stop_watch if @watch[:thread]
     end
 
     private
@@ -52,7 +52,7 @@ module SSDP
               "Host: #{options[:broadcast]}:#{options[:port]}\n" \
               "Man: \"ssdp:discover\"\n"
       query += "ST: #{options[:service]}\n" if options[:service]
-      options[:params].each { |key, val| query += "#{key}: #{value}\n" } if options[:params]
+      options[:params].each { |key, val| query += "#{key}: #{val}\n" } if options[:params]
       query + "\n"
     end
 
@@ -80,7 +80,7 @@ module SSDP
         began = Time.now
         remaining = options[:timeout]
         while !found && remaining > 0
-          ready = IO::select [@search_socket], nil, nil, remaining
+          ready = IO.select [@search_socket], nil, nil, remaining
           if ready
             message, producer = @search_socket.recvfrom options[:maxpack]
             result = process_ssdp_packet message, producer
@@ -89,7 +89,7 @@ module SSDP
           remaining = options[:timeout] - (Time.now - began).to_i
         end
       else
-        while !found
+        until found
           message, producer = @search_socket.recvfrom options[:maxpack]
           result = process_ssdp_packet message, producer
           found = options[:filter].nil? ? true : options[:filter].call(result)
@@ -109,7 +109,7 @@ module SSDP
 
       while remaining > 0
         start_time = Time.now
-        ready = IO::select [@search_socket], nil, nil, remaining
+        ready = IO.select [@search_socket], nil, nil, remaining
         if ready
           message, producer = @search_socket.recvfrom options[:maxpack]
           if options[:filter].nil?
@@ -138,7 +138,7 @@ module SSDP
       @watch[:socket] = SSDP.create_listener @options
       @watch[:thread] = Thread.new do
         begin
-          while true
+          loop do
             message, producer = @watch[:socket].recvfrom @options[:maxpack]
             notification = process_ssdp_packet message, producer
             notification_type = notification[:params]['NT']
@@ -154,6 +154,5 @@ module SSDP
       @watch[:thread].exit
       @watch[:thread] = nil
     end
-
   end
 end

data/lib/ssdp/producer.rb

@@ -7,7 +7,7 @@ module SSDP
     attr_accessor :services
     attr_accessor :uuid
 
-    def initialize(options = {})
+    def initialize(options={})
       @uuid = SecureRandom.uuid
       @services = {}
       @listener = { :socket => nil, :thread => nil }
@@ -24,14 +24,14 @@ module SSDP
       start_listener if @listener[:thread].nil?
     end
 
-    def stop(bye_bye = true)
+    def stop(bye_bye=true)
       was_running = running?
 
-      if @listener[:thread] != nil
+      if @listener[:thread]
         @listener[:thread].exit
         @listener[:thread] = nil
       end
-      if @notifier[:thread] != nil
+      if @notifier[:thread]
         @notifier[:thread].exit
         @notifier[:thread] = nil
       end
@@ -123,7 +123,7 @@ module SSDP
       @listener[:socket] = SSDP.create_listener @options
       @listener[:thread] = Thread.new do
         begin
-          while true
+          loop do
             message, consumer = @listener[:socket].recvfrom @options[:maxpack]
             process_ssdp message, { :address => consumer[3], :port => consumer[1] } unless @services.count == 0
           end
@@ -135,12 +135,11 @@ module SSDP
 
     def start_notifier
       @notifier[:thread] = Thread.new do
-        while true
+        loop do
           sleep @options[:interval]
           @services.each { |type, params| send_notification type, params }
         end
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Dillon Aumiller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies: []
 description: SSDP client/server library. Server notify/part/respond; client search/listen.
 email: dillonaumiller@gmail.com