vindetta 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431f60cb9e88b478d17ac6364e430add13aae1aa
-  data.tar.gz: 744ed0e12ac60ca9d2ec5f099120a82b1c702c2d
+  metadata.gz: ad6e970871eb591e0f430b78fe2940201dedd0e7
+  data.tar.gz: 38c7548b9a5a98507205f998176db995f659aa35
 SHA512:
-  metadata.gz: be530f83c70f9d5ca9626596e0b01ee2760da8981fc9ea2a2d0ecd02ab462c3615c01fa87497dc886a5d2ea5b6f1e5823cf05419305fcf9999adb377e2f13e36
-  data.tar.gz: 824a3482af1ace05096c5742f8266c46323fb62911230acc79268b829b29e31325ead79b8a92825027c95edb66eed5e86e8c2cff2127cc519a9d61678985dde0
+  metadata.gz: d29396ef25dfea7edde00fecfe8ea48f0497f0ddb9a041da5bab0f24df4213c1b1f68fe1133c8250b8002f3fea269afd30f604959584f79009337c477c7b792e
+  data.tar.gz: 96872e1404a6ec1d0863cb0ba5d2e5966db0dde38e4b837274829fc74a14f232a862ca4a35caf87b9f307abf2d93d1637b8f5d63f70ee986438b5fd35da7a647

data/exe/vindetta

@@ -2,4 +2,4 @@
 
 require "vindetta"
 
-Vindetta::CLI.run(ARGV)
+exit Vindetta::CLI.run(ARGV)

data/lib/vindetta/cli.rb

@@ -13,7 +13,7 @@ module Vindetta
     version Vindetta::VERSION
 
     desc "Validates a VIN"
-
+    
     command %i[validate v] do |c|
       c.action do |_global, _options, args|
         vin = args.first

data/lib/vindetta/decoder.rb

@@ -1,5 +1,9 @@
 module Vindetta
   class Decoder
+    BASE_MODEL_YEAR = 1980
+    ALPHA = ('A'..'Z').to_a
+    NUMERIC = ("0".."9").to_a
+
     def self.vin(vin)
       {
         :plant_code => vin[PLANT_CODE_INDEX],
@@ -13,16 +17,12 @@ module Vindetta
     private
 
     def self.model_year(vin)
-      @years ||= YAML.load_file(File.expand_path("../data/vis.yaml", __FILE__))["year"]
-      @alpha ||= "ABCDEFGHJKLMNPRSTUVWXYZ".chars
-
-      tenth = vin[9]
-      seventh = vin[6]
+      index = ((ALPHA - %w[I O Q U Z]) + (NUMERIC - %w[0])).find_index { |c| c == vin[9] }
 
-      if @alpha.include?(seventh)
-        @years[tenth].last
+      if ALPHA.include?(vin[6])
+        BASE_MODEL_YEAR + index + 30
       else
-        @years[tenth].first
+        BASE_MODEL_YEAR + index
       end
     end
   end

data/lib/vindetta/generator.rb

@@ -21,8 +21,8 @@ module Vindetta
 
     def self.vis(_options = {})
       [
-        VIS_CHARACTERS.sample(VIS_LENGTH - 1),
-        MODEL_YEAR_CHARACTERS.sample
+        MODEL_YEAR_CHARACTERS.sample,
+        VIS_CHARACTERS.sample(VIS_LENGTH - 1)
       ].flatten.join("")
     end
   end

data/lib/vindetta/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vindetta
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -161,7 +161,6 @@ files:
 - lib/vindetta.rb
 - lib/vindetta/calculator.rb
 - lib/vindetta/cli.rb
-- lib/vindetta/data/vis.yaml
 - lib/vindetta/data/wmi.yaml
 - lib/vindetta/decoder.rb
 - lib/vindetta/generator.rb

data/lib/vindetta/data/vis.yaml

@@ -1,93 +0,0 @@
----
-
-year:
-  A:
-    - 1980
-    - 2010
-  B:
-    - 1981
-    - 2011
-  C:
-    - 1982
-    - 2012
-  D:
-    - 1983
-    - 2013
-  E:
-    - 1984
-    - 2014
-  F:
-    - 1985
-    - 2015
-  G:
-    - 1986
-    - 2016
-  H:
-    - 1987
-    - 2017
-  J:
-    - 1988
-    - 2018
-  K:
-    - 1989
-    - 2019
-  L:
-    - 1990
-    - 2020
-  M:
-    - 1991
-    - 2021
-  N:
-    - 1992
-    - 2022
-  P:
-    - 1993
-    - 2023
-  R:
-    - 1994
-    - 2024
-  S:
-    - 1995
-    - 2025
-  T:
-    - 1996
-    - 2026
-  V:
-    - 1997
-    - 2027
-  W:
-    - 1998
-    - 2028
-  X:
-    - 1999
-    - 2029
-  Y:
-    - 2000
-    - 2030
-  "1":
-    - 2001
-    - 2031
-  "2":
-    - 2002
-    - 2032
-  "3":
-    - 2003
-    - 2033
-  "4":
-    - 2004
-    - 2034
-  "5":
-    - 2005
-    - 2035
-  "6":
-    - 2006
-    - 2036
-  "7":
-    - 2007
-    - 2037
-  "8":
-    - 2008
-    - 2038
-  "9":
-    - 2009
-    - 2039