ax-track 0.1.9 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8a0965e6d150c1d817952ef21243d4c6cde5de9982da627c7eaf62c5612ae4
-  data.tar.gz: 15880392636fdd11ca36bd70d17f44862afe9b09a0bc464a70e5fd5e6c31089b
+  metadata.gz: a2435c9350d10dfb406b2c3f0c1a4db35de9029465e7b31622407a0a580722d4
+  data.tar.gz: 803333823277c76dd4532382c409d5c4dbe5b1ad10070626005da7ff9f3c0552
 SHA512:
-  metadata.gz: 0daa74bd47a6ce1f42748d80eaf539ef8f4d93d92e8ef56b1839965b6950187ed9323cc747ffde2de8e276bb7e848ed5ffe7825b05eb20ece53be981e004a6c1
-  data.tar.gz: 9674635ea14e6987405f9a5ca0b1ce79e030008af98393f620fea3c5dceca6c1ad4075867472d3073b9c5e80fa1426cf05bee4265dcd99bc69d57c48e1177e0c
+  metadata.gz: b194b85b47d4eea1f300ef5a2d579f3029abce9bfc03920c859c2d1e25769859e5a608d150847fdb276a4142186b19730bbcd279865197b7c6356b2ec4b0c5ca
+  data.tar.gz: 5ebdfac60f867abc3a6dd92f4584c22411acc1eed1427ccd26b15d3727f7bae53635e8c406c9f39589f3a8a1638fa7d996ba3afbc777a2f3f07af2ec69120b0d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ax-track (0.1.9)
+    ax-track (0.1.15)
       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/client.rb

@@ -12,9 +12,10 @@ module AxTrack
     APIKeyMissing = Class.new(StandardError)
 
     attr_reader :api_key, :adapter
-    def initialize(api_key: ENV['AXTRACK_API_KEY'], adapter: Faraday.default_adapter)
-      @api_key = api_key
-      @adapter = adapter
+    def initialize(api_key: nil, adapter: nil, stubs: nil)
+      @api_key  = api_key || ENV['AXTRACK_API_KEY']
+      @adapter  = adapter || Faraday.default_adapter
+      @stubs    = stubs
 
       raise APIKeyMissing, "No API key provided" if !defined?(api_key) || api_key.nil? ||  api_key.empty?
     end
@@ -33,7 +34,7 @@ module AxTrack
         #conn.request :url_encoded
         conn.request :json
         conn.response :json, content_type: 'application/json'
-        conn.adapter Faraday.default_adapter
+        conn.adapter adapter, @stubs
         conn.headers['Authorization'] = "Token #{api_key}" unless api_key.empty?
       end
     end

data/lib/ax_track/collection.rb

@@ -6,15 +6,13 @@ module AxTrack
     # type is the class Type to wrap the results from key
     def self.from_response(json_response, key:, type: )
       body = json_response.body
-      new(
-        data: body[key].map { |attrs| type.new(attrs ) },
-        total: body.dig('count'),
-        next_cursor: body.dig('next'),
-        prev_cursor: body.dig('previous')
-      )
+      new(data: body[key].map { |attrs| type.new(attrs ) },
+          total: body.dig('count'),
+          next_cursor: body.dig('next'),
+          prev_cursor: body.dig('previous'))
     end
 
-    def initialize (data:, total:, next_cursor:, prev_cursor:)
+    def initialize(data:, total:, next_cursor:, prev_cursor:)
       @data = data
       @total = total
       @next_cursor = next_cursor.nil? || next_cursor.empty? ? nil : next_cursor

data/lib/ax_track/object.rb

@@ -8,9 +8,6 @@ module AxTrack
     def create_getters(required_getter_methods = instance_variables.map { |attr_name| attr_name[1..-1 ]})
       required_getter_methods.each do |attr|
         singleton_class.send :attr_reader, attr unless self.respond_to? attr
-        # define_singleton_method(v.to_s.tr('@','')) do
-        #   instance_variable_get(v)
-        # end
       end
     end
 

data/lib/ax_track/objects/tracker.rb

@@ -2,34 +2,40 @@ module AxTrack
   class Tracker < Object
 
     def initialize(json_response)
-      @tracker_id =       json_response['id']
-      @asset_id =         json_response['asset']
-      @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')
+      @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']
-      @user_url =         website_url(@asset_id)
+      @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/#{id}"
+      "https://app.ax-track.ch/#/map/assets/#{@tracker_id}"
     end
 
 

data/lib/ax_track/resource.rb

@@ -3,14 +3,13 @@ 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)
 
     HTTP_OK_CODE = 200
 
@@ -43,9 +42,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.9"
+  VERSION = "0.1.15"
 end

metadata

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