vindetta 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f38d44cf4f767c61e1075d998785e2b3db2b24
-  data.tar.gz: 5e5a641a4794a50b8189d6c735a07e0f3a8853bb
+  metadata.gz: dc052c66bde259587a11d28f3b5639872d5e1dc1
+  data.tar.gz: 52340e3f20255fe4aee6533b6f30038ef970b6b9
 SHA512:
-  metadata.gz: 1893fdec6e3f16ada0960216a114a292088bfaa125e1b2cc9887ab46ae822eb3d3564d84e48a21f75e51bb5545aee80c48f0de49f3259d25714c200cfe906c79
-  data.tar.gz: 0d110c315e1ec7fcece6031acd4f9c964567e05b2069db0ca81a944eb33106153135a1da77ce74d3a782c8a54a1bd586fc43a20f2cd4ce7c95e13a2260c6dcea
+  metadata.gz: 14306fe4f6bfd2dade7f8e922953336d3fe809908d02fdeb52207b3f476122653197d549d3899d7d63282a083fdbf87a234435ddb2aaaf0b232d0515b6eaf228
+  data.tar.gz: 9bb861898cb7ba53e2642712c07cc466ce14e91271f99797b6b3665de0fd840adea5b947faaf9d47586a7db5b40cd5925cb4b4976052e78f2deb88b17044e110

data/lib/vindetta.rb

@@ -5,6 +5,7 @@ require "vindetta/transliterator"
 require "vindetta/validator"
 require "vindetta/api"
 require "vindetta/decoder"
+require "vindetta/calculator"
 require "vindetta/version"
 
 module Vindetta

data/lib/vindetta/calculator.rb

@@ -0,0 +1,15 @@
+module Vindetta
+  class Calculator
+    MAP = %w(0 1 2 3 4 5 6 7 8 9 X)
+    WEIGHTS = [8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2]
+
+    def self.check_digit(vin)
+      sum = Transliterator
+        .vin(vin)
+        .zip(WEIGHTS)
+        .reduce(0) {|sum, (a, b)| sum + (a * b) }
+
+      MAP[sum % 11]
+    end
+  end
+end

data/lib/vindetta/decoder.rb

@@ -4,6 +4,8 @@ require "json"
 
 module Vindetta
   class Decoder
+    CHECK_DIGIT_INDEX = 8
+
     def self.vin(vin)
       Result.new(Api.get(vin)["Results"])
     end
@@ -13,7 +15,7 @@ module Vindetta
     end
 
     def self.check_digit(vin)
-      vin[8]
+      vin[CHECK_DIGIT_INDEX]
     end
 
     def self.wmi(vin)
@@ -24,7 +26,7 @@ module Vindetta
       defaults = { :check_digit => true }
       options = defaults.merge(options)
 
-      vin[3..8].tap do |vds|
+      vin[3..CHECK_DIGIT_INDEX].tap do |vds|
         vds.chop! unless options[:check_digit]
       end
     end

data/lib/vindetta/transliterator.rb

@@ -2,6 +2,10 @@ module Vindetta
   class Transliterator
     MAPPING = "0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ".split("").freeze
 
+    def self.vin(vin)
+      vin.chars.map { |c| run(c) }
+    end
+
     def self.run(character)
       index = MAPPING.find_index(character)
       raise Vindetta::InvalidCharacter, character unless index

data/lib/vindetta/validator.rb

@@ -1,25 +1,15 @@
 module Vindetta
   class Validator
-    LENGTH = 17
-    MAP = "0123456789X".chars
-    WEIGHTS = "8765432X98765432".chars
-
     def self.vin(vin)
-      return false unless vin.length == LENGTH
+      length(vin) && check_digit(vin)
+    end
 
-      check_digit(vin) == Decoder.check_digit(vin)
+    def self.length(vin)
+      vin.length == 17
     end
 
     def self.check_digit(vin)
-      wmi = Decoder.wmi(vin).chars
-      vds = Decoder.vds(vin, :check_digit => false).chars
-      vis = Decoder.vis(vin).chars
-
-      calculated = [wmi, vds, vis].flatten.map.with_index do |c, i|
-        Transliterator::run(c) * MAP.find_index(WEIGHTS[i])
-      end.sum
-
-      MAP[calculated % 11]
+      Calculator.check_digit(vin) == Decoder.check_digit(vin)
     end
   end
 end

data/lib/vindetta/version.rb

@@ -1,3 +1,3 @@
 module Vindetta
-  VERSION = "0.17.0".freeze
+  VERSION = "0.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vindetta
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -200,6 +200,7 @@ files:
 - exe/vindetta
 - lib/vindetta.rb
 - lib/vindetta/api.rb
+- lib/vindetta/calculator.rb
 - lib/vindetta/cli.rb
 - lib/vindetta/data/vis.yaml
 - lib/vindetta/data/wmi.yaml