scan_beacon 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9643cd20260fece814e2595cc27be91924bef9f3
-  data.tar.gz: f6348fcd26d8a6aeb6eedcb2ea7f7313c3aa6cba
+  metadata.gz: 62a197cb71f842cb63b20f4971cc3bcd18a954d0
+  data.tar.gz: baa10f94b8b9e79fdd5e7e02963f6804a9a38285
 SHA512:
-  metadata.gz: c6b8044679facdfdfb80de910fa26e0719f4fed52c38979c62f846604c1e2830a3f297281414ede5fc7d5e8fc84a53c299114a44ff2081dac5ce68a978309271
-  data.tar.gz: 3224871074669b94635c9e1395a3510ebdc68fa9c0245aa73a11992cb1554ddb47fc7363d4f72c1097166d555e1f6650e787a2b04a2310b3cbc38314bab6df3b
+  metadata.gz: 75a02758bf83671e5897e5e46053898d992dbc3eb47d19f47d64021623ec1c700792939e30c381b181f0e9020a9d7ac1f395c4be26cd63adb70dda9ca546b1d0
+  data.tar.gz: 5c1a5792324e66b1e9ae33bcd8169c1f0f32f8d10d833e737ed10c63c21ee5a039e66019ac0b57f17fcd00416ef1431133bf8b0028bf98a19278e0e3a3dfea67

data/lib/scan_beacon/ble112_device.rb

@@ -57,7 +57,9 @@ module ScanBeacon
     end
 
     def get_addr
-      response = bg_command(@file, BG_MSG_CLASS_SYSTEM, BG_GET_ADDRESS)
+      # use a timeout here because we're using this to detect BLE112s and if it
+      # isn't one, it may not respond right away
+      response = bg_command(@file, BG_MSG_CLASS_SYSTEM, BG_GET_ADDRESS,nil,nil,0.2)
       response[4..-1].reverse.unpack("H2:H2:H2:H2:H2:H2").join(":") if response.length == 10
     end
 
@@ -112,7 +114,9 @@ module ScanBeacon
     end
 
     def read
-      BLE112Response.new( bg_read(@file) )
+      data = bg_read(@file, 0.2)
+      return nil if data.nil?
+      BLE112Response.new( data )
     end
 
     def reset
@@ -126,6 +130,7 @@ module ScanBeacon
 
     class BLE112Response
       def initialize(data)
+        data ||= ""
         @data = data.force_encoding("ASCII-8BIT")
       end
 
@@ -172,7 +177,7 @@ module ScanBeacon
 
     private
 
-      def bg_command(port, msg_class, msg, data=nil, data_format=nil)
+      def bg_command(port, msg_class, msg, data=nil, data_format=nil, timeout=nil)
         data = [data].compact unless data.is_a? Array
         if data_format.nil?
           data = data.pack('C*')
@@ -181,10 +186,13 @@ module ScanBeacon
         end
         cmd = [0, data.size, msg_class, msg].flatten.pack('C*') + data
         port.write(cmd)
-        bg_read(port)
+        bg_read(port, timeout)
       end
 
-      def bg_read(port)
+      def bg_read(port, timeout = nil)
+        if !timeout.nil?
+          return nil if IO.select([port],nil,nil, timeout).nil?
+        end
         response = port.read(1) while response.nil? || ![0x00, 0x80].include?(response.unpack('C')[0])
         response << port.read(3)
         payload_length = response[1].unpack('C')[0]

data/lib/scan_beacon/ble112_scanner.rb

@@ -16,16 +16,23 @@ module ScanBeacon
           keep_scanning = true
           while keep_scanning do
             response = device.read
-            if response.advertisement?
+            if response && response.advertisement?
               if response.manufacturer_ad?
                 keep_scanning = false if yield(response.advertisement_data, response.mac, response.rssi) == false
               else
                 keep_scanning = false if yield(response.advertisement_data[4..-1], response.mac, response.rssi, 0x03) == false
               end
+            else
+              keep_scanning = false if yield(nil, nil, nil) == false
             end
           end
         ensure
-          device.stop_scan
+          begin
+            device.stop_scan
+          rescue StandardError
+            # don't crash trying to stop scan - it may be that the device was
+            # unplugged
+          end
         end
       end
     end

data/lib/scan_beacon/version.rb

@@ -1,3 +1,3 @@
 module ScanBeacon
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan_beacon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Radius Networks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides Beacon scanning functionality