vin-validator 1.0.0.pre.rc.4 → 1.1.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0900718cbe575b518977738752910919e1cd816dda122a14a3bcf61fa15ec08
-  data.tar.gz: 4229000169bba080ef7f1be600499da69c0f9f65d40b066f7635eed3e3530825
+  metadata.gz: 6523c6bd1ad2fea7e124214d1373e350ad91651425e356895b27fa9e3e65345f
+  data.tar.gz: 8f904a2603046eb4381f417300e0450b0f095aca1c43857de1b9c9753c47bff8
 SHA512:
-  metadata.gz: 6ee7bbe424b9d984356af801069dce68f1a46c9db272831b1990703351bbcf47756c5494f38cf6df061014e65519a98b0cabd10d039fc098d736fcfabb97c479
-  data.tar.gz: bf9cb2c03dabcc1771a567f973f0705ca753f99a63e39f60753bca42c2c95cd44486e378534f16e0000df5d5c5002893d0bae5ad10337bd5b709bb296ba6cdf3
+  metadata.gz: a77c0325d479f4f263e1beb3354cafeb21d6eb7251cba6c7e48f64e735c559c0843fb4d50088c91d910c46002ea234589684b50e7e08edcbb52c4cf943d51a3c
+  data.tar.gz: 90c38e20991bfd30dfc0df5b40eab5c56360d8e1a1e42933482c95af5bb87faacb0df0332b74dd7cd03649df81311393ca1db341aa0a91f901e9c832887a25ef

data/lib/vin-validator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require_relative 'vin_validator/base_model'
 require_relative 'vin_validator/knowledge'
 require_relative 'vin_validator/version'
 require 'net/http'

data/lib/vin_validator/api.rb

@@ -11,9 +11,6 @@ module VinValidator
       # @return [Hash]
       #
       def vin_info(vins)
-        check_nhtsa = block_given? ? yield : true
-        return {} unless check_nhtsa
-
         vins_to_check = [vins]
         vins_to_check.flatten!
         vins_to_check.compact!

data/lib/vin_validator/base_model.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module VinValidator
+  class BaseModel
+    class << self
+      # Loads all objects
+      #
+      # @return [Hash]
+      #
+      def all
+        return @all if defined?(@all)
+
+        all = JSON.parse(File.read(File.join(__dir__, "#{filename}.json")), { symbolize_names: true }).map do |id, v|
+          [id.to_s, new(**v)]
+        end
+
+        @all = all.to_h
+      end
+
+      private
+
+        # Basename of the JSON file to read
+        #
+        # @return [String]
+        #
+        def filename
+          ''
+        end
+    end
+  end
+end

data/lib/vin_validator/knowledge.rb

@@ -3,11 +3,75 @@
 require_relative './api'
 require_relative './maker'
 require_relative './result'
+require_relative './year'
 require_relative './wmi'
 
 module VinValidator
   class Knowledge
     class << self
+      # Validates each vin provided
+      #
+      # @param vins [String, Array<String>]
+      # @param hit_nhtsa [Boolean] if `true`, query NHTSA. default: `false`
+      #
+      # @return [Hash]
+      #
+      def validate(vins, hit_nhtsa = false)
+        check_types = {
+          body_type: 'Body type',
+          trailer_type: 'Trailer type',
+          vehicle_type: 'Vehicle type',
+          gvw: 'GVW'
+        }
+
+        results = vin_info(vins, hit_nhtsa).map do |vin, simple_check|
+          unless simple_check.fetch(:errors).empty?
+            next [vin, {
+              valid: false,
+              wmi: [],
+              year: {},
+              errors: simple_check.fetch(:errors).map(&:value)
+            }]
+          end
+
+          vin_split = vin.split('')
+
+          vin_wmi = vin_split[0..2].join
+          vin_year = vin_split[9].to_s
+          year = VinValidator::Year.find_by(letter: vin_year)
+
+          possible_wmis = Array(simple_check[:make]).map { |gem_vin_wmi| { make: gem_vin_wmi.value } }
+
+          errors = []
+
+          if possible_wmis.empty?
+            errors = [
+              'The manufacturer is not a manufacturer of trucking equipment.',
+              'If they are, contact the site admin to add them as a manufacturer.'
+            ]
+          end
+
+          infos = []
+          check_types.each do |type, human_type|
+            next if simple_check.dig(type).nil?
+            next if simple_check.fetch(type).value.nil?
+            next if simple_check.fetch(type).value.empty?
+
+            infos << "NHTSA says #{human_type} is #{simple_check.fetch(type).value}"
+          end
+
+          [vin, {
+            valid: !year.nil? && !possible_wmis.nil?,
+            year: { letter: year.letter, year: year.year },
+            errors: errors,
+            wmi: possible_wmis.uniq { |wmi| wmi[:make] },
+            infos: infos
+          }]
+        end
+
+        results.to_h
+      end
+
       # Gathers/builds info for each vin provided
       #
       # @param vins [String, Array<String>]
@@ -15,8 +79,8 @@ module VinValidator
       #
       # @return [Hash]
       #
-      def vin_info(vins, hit_nhtsa = false, &block)
-        results = hit_nhtsa ? VinValidator::Api.vin_info(vins, &block) : {}
+      def vin_info(vins, hit_nhtsa = false)
+        results = hit_nhtsa ? VinValidator::Api.vin_info(vins) : {}
 
         Array(vins).map { |vin| [vin, build_results(vin, results.fetch(vin, {}))] }.to_h
       end

data/lib/vin_validator/maker.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
 module VinValidator
-  class Maker
+  class Maker < VinValidator::BaseModel
     class << self
-      # Loads all makers
-      #
-      # @return [Hash]
-      #
-      def all
-        return @all if defined?(@all)
-
-        all = JSON.parse(File.read(File.join(__dir__, 'makers.json')), { symbolize_names: true }).map do |id, v|
-          [id.to_s, new(**v)]
-        end
-
-        @all = all.to_h
-      end
-
       # Finds the maker with the given `id`
       #
       # @return [VinValidator::Maker]
@@ -24,6 +10,13 @@ module VinValidator
       def find(id)
         all.fetch(id.to_s)
       end
+
+      private
+
+        # @see super
+        def filename
+          'makers'
+        end
     end
 
     # @return [Integer]

data/lib/vin_validator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VinValidator
-  VERSION = '1.0.0-rc.4'
+  VERSION = '1.1.0-rc.1'
 end

data/lib/vin_validator/wmi.rb

@@ -1,22 +1,8 @@
 # frozen_string_literal: true
 
 module VinValidator
-  class Wmi
+  class Wmi < VinValidator::BaseModel
     class << self
-      # Loads all wmis
-      #
-      # @return [Hash]
-      #
-      def all
-        return @all if defined?(@all)
-
-        all = JSON.parse(File.read(File.join(__dir__, 'wmis.json')), { symbolize_names: true }).map do |id, v|
-          [id.to_s, new(**v)]
-        end
-
-        @all = all.to_h
-      end
-
       # Finds the wmi with the given `id`
       #
       # @return [VinValidator::Wmi]
@@ -32,6 +18,13 @@ module VinValidator
       def where(wmi:)
         all.values.select { |w| w.wmi == wmi }
       end
+
+      private
+
+        # @see super
+        def filename
+          'wmis'
+        end
     end
 
     # @return [Integer]

data/lib/vin_validator/year.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module VinValidator
+  class Year < VinValidator::BaseModel
+    class << self
+      # Finds the year with the given `letter`
+      #
+      # @return [VinValidator::Year]
+      #
+      def find_by(letter:)
+        all.dig(letter.to_s)
+      end
+
+      private
+
+        # @see super
+        def filename
+          'years'
+        end
+    end
+
+    # @return [Integer]
+    attr_accessor :id
+    # @return [Integer]
+    attr_accessor :year
+    # @return [String]
+    attr_accessor :letter
+
+    # :nodoc:
+    def initialize(id:, year:, letter:)
+      @id = id
+      @year = year
+      @letter = letter
+    end
+  end
+end

data/lib/vin_validator/years.json

@@ -0,0 +1,152 @@
+{
+  "1": {
+    "id": 1,
+    "letter": "1",
+    "year": "2001"
+  },
+  "2": {
+    "id": 2,
+    "letter": "2",
+    "year": "2002"
+  },
+  "3": {
+    "id": 3,
+    "letter": "3",
+    "year": "2003"
+  },
+  "4": {
+    "id": 4,
+    "letter": "4",
+    "year": "2004"
+  },
+  "5": {
+    "id": 5,
+    "letter": "5",
+    "year": "2005"
+  },
+  "6": {
+    "id": 6,
+    "letter": "6",
+    "year": "2006"
+  },
+  "7": {
+    "id": 7,
+    "letter": "7",
+    "year": "2007"
+  },
+  "8": {
+    "id": 8,
+    "letter": "8",
+    "year": "2008"
+  },
+  "9": {
+    "id": 9,
+    "letter": "9",
+    "year": "2009"
+  },
+  "A": {
+    "id": 10,
+    "letter": "A",
+    "year": "2010"
+  },
+  "B": {
+    "id": 11,
+    "letter": "B",
+    "year": "2011"
+  },
+  "C": {
+    "id": 12,
+    "letter": "C",
+    "year": "2012"
+  },
+  "D": {
+    "id": 13,
+    "letter": "D",
+    "year": "2013"
+  },
+  "E": {
+    "id": 14,
+    "letter": "E",
+    "year": "2014"
+  },
+  "F": {
+    "id": 15,
+    "letter": "F",
+    "year": "2015"
+  },
+  "G": {
+    "id": 16,
+    "letter": "G",
+    "year": "2016"
+  },
+  "H": {
+    "id": 17,
+    "letter": "H",
+    "year": "2017"
+  },
+  "J": {
+    "id": 18,
+    "letter": "J",
+    "year": "2018"
+  },
+  "K": {
+    "id": 19,
+    "letter": "K",
+    "year": "2019"
+  },
+  "L": {
+    "id": 20,
+    "letter": "L",
+    "year": "2020"
+  },
+  "M": {
+    "id": 21,
+    "letter": "M",
+    "year": "2021"
+  },
+  "N": {
+    "id": 22,
+    "letter": "N",
+    "year": "2022"
+  },
+  "P": {
+    "id": 23,
+    "letter": "P",
+    "year": "2023"
+  },
+  "R": {
+    "id": 24,
+    "letter": "R",
+    "year": "2024"
+  },
+  "S": {
+    "id": 25,
+    "letter": "S",
+    "year": "1995"
+  },
+  "T": {
+    "id": 26,
+    "letter": "T",
+    "year": "1996"
+  },
+  "V": {
+    "id": 27,
+    "letter": "V",
+    "year": "1997"
+  },
+  "W": {
+    "id": 28,
+    "letter": "W",
+    "year": "1998"
+  },
+  "X": {
+    "id": 29,
+    "letter": "X",
+    "year": "1999"
+  },
+  "Y": {
+    "id": 30,
+    "letter": "Y",
+    "year": "2000"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vin-validator
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.4
+  version: 1.1.0.pre.rc.1
 platform: ruby
 authors:
 - Brands Insurance
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubomatic
@@ -36,6 +36,7 @@ files:
 - README.adoc
 - lib/vin-validator.rb
 - lib/vin_validator/api.rb
+- lib/vin_validator/base_model.rb
 - lib/vin_validator/knowledge.rb
 - lib/vin_validator/maker.rb
 - lib/vin_validator/makers.json
@@ -43,6 +44,8 @@ files:
 - lib/vin_validator/version.rb
 - lib/vin_validator/wmi.rb
 - lib/vin_validator/wmis.json
+- lib/vin_validator/year.rb
+- lib/vin_validator/years.json
 homepage: https://github.com/BrandsInsurance/vin-validator/
 licenses:
 - MIT