vinquery 0.3.0 → 0.3.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vinquery (0.2.0)
+    vinquery (0.3.5)
       nokogiri (>= 1.4.4)
 
 GEM
@@ -10,18 +10,18 @@ GEM
     addressable (2.2.6)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    nokogiri (1.4.4)
+    nokogiri (1.4.6)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    vin_exploder (0.2.0)
+    vin_exploder (0.3.0)
     webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS

data/lib/vinquery.rb

@@ -5,7 +5,7 @@ class Vinquery
   attr_reader :attributes, :errors, :result
 
   def self.get(vin, options={})
-    request = Vinquery.new options[:url], options[:access_code], options[:report_type]
+    request = Vinquery.new(options[:url], options[:access_code], options[:report_type])
     doc = request.fetch vin
     result = request.parse doc
     request
@@ -19,8 +19,9 @@ class Vinquery
   
   def fetch(vin)
     # use reducable=FALSE to get additional fields like fuel_type
-    url_s = "#{@url}?accessCode=#{@access_code}&vin=#{vin}&reportType=#{@report_type}&reducable=FALSE"
-    url = URI.parse(URI.escape(url_s))
+    @uri ||= "#{@url}?accessCode=#{@access_code}&reportType=#{@report_type}&reducable=FALSE"
+    url_s = @uri + "&vin=#{vin}"
+    url = URI.parse(url_s)
     begin
       @result = Net::HTTP.get url
     rescue Exception => e
@@ -41,11 +42,14 @@ class Vinquery
   end
 
   def set_attributes(doc)
-    attributes = {:vendor_result => @result}
+    attributes = {}
     doc.xpath('//vehicle[1]/item').each do |item|
-      attributes[item.attributes['key'].value.downcase.gsub(/ /, '_').intern] = item.attributes['value'].value
+      attributes[item.attributes['key'].value.downcase.gsub('.', '').gsub(/ /, '_').to_sym] = item.attributes['value'].value
+    end
+    if attributes.size > 0
+      attributes[:vin] = doc.css('vin').first.attributes['number'].value
+      attributes[:vendor_result] = doc.to_xml 
     end
-    
     @attributes = attributes
   end
 

data/lib/vinquery/version.rb

@@ -1,3 +1,3 @@
 class Vinquery
-  VERSION = '0.3.0'
+  VERSION = '0.3.5'
 end

data/lib/vinquery/vin_exploder/adapter.rb

@@ -8,6 +8,10 @@ module VinExploder
     
     class VinqueryAdapter < AbstractAdapter
       
+      # Create new vinquery adapter
+      #
+      # == Parameters
+      # options:: access_code, report_type, url
       def initialize(options)
         super
       end
@@ -26,7 +30,9 @@ module VinExploder
       
       def normalize(vq_hash)
         # fuel_type = vq_hash[:engine_type].match(/(GAS|DIESEL|HYBRID)/)[0]
-        {:year => vq_hash.delete(:model_year)}.merge(vq_hash)
+        # driveline_type = vq_hash[:driveline].match(/(FWD|4WD|2WD)/)[0]
+        door_number = vq_hash[:body_style].match(/(\d)-DR/)[1] unless vq_hash.empty?
+        {:year => vq_hash.delete(:model_year), :number_of_doors => door_number}.merge(vq_hash)
       end
       
     end

data/spec/vinquery_spec.rb

@@ -22,10 +22,10 @@ describe Vinquery do
       @query.set_attributes(doc)
       # @query.attributes.each_pair{|k,v| puts "#{k} - #{v}"}
       @query.attributes[:body_style].should == "CREW CAB PICKUP 4-DR"
-      @query.attributes.count.should == 169
+      @query.attributes.count.should == 171
     end
 
-    it 'should recover from poorly or unexpected xml document' do
+    it 'should recover from poorly formatted or unexpected xml document' do
       xml_s = '<?xml version="1.0"?>\\n<blah status="FAILED" number="vin"\\n'
       doc = Nokogiri::HTML(xml_s)
       @query.set_attributes(doc).should == {}
@@ -55,7 +55,7 @@ describe Vinquery do
       doc = @query.fetch('')
       doc.css('vin').first.attributes['status'].value.should == "FAILED"
       doc.css('message').first.attributes['key'].value.should == "VinQuery unavailable"
-      doc.css('message').first.attributes['value'].value.should == "Oops, it looks like our VIN decoding database is down right now. Please try again later."
+      doc.css('message').first.attributes['value'].value.should == "Oops, it looks like our VIN decoder is unavailable at the moment. Please try again later."
     end
   end
 
@@ -78,13 +78,15 @@ describe Vinquery do
       query.valid?.should == true
       query.errors.empty?.should == true
       query.attributes.class.should equal(Hash)
+      query.attributes[:make].should == 'Dodge'
     end
     
-    it 'should return an errors hash with an invalid vin number' do
+    it 'should return an errors array with an invalid vin number' do
       res = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>\r\n<VINquery Version="1.0.0" Report_Type="BASIC" Date="2/19/2011">\r\n    <VIN Number="ABCDEFGHIJKLMNOPQ" Status="FAILED">\r\n        <Message Key="5" Value="Invalid VIN number: This VIN number contains invalid letters: I,O or Q." />\r\n    </VIN>\r\n</VINquery>'
       stub_request(:any, /.*invalidvin.*/).to_return(:body => res, :status => 200, :headers => { 'Content-Length' => res.length})
       results = Vinquery.get('BADVIN', {:url => 'http://www.invalidvin.com', :access_code => 'access_code', :report_type => 'report_type_2'})
       results.valid?.should == false
+      results.errors.class.should == Array
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: vinquery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors: 
 - Jake Mallory
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri