earth 0.3.2 → 0.3.3

data/lib/earth/automobile/automobile_make_model/data_miner.rb

@@ -17,7 +17,7 @@ AutomobileMakeModel.class_eval do
       AutomobileMakeModelYearVariant.run_data_miner!
       connection.execute %{
         INSERT IGNORE INTO automobile_make_models(name, make_name)
-        SELECT automobile_make_model_year_variants.model_name, automobile_make_model_year_variants.make_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.model_name) > 0 AND LENGTH(automobile_make_model_year_variants.make_name) > 0
+        SELECT automobile_make_model_year_variants.make_model_name, automobile_make_model_year_variants.make_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_model_name) > 0 AND LENGTH(automobile_make_model_year_variants.make_name) > 0
       }
     end
     
@@ -26,9 +26,10 @@ AutomobileMakeModel.class_eval do
       AutomobileMakeModelYearVariant.run_data_miner!
       automobile_make_models = AutomobileMakeModel.arel_table
       automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
-      conditional_relation = automobile_make_models[:name].eq(automobile_make_model_year_variants[:model_name])
+      conditional_relation = automobile_make_models[:name].eq(automobile_make_model_year_variants[:make_model_name])
       %w{ city highway }.each do |i|
-        relation = AutomobileMakeModelYearVariant.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
+        # sabshere 12/6/10 careful, don't use AutomobileMakeModelYearVariant.where here or you will be forced into projecting *
+        relation = automobile_make_model_year_variants.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
         update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
         update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
       end

data/lib/earth/automobile/automobile_make_model_year/data_miner.rb

@@ -21,8 +21,8 @@ AutomobileMakeModelYear.class_eval do
     process "Derive model year names from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
       connection.execute %{
-        INSERT IGNORE INTO automobile_make_model_years(name, make_name, model_name, year, make_year_name)
-        SELECT automobile_make_model_year_variants.model_year_name, automobile_make_model_year_variants.make_name, automobile_make_model_year_variants.model_name, automobile_make_model_year_variants.year, automobile_make_model_year_variants.make_year_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_name) > 0 AND LENGTH(automobile_make_model_year_variants.model_name) > 0
+        INSERT IGNORE INTO automobile_make_model_years(name, make_name, make_model_name, year, make_year_name)
+        SELECT automobile_make_model_year_variants.make_model_year_name, automobile_make_model_year_variants.make_name, automobile_make_model_year_variants.make_model_name, automobile_make_model_year_variants.year, automobile_make_model_year_variants.make_year_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_name) > 0 AND LENGTH(automobile_make_model_year_variants.make_model_name) > 0
       }
     end
     
@@ -34,9 +34,10 @@ AutomobileMakeModelYear.class_eval do
       AutomobileMakeModelYearVariant.run_data_miner!
       automobile_make_model_years = AutomobileMakeModelYear.arel_table
       automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
-      conditional_relation = automobile_make_model_years[:name].eq(automobile_make_model_year_variants[:model_year_name])
+      conditional_relation = automobile_make_model_years[:name].eq(automobile_make_model_year_variants[:make_model_year_name])
       %w{ city highway }.each do |i|
-        relation = AutomobileMakeModelYearVariant.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
+        # sabshere 12/6/10 careful, don't use AutomobileMakeModelYearVariant.where here or you will be forced into projecting *
+        relation = automobile_make_model_year_variants.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
         update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
         update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
       end

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -440,9 +440,9 @@ AutomobileMakeModelYearVariant.class_eval do
     # end
     
     process "Derive model and model year names" do
-      update_all "model_name = CONCAT(make_name, ' ', name)"
+      update_all "make_model_name = CONCAT(make_name, ' ', name)"
       update_all "make_year_name = CONCAT(make_name, ' ', year)"
-      update_all "model_year_name = CONCAT(make_name, ' ', name, ' ', year)"
+      update_all "make_model_year_name = CONCAT(make_name, ' ', name, ' ', year)"
     end
     
     process "Calculate adjusted fuel efficiency using the latest EPA equations" do

data/lib/earth/locality/petroleum_administration_for_defense_district.rb

@@ -1,6 +1,6 @@
 class PetroleumAdministrationForDefenseDistrict < ActiveRecord::Base
   set_primary_key :code
-  set_table_name :petrolem_districts
+  set_table_name :petroleum_districts
   
   data_miner do
     tap "Brighter Planet's PADD info", Earth.taps_server

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-12-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,15 +26,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 5
         segments: 
         - 3
-        - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: "3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -155,16 +152,12 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196417
+        hash: 7
         segments: 
         - 2
-        - 0
-        - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
+        version: "2"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -187,14 +180,13 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 1
         - 5
-        - 0
-        version: 1.5.0
+        version: "1.5"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -233,12 +225,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
   type: :development
   version_requirements: *id014
 description: An earth-simulation environment with ActiveRecord models and data