home_assistant-ble 1.4.0.pre.alpha.pre.32 → 1.4.0.pre.alpha.pre.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d40822bc4dd54c92cc3dd735499eeaaf6251c3
-  data.tar.gz: ea08ebd4d2cf0b8586240ae06fa2210597656922
+  metadata.gz: ff5918a753301ad3ed7c86b86c73336a9a948724
+  data.tar.gz: 55ee964acc4b7708994f34cf74a1c6dbfffc265d
 SHA512:
-  metadata.gz: e4340a006e1b04185798eb906819e00a2d92ab540139e45a0334c2b7cf295c855f9612af337ef1b9525f76c4d8e6b9fa5b066226726d24c98a2469ebcf398fdd
-  data.tar.gz: 3bec35280bd3e7966aa078b00edb753a30bddca3a8a9ab1aa5af88d2fd711accb40f724dc4743947bfade229fa571868dafafe92069f39fbbaeb7b87f3df5533
+  metadata.gz: e1a2f39f04a46dd1ba4770d5c4f86df2ca220d70ffc37bc2e83f2be382dd8ed34bc93bdb8957c13a392e7e44616699a74e82e21d32da0068308970ae3e3695c7
+  data.tar.gz: 00ff99ae4f083d0ea658d8e4af803847bbd3dc24f2e596991bd2f13624f323879011c2a2c372ced679df74b086066acb5929a90a3a7e0ab2dff459d21c62eb6d

data/lib/home_assistant/ble.rb

@@ -45,15 +45,16 @@ module HomeAssistant
           YAML.load_file(config['home_assistant_devices_file']).each do |name, conf|
             next unless conf['mac'] =~ /^(ble_|bt_)/i
             next unless conf['track']
-            mac = conf.delete('mac').gsub(/^(ble_|bt_)/i, '').upcase
-            conf['name'] = name # erase name with HA id
-            devices[mac] = conf
-            debug "Adding #{mac} (#{name}) found in known_devices.yaml"
+            mac = conf['mac'].gsub(/^(ble_|bt_)/i, '').upcase
+            conf['dev_id'] = name
+            devices[mac] = conf.select { |k, _v| %w(dev_id mac name).include? k }
+            debug "Adding #{mac} (#{conf['name']}) found in known_devices.yaml"
           end
         end
         if config['home_assistant_devices']
-          config['home_assistant_devices'].each do |mac, name|
-            devices[mac] = Mash.new(name: name)
+          config['home_assistant_devices'].each do |mac, _name|
+            ble_mac = "BLE_#{mac.upcase}" unless mac =~ /^(ble_|bt_)/i
+            devices[mac] = Mash.new(mac: ble_mac)
           end
         end
 
@@ -106,23 +107,13 @@ module HomeAssistant
         end
       end
 
-      def state_update(ha_conf, state)
-        attributes = {}
-        attributes['entity_picture'] = ha_conf['picture']
-        if ha_conf['gravatar']
-          hash = Digest::MD5.hexdigest(ha_conf['gravatar'].downcase)
-          attributes['entity_picture'] = "https://www.gravatar.com/avatar/#{hash}"
-        end
-        JSON.dump('state' => state, 'attributes' => attributes)
-      end
-
       def update_home_assistant(ha_conf, state)
-        ha_name = ha_conf['name']
-        uri = URI.join(home_assistant_url, "api/states/device_tracker.#{ha_name}")
+        ha_conf['location_name'] = state
+        uri = URI.join(home_assistant_url, '/api/services/device_tracker/see')
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
         request['X-Ha-Access'] = home_assistant_password if home_assistant_password
-        request.body = state_update(ha_conf, state)
+        request.body = ha_conf.to_json
         req_options = { use_ssl: uri.scheme == 'https' }
 
         response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
@@ -130,10 +121,10 @@ module HomeAssistant
         end
 
         if response.code.to_i == 200
-          debug "State update #{state} sent to HA for #{ha_name}"
+          debug "State update #{state} sent to HA for #{ha_conf['dev_id']}"
           debug response.body
         else
-          log "Error while sending #{state} to HA form #{ha_name}."
+          log "Error while sending #{state} to HA form #{ha_conf['dev_id']}."
           log "URI was: #{uri}. Response was:"
           log response.body
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: home_assistant-ble
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.alpha.pre.32
+  version: 1.4.0.pre.alpha.pre.37
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler