helium-ruby 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1c3528079c29fb5ecbbd5d094a35be35307a74
-  data.tar.gz: 2c668cc1dadc8cc231cf7186b385a2c2f308d586
+  metadata.gz: 43e173ae51cf81b50cd37e722e907a77a0361868
+  data.tar.gz: a7869b3f5887e95dbdab8b5cb85500b43def65ff
 SHA512:
-  metadata.gz: f99d27ae04c82ec7e880b6c93a227f7de11eb7fee9091f16644467beabbf900b6edcc0f44447c5d67d8572c6833e7664a0dfb6c4fce80557ca9a4deacb2c96be
-  data.tar.gz: 2d5883f2ad98e90cbc2764f0efb6af732b4453a04c112265262f1c4abb024089ccb4651fa3685290bebae130bb260a089934a20dadcce68f00e920b77ed3503b
+  metadata.gz: c6e471b7bfb6dc6064c69f3eee51b21b7c7d91cfa64de7238e0fe9ac6ccd58d38fba76458e2d943881d786c0129a5f85e08ed3bb6dae6c96b93338cc55ebffb2
+  data.tar.gz: da14f3d09e1b1d04904317bf79177d84934528ba7d1aefdd470453ea70910e91a862e9b121122d9b514355e64817a4663faeb9245ff50272a85b60c1a95570a5

data/lib/helium/element.rb

@@ -1,13 +1,14 @@
 module Helium
   class Element < Resource
-    attr_reader :name, :mac, :last_seen
+    attr_reader :name, :mac, :last_seen, :device_type
 
     def initialize(opts = {})
       super(opts)
 
-      @name      = @params.dig("attributes", "name")
-      @mac       = @params.dig("meta", "mac")
-      @last_seen = @params.dig('meta', 'last-seen')
+      @name        = @params.dig("attributes", "name")
+      @mac         = @params.dig("meta", "mac")
+      @last_seen   = @params.dig('meta', 'last-seen')
+      @device_type = @params.dig('meta', 'device-type')
     end
 
     def sensors
@@ -24,15 +25,6 @@ module Helium
       @_last_seen ||= DateTime.parse(@last_seen)
     end
 
-    # TODO can probably generalize this a bit more
-    def as_json
-      super.merge({
-        name: name,
-        mac: mac,
-        last_seen: last_seen
-      })
-    end
-
     def timeseries(opts = {})
       size        = opts.fetch(:size, 1000)
       port        = opts.fetch(:port, nil)
@@ -50,5 +42,15 @@ module Helium
         aggsize:    aggsize
       )
     end
+
+    # TODO can probably generalize this a bit more
+    def as_json
+      super.merge({
+        name: name,
+        mac: mac,
+        last_seen: last_seen,
+        device_type: device_type
+      })
+    end
   end
 end

data/lib/helium/sensor.rb

@@ -1,14 +1,15 @@
 module Helium
   class Sensor < Resource
-    attr_reader :name, :mac, :ports, :last_seen
+    attr_reader :name, :mac, :ports, :last_seen, :device_type
 
     def initialize(opts = {})
       super(opts)
 
-      @name      = @params.dig('attributes', 'name')
-      @mac       = @params.dig('meta', 'mac')
-      @ports     = @params.dig('meta', 'ports')
-      @last_seen = @params.dig('meta', 'last-seen')
+      @name        = @params.dig('attributes', 'name')
+      @mac         = @params.dig('meta', 'mac')
+      @ports       = @params.dig('meta', 'ports')
+      @last_seen   = @params.dig('meta', 'last-seen')
+      @device_type = @params.dig('meta', 'device-type')
     end
 
     def element
@@ -78,7 +79,8 @@ module Helium
         mac: mac,
         ports: ports,
         last_seen: last_seen,
-        virtual: virtual?
+        virtual: virtual?,
+        device_type: device_type
       })
     end
   end

data/lib/helium/version.rb

@@ -1,3 +1,3 @@
 module Helium
-  VERSION = "0.22.0"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helium-ruby
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Andrew Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus