ble 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05bba72a755368615142178e182af8ade6c5f97d
-  data.tar.gz: 0c0e6f32a4abd668bce46c26f845492e440a72a5
+  metadata.gz: d0d63de7a39417e54dd34e2fc70a326061d36cc6
+  data.tar.gz: ac360bfb08b81186e16840c3c7dac76f09788d6f
 SHA512:
-  metadata.gz: 223434f164e5c8adad7c0bfd043b4cf4955329d939c88210fc22d6abf422110ce8713dede74bec3641ce8b1b7f2dd1e81a03458496159793ae3832642c377438
-  data.tar.gz: 29dbc315196f93c8c5e2f2ddd8ba2dcc0788561a19061637938cafc6541f5978d3d9d2162437c74e4746d7d12c0ac4d3349c4d2ed2f499930ee10bf5d0442874
+  metadata.gz: d4a84b8634507629242d89e81542d03e5036ca73faba52e1a4db5d128ea8140e8ac46925de9b45948e12fa6de894865a9e2835500b5ef28265aa2c597bae989a
+  data.tar.gz: ff96bdeadd3582a120bcd68b8b48864a736d611653c8754508daf08fe68f7fa5808cc7395397277c64be0c434a3a14f642f4bb2d445968f98927007e997caf4b

data/lib/ble.rb

@@ -61,9 +61,11 @@ module BLE
     # on this device
     class NotFound               < Error         ; end
     class AccessUnavailable      < Error         ; end
-    
+    class NotSupported      < Error         ; end
 
-    GATT_BASE_UUID="00000000-0000-1000-8000-00805F9B34FB"
+
+    # Base UUID for GATT services defined with 16bit or 32bit UUID
+    GATT_BASE_UUID="00000000-0000-1000-8000-00805f9b34fb"
 
     #"DisplayOnly", "DisplayYesNo", "KeyboardOnly",
     # "NoInputNoOutput" and "KeyboardDisplay" which
@@ -73,9 +75,9 @@ module BLE
         raise NotYetImplemented
         bus = DBus.session_bus
         service = bus.request_service("org.ruby.service")
-        
+
         service.export(BLE::Agent.new(agent_path))
-        
+
         o_bluez = BLUEZ.object('/org/bluez')
         o_bluez.introspect
         o_bluez[I_AGENT_MANAGER].RegisterAgent(agent_path, "NoInputNoOutput")
@@ -83,30 +85,25 @@ module BLE
 
 
 
-    def self.UUID(val)
-        val.downcase
-    end
-    
-    class UUID
-        REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-    end
-      
 
     # Check if Bluetooth underlying API is accessible
     def self.ok?
         BLUEZ.exists?
     end
-    
+
 end
 
 require_relative 'ble/version'
+require_relative 'ble/uuid'
 require_relative 'ble/adapter'
 require_relative 'ble/device'
 require_relative 'ble/service'
 require_relative 'ble/characteristic'
 require_relative 'ble/agent'
 
-require_relative 'ble/db_service'
-require_relative 'ble/db_characteristic'
+require_relative 'ble/db_sig_service'
+require_relative 'ble/db_sig_characteristic'
+require_relative 'ble/db_eddystone'
+require_relative 'ble/db_nordic'
 
 

data/lib/ble/characteristic.rb

@@ -76,6 +76,7 @@ module Characteristic
         when Symbol      then DB_NICKNAME[id]
         when UUID::REGEX then DB_UUID[id]
         when String      then DB_TYPE[id]
+        when Integer     then DB_UUID[BLE::UUID(id)]
         else raise ArgumentError, "invalid type for characteristic id"
         end
     end
@@ -104,56 +105,49 @@ module Characteristic
     #
     # @param uuid [Integer, String] 16-bit, 32-bit or 128-bit uuid
     # @param name [String]
-    # @param type [String]
-    # @option opts :in  [Proc] convert to ruby
-    # @option opts :out [Proc] convert to bluetooth data
-    # @option opts :vry [Proc] verify
+    # @option opts :type [String] type
+    # @option opts :nick [Symbol] nickname
+    # @option opts :in   [Proc] convert to ruby
+    # @option opts :out  [Proc] convert to bluetooth data
+    # @option opts :vry  [Proc] verify
     # @return [Hash] characteristic description
-    def self.add(uuid, name:, type:, **opts)
-        _in   = opts.delete :in
-        _out  = opts.delete :out
-        vrfy  = opts.delete :vrfy            
+    def self.add(uuid, name:, **opts)
+        uuid = BLE::UUID(uuid)
+        type =  opts.delete :type
+        nick = opts.delete :nick
+        _in  = opts.delete :in
+        _out = opts.delete :out
+        vrfy = opts.delete :vrfy            
         if opts.first 
             raise ArgumentError, "unknown keyword: #{opts.first[0]}" 
         end
         
-        uuid = case uuid
-               when Integer
-                   if !(0..4294967296).include?(uuid)
-                       raise ArgumentError, "not a 16bit or 32bit uuid"
-                   end
-                   ([uuid].pack("L>").unpack('H*').first +
-                    "-0000-1000-8000-00805F9B34FB")
-                   
-               when String
-                   if uuid !~ UUID::REGEX
-                       raise ArgumentError, "not a 128bit uuid string"
-                   end
-                   uuid
-               else raise ArgumentError, "invalid uuid type"
-               end
-        uuid = uuid.downcase
-        type = type.downcase
         
-        DB_TYPE[type] = DB_UUID[uuid] = {
-            name: name,
-            type: type,
+        desc = DB_UUID[uuid] = {
             uuid: uuid,
-            in: _in,
-            out: _out,
+            name: name,
+              in: _in,
+             out: _out,
             vrfy: vrfy
         }
         
-        stype  = type.split('.')
-        key    = stype.pop.to_sym
-        prefix = stype.join('.')
-        case prefix
-        when 'org.bluetooth.characteristic'
-            if DB_NICKNAME.include?(key)
+        # Add type if specified
+        if type
+            type = type.downcase
+            desc.merge!(type: type)
+            DB_TYPE[type] = desc
+        end
+
+        # Add nickname if specified or can be derived from type
+        if nick.nil? && type && type =~ /\.(?<key>[^.]+)$/
+            nick = $1.to_sym if type.start_with? 'org.bluetooth.characteristic'
+        end
+        if nick
+            if DB_NICKNAME.include?(nick)
                 raise ArgumentError,
-                      "nickname '#{key}' already registered (type: #{type})"
+                      "nickname '#{nick}' already registered (uuid: #{uuid})"
             end
-            DB_NICKNAME[key] = DB_UUID[uuid]
+            DB_NICKNAME[nick] = desc
         end
     end
 end

data/lib/ble/db_eddystone.rb

@@ -0,0 +1,50 @@
+module BLE
+module Service
+    add 'ee0c2080-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone-URL Beacon Configuration'
+end
+end
+
+module BLE
+module Characteristic
+    add 'ee0c2081-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Lock State',
+        nick: :esurl_lockstate
+
+    add 'ee0c2082-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Lock',
+        nick: :esurl_lock
+
+    add 'ee0c2083-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Unlock',
+        nick: :esurl_unlock
+
+    add 'ee0c2084-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone URL Data',
+        nick: :esurl_data
+
+    add 'ee0c2085-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Flags',
+        nick: :esurl_flags
+
+    add 'ee0c2086-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Adv Tx Power Levels',
+        nick: :esurl_adv_txpower_levels
+
+    add 'ee0c2087-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone TX power mode',
+        nick: :esurl_txpower_mode
+
+    add 'ee0c2088-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Beacon period',
+        nick: :esurl_beacon_period
+
+    add 'ee0c2089-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Reset',
+        nick: :esurl_reset
+
+    add 'ee0c208a-8786-40ba-ab96-99b91ac981d8',
+        name: 'Eddystone Radio Tx Power Levels',
+        nick: :esurl_radio_txpower_levels
+end
+end

data/lib/ble/db_nordic.rb

@@ -0,0 +1,26 @@
+module BLE
+module Service
+    add '00001530-1212-efde-1523-785feabcd123',
+        name: 'Nordic Device Firmware Update Service'
+
+    add '6e400001-b5a3-f393-e0a9-e50e24dcca9e',
+        name: 'Nordic UART Service'
+end
+end
+
+
+module BLE
+module Characteristic
+    add '00001531-1212-efde-1523-785feabcd123', # WriteWithoutResponse
+        name: 'DFU Packet'
+
+    add '00001532-1212-efde-1523-785feabcd123', # Write,Notify
+        name: 'DFU Control Point'
+
+    add '6e400002-b5a3-f393-e0a9-e50e24dcca9e',
+        name: 'UART TX'
+
+    add '6e400003-b5a3-f393-e0a9-e50e24dcca9e',
+        name: 'UART RX'
+end
+end

data/lib/ble/db_sig_characteristic.rb

@@ -0,0 +1,142 @@
+module BLE
+module Characteristic
+    #   C         | Integer | 8-bit unsigned (unsigned char)
+    #   S         | Integer | 16-bit unsigned, native endian (uint16_t)
+    #   L         | Integer | 32-bit unsigned, native endian (uint32_t)
+    #   Q         | Integer | 64-bit unsigned, native endian (uint64_t)
+    #             |         |
+    #   c         | Integer | 8-bit signed (signed char)
+    #   s         | Integer | 16-bit signed, native endian (int16_t)
+    #   l         | Integer | 32-bit signed, native endian (int32_t)
+    #   q         | Integer | 64-bit signed, native endian (int64_t)
+    #
+    #   <         | Little endian
+    #   >         | Big endian
+
+    add 0x2A07,
+        name: 'Tx Power Level',
+        type: 'org.bluetooth.characteristic.tx_power_level',
+        vrfy: ->(x) { (-100..20).include?(c) },
+          in: ->(s) { s.unpack('c').first },
+         out: ->(v) { [ v ].pack('c') }
+
+    add 0x2A23,
+        name: 'System ID',
+        type: 'org.bluetooth.characteristic.system_id',
+        vrfy: ->(x) { (0..1099511627775).include?(x[0]) &&
+                      (0..16777215     ).include?(x[1])},
+          in: ->(s) { raise NotYetImplemented },
+         out: ->(v) { raise NotYetImplemented }
+
+    add 0x2A24,
+        name: 'Model Number String',
+        type: 'org.bluetooth.characteristic.model_number_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+
+    add 0x2A25,
+        name: 'Serial Number String',
+        type: 'org.bluetooth.characteristic.serial_number_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+
+    add 0x2A26,
+        name: 'Firmware Revision String',
+        type: 'org.bluetooth.characteristic.firmware_revision_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+
+    add 0x2A27,
+        name: 'Hardware Revision String',
+        type: 'org.bluetooth.characteristic.hardware_revision_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+
+    add 0x2A28,
+        name: 'Software Revision String',
+        type: 'org.bluetooth.characteristic.software_revision_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+
+    add 0x2A29,
+        name: 'Manufacturer Name String',
+        type: 'org.bluetooth.characteristic.manufacturer_name_string',
+          in: ->(s) { s.force_encoding('UTF-8') },
+         out: ->(v) { v.encode('UTF-8') }
+    
+    add 0x2A2A,
+        name: 'IEEE 11073-20601 Regulatory Certification Data List',
+        type: 'org.bluetooth.characteristic.ieee_11073-20601_regulatory_certification_data_list',
+          in: ->(s) { raise NotYetImplemented },
+         out: ->(v) { raise NotYetImplemented }
+    
+    add 0x2A50,
+        name: 'PnP ID',
+        type: 'org.bluetooth.characteristic.pnp_id',
+         in: ->(s) { vendor_src, vendor_id,
+                     product_id, product_version = s.unpack('CS<S<S<')
+                     vendor_src = case vendor_src
+                                  when 1 then :bluetooth_sig
+                                  when 2 then :usb_forum
+                                  else        :reserved
+                                  end
+                     [ vendor_src, vendor_id,
+                       product_id, product_version ] },
+         out: ->(v) { raise NotYetImplemented }
+    
+    
+    add 0x2A6E,
+        name: 'Temperature',
+        type: 'org.bluetooth.characteristic.temperature',
+        vrfy: ->(x) { (0..100).include?(x) },
+          in: ->(s) { s.unpack('s<').first.to_f / 100 },
+         out: ->(v) { [ v*100 ].pack('s<') }
+
+    add 0x2A76,
+        name: 'UV Index',
+        type: 'org.bluetooth.characteristic.uv_index',
+          in: ->(s) { s.unpack('C').first },
+         out: ->(v) { [ v ].pack('C') }
+
+    add 0x2A77,
+        name: 'Irradiance',
+        type: 'org.bluetooth.characteristic.irradiance',
+          in: ->(s) { s.unpack('S<').first.to_f / 10 },
+         out: ->(v) { [ v*10 ].pack('S<') }
+
+    add 0x2A7A,
+        name: 'Heat Index',
+        type: 'org.bluetooth.characteristic.heat_index',
+          in: ->(s) { s.unpack('c').first },
+         out: ->(v) { [ v ].pack('c') }
+
+    add 0x2A19,
+        name: 'Battery Level',
+        type: 'org.bluetooth.characteristic.battery_level',
+        vrfy: ->(x) { (0..100).include?(x) },
+          in: ->(s) { s.unpack('C').first },
+         out: ->(v) { [ v ].pack('C') }
+
+    add 0x2A6F,
+        name: 'Humidity',
+        type: 'org.bluetooth.characteristic.humidity',
+        vrfy: ->(x) { (0..100).include?(x) },
+          in: ->(s) { s.unpack('S<').first.to_f / 100 },
+         out: ->(v) { [ v*100 ].pack('S<') }
+
+    add 0x2A6D,
+        name: 'Pressure',
+        type: 'org.bluetooth.characteristic.pressure',
+        vrfy: ->(x) { x >= 0 },
+          in: ->(s) { s.unpack('L<').first.to_f / 10 },
+         out: ->(v) { [ v*10 ].pack('L<') }
+
+    add 0x2AB3,
+        name: 'Altitude',
+        type: 'org.bluetooth.characteristic.altitude',
+        vrfy: ->(x) { x >= 0 },
+          in: ->(s) { s.unpack('S<').first },
+          out: ->(v) { [ v ].pack('S<') }
+
+end
+end

data/lib/ble/{db_service.rb → db_sig_service.rb}

@@ -55,6 +55,5 @@ module Service
     add 0x181D,
         name: 'Weight Scale',
         type: 'org.bluetooth.service.weight_scale'
-    
 end
 end

data/lib/ble/device.rb

@@ -19,19 +19,19 @@ class Device
         @adapter, @dev = adapter, dev
         @auto_refresh  = auto_refresh
         @services      = {}
-        
+
         @n_adapter = adapter
         @p_adapter = "/org/bluez/#{@n_adapter}"
         @o_adapter = BLUEZ.object(@p_adapter)
         @o_adapter.introspect
-        
+
         @n_dev     = 'dev_' + dev.tr(':', '_')
         @p_dev     = "/org/bluez/#{@n_adapter}/#{@n_dev}"
         @o_dev     = BLUEZ.object(@p_dev)
         @o_dev.introspect
-        
+
         self.refresh if @auto_refresh
-        
+
         @o_dev[I_PROPERTIES]
             .on_signal('PropertiesChanged') do |intf, props|
             case intf
@@ -43,7 +43,7 @@ class Device
             end
         end
     end
-    
+
     # This removes the remote device object.
     # It will remove also the pairing information.
     # @return [Boolean]
@@ -58,8 +58,8 @@ class Device
         else raise ScriptError
         end
     end
-    
-    
+
+
     # This method will connect to the remote device,
     # initiate pairing and then retrieve all SDP records
     # (or GATT primary services).
@@ -71,6 +71,7 @@ class Device
     # all other cases the default agent will handle this just fine.
     # In case there is no application agent and also
     # no default agent present, this method will fail.
+    #
     # @return [Boolean]
     def pair
         @o_dev[I_DEVICE].Pair
@@ -88,7 +89,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # This method can be used to cancel a pairing
     # operation initiated by the Pair method.
     # @return [Boolean]
@@ -102,7 +103,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # This connect to the specified profile UUID or to any (:all)
     # profiles the remote device supports that can be connected to
     # and have been flagged as auto-connectable on our side.  If
@@ -133,7 +134,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # This method gracefully disconnects :all connected profiles
     # and then terminates low-level ACL connection.
     # ACL connection will be terminated even if some profiles
@@ -161,7 +162,7 @@ class Device
         when E_INVALID_ARGUMENTS
             raise ArgumentError, "unsupported profile (#{profile})"
         when E_NOT_SUPPORTED
-            raise NotSuppported
+            raise NotSupported
         when E_NOT_CONNECTED
             true
         when E_UNKNOWN_OBJECT
@@ -169,7 +170,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # Indicates if the remote device is paired
     def is_paired?
         @o_dev[I_DEVICE]['Paired']
@@ -180,7 +181,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # Indicates if the remote device is currently connected.
     def is_connected?
         @o_dev[I_DEVICE]['Connected']
@@ -191,7 +192,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # List of available services as UUID.
     #
     # @raise [NotConnected] if device is not in a connected state
@@ -201,18 +202,25 @@ class Device
     # @note This is the list of UUIDs for which we have an entry
     #       in the underlying api (bluez-dbus), which can be less
     #       that the list of advertised UUIDs.
+    # @example list available services
+    #   $d.services.each {|uuid|
+    #     info = BLE::Service[uuid]
+    #     name = info.nil? ? uuid : info[:name]
+    #     puts name
+    #   }
+    #
     # @return [Array<String>] List of service UUID
     def services
         raise NotConnected unless is_connected?
         @services.keys
     end
-    
+
     # Check if service is available on the device
     # @return [Boolean]
     def has_service?(service)
         @service.key?(_uuid_service(service))
     end
-    
+
     # List of available characteristics UUID for a service.
     #
     # @param service service can be a UUID, a service type or
@@ -229,21 +237,21 @@ class Device
             chars.keys
         end
     end
-    
+
     # The Bluetooth device address of the remote device.
     # @return [String] MAC address
     def address
         @o_dev[I_DEVICE]['Address']
     end
-    
+
     # The Bluetooth remote name.
     # It is better to always use the {#alias} when displaying the
-    # devices name. 
+    # devices name.
     # @return [String] name
     def name # optional
         @o_dev[I_DEVICE]['Name']
     end
-    
+
     # The name alias for the remote device.
     # The alias can be used to have a different friendly name for the
     # remote device.
@@ -259,13 +267,13 @@ class Device
     def alias=(val)
         @o_dev[I_DEVICE]['Alias'] = val.nil? ? "" : val.to_str
     end
-    
+
     # Is the device trusted?
     # @return [Boolean]
     def is_trusted?
         @o_dev[I_DEVICE]['Trusted']
     end
-    
+
     # Indicates if the remote is seen as trusted. This
     # setting can be changed by the application.
     # @param val [Boolean]
@@ -276,13 +284,13 @@ class Device
         end
         @o_dev[I_DEVICE]['Trusted'] = val
     end
-    
+
     # Is the device blocked?
     # @return [Boolean]
     def is_blocked?
         @o_dev[I_DEVICE]['Blocked']
     end
-    
+
     # If set to true any incoming connections from the
     # device will be immediately rejected. Any device
     # drivers will also be removed and no new ones will
@@ -295,7 +303,7 @@ class Device
         end
         @o_dev[I_DEVICE]['Blocked'] = val
     end
-    
+
     # Received Signal Strength Indicator of the remote
     # device (inquiry or advertising).
     # @return [Integer]
@@ -307,7 +315,7 @@ class Device
         else raise ScriptError
         end
     end
-    
+
     # Advertised transmitted power level (inquiry or advertising).
     # @return [Integer]
     def tx_power # optional
@@ -318,8 +326,8 @@ class Device
         else raise ScriptError
         end
     end
-    
-    
+
+
     # Refresh list of services and characteristics
     # @return [Boolean]
     def refresh
@@ -328,7 +336,7 @@ class Device
     rescue NotConnected, StalledObject
         false
     end
-    
+
     # Refresh list of services and characteristics
     # @raise [NotConnected] if device is not in a connected state
     # @return [self]
@@ -363,7 +371,7 @@ class Device
                 sleep(0.25) ; max_wait -= 0.25 ; retry
             end
             raise NotReady
-            
+
         else raise ScriptError
         end
     end
@@ -422,7 +430,7 @@ class Device
         flags = char[:flags]
         obj   = char[:obj]
         info  = Characteristic[uuid]
-        
+
         if flags.include?('write') ||
            flags.include?('write-without-response')
             if !raw && info
@@ -442,9 +450,9 @@ class Device
         end
         nil
     end
-    
+
     private
-    
+
     def _characteristics(service)
         if srv = @services[_uuid_service(service)]
             srv[:characteristics]
@@ -462,7 +470,7 @@ class Device
         if uuid.nil?
             raise ArgumentError, "unable to get UUID for service"
         end
-        
+
         uuid
     end
     def _uuid_characteristic(characteristic)
@@ -477,7 +485,7 @@ class Device
         if uuid.nil?
             raise ArgumentError, "unable to get UUID for service"
         end
-        
+
         uuid
     end
 end

data/lib/ble/service.rb

@@ -34,6 +34,7 @@ module Service
         when Symbol      then DB_NICKNAME[id]
         when UUID::REGEX then DB_UUID[id]
         when String      then DB_TYPE[id]
+        when Integer     then DB_UUID[BLE::UUID(id)]
         else raise ArgumentError, "invalid type for service id"
         end
     end
@@ -79,49 +80,41 @@ module Service
     #
     # @param uuid [Integer, String] 16-bit, 32-bit or 128-bit uuid
     # @param name [String]
-    # @param type [String]
+    # @option opts :type [String] type
+    # @option opts :nick [Symbol] nickname
     # @return [Hash] service description
-    def self.add(uuid, name:, type:, **opts)
+    def self.add(uuid, name:, **opts)
+        uuid = BLE::UUID(uuid)
+        type = opts.delete :type
+        nick = opts.delete :nick
         if opts.first 
             raise ArgumentError, "unknown keyword: #{opts.first[0]}" 
         end
         
-        uuid = case uuid
-               when Integer
-                   if !(0..4294967296).include?(uuid)
-                       raise ArgumentError, "not a 16bit or 32bit uuid"
-                   end
-                   ([uuid].pack("L>").unpack('H*').first +
-                    "-0000-1000-8000-00805F9B34FB")
-                   
-               when String
-                   if uuid !~ UUID::REGEX
-                       raise ArgumentError, "not a 128bit uuid string"
-                   end
-                   uuid
-               else raise ArgumentError, "invalid uuid type"
-               end
-        uuid = uuid.downcase
-        type = type.downcase
-        
-        desc = DB_TYPE[type] = DB_UUID[uuid] = {
-            name: name,
-            type: type,
+        desc = DB_UUID[uuid] = {
             uuid: uuid,
+            name: name,
         }
-        
-        stype  = type.split('.')
-        key    = stype.pop.to_sym
-        prefix = stype.join('.')
-        case prefix
-        when 'org.bluetooth.service'
-            if DB_NICKNAME.include?(key)
+
+        # Add type if specified
+        if type
+            type = type.downcase
+            desc.merge!(type: type)
+            DB_TYPE[type] = desc
+        end
+
+        # Add nickname if specified or can be derived from type
+        if nick.nil? && type && type =~ /\.(?<key>[^.]+)$/
+            nick = $1.to_sym if type.start_with? 'org.bluetooth.service'
+        end
+        if nick
+            if DB_NICKNAME.include?(nick)
                 raise ArgumentError,
-                      "nickname '#{key}' already registered (type: #{type})"
+                      "nickname '#{nick}' already registered (uuid: #{uuid})"
             end
-            DB_NICKNAME[key] = desc
+            DB_NICKNAME[nick] = desc
         end
-
+        
         desc
     end
 end

data/lib/ble/uuid.rb

@@ -0,0 +1,25 @@
+module BLE
+    # Cast value to a well-formatted 128bit UUID string
+    # @param [String, Integer] val uuid
+    # @return [String] well formated 128bit UUID
+    def self.UUID(val)
+        case val
+        when Integer
+            if !(0..4294967295).include?(val)  # 2**32-1
+                raise ArgumentError, "not a 16-bit or 32-bit UUID"
+            end
+            ([val].pack("L>").unpack('H*').first + GATT_BASE_UUID[8..-1])
+        when String
+            if val !~ UUID::REGEX
+                raise ArgumentError, "not a 128bit uuid string"
+            end
+            val.downcase
+        else raise ArgumentError, "invalid uuid type"
+        end
+    end
+    
+    class UUID
+        # Regular expression for matching UUID 128-bit string
+        REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+    end
+end

data/lib/ble/version.rb

@@ -1,4 +1,9 @@
 module BLE
-    # Library version
-    VERSION = "0.0.2"
+  # Library version
+
+  #
+  # 0.0.3 PATCH
+  # - [FIX] NotSupported exeption was not declared.
+  #
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ble
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephane D'Alu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
@@ -94,10 +94,13 @@ files:
 - lib/ble/adapter.rb
 - lib/ble/agent.rb
 - lib/ble/characteristic.rb
-- lib/ble/db_characteristic.rb
-- lib/ble/db_service.rb
+- lib/ble/db_eddystone.rb
+- lib/ble/db_nordic.rb
+- lib/ble/db_sig_characteristic.rb
+- lib/ble/db_sig_service.rb
 - lib/ble/device.rb
 - lib/ble/service.rb
+- lib/ble/uuid.rb
 - lib/ble/version.rb
 homepage: http://github.com/sdalu/ruby-ble
 licenses:
@@ -124,4 +127,3 @@ signing_key:
 specification_version: 4
 summary: Bluetooth Low Energy (BLE) API
 test_files: []
-has_rdoc: yard

data/lib/ble/db_characteristic.rb

@@ -1,70 +0,0 @@
-module BLE
-module Characteristic
-    #   C         | Integer | 8-bit unsigned (unsigned char)
-    #   S         | Integer | 16-bit unsigned, native endian (uint16_t)
-    #   L         | Integer | 32-bit unsigned, native endian (uint32_t)
-    #   Q         | Integer | 64-bit unsigned, native endian (uint64_t)
-    #             |         |
-    #   c         | Integer | 8-bit signed (signed char)
-    #   s         | Integer | 16-bit signed, native endian (int16_t)
-    #   l         | Integer | 32-bit signed, native endian (int32_t)
-    #   q         | Integer | 64-bit signed, native endian (int64_t)
-    #
-    #   <         | Little endian
-    #   >         | Big endian
-
-    
-    add 0x2A6E,
-        name: 'Temperature',
-        type: 'org.bluetooth.characteristic.temperature',
-        vrfy: ->(x) { (0..100).include?(x) },
-          in: ->(s) { s.unpack('s<').first.to_f / 100 },
-         out: ->(v) { [ v*100 ].pack('s<') }
-
-    add 0x2A76,
-        name: 'UV Index',
-        type: 'org.bluetooth.characteristic.uv_index',
-          in: ->(s) { s.unpack('C').first },
-         out: ->(v) { [ v ].pack('C') }
-
-    add 0x2A77,
-        name: 'Irradiance',
-        type: 'org.bluetooth.characteristic.irradiance',
-          in: ->(s) { s.unpack('S<').first.to_f / 10 },
-         out: ->(v) { [ v*10 ].pack('S<') }
-
-    add 0x2A7A,
-        name: 'Heat Index',
-        type: 'org.bluetooth.characteristic.heat_index',
-          in: ->(s) { s.unpack('c').first },
-         out: ->(v) { [ v ].pack('c') }
-
-    add 0x2A19,
-        name: 'Battery Level',
-        type: 'org.bluetooth.characteristic.battery_level',
-        vrfy: ->(x) { (0..100).include?(x) },
-          in: ->(s) { s.unpack('C').first },
-         out: ->(v) { [ v ].pack('C') }
-
-    add 0x2A6F,
-        name: 'Humidity',
-        type: 'org.bluetooth.characteristic.humidity',
-        vrfy: ->(x) { (0..100).include?(x) },
-          in: ->(s) { s.unpack('S<').first.to_f / 100 },
-         out: ->(v) { [ v*100 ].pack('S<') }
-
-    add 0x2A6D,
-        name: 'Pressure',
-        type: 'org.bluetooth.characteristic.pressure',
-        vrfy: ->(x) { x >= 0 },
-          in: ->(s) { s.unpack('L<').first.to_f / 10 },
-         out: ->(v) { [ v*10 ].pack('L<') }
-
-    add 0x2AB3,
-        name: 'Altitude',
-        type: 'org.bluetooth.characteristic.altitude',
-        vrfy: ->(x) { x >= 0 },
-          in: ->(s) { s.unpack('S<').first },
-         out: ->(v) { [ v ].pack('S<') }
-end
-end