hypertrack 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9716d695f09e507853ca9745f765191d5efeabda
-  data.tar.gz: 8a2c4b15c4770a2f9cc2952efe8b1c2cec933972
+  metadata.gz: e3117268450676faa824eada7433de18ede4edfa
+  data.tar.gz: aa5eb28485a7c72425459758630ec272b9391b56
 SHA512:
-  metadata.gz: 465a675a0ce5a9e5c70110c7b1c79243b094dcdf58f9d545243ce40ea97661dfa5d7db810ac108e42910c9f42968995473edcce51e8b582b2b608036f427f34c
-  data.tar.gz: eb695184c6af67acd6e5c592660586744606d95926424acb4c3aef76c866cec9da60ede42917479a8838e5ac5047270f4605ad18356fb4bbf021fdb31e407fc2
+  metadata.gz: 78607d37513ab79914d7c61716709c053def04d59eb828cdc4fb150fced1604877b6009de5fb20b732a9dd9ce202e6d05ad8932751a94f775bc5e3ec750d4d25
+  data.tar.gz: 26ae3858d188e56a7d982144b8d99b475d765dc4803368e1fd91c1d9de6cdb623e977ced4101c992d713791b6f88d3dce23e73c09ad5fa4f3230040b9674097e

data/lib/hypertrack.rb

@@ -1,5 +1,5 @@
 require "json"
-require 'net/https'
+require "net/https"
 
 require_relative "util"
 require_relative "hypertrack/params_validator"
@@ -16,6 +16,7 @@ require_relative "hypertrack/api_operations/driver_api"
 require_relative "hypertrack/api_operations/task_api"
 require_relative "hypertrack/api_operations/trip_api"
 require_relative "hypertrack/api_operations/shift_api"
+require_relative "hypertrack/api_operations/gps_log_api"
 
 # All HTTP calls made here
 require_relative "hypertrack/api_client"
@@ -34,6 +35,7 @@ require_relative "hypertrack/resources/fleet"
 require_relative "hypertrack/resources/hub"
 require_relative "hypertrack/resources/shift"
 require_relative "hypertrack/resources/event"
+require_relative "hypertrack/resources/gps_log"
 
 module HyperTrack
 

data/lib/hypertrack/api_client.rb

@@ -54,7 +54,7 @@ module HyperTrack
         end
 
         header = get_auth_header
-        request_object = VERB_MAP[http_method].new(api_uri.path, header)
+        request_object = VERB_MAP[http_method].new(api_uri.request_uri, header)
         request_object['Content-Type'] = 'application/json'
         request_object
       end
@@ -76,7 +76,7 @@ module HyperTrack
           begin
             JSON.parse(response.body)
           rescue JSON::ParserError => e
-            raise HyperTrack::InvalidJSONResponse(response.body)
+            raise HyperTrack::InvalidJSONResponse.new(response.body)
           end
         else
           error_klass = HyperTrack::Error.defined_codes[response_code] || HyperTrack::UnknownError

data/lib/hypertrack/api_operations/driver_api.rb

@@ -10,14 +10,14 @@ module HyperTrack
 
         def map_list(filter_params={})
           map_list_path = "#{HyperTrack::Driver::API_BASE_PATH}map_list/"
-          result = HyperTrack::ApiClient.fetch(map_list_path, filter_params)
+          HyperTrack::ApiClient.fetch(map_list_path, filter_params)
         end
 
       end
 
       def overview(filter_params={})
         driver_overview_path = "#{HyperTrack::Driver::API_BASE_PATH}#{self.id}/overview/"
-        result = HyperTrack::ApiClient.fetch(driver_overview_path, filter_params)
+        HyperTrack::ApiClient.fetch(driver_overview_path, filter_params)
       end
 
     end

data/lib/hypertrack/api_operations/gps_log_api.rb

@@ -0,0 +1,20 @@
+module HyperTrack
+  module ApiOperations
+    module GPSLogAPI
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+
+        def filtered_list(params)
+          if HyperTrack::ParamsValidator.valid_args?(params, [:driver_id], HyperTrack::GPSLog::VALID_ATTRIBUTE_VALUES)
+            HyperTrack::GPSLog.list(params.merge(filtered: true))
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/hypertrack/api_operations/task_api.rb

@@ -3,8 +3,10 @@ module HyperTrack
     module TaskAPI
 
       def editable_url(params)
-        path = "editable_url/"
-        self.update(path, params, [:editable])
+        if HyperTrack::ParamsValidator.valid_args?(params, [:editable], self.class::VALID_ATTRIBUTE_VALUES)
+          api_path = "#{self.class::API_BASE_PATH}#{self.id}/editable_url/"
+          HyperTrack::ApiClient.update(api_path, params)
+        end
       end
 
       def start(params)

data/lib/hypertrack/api_operations/trip_api.rb

@@ -11,7 +11,7 @@ module HyperTrack
         def sending_eta(params)
           if HyperTrack::ParamsValidator.valid_args?(params, [:driver, :destination], HyperTrack::Trip::VALID_ATTRIBUTE_VALUES)
             eta_path = "#{HyperTrack::Trip::API_BASE_PATH}lite/"
-            result = HyperTrack::ApiClient.update(eta_path, params)
+            HyperTrack::ApiClient.update(eta_path, params)
           end
         end
 

data/lib/hypertrack/params_validator.rb

@@ -10,8 +10,9 @@ module HyperTrack
 
         params = Util.symbolize_keys(params)
 
-        if missing_required_fields?(params, required_fields)
-          raise HyperTrack::InvalidParameters.new("Request is missing required params - #{required_fields - params.keys}")
+        missing_params = missing_required_fields(params, required_fields)
+        if missing_params.length > 0
+          raise HyperTrack::InvalidParameters.new("Request is missing required params - #{missing_params}")
         end
 
         params.each do |name, value|
@@ -33,12 +34,13 @@ module HyperTrack
         params.is_a?(Hash)
       end
 
-      def missing_required_fields?(params, required_fields)
+      def missing_required_fields(params, required_fields)
+        missing_fields = []
         required_fields.each do |field|
-          return true if Util.blank?(params[field])
+          missing_fields << field if Util.blank?(params[field])
         end
 
-        false
+        missing_fields
       end
 
     end

data/lib/hypertrack/resources/gps_log.rb

@@ -0,0 +1,31 @@
+module HyperTrack
+  class GPSLog < HyperTrack::SharedResource
+    include HyperTrack::ApiOperations::GPSLogAPI
+
+    API_BASE_PATH = "gps/"
+    REQUIRED_FIELDS = [:driver_id, :location, :speed, :bearing, :altitude, :recorded_at]
+
+    VALID_ATTRIBUTE_VALUES = {
+      activities: {
+        allowed: [:stationary, :walking, :running, :automotive, :cycling, :unknown]
+      },
+      activity_confidence: {
+        allowed: (0..100).to_a
+      }
+    }
+
+    def self.create(params={})
+      raise HyperTrack::MethodNotAllowed.new("Create not allowed on HyperTrack::GPSLog class")
+    end
+
+    def self.list(params={})
+      if params.is_a?(Hash)
+        params[:filtered] ? params.delete(:raw) : params[:raw] = true
+      end
+      params.delete(:filtered)
+
+      super(params)
+    end
+
+  end
+end

data/lib/hypertrack/resources/trip.rb

@@ -3,11 +3,14 @@ module HyperTrack
     include HyperTrack::ApiOperations::TripAPI
 
     API_BASE_PATH = "trips/"
-    REQUIRED_FIELDS = [:driver_id, :start_location, :tasks]
+    REQUIRED_FIELDS = [:driver_id, :start_location, :tasks, :has_ordered_tasks]
 
     VALID_ATTRIBUTE_VALUES = {
       vehicle_type: {
         allowed: HyperTrack::SharedResource::VALID_VEHICLE_TYPES
+      },
+      has_ordered_tasks: {
+        allowed: [true, false]
       }
     }
 

data/lib/hypertrack/shared_resource.rb

@@ -30,7 +30,7 @@ module HyperTrack
       @values.values
     end
 
-    def to_json(*a)
+    def to_json
       JSON.generate(@values)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypertrack
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Utsav Kesharwani
@@ -14,14 +14,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 description: Ruby wrapper around HyperTrack's API. Refer http://docs.hypertrack.io/
@@ -38,6 +38,7 @@ files:
 - lib/hypertrack/api_operations/common/retrieve.rb
 - lib/hypertrack/api_operations/common/update.rb
 - lib/hypertrack/api_operations/driver_api.rb
+- lib/hypertrack/api_operations/gps_log_api.rb
 - lib/hypertrack/api_operations/shift_api.rb
 - lib/hypertrack/api_operations/task_api.rb
 - lib/hypertrack/api_operations/trip_api.rb
@@ -48,6 +49,7 @@ files:
 - lib/hypertrack/resources/driver.rb
 - lib/hypertrack/resources/event.rb
 - lib/hypertrack/resources/fleet.rb
+- lib/hypertrack/resources/gps_log.rb
 - lib/hypertrack/resources/hub.rb
 - lib/hypertrack/resources/neighbourhood.rb
 - lib/hypertrack/resources/shift.rb
@@ -65,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the HyperTrack API!