vindetta 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3900e8e738013d538a9ad3640ed2fce1d2dd0d4
-  data.tar.gz: fa7efc3df758cf3dc570db2d96866f47b606f14c
+  metadata.gz: 8c49fca14fbaabb7d61f5ec8a1407c9d58d49a08
+  data.tar.gz: fd70297a6f888678684f4ff4fb740695385badee
 SHA512:
-  metadata.gz: 5a5040aa6110a0c377317820296587847c2f681af4b530038f1f196cfc9f612e74f6c7a558fc932df0fc20c9e22a972d7549efb96179cdd13041185b178f2746
-  data.tar.gz: bac8e88bfc0e74ccd1f52e4909e3f356b684c45ab3f828f603f6567b7913559f5230510bff1fe48a70d490f056a0755e4408f806edab3e31b153e1088b7a47db
+  metadata.gz: ec71fe44e68b55b824c9b39de7d169eddc3394367c17e5d2e4c05c89f9bda71121281c1059c53b62650b06c44bafa9f3849c5590a1027a9815db34d7db4e8359
+  data.tar.gz: c117237631e813aedda91bbb9a13ea8d95b36e331ca889af12d8d4a7fc9cfa07ae8f560f6b0a3541c1602ee8eca26e3217574d2ec2c1dd13f0c1252a1948f483

data/lib/vindetta/api.rb

@@ -0,0 +1,24 @@
+require "net/http"
+require "json"
+
+module Vindetta
+  class Api
+    def self.get(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/cli.rb

@@ -30,9 +30,7 @@ module Vindetta
 
         exit_now!(I18n.t("required"), 1) if vin.nil?
 
-        valid = Vindetta::Validator.run(vin)
-
-        puts valid ? 1 : 0
+        puts Vindetta::Validator.run(vin)
       end
     end
 

data/lib/vindetta/decoder.rb

@@ -1,13 +1,31 @@
-require "httparty"
 require "vindetta/decoder/result"
+require "net/http"
+require "json"
 
 module Vindetta
   class Decoder
     def self.decode_vin(vin)
-      result = HTTParty.get("https://vpic.nhtsa.dot.gov/api/vehicles/decodevin/#{vin}?format=json")
-      json = JSON.parse(result.body)
+      Result.new(Api.get(vin)["Results"])
+    end
+
+    def self.plant_code(vin)
+      vin[10]
+    end
+
+    def self.check_digit(vin)
+      vin[8]
+    end
+
+    def self.wmi(vin)
+      vin[0..2]
+    end
+
+    def self.vds(vin)
+      vin[3..7]
+    end
 
-      Result.new(json["Results"])
+    def self.year(vin)
+      decode_vin(vin).year
     end
   end
 end

data/lib/vindetta/locale/en.yml

@@ -1,3 +1,4 @@
 en:
   required: "vin is required"
   invalid_length: "Invalid Length"
+  invalid_check_digit: "Invalid Check Digit"

data/lib/vindetta/validator.rb

@@ -1,17 +1,23 @@
-require "active_model"
-
 module Vindetta
-  class Validator < ActiveModel::Validator
+  class Validator
     LENGTH = 17
+    CHECK_DIGIT_INDEX = 8
+    MAP = "0123456789X".chars
+    WEIGHTS = "8765432X098765432".chars
 
     def self.run(value)
-      Vin.new(value).valid?
+      return false unless value.length == LENGTH
+
+      check_digit(value) == value[CHECK_DIGIT_INDEX]
     end
 
-    def validate(record)
-      record.errors.add(:value, I18n.t("invalid_length")) if record.value.length != LENGTH
+    def self.check_digit(value)
+      check_digit = value.chars[8]
+      calculated = value.chars.map.with_index do |c, i|
+        Transliterator::run(c) * MAP.find_index(WEIGHTS[i])
+      end.sum
 
-      # TODO: Check format
+      MAP[calculated % 11]
     end
   end
 end

data/lib/vindetta/version.rb

@@ -1,3 +1,3 @@
 module Vindetta
-  VERSION = "0.15.0".freeze
+  VERSION = "0.16.0".freeze
 end

data/lib/vindetta.rb

@@ -3,12 +3,9 @@ require "vindetta/errors"
 require "vindetta/generator"
 require "vindetta/transliterator"
 require "vindetta/validator"
+require "vindetta/api"
 require "vindetta/decoder"
 require "vindetta/version"
-require "vindetta/vin"
-require "vindetta/vin/wmi"
-require "vindetta/vin/vds"
-require "vindetta/vin/vis"
 
 module Vindetta
   def self.generate(options = {})

data/vindetta.gemspec

@@ -22,11 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel", "~> 5.1"
-  spec.add_dependency "activesupport", "~> 5.1"
   spec.add_dependency "gli", "~> 2.16"
   spec.add_dependency "i18n", "~> 0.9.1"
-  spec.add_dependency "httparty", "~> 0.15.6"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "factory_bot", "~> 4.8.2"

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vindetta
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +185,7 @@ files:
 - bin/setup
 - exe/vindetta
 - lib/vindetta.rb
+- lib/vindetta/api.rb
 - lib/vindetta/cli.rb
 - lib/vindetta/data/vis.yaml
 - lib/vindetta/data/wmi.yaml
@@ -239,7 +198,6 @@ files:
 - lib/vindetta/transliterator.rb
 - lib/vindetta/validator.rb
 - lib/vindetta/version.rb
-- lib/vindetta/vin.rb
 - lib/vindetta/vin/vds.rb
 - lib/vindetta/vin/vis.rb
 - lib/vindetta/vin/wmi.rb

data/lib/vindetta/vin.rb

@@ -1,76 +0,0 @@
-require "active_support"
-require "active_model"
-
-module Vindetta
-  class Vin
-    include ActiveModel::Validations
-    include Enumerable
-
-    def each(&block)
-      @value.chars(&block)
-    end
-
-    def [](index)
-      each[index]
-    end
-
-    attr_reader :value
-
-    validates_with Validator
-
-    def initialize(value)
-      @value = value
-    end
-
-    alias eql? ==
-
-    def ==(other)
-      self.class == other.class && value == other.value
-    end
-
-    def check_digit
-      value[8]
-    end
-
-    def year
-      vis.year
-    end
-
-    def region
-      wmi.region
-    end
-
-    ##
-    # World Manufacturer Identity
-    #
-    def wmi
-      @wmi ||= Wmi.new(self)
-    end
-
-    # #
-    # Vehicle Descriptor Section
-    #
-    def vds
-      @vds ||= Vds.new(self)
-    end
-
-    ##
-    # Vehicle Identifier Section
-    #
-    def vis
-      @vis ||= Vis.new(self)
-    end
-
-    def model_year
-      value[9]
-    end
-
-    def manufacturing_plant
-      value[10]
-    end
-
-    def serial_number
-      value[11..16]
-    end
-  end
-end