earth 0.12.2 → 0.12.3

data/lib/earth/automobile/automobile_fuel.rb

@@ -49,6 +49,18 @@ class AutomobileFuel < ActiveRecord::Base
     end
   end
   
+  # for AutomobileMakeModel.custom_find
+  def suffix
+    case code
+    when 'D', 'BP-B5', 'BP-B20', 'BP-B100'
+      'DIESEL'
+    when 'E'
+      'FFV'
+    when 'C'
+      'CNG'
+    end
+  end
+  
   falls_back_on :name => 'fallback',
                 :base_fuel_name => 'Motor Gasoline',
                 :blend_fuel_name => 'Distillate Fuel Oil No. 2',

data/lib/earth/automobile/automobile_make_model.rb

@@ -5,6 +5,19 @@ class AutomobileMakeModel < ActiveRecord::Base
   belongs_to :automobile_fuel, :foreign_key => :fuel_code, :primary_key => :code
   belongs_to :alt_automobile_fuel, :foreign_key => :alt_fuel_code, :primary_key => :code, :class_name => 'AutomobileFuel'
   
+  # Used by Automobile and AutomobileTrip to look up a make model year considering fuel
+  def self.custom_find(characteristics)
+    if characteristics[:make] and characteristics[:model]
+      # append fuel suffix to model name and search
+      make_model = if characteristics[:automobile_fuel]
+        find_by_make_name_and_model_name characteristics[:make].name, [characteristics[:model].name, characteristics[:automobile_fuel].suffix].join(' ')
+      end
+      
+      # use original model name if fuel suffix didn't help
+      make_model ? make_model : AutomobileMakeModel.find_by_make_name_and_model_name(characteristics[:make].name, characteristics[:model].name)
+    end
+  end
+  
   # for deriving fuel codes and type name
   def model_years
     AutomobileMakeModelYear.where(:make_name => make_name, :model_name => model_name)

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

data/spec/earth/automobile/automobile_make_model_spec.rb

@@ -68,6 +68,46 @@ describe AutomobileMakeModel do
     it { f150_ffv.type_name.should == 'Light-duty trucks' }
   end
   
+  describe '.custom_find' do
+    it 'considers fuel' do
+      %w{ diesel B5 B20 B100 }.each do |fuel|
+        AMM.custom_find(
+          {
+            :make => AutomobileMake.find('Volkswagen'),
+            :model => AutomobileModel.find('Jetta'),
+            :automobile_fuel => AutomobileFuel.find(fuel)
+          }
+        ).name.should == 'Volkswagen JETTA DIESEL'
+      end
+      
+      AMM.custom_find(
+        {
+          :make => AutomobileMake.find('Ford'),
+          :model => AutomobileModel.find('F150'),
+          :automobile_fuel => AutomobileFuel.find('E85')
+        }
+      ).name.should == 'Ford F150 FFV'
+      
+      AMM.custom_find(
+        {
+          :make => AutomobileMake.find('Honda'),
+          :model => AutomobileModel.find('Civic'),
+          :automobile_fuel => AutomobileFuel.find('CNG')
+        }
+      ).name.should == 'Honda CIVIC CNG'
+    end
+    
+    it 'ignores fuel if it does not help' do
+      AMM.custom_find(
+        {
+          :make => AutomobileMake.find('Volkswagen'),
+          :model => AutomobileModel.find('Jetta'),
+          :automobile_fuel => AutomobileFuel.find('CNG')
+        }
+      ).name.should == 'Volkswagen JETTA'
+    end
+  end
+  
   describe '#model_years' do
     it { civic.model_years.sort.should == civic_years.sort }
   end

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-15 00:00:00 Z
+date: 2012-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -681,7 +681,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2577779194019475364
+      hash: -307877030326161721
       segments: 
       - 0
       version: "0"
@@ -690,7 +690,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2577779194019475364
+      hash: -307877030326161721
       segments: 
       - 0
       version: "0"