vindetta 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0a0382f394eb885e1ef31017cb92a1176ff84d
-  data.tar.gz: abdb80414aab149e380217fae57357c89a99579c
+  metadata.gz: c8dfed0d7c7a0c406c59017a6468cfa8e313a114
+  data.tar.gz: 3976fb86a2f0f0d1da131afc050b8a194569c808
 SHA512:
-  metadata.gz: 67d06d280c0d2f201b124a1923911154f48e8441487340a7e0a47a8553a4713823b4bdd5a7f3f091b555d8e7cc1766a0ad8ec206fefd0dc9c4b3f1b5f78f943b
-  data.tar.gz: 96dae041eadc8982a620a1766d7b5d370b4f289167c4ef8cd9f47da29465edc3be525d3241faf38284d58ad49ad61a9103ee7f1b6032f53621dc8e26af083373
+  metadata.gz: 861597ee5333726eb83c2486b4b8586d186f5c4b2529945cbd4cdeae49fd1e6b2f24cc0ea5a2a58ad1bf770a7e725ad29c7024e92fd4e8ef5e2670c43f684f0b
+  data.tar.gz: '082362eb73ac1ebe451d5c2dc12f2edd22b2903523f9cb49f92b0c00aa47cc1cbb2e6a99f9b6734db2fee48221f26f6486cd8714689319c1d5b5ac5594cd0856'

data/.travis.yml

@@ -2,4 +2,4 @@ sudo: false
 language: ruby
 rvm:
   - 2.4.1
-before_install: gem install bundler -v 1.14.6
+before_install: gem install bundler -v 1.16.1

data/lib/vindetta/calculator.rb

@@ -1,19 +1,21 @@
 module Vindetta
   class Calculator
-    CHECK_DIGITS = "0123456789X".chars
-    WEIGHTS = [8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2]
-
     def self.check_digit(vin)
-      CHECK_DIGITS[sum(vin) % CHECK_DIGITS.length]
-    end
+      transliterator = -> (c) do
+        "0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ".chars.index(c) % 10
+      end
+
+      summer = -> (sum, (a, b)) do
+        sum + (a * b)
+      end
 
-    private
+      sum = vin
+        .chars
+        .map(&transliterator)
+        .zip([8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2])
+        .reduce(0, &summer)
 
-    def self.sum(vin)
-      Transliterator
-        .vin(vin)
-        .zip(WEIGHTS)
-        .reduce(0) { |sum, (a, b)| sum + (a * b) }
+      "0123456789X"[sum % 11]
     end
   end
 end

data/lib/vindetta/cli.rb

@@ -32,7 +32,7 @@ module Vindetta
 
         exit_now!(I18n.t("required"), 1) if vin.nil?
 
-        puts Vindetta::Decoder.vin(vin).to_json
+        puts Vindetta::Decoder.vin(vin)
       end
     end
 

data/lib/vindetta/data/wmi.yaml

@@ -197,7 +197,8 @@ wmi:
   VF6: Renault (Trucks & Buses)
   VF7: Citroën
   VF8: Matra
-  VF9/795: Bugatti
+  VF9: Bugatti
+  795: Bugatti
   VG5: MBK (motorcycles)
   VLU: Scania France
   VN1: SOVAB (France)
@@ -251,7 +252,8 @@ wmi:
   XLB: Volvo (NedCar)
   XLE: Scania Netherlands
   XLR: DAF (trucks)
-  XL9/363: Spyker
+  XL9: Spyker
+  363: Spyker
   XMC: Mitsubishi (NedCar)
   XTA: Lada/AvtoVAZ (Russia)
   XTC: KAMAZ (Russia)
@@ -277,8 +279,10 @@ wmi:
   YS3: Saab
   YS4: Scania Bus
   YTN: Saab NEVS
-  YT9/007: Koenigsegg
-  YT9/034: Carvia
+  YT9: Koenigsegg
+  007: Koenigsegg
+  YT9: Carvia
+  034: Carvia
   YU7: Husaberg (motorcycles)
   YV1: Volvo Cars
   YV4: Volvo Cars

data/lib/vindetta/decoder.rb

@@ -1,46 +1,12 @@
-require "vindetta/decoder/result"
-require "net/http"
-require "json"
-
 module Vindetta
   class Decoder
-    CHECK_DIGIT_INDEX = 8
-
     def self.vin(vin)
-      Result.new(Api.decode(vin)["Results"])
-    end
-
-    def self.plant_code(vin)
-      vin[10]
-    end
-
-    def self.check_digit(vin)
-      vin[CHECK_DIGIT_INDEX]
-    end
-
-    def self.wmi(vin)
-      vin[0..2]
-    end
-
-    def self.vds(vin, options = {})
-      defaults = { check_digit: true }
-      options = defaults.merge(options)
-
-      vin[3..CHECK_DIGIT_INDEX].tap do |vds|
-        vds.chop! unless options[:check_digit]
-      end
-    end
-
-    def self.year(vin)
-      vin(vin).year
-    end
-
-    def self.vis(vin)
-      vin[9..16]
-    end
-
-    def self.production_number(vin)
-      vin[11..16]
+      {
+        :plant_code => vin[PLANT_CODE_INDEX],
+        :wmi => vin[WMI_RANGE],
+        :check_digit => vin[CHECK_DIGIT_INDEX],
+        :production_number => vin[PRODUCTION_NUMBER_RANGE]
+      }
     end
   end
 end

data/lib/vindetta/generator.rb

@@ -1,33 +1,29 @@
 module Vindetta
   class Generator
-    WMI_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
-    VDS_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
-    VIS_CHARACTERS = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ".chars
-
     def self.vin(options = {})
       "#{wmi}#{vds}#{vis}".tap do |vin|
-        vin[8] = Calculator.check_digit(vin)
+        vin[CHECK_DIGIT_INDEX] = Calculator.check_digit(vin)
       end
     end
 
     def self.wmi(_options = {})
-      WMI_CHARACTERS.sample(3).join("")
+      @wmis ||= begin
+        path = File.expand_path("../data/wmi.yaml", __FILE__)
+        YAML.load_file(path)["wmi"].keys
+      end
+
+      @wmis.sample.rjust(WMI_LENGTH, "9")
     end
 
     def self.vds(_options = {})
-      VDS_CHARACTERS.sample(6).join("")
+      VDS_CHARACTERS.sample(VDS_LENGTH).join("")
     end
 
-    ##
-    # One consistent element of the VIS is the 10th digit,
-    # which is required worldwide to encode the model year of
-    # the vehicle. Besides the three letters that are not
-    # allowed in the VIN itself (I, O and Q), the letters U
-    # and Z and the digit 0 are not used for the model year
-    # code. The year code is the model year for the vehicle.
-    #
     def self.vis(_options = {})
-      VIS_CHARACTERS.sample(8).join("")
+      [
+        VIS_CHARACTERS.sample(VIS_LENGTH - 1),
+        MODEL_YEAR_CHARACTERS.sample
+      ].flatten.join("")
     end
   end
 end

data/lib/vindetta/validator.rb

@@ -3,11 +3,13 @@ module Vindetta
     def self.vin(vin)
       return false unless vin.length == Vindetta::VIN_LENGTH
 
-      Calculator.check_digit(vin) == Decoder.check_digit(vin)
+      Calculator.check_digit(vin) == Decoder.vin(vin)[:check_digit]
     end
 
     def self.wmi(wmi)
       return false unless wmi.length == Vindetta::WMI_LENGTH
+
+      true
     end
 
     def self.vds(vds)

data/lib/vindetta/version.rb

@@ -1,3 +1,3 @@
 module Vindetta
-  VERSION = "0.19.0".freeze
+  VERSION = "0.20.0".freeze
 end

data/lib/vindetta.rb

@@ -1,11 +1,8 @@
+require "vindetta/calculator"
 require "vindetta/cli"
-require "vindetta/errors"
+require "vindetta/decoder"
 require "vindetta/generator"
-require "vindetta/transliterator"
 require "vindetta/validator"
-require "vindetta/api"
-require "vindetta/decoder"
-require "vindetta/calculator"
 require "vindetta/version"
 
 module Vindetta
@@ -13,4 +10,17 @@ module Vindetta
   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
+
+  WMI_RANGE = 0..2
+  VDS_RANGE = 3..CHECK_DIGIT_INDEX
+  PRODUCTION_NUMBER_RANGE = 11..16
+  VIS_RANGE = 9..16
 end

data/vindetta.gemspec

@@ -24,12 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "i18n", "~> 0.9.1"
 
   spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "factory_bot", "~> 4.8.2"
   spec.add_development_dependency "guard-rspec", "~> 4.7.3"
+  spec.add_development_dependency "pry", "~> 0.11.3"
   spec.add_development_dependency "rake", "~> 12.3.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 0.49"
   spec.add_development_dependency "simplecov", "~> 0.15.1"
-  spec.add_development_dependency "vcr", "~> 4.0.0"
-  spec.add_development_dependency "webmock", "~> 3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vindetta
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.1
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.1
 description: Ruby gem for generating VINs
 email:
 - kyle@joinroot.com
@@ -185,23 +157,15 @@ files:
 - bin/setup
 - 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
 - lib/vindetta/decoder.rb
-- lib/vindetta/decoder/dsl.rb
-- lib/vindetta/decoder/result.rb
-- lib/vindetta/errors.rb
 - lib/vindetta/generator.rb
 - lib/vindetta/locale/en.yml
-- lib/vindetta/transliterator.rb
 - lib/vindetta/validator.rb
 - lib/vindetta/version.rb
-- lib/vindetta/vin/vds.rb
-- lib/vindetta/vin/vis.rb
-- lib/vindetta/vin/wmi.rb
 - vindetta.gemspec
 homepage: https://github.com/kyledecot/vindetta
 licenses:

data/lib/vindetta/api.rb

@@ -1,24 +0,0 @@
-require "net/http"
-require "json"
-
-module Vindetta
-  class Api
-    def self.decode(vin)
-      uri = URI("https://vpic.nhtsa.dot.gov/api/vehicles/decodevin/#{vin}?format=json")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request = Net::HTTP::Get.new(uri.request_uri)
-      response = http.request(request)
-
-      parse(http.request(request))
-    end
-
-    private
-
-    def self.parse(response)
-      JSON.parse(response.body)
-    end
-  end
-end

data/lib/vindetta/decoder/dsl.rb

@@ -1,34 +0,0 @@
-module Vindetta
-  class Decoder
-    module DSL
-      def decoded_attributes
-        @decoded_attributes ||= []
-      end
-
-      def has_value(name, variable_id, options = {})
-        decoded_attributes << name
-
-        define_method name do
-          value = value_for(variable_id)
-
-          case options[:type]
-          when :int then value&.to_i
-          else
-            value
-          end
-        end
-      end
-
-      def self.extended(mod)
-        mod.instance_eval do
-          define_method :value_for do |variable_id|
-            result = @variables.find { |r| r["VariableId"] == variable_id }
-            return unless result
-
-            result["Value"]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vindetta/decoder/result.rb

@@ -1,38 +0,0 @@
-require "vindetta/decoder/dsl"
-
-module Vindetta
-  class Decoder
-    class Result
-      extend Vindetta::Decoder::DSL
-
-      has_value :make, 26
-      has_value :model, 28
-      has_value :year, 29, type: :int
-      has_value :number_of_doors, 14, type: :int
-      has_value :number_of_windows, 40, type: :int
-      has_value :seat_belts_type, 79
-      has_value :manufacturer_name, 27
-      has_value :vehicle_type, 39
-      has_value :plant_city, 31
-      has_value :body_class, 5
-      has_value :primary_fuel_type, 24
-      has_value :engine_configuration, 64
-      has_value :manufacturer_id, 157, type: :int
-      has_value :primary_fuel_type, 24
-
-      def initialize(variables)
-        @variables = variables
-      end
-
-      def inspect
-        "#<Vindetta::Decoder::Response:#{format('0x00%x', (object_id << 1))}>"
-      end
-
-      def to_json
-        self.class.decoded_attributes.map do |a|
-          [a, send(a)]
-        end.to_h
-      end
-    end
-  end
-end

data/lib/vindetta/errors.rb

@@ -1,7 +0,0 @@
-module Vindetta
-  class InvalidCharacter < StandardError
-  end
-
-  class InvalidVin < StandardError
-  end
-end

data/lib/vindetta/transliterator.rb

@@ -1,17 +0,0 @@
-module Vindetta
-  class Transliterator
-    MAPPING = "0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ".chars
-
-    def self.vin(vin)
-      vin.chars.map do |c|
-        index = MAPPING.find_index(c)
-        raise Vindetta::InvalidCharacter, c unless index
-        index % 10
-      end
-    end
-
-    def self.run(character)
-      vin(character.to_s)[0]
-    end
-  end
-end

data/lib/vindetta/vin/vds.rb

@@ -1,21 +0,0 @@
-module Vindetta
-  class Vin
-    class Vds
-      attr_reader :value
-
-      def initialize(vin)
-        @vin = vin
-      end
-
-      def value
-        @vin[3..7].join("")
-      end
-
-      alias eql? ==
-
-      def ==(other)
-        self.class == other.class && value == other.value
-      end
-    end
-  end
-end

data/lib/vindetta/vin/vis.rb

@@ -1,47 +0,0 @@
-module Vindetta
-  class Vin
-    class Vis
-      DATA_PATH = File.expand_path("../../data/vis.yaml", __FILE__)
-
-      attr_reader :value
-
-      def initialize(vin)
-        @vin = vin
-      end
-
-      alias eql? ==
-
-      def ==(other)
-        self.class == other.class && value == other.value
-      end
-
-      def seventh
-        @vin[6]
-      end
-
-      def value
-        @vin[9..16].join("")
-      end
-
-      def year
-        @year ||= begin
-          years = self.class.data.dig("year", value[0])
-
-          # TODO: Replace this w/ a constant of alpha characters and check against that
-          begin
-            Integer(seventh)
-            years[0]
-          rescue ArgumentError
-            years[1]
-          end
-        end
-      end
-
-      private
-
-      def self.data
-        @data ||= YAML.load_file(DATA_PATH).stringify_keys
-      end
-    end
-  end
-end

data/lib/vindetta/vin/wmi.rb

@@ -1,39 +0,0 @@
-module Vindetta
-  class Vin
-    class Wmi
-      DATA_PATH = File.expand_path("../../data/wmi.yaml", __FILE__)
-
-      def initialize(vin)
-        @vin = vin
-      end
-
-      def name
-        @name ||= self.class.data["wmi"][value]
-      end
-
-      alias eql? ==
-
-      def value
-        @vin[0..2].join("")
-      end
-
-      def region
-        @name ||= begin
-          regions = self.class.data["region"] # TODO: Pull this out into private method
-
-          regions.detect do |key, characters_for_region|
-            break key if characters_for_region.include?(value[0])
-          end
-        end
-      end
-
-      def ==(other)
-        self.class == other.class && value == other.value
-      end
-
-      def self.data
-        @data ||= YAML.load_file(DATA_PATH)
-      end
-    end
-  end
-end