quelink-mg 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea5c2cf43ce12b5862a854e1cec5cc7149fa196f70cc6de57390d8ba4e4ef0b
-  data.tar.gz: ced81a168e9b4c4db172bcb205b16a1e4c981cb03ea3a565149b1524487c1c88
+  metadata.gz: 156a74e9c90ed12d937afba89ed165d4c79f655b81158352aca3138962aeab2c
+  data.tar.gz: 5a3ec61486354ecfd8c359a8cc651b1c94f73eceba33164dedab67abc27ede56
 SHA512:
-  metadata.gz: c27447f6092dcf66651a7cb7154fe85c8d491ee8945a111dad3f950ec4077f3d231425d468af84ab501ef525dad525b0a55726ec48158909c608a75a986ea4d9
-  data.tar.gz: 1772f49c7e43a6e2d47eafb541428f88bb1611dc0e7f5782a76d1957a57fff7067daad797d1d5ed9cb99643c250047570c5ae90b1d62ce6007fcd4ec48ba1f78
+  metadata.gz: 873fca115ba479772b24a1f9cafce41112528c8fe5847a190e67a77cfb10e73b6aa4a0e14049178bb5b811be8e9e38d6d43defa0dd41cdb9d5f0313be2202b56
+  data.tar.gz: 15fb64bf910ce1ac9178535af37818f9c2482877db381df655b7412046189d28bb927cde60d8ac7f5839bc4514b2e068ef1532740766886dddbf9baf19d98bad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quelink-mg (0.2.0)
+    quelink-mg (0.3.0)
       activesupport (~> 7.0)
 
 GEM

data/lib/quelink-mg/at/base.rb

@@ -19,13 +19,23 @@ module QuelinkMg
       private
 
       def verify_params(acceptable_values, error)
+        required_values.each do |rv|
+          raise_error(rv, error) if @params.fetch(rv, nil).nil?
+        end
+
         acceptable_values.each do |k, v|
-          next if v.include?(@params.fetch(k, nil))
+          value = @params.fetch(k, nil)
+
+          next if value.blank? || v.include?(value)
 
           raise_error(k, error)
         end
       end
 
+      def required_values
+        %i[password serial_number]
+      end
+
       def raise_error(type, error)
         raise error, "Wrong #{type}: #{@params}"
       end

data/lib/quelink-mg/buff/base.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module QuelinkMg
+  module Buff
+    class Base < ::QuelinkMg::Resp::Base
+      QUELINK_DATE_FORMAT = '%Y%m%d%H%M%S'
+    end
+  end
+end

data/lib/quelink-mg/buff/gtfri.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module QuelinkMg
+  module Buff
+    class Gtfri < Base
+      GTFRI_RESP_KEYS = %w[protocol_version unique_id device_name report_id report_type number
+                           gps_accuracy speed azimuth elevation longitude latitude gps_utc_time
+                           mcc mnc lac cell_id odo_mileage battery_percentage send_time count_number].freeze
+
+      def hash
+        unify_keys(GTFRI_RESP_KEYS.zip(@response.split(',')).to_h)
+      end
+    end
+  end
+end

data/lib/quelink_mg.rb

@@ -34,6 +34,9 @@ require File.expand_path('quelink-mg/ack/gtrto.rb', __dir__)
 require File.expand_path('quelink-mg/ack/gtsri.rb', __dir__)
 require File.expand_path('quelink-mg/ack/gtudf.rb', __dir__)
 
+require File.expand_path('quelink-mg/buff/base.rb', __dir__)
+require File.expand_path('quelink-mg/buff/gtfri.rb', __dir__)
+
 require File.expand_path('quelink-mg/configuration.rb', __dir__)
 
 module QuelinkMg

data/quelink-mg.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'quelink-mg'
-  s.version     = '0.2.1'
+  s.version     = '0.4.0'
   s.summary     = 'Quelink devices command reader and writer'
   s.description = 'Quelink devices command reader and writer'
   s.authors     = ['Stanislaw Zawadzki']

data/spec/quelink_mg/at/gtcfg_spec.rb

@@ -34,6 +34,16 @@ RSpec.describe QuelinkMg::At::Gtcfg do
                                                        '300,2,0,20491231235959,0,0000,0,10,,,FFFF$'
   end
 
+  it 'creates message if some params available' do
+    params =
+      {
+        password: 'gl310m',
+        gps_on_need: 1,
+        serial_number: 'FFFF'
+      }
+    expect(described_class.new(params:).message).to eq 'AT+GTCFG=gl310m,,,,,1,,,,,,,,,,,,,,,,,,,FFFF$'
+  end
+
   it 'raises error on missing params' do
     expect { described_class.new(params: {}).message }.to raise_error(InvalidATGTCFGException)
   end

data/spec/quelink_mg/buff/gtfri_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe QuelinkMg::Buff::Gtfri do
+  it 'parses valid response' do
+    response = 'C30204,860201061504521,,0,0,1,1,0.0,0,96.2,21.012847,52.200338,20230813061232,\\
+      0260,0003,E31F,0447020D,,34,20230813061231,3E94'
+
+    parsed_response = described_class.new(response:).hash
+    expect(parsed_response).not_to eq({})
+    expect(parsed_response['send_time']).to eq Time.use_zone('UTC') { Time.zone.parse('20230813061231') }.in_time_zone
+    expect(parsed_response['gps_utc_time']).to eq Time.use_zone('UTC') {
+      Time.zone.parse('20230813061232')
+    }.in_time_zone
+    expect(parsed_response['longitude']).to eq 21.012847
+    expect(parsed_response['latitude']).to eq 52.200338
+    expect(parsed_response['unique_id']).to eq 860_201_061_504_521
+    expect(parsed_response['battery_percentage']).to eq 34
+    expect(parsed_response['device_name']).to eq ''
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quelink-mg
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Stanislaw Zawadzki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,8 @@ files:
 - lib/quelink-mg/at/gtrto.rb
 - lib/quelink-mg/at/gtsri.rb
 - lib/quelink-mg/at/gtudf.rb
+- lib/quelink-mg/buff/base.rb
+- lib/quelink-mg/buff/gtfri.rb
 - lib/quelink-mg/configuration.rb
 - lib/quelink-mg/resp/base.rb
 - lib/quelink-mg/resp/gtfri.rb
@@ -136,6 +138,7 @@ files:
 - spec/quelink_mg/at/gtrto_spec.rb
 - spec/quelink_mg/at/gtsri_spec.rb
 - spec/quelink_mg/at/gtudf_spec.rb
+- spec/quelink_mg/buff/gtfri_spec.rb
 - spec/quelink_mg/resp/gtfri_spec.rb
 - spec/quelink_mg/resp/gtgsv_spec.rb
 - spec/quelink_mg/resp/gtinf_spec.rb