scan_beacon 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838d6c716e2a552286f23328ddbf3df125d42b91
-  data.tar.gz: 03f63cc6ced4d549618d7d93cdef6bd2bbee6779
+  metadata.gz: 9643cd20260fece814e2595cc27be91924bef9f3
+  data.tar.gz: f6348fcd26d8a6aeb6eedcb2ea7f7313c3aa6cba
 SHA512:
-  metadata.gz: ca02db0c9420967326b7977e7bc130e2447549c369d29a688dbf898f47298081124c443cfe1a624e553972e2dd05d4717e3b764c99b9ae91c86e5ad0ced780d2
-  data.tar.gz: ee3eb6dd03090eca7fe8ac1f48ca699b65a8f76ed716eeeb62a9bdc89a94ec4050c8d8d974dd0810be462258057d8739872fa3afecd21d2fda746b565eccb27f
+  metadata.gz: c6b8044679facdfdfb80de910fa26e0719f4fed52c38979c62f846604c1e2830a3f297281414ede5fc7d5e8fc84a53c299114a44ff2081dac5ce68a978309271
+  data.tar.gz: 3224871074669b94635c9e1395a3510ebdc68fa9c0245aa73a11992cb1554ddb47fc7363d4f72c1097166d555e1f6650e787a2b04a2310b3cbc38314bab6df3b

data/lib/scan_beacon/ble112_advertiser.rb

@@ -1,28 +1,9 @@
 module ScanBeacon
-  class BLE112Advertiser
-
-    attr_accessor :beacon, :parser, :ad
+  class BLE112Advertiser < GenericIndividualAdvertiser
 
     def initialize(opts = {})
       @device = BLE112Device.new opts[:port]
-      self.beacon = opts[:beacon]
-      self.parser = opts[:parser]
-      self.parser ||= BeaconParser.default_parsers.find {|parser| parser.beacon_type == beacon.beacon_types.first}
-      @advertising = false
-    end
-
-    def beacon=(value)
-      @beacon = value
-      update_ad
-    end
-
-    def parser=(value)
-      @parser = value
-      update_ad
-    end
-
-    def ad=(value)
-      @ad = value
+      super()
     end
 
     def start(with_rotation = false)
@@ -43,11 +24,6 @@ module ScanBeacon
       "<BLE112Advertiser ad=#{@ad.inspect}>"
     end
 
-    def update_ad
-      self.ad = @parser.generate_ad(@beacon) if @parser && @beacon
-      self.start if @advertising
-    end
-
     def rotate_addr
       @device.open do
         @device.rotate_addr

data/lib/scan_beacon/bluez_advertiser.rb

@@ -1,54 +1,40 @@
 module ScanBeacon
-  class BlueZAdvertiser
+  class BlueZAdvertiser < GenericIndividualAdvertiser
  
-    attr_accessor :beacon, :parser, :ad, :addr
+    attr_reader :addr
 
     def initialize(opts = {})
       @device_id = opts[:device_id] || BlueZ.devices.map {|d| d[:device_id]}[0]
       raise "No available devices" if @device_id.nil?
       BlueZ.device_up @device_id
-      @addr = @initial_addr = BlueZ.devices.find {|d| d[:device_id] == @device_id}[:addr]
-      self.beacon = opts[:beacon]
-      self.parser = opts[:parser]
-      self.parser ||= BeaconParser.default_parsers.find {|parser| parser.beacon_type == beacon.beacon_types.first}
+      addr = @initial_addr = BlueZ.devices.find {|d| d[:device_id] == @device_id}[:addr]
+      super(opts)
     end
 
-    def beacon=(value)
-      @beacon = value
-      update_ad
-    end
-
-    def parser=(value)
-      @parser = value
-      update_ad
-    end
-
-    def ad=(value)
-      @ad = value
+    def start(with_rotation = false)
       BlueZ.set_advertisement_bytes @device_id, @ad
-    end
-
-    def start
-      BlueZ.start_advertising @device_id, nil
-    end
-
-    def start_with_random_addr
-      addr = random_addr
-      BlueZ.start_advertising @device_id, addr
+      # You must call start advertising any time you change the advertisement bytes
+      # otherwise they won't take
+      if with_rotation
+        @addr = random_addr 
+        BlueZ.start_advertising @device_id, addr
+      else
+        # have to pass nil for addr if we don't want to override it and use the internal
+        BlueZ.start_advertising @device_id, nil
+      end
+    
+      @advertising=true
     end
 
     def stop
       BlueZ.stop_advertising @device_id
+      @advertising=false
     end
 
     def inspect
       "<BlueZAdvertiser ad=#{@ad.inspect}>"
     end
 
-    def update_ad
-      self.ad = @parser.generate_ad(@beacon) if @parser && @beacon
-    end
-
     def rotate_addr_and_update_ad
       self.update_ad
       self.stop

data/lib/scan_beacon/generic_advertiser.rb

@@ -0,0 +1,27 @@
+module ScanBeacon
+  class GenericAdvertiser
+    attr_accessor :beacon, :parser, :ad
+    attr_reader :advertising
+
+    def initialize(opts = {})
+      self.beacon = opts[:beacon]
+      self.parser = opts[:parser]
+      if beacon
+        self.parser ||= BeaconParser.default_parsers.find {|parser| parser.beacon_type == beacon.beacon_types.first}
+      end
+      @advertising = false
+    end
+    
+    def start(with_rotation = false)
+      raise NotImplementedError
+    end
+
+    def stop
+      raise NotImplementedError
+    end
+
+    def inspect
+      raise NotImplementedError
+    end
+  end
+end

data/lib/scan_beacon/generic_individual_advertiser.rb

@@ -0,0 +1,27 @@
+module ScanBeacon
+  class GenericIndividualAdvertiser < GenericAdvertiser
+    def initialize(opts={})
+      @parser = nil
+      super(opts)
+    end
+
+    def beacon=(value)
+      @beacon = value
+      update_ad
+    end
+
+    def parser=(value)
+      @parser = value
+      update_ad
+    end
+
+    def update_ad    
+      self.ad = @parser.generate_ad(@beacon) if @parser && @beacon
+    end
+    
+    def ad=(value)
+      @ad = value
+      self.start if advertising
+    end
+  end
+end

data/lib/scan_beacon/version.rb

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

data/lib/scan_beacon.rb

@@ -5,6 +5,8 @@ require "scan_beacon/beacon_parser"
 require "scan_beacon/generic_scanner"
 require "scan_beacon/ble112_device"
 require "scan_beacon/ble112_scanner"
+require "scan_beacon/generic_advertiser"
+require "scan_beacon/generic_individual_advertiser"
 require "scan_beacon/ble112_advertiser"
 case RUBY_PLATFORM
 when /darwin/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan_beacon
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - Radius Networks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,8 @@ files:
 - lib/scan_beacon/bluez_advertiser.rb
 - lib/scan_beacon/bluez_scanner.rb
 - lib/scan_beacon/core_bluetooth_scanner.rb
+- lib/scan_beacon/generic_advertiser.rb
+- lib/scan_beacon/generic_individual_advertiser.rb
 - lib/scan_beacon/generic_scanner.rb
 - lib/scan_beacon/version.rb
 - scan_beacon.gemspec
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Provides Beacon scanning functionality