vin_exploder 0.3.1 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vin_exploder (0.3.0)
+    vin_exploder (0.4.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/vin_exploder/cache/couchrest_cache_store.rb

@@ -19,9 +19,8 @@ module Cache
     def read(vin)
       key = make_vin_cache_key(vin)
       result = @db.get(key)['data'] rescue nil
-      hash = {}
-      result.each{|k,v| hash[k.to_sym] = v} unless result.nil?
-      hash.empty? ? nil : hash
+      hash = symbolize_result_hash(result) unless result.nil?
+      hash
     end
     
     def write(vin, hash)

data/lib/vin_exploder/cache.rb

@@ -33,15 +33,14 @@ module VinExploder
       #   cache.fetch("VIN_NUMBER_2")   # => {:make => 'Dodge', :model => '1500'}
       #
       def fetch(vin)
+        hash = read(vin)
         if block_given?
-          hash = read(vin)
           if hash.nil?
             hash = yield 
-            write(vin, hash)
+            write(vin, hash) unless hash.empty? || (hash[:errors] && !hash[:errors].empty?)
           end
-        else
-          hash = read(vin)
         end
+        hash
       end
     
       # Fetches VIN data from the cache, using the given key. If VIN has
@@ -67,7 +66,13 @@ module VinExploder
       # Position 9 is a checksum value and should not be used in the key.
       def make_vin_cache_key(vin)
         key = vin.slice(0,8)
-        key << vin.slice(10,2)
+        key << vin.slice(9,2)
+      end
+      
+      def symbolize_result_hash(hash)
+        new_hash = {}
+        hash.each{|k,v| new_hash[k.to_sym] = v}
+        new_hash
       end
     
     end

data/lib/vin_exploder/configuration.rb

@@ -16,7 +16,7 @@ module VinExploder
       if args.empty?
         case @cache_store
         when Symbol
-          VinExploder::Cache.const_get(@cache_store.to_s.split('_').map{|s| s.capitalize }.join)
+          @cache_store = VinExploder::Cache.const_get(@cache_store.to_s.split('_').map{|s| s.capitalize }.join)
         else
           @cache_store
         end
@@ -30,7 +30,7 @@ module VinExploder
       if args.empty?
         case @adapter
         when Symbol
-          VinExploder::Decode.const_get(@adapter.to_s.split('_').map{|s| s.capitalize }.join)
+          @adapter = VinExploder::Decode.const_get(@adapter.to_s.split('_').map{|s| s.capitalize }.join)
         else
           @adapter
         end

data/lib/vin_exploder/exploder.rb

@@ -20,10 +20,11 @@ module VinExploder
     # An Explosion object containing the decoded vin attributes
     def get(vin)
       hash = @cache.fetch(vin) do
-        # get from vender adapter
         @adapter.explode(vin)
       end
-      Explosion.new vin, hash, hash.delete(:errors)
+      errors = hash ? hash.delete(:errors) : []
+      data = hash ? hash : {}
+      Explosion.new vin, data, errors
     end
     
   end

data/lib/vin_exploder/explosion.rb

@@ -4,7 +4,7 @@ module VinExploder
   
   class Explosion
     
-    attr_reader :vin, :success, :errors, :make, :model, :year, :driveline, :body_style, :fuel_type, :all
+    attr_reader :vin, :success, :errors, :make, :model, :year, :driveline, :body_style, :fuel_type, :number_of_doors, :all
     
     def initialize(vin, vin_hash, errors={})
       @vin = vin
@@ -15,8 +15,9 @@ module VinExploder
       @driveline = @all[:driveline]
       @body_style = @all[:body_style]
       @fuel_type = @all[:fuel_type]
+      @number_of_doors = @all[:number_of_doors]
       @trim_level = @all[:trim_level]
-      @errors = errors.nil? ? {} : errors
+      @errors = errors.nil? ? [] : errors
       @success = @errors.empty?
     end
     

data/lib/vin_exploder/version.rb

@@ -1,3 +1,3 @@
 module VinExploder
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/vin_exploder.rb

@@ -21,3 +21,4 @@ require 'vin_exploder/configuration'
 require 'vin_exploder/cache'
 require 'vin_exploder/explosion'
 require 'vin_exploder/exploder'
+require 'vin_exploder/abstract_adapter'

data/spec/cache/activerecord_cache_store_spec.rb

@@ -25,7 +25,7 @@ describe ActiveRecordCacheStore do
       create_table :test_ar_cache_stores, :force => true do |t|
         t.column :key,       :string
         t.column :vin,       :string
-        t.column :make,       :string
+        t.column :make,      :string
         t.column :data,      :text
       end
     end

data/spec/cache/cache_store_spec.rb

@@ -23,11 +23,12 @@ describe Store do
   
   describe '#fetch' do
     it 'should execute the block and pass through #write' do
+      result = {'vin' => 'EXPLODED_VIN'}
       store = Store.new
-      store.should_receive(:write).with('VIN', 'EXPLODED_VIN').exactly(1).times { 'EXPLODED_VIN' }
+      store.should_not_receive(:write).exactly(1).times
       store.fetch('VIN') do
-        'EXPLODED_VIN'
-      end.should == 'EXPLODED_VIN'
+        result
+      end.should == result
     end
     
     it 'should return nil with no block' do

metadata

@@ -2,7 +2,7 @@
 name: vin_exploder
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jake Mallory
@@ -10,7 +10,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: rspec