my_john_deere_api 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4919eaf224090046a44f2ec4712dfddaebcbb7b5279dc9499cb09ab5b13f1445
-  data.tar.gz: 5b9d66230b2a3fc29f7111ddad1fc82ea3796935d1d87465238e4f8a70c66f18
+  metadata.gz: 2295d8403dd887dfd1dad300885aebef06aa41b07f209a72d2de68b784535ea0
+  data.tar.gz: ceb47dd947221150f3d6826e19e343888830f85c88924b189948874aa7825888
 SHA512:
-  metadata.gz: 6d908341e42d6a225810c7463157dc453490c7dc5a5c93fea52c5445a91e3ec73d2860c3565918a0a70d9858fe61f7170dd5acdc1b9bb6b5cc0eb57f7d4597cc
-  data.tar.gz: 6f23310c0403f482d092026780c2280778f7e55ccf309dec23e993522a4d9c80aaf62a94cf045272e16b8563571cd8b00b2e092b775c304a5eed52ae4d27b4c3
+  metadata.gz: 1183f5923dcb7932c71f9f10e6968ea332e35e332d980030637426261d0240dd4ab4c464d58cb2a511ce7f2060bdb320926dfca682808afe72cc704afafb061c
+  data.tar.gz: c16eb6aa03f079b1968d7eab2bde1f754e147305e66378ce7719648f930f76891f2ac51bed88391e6dd0676e4e7b4a403255851f9efb3b297239d5d46eeec1cf

data/lib/my_john_deere_api/request/create/asset_location.rb

@@ -2,6 +2,8 @@ require 'date'
 
 module MyJohnDeereApi
   class Request::Create::AssetLocation < Request::Create::Base
+    include Validators::AssetLocation
+
     private
 
     ##
@@ -73,13 +75,6 @@ module MyJohnDeereApi
       @resource ||= "/assets/#{attributes[:asset_id]}/locations"
     end
 
-    ##
-    # Required attributes for this class
-
-    def required_attributes
-      [:asset_id, :timestamp, :geometry, :measurement_data]
-    end
-
     ##
     # Retrieve newly created record
 
@@ -111,28 +106,5 @@ module MyJohnDeereApi
     def model
       Model::AssetLocation
     end
-
-    ##
-    # Custom validations for this class
-
-    def validate_attributes
-      validate_measurement_data
-    end
-
-    def validate_measurement_data
-      unless attributes[:measurement_data].is_a?(Array)
-        errors[:measurement_data] ||= 'must be an array'
-        return
-      end
-
-      attributes[:measurement_data].each do |measurement|
-        [:name, :value, :unit].each do |attr|
-          unless measurement.has_key?(attr)
-            errors[:measurement_data] ||= "must include #{attr}"
-            return
-          end
-        end
-      end
-    end
   end
 end

data/lib/my_john_deere_api/validators/asset_location.rb

@@ -0,0 +1,34 @@
+module MyJohnDeereApi::Validators
+  module AssetLocation
+    include Base
+
+    private
+
+    def required_attributes
+      [:asset_id, :timestamp, :geometry, :measurement_data]
+    end
+
+    ##
+    # Custom validations for this class
+
+    def validate_attributes
+      validate_measurement_data
+    end
+
+    def validate_measurement_data
+      unless attributes[:measurement_data].is_a?(Array)
+        errors[:measurement_data] ||= 'must be an array'
+        return
+      end
+
+      attributes[:measurement_data].each do |measurement|
+        [:name, :value, :unit].each do |attr|
+          unless measurement.has_key?(attr)
+            errors[:measurement_data] ||= "must include #{attr}"
+            return
+          end
+        end
+      end
+    end
+  end
+end

data/lib/my_john_deere_api/validators.rb

@@ -1,4 +1,5 @@
 module MyJohnDeereApi::Validators
   autoload :Base,               'my_john_deere_api/validators/base'
   autoload :Asset,              'my_john_deere_api/validators/asset'
+  autoload :AssetLocation,      'my_john_deere_api/validators/asset_location'
 end

data/lib/my_john_deere_api/version.rb

@@ -1,3 +1,3 @@
 module MyJohnDeereApi
-  VERSION='1.3.3'
+  VERSION='1.3.4'
 end

data/test/lib/my_john_deere_api/validators/asset_location_test.rb

@@ -0,0 +1,61 @@
+require 'support/helper'
+
+class AssetLocationValidatorTest
+  include JD::Validators::AssetLocation
+
+  attr_reader :attributes
+
+  def initialize(attributes)
+    @attributes = attributes
+  end
+end
+
+describe 'MyJohnDeereApi::Validators::AssetLocation' do
+  let(:klass) { AssetLocationValidatorTest }
+  let(:object) { klass.new(attributes) }
+  let(:attributes) { valid_attributes }
+
+  let(:valid_attributes) do
+    {
+      asset_id: asset_id,
+      timestamp: CONFIG.timestamp,
+      coordinates: CONFIG.coordinates,
+      measurement_data: CONFIG.measurement_data
+    }
+  end
+
+  it 'exists' do
+    assert JD::Validators::AssetLocation
+  end
+
+  it 'inherits from MyJohnDeereApi::Validators::Base' do
+    [:validate!, :valid?].each{ |method_name| assert object.respond_to?(method_name) }
+  end
+
+  it 'requires several attributes' do
+    [:asset_id, :timestamp, :geometry, :measurement_data].each do |attr|
+      object = klass.new(valid_attributes.merge(attr => nil))
+
+      refute object.valid?
+      exception = assert_raises(JD::InvalidRecordError) { object.validate! }
+
+      assert_includes exception.message, "#{attr} is required"
+      assert_includes object.errors[attr], 'is required'
+    end
+  end
+
+  it 'requires measurement_data to have the right keys' do
+    [:name, :value, :unit].each do |key|
+      attributes = Marshal.load(Marshal.dump(valid_attributes))
+      attributes[:measurement_data].first.delete(key)
+
+      object = klass.new(attributes)
+
+      refute object.valid?
+      exception = assert_raises(JD::InvalidRecordError) { object.validate! }
+
+      assert_includes exception.message, "measurement_data must include #{key}"
+      assert_includes object.errors[:measurement_data], "must include #{key}"
+    end
+  end
+end

data/test/lib/my_john_deere_api/validators/asset_test.rb

@@ -1,22 +1,17 @@
 require 'support/helper'
 
-module AssetValidatorTest
-  class Base
-    include JD::Validators::Asset
+class AssetValidatorTest
+  include JD::Validators::Asset
 
-    attr_reader :attributes
+  attr_reader :attributes
 
-    def initialize(attributes)
-      @attributes = attributes
-    end
-  end
-
-  class Vanilla < Base
+  def initialize(attributes)
+    @attributes = attributes
   end
 end
 
 describe 'MyJohnDeereApi::Validators::Asset' do
-  let(:klass) { AssetValidatorTest::Base }
+  let(:klass) { AssetValidatorTest }
   let(:object) { klass.new(attributes) }
   let(:attributes) { valid_attributes }
 

data/test/lib/my_john_deere_api/validators_test.rb

@@ -9,5 +9,9 @@ describe 'MyJohnDeereApi::Validators' do
     it 'loads Validators::Asset' do
       assert JD::Validators::Asset
     end
+
+    it 'loads Validators::AssetLocation' do
+      assert JD::Validators::AssetLocation
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_john_deere_api
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Jaime Bellmyer
@@ -151,6 +151,7 @@ files:
 - lib/my_john_deere_api/request/update/base.rb
 - lib/my_john_deere_api/validators.rb
 - lib/my_john_deere_api/validators/asset.rb
+- lib/my_john_deere_api/validators/asset_location.rb
 - lib/my_john_deere_api/validators/base.rb
 - lib/my_john_deere_api/version.rb
 - test/lib/my_john_deere_api/authorize_test.rb
@@ -199,6 +200,7 @@ files:
 - test/lib/my_john_deere_api/request/update/base_test.rb
 - test/lib/my_john_deere_api/request/update_test.rb
 - test/lib/my_john_deere_api/request_test.rb
+- test/lib/my_john_deere_api/validators/asset_location_test.rb
 - test/lib/my_john_deere_api/validators/asset_test.rb
 - test/lib/my_john_deere_api/validators/base_test.rb
 - test/lib/my_john_deere_api/validators_test.rb