vindetta 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6e970871eb591e0f430b78fe2940201dedd0e7
-  data.tar.gz: 38c7548b9a5a98507205f998176db995f659aa35
+  metadata.gz: 3dbbe61deb1b5f0e99e9008cf72c6245fd4dbd0c
+  data.tar.gz: fcd8b4049b037d0f9b6d3014982ebe5f6be94b10
 SHA512:
-  metadata.gz: d29396ef25dfea7edde00fecfe8ea48f0497f0ddb9a041da5bab0f24df4213c1b1f68fe1133c8250b8002f3fea269afd30f604959584f79009337c477c7b792e
-  data.tar.gz: 96872e1404a6ec1d0863cb0ba5d2e5966db0dde38e4b837274829fc74a14f232a862ca4a35caf87b9f307abf2d93d1637b8f5d63f70ee986438b5fd35da7a647
+  metadata.gz: fed19a59cae3e7a4ccafbeeac0b723efc82671ddef1b391a9d80af0d2ed5d03578ee4a27a6dad7200b3cd2b9cd9c2820e927037174dc859aae1db62703a75244
+  data.tar.gz: 64b175741142d7f8f1ff645fab7e573a4677e777cce29731585e69a69b2c687f7a670491e689acd2cf5e2c1793eb922ba557b232537bf4ced7ecbd0c0e1d7b7f

data/lib/vindetta.rb

@@ -2,20 +2,14 @@ require "vindetta/calculator"
 require "vindetta/cli"
 require "vindetta/decoder"
 require "vindetta/generator"
+require "vindetta/standard"
 require "vindetta/validator"
 require "vindetta/version"
 
 module Vindetta
-  VIN_LENGTH = 17
-  WMI_LENGTH = 3
-  VDS_LENGTH = 6
-  VIS_LENGTH = 8
-
   CHECK_DIGIT_INDEX = 8
   PLANT_CODE_INDEX = 10
 
-  WMI_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
-  VDS_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
   VIS_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
   MODEL_YEAR_CHARACTERS = VIS_CHARACTERS - "UZ".chars
 

data/lib/vindetta/cli.rb

@@ -13,14 +13,17 @@ module Vindetta
     version Vindetta::VERSION
 
     desc "Validates a VIN"
-    
+
     command %i[validate v] do |c|
       c.action do |_global, _options, args|
         vin = args.first
 
         exit_now!(I18n.t("required"), 1) if vin.nil?
 
-        puts Vindetta::Validator.vin(vin)
+        standard = Vindetta::Standard::ISO3779
+        validator = Vindetta::Validator.new(standard)
+
+        puts validator.vin(vin)
       end
     end
 
@@ -32,7 +35,10 @@ module Vindetta
 
         exit_now!(I18n.t("required"), 1) if vin.nil?
 
-        puts Vindetta::Decoder.vin(vin)
+        standard = Vindetta::Standard::ISO3779
+        decoder = Vindetta::Decoder.new(standard)
+
+        puts decoder.vin(vin)
       end
     end
 
@@ -40,7 +46,10 @@ module Vindetta
 
     command %i[generate g] do |c|
       c.action do |_global, _options, _args|
-        puts Vindetta::Generator.vin
+        standard = Vindetta::Standard::ISO3779
+        generator = Vindetta::Generator.new(standard)
+
+        puts generator.vin
       end
     end
   end

data/lib/vindetta/decoder.rb

@@ -4,8 +4,12 @@ module Vindetta
     ALPHA = ('A'..'Z').to_a
     NUMERIC = ("0".."9").to_a
 
-    def self.vin(vin)
-      {
+    def initialize(standard)
+      @standard = standard
+    end
+
+    def vin(vin)
+       {
         :plant_code => vin[PLANT_CODE_INDEX],
         :wmi => vin[WMI_RANGE],
         :check_digit => vin[CHECK_DIGIT_INDEX],
@@ -16,7 +20,7 @@ module Vindetta
 
     private
 
-    def self.model_year(vin)
+    def model_year(vin)
       index = ((ALPHA - %w[I O Q U Z]) + (NUMERIC - %w[0])).find_index { |c| c == vin[9] }
 
       if ALPHA.include?(vin[6])

data/lib/vindetta/generator.rb

@@ -1,29 +1,36 @@
 module Vindetta
   class Generator
-    def self.vin(options = {})
+    attr_reader :standard
+
+    def initialize(standard)
+      @standard = standard
+    end
+
+    def vin(options = {})
       "#{wmi}#{vds}#{vis}".tap do |vin|
         vin[CHECK_DIGIT_INDEX] = Calculator.check_digit(vin)
       end
     end
 
-    def self.wmi(_options = {})
+    def wmi(_options = {})
       @wmis ||= begin
         path = File.expand_path("../data/wmi.yaml", __FILE__)
         YAML.load_file(path)["wmi"].keys
       end
 
-      "#{@wmis.sample}".rjust(WMI_LENGTH, "9")
+      "#{@wmis.sample}".rjust(standard.wmi.length, "9")
     end
 
-    def self.vds(_options = {})
-      VDS_CHARACTERS.sample(VDS_LENGTH).join("")
+    def vds(_options = {})
+      characters = standard.vds.map(&:characters)
+
+      characters.map(&:sample).join
     end
 
-    def self.vis(_options = {})
-      [
-        MODEL_YEAR_CHARACTERS.sample,
-        VIS_CHARACTERS.sample(VIS_LENGTH - 1)
-      ].flatten.join("")
+    def vis(_options = {})
+      characters = standard.vis.map(&:characters)
+
+      characters.map(&:sample).join
     end
   end
 end

data/lib/vindetta/standard.rb

@@ -0,0 +1,6 @@
+require 'vindetta/standard/iso3779'
+
+module Vindetta
+  module Standard
+  end
+end

data/lib/vindetta/standard/iso3779.rb

@@ -0,0 +1,65 @@
+module Vindetta
+  module Standard
+    class ISO3779
+      LENGTH = 17
+
+      def self.wmi
+        OpenStruct.new(
+          :length => 3
+        )
+      end
+
+      def self.vds
+        @vds ||= [
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          }),
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          }),
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          }),
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          }),
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          }),
+          OpenStruct.new({
+            :characters => "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
+          })
+        ]
+      end
+
+      def self.vis
+        @vis ||= [
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "V", "W", "X", "Y"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          }),
+          OpenStruct.new({
+            :characters => ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+          })
+        ]
+      end
+    end
+  end
+end

data/lib/vindetta/validator.rb

@@ -1,27 +1,33 @@
 module Vindetta
   class Validator
-    def self.vin(vin)
-      return false unless vin.length == Vindetta::VIN_LENGTH
+    attr_reader :standard
 
-      Calculator.check_digit(vin) == Decoder.vin(vin)[:check_digit]
+    def initialize(standard)
+      @standard = standard
+    end
+
+    def vin(vin)
+      return false unless vin.length == standard::LENGTH
+
+      Calculator.check_digit(vin) == Decoder.new(Vindetta::Standard::ISO3779).vin(vin)[:check_digit]
     rescue Calculator::InvalidCharacterError
         false
     end
 
-    def self.wmi(wmi)
-      return false unless wmi.length == Vindetta::WMI_LENGTH
+    def wmi(wmi)
+      return false unless wmi.length == standard.wmi.length
 
       true
     end
 
-    def self.vds(vds)
-      return false unless vds.length == Vindetta::VDS_LENGTH
+    def vds(vds)
+      return false unless vds.length == standard.vds.length
 
       true
     end
 
-    def self.vis(vis)
-      return false unless vis.length == Vindetta::VIS_LENGTH
+    def vis(vis)
+      return false unless vis.length == standard.vis.length
 
       true
     end

data/lib/vindetta/version.rb

@@ -1,3 +1,3 @@
 module Vindetta
-  VERSION = "0.24.0".freeze
+  VERSION = "0.25.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vindetta
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -165,6 +165,8 @@ files:
 - lib/vindetta/decoder.rb
 - lib/vindetta/generator.rb
 - lib/vindetta/locale/en.yml
+- lib/vindetta/standard.rb
+- lib/vindetta/standard/iso3779.rb
 - lib/vindetta/validator.rb
 - lib/vindetta/version.rb
 - vindetta.gemspec