ax-track 0.1.8 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020bb6c2b8ab4cc16a243f3a085c0a043f61d3472afd0fe94c1a2604801c07bb
-  data.tar.gz: dab3b71fe20f914974abebbf736cd755a236c2f5f1db424d99a0f610055243b7
+  metadata.gz: 2c016c0f8b6b21a305c193d350b3a1bf003bc4022da5116c56eb9eb46bd87689
+  data.tar.gz: fb56d8a6ad760e23c4d90d513d28d1bc46a06832cc8fe25e18e0332556021fac
 SHA512:
-  metadata.gz: 0ecfd0e82fe24c79903cbdac6b007c5f747c37f29d73cd5713e56716dd7bf54903e328470e3edaf2a26c59985b33a1ad3a3d3d42cf8e113ea5e5dfa7f012d251
-  data.tar.gz: 76fdbd7f4455f1a43029f508b5c3716f293ce93f1f15f5ccda6e5c284980f1ddeb20bbdeea3ac74d30ba35de728ae9933df0ad3ee15dc0030d681e1d3b9fdad9
+  metadata.gz: '02385bde367ee4eb289955f65e8516d9e0b548ba4e5539d6da4bd1838307c99fdcc1940f6fa53460887ddb821fb95939b4fe8de224627cd0c6ecc4b148eecd69'
+  data.tar.gz: ec3105555b83b46efecf619c04794e9e7873620fffaa82d7574d6a309b32949e93c84f929714687ca17b7cf798c920e54ed3f3d2c46b3cc4caf941fe509e00f8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ax-track (0.1.8)
+    ax-track (0.1.14)
       faraday (~> 1.7)
       faraday_middleware (~> 1.1)
 

data/README.md

@@ -34,7 +34,7 @@ client = AxTrack::Client.new(api_key: your_api_key)
 # Get a list of all trackers
 client.tracker.list
 
-# Get the specific information of a specific tracker
+# Get the specific information of a specific tracker. If :asset_id is invalid, a AxTrack::Resource::NotFoundError is returned
 client.tracker.retrieve(:tracker_id)
 ```
 
@@ -43,7 +43,7 @@ client.tracker.retrieve(:tracker_id)
 # Get a list of all assets
 client.asset.list
 
-# Get a specific asset
+# Get a specific asset. If :asset_id is invalid, a AxTrack::Resource::NotFoundError is returned
 client.asset.retrieve(:asset_id)
 
 # Update a specif asset
@@ -52,6 +52,9 @@ client.asset.update(:tracker_id, params)
 client.tracker.update(:tracker_id, name: 'New name')
 ```
 
+### Errors
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ax_track/objects/tracker.rb

@@ -2,31 +2,43 @@ module AxTrack
   class Tracker < Object
 
     def initialize(json_response)
-      @id =               json_response['id']
-      @url =              json_response['url']
-      @active =           json_response['active']
-      @model =            json_response['model']
-      @axtrack_asset_id = json_response['asset']
-      @asset_details      = Asset.new json_response['asset_details'] if json_response['asset_details']
-      @name =             json_response.dig('asset_details', 'name')
+      @tracker_id        = json_response['id']
+      @asset_id          = json_response['asset']
+      @identifier        = json_response['identifier']
+      @url               = json_response['url']
+      @active            = json_response['active']
+      @model             = json_response['model']
+      @asset_details     = Asset.new json_response['asset_details'] if json_response['asset_details']
+      @name              =  json_response.dig('asset_details', 'name')
       @last_message_timestamp = DateTime.parse(json_response['last_message_timestamp'], false) if json_response['last_message_timestamp']
-      @url =              json_response['url']
+      @url               = json_response['url']
+      @user_url          = website_url
       @last_gps_position = GPSPosition.new(json_response['last_gps_measurement'] || json_response['asset_details'])
 
-      @battery =          json_response.dig('asset_details', 'sensor_data', 'battery', 'value')
+      @battery           = json_response.dig('asset_details', 'sensor_data', 'battery', 'value')
+      sensor_data        = json_response.dig('asset_details', 'sensor_data')
 
-      sensor_data =       json_response.dig('asset_details', 'sensor_data')
-      sensor_data.delete('battery')
-      @sensor_data =      sensor_data
+      @sensor_data       = sensor_data
+
+      @network           = json_response['network']
 
       create_getters
     end
 
     def available_sensor_data
       # returns a hash with available senson data
-      self.sensor_data.keys
+      sensor_data_temp = self.sensor_data.keys
+      # if no timestamp is available in the GPSPosition, then there wasn't a last_gps_measurement returned in the json
+      # hence the sensor doesn't contain a GPS module.
+      sensor_data_temp = sensor_data_temp.unshift('gps') if self.last_gps_position.respond_to? :timestamp
+      sensor_data_temp
+    end
+
+    def website_url
+      "https://app.ax-track.ch/#/map/assets/#{@tracker_id}"
     end
 
+
     class GPSPosition < Object
 
       def initialize(json_response)

data/lib/ax_track/resource.rb

@@ -3,14 +3,14 @@ module AxTrack
   class Resource
     attr_reader :client, :response
 
-    GithubAPIError = Class.new(StandardError)
-    BadRequestError = Class.new(GithubAPIError)
-    UnauthorizedError = Class.new(GithubAPIError)
-    ForbiddenError = Class.new(GithubAPIError)
-    ApiRequestsQuotaReachedError = Class.new(GithubAPIError)
-    NotFoundError = Class.new(GithubAPIError)
-    UnprocessableEntityError = Class.new(GithubAPIError)
-    ApiError = Class.new(GithubAPIError)
+    ApiError = Class.new(StandardError)
+    BadRequestError = Class.new(ApiError)
+    UnauthorizedError = Class.new(ApiError)
+    ForbiddenError = Class.new(ApiError)
+    ApiRequestsQuotaReachedError = Class.new(ApiError)
+    NotFoundError = Class.new(ApiError)
+    UnprocessableEntityError = Class.new(ApiError)
+    ApiError = Class.new(ApiError)
 
     HTTP_OK_CODE = 200
 
@@ -43,9 +43,7 @@ module AxTrack
         BadRequestError
       when HTTP_UNAUTHORIZED_CODE
         UnauthorizedError
-      when HTTP_FORBIDDEN_CODE
-        ForbiddenError
-      when HTTP_NOT_FOUND_CODE
+      when HTTP_NOT_FOUND_CODE, HTTP_FORBIDDEN_CODE
         NotFoundError
       when HTTP_UNPROCESSABLE_ENTITY_CODE
         UnprocessableEntityError

data/lib/ax_track/resources/asset_resource.rb

@@ -13,10 +13,11 @@ module AxTrack
                           endpoint: "assets/#{asset_id}").body
     end
 
-    def update(asset_id, **attributes)
+    def update(asset_id, headers: {}, **attributes)
       Asset.new request(http_method: :patch,
                         endpoint:  "assets/#{asset_id}",
-                        body: attributes).body
+                        body: attributes,
+                        headers: {}).body
 
     end
   end

data/lib/ax_track/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AxTrack
-  VERSION = "0.1.8"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ax-track
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.14
 platform: ruby
 authors:
 - Philipp Baumann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday