earth 0.4.1 → 0.4.2

data/earth.gemspec

@@ -4,7 +4,7 @@ require "earth/version"
 
 Gem::Specification.new do |s|
   s.name        = "earth"
-  s.version = "0.4.1"
+  s.version = Earth::VERSION
   s.date = "2011-02-21"
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Seamus Abshere", "Derek Kastner", "Andy Rossmeissl"]

data/lib/earth.rb

@@ -5,7 +5,6 @@ require 'earth/conversions_ext'
 require 'earth/inflectors'
 require 'data_miner'
 require 'falls_back_on'
-require 'falls_back_on/active_record_ext'
 require 'weighted_average'
 require 'loose_tight_dictionary'
 require 'slither'
@@ -162,3 +161,12 @@ private
     end
   end
 end
+
+def INSERT_IGNORE(cmd)
+  if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
+    prefix = 'INSERT'
+  else
+    prefix = 'INSERT IGNORE'
+  end
+  ActiveRecord::Base.connection.execute "#{prefix} #{cmd}"
+end

data/lib/earth/air/aircraft_manufacturer/data_miner.rb

@@ -10,8 +10,7 @@ AircraftManufacturer.class_eval do
     
     process "Derive a list of aircraft manufacturers from aircraft" do
       Aircraft.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO aircraft_manufacturers(name)
+      INSERT_IGNORE %{INTO aircraft_manufacturers(name)
         SELECT aircraft.manufacturer_name FROM aircraft WHERE aircraft.manufacturer_name IS NOT NULL
       }
     end

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

@@ -12,18 +12,18 @@ AutomobileMake.class_eval do
     
     process "Derive manufacturer names from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO automobile_makes(name)
+      INSERT_IGNORE %{INTO automobile_makes(name)
         SELECT DISTINCT automobile_make_model_year_variants.make_name
         FROM automobile_make_model_year_variants
+        WHERE automobile_make_model_year_variants.make_name IS NOT NULL
+        AND LENGTH(automobile_make_model_year_variants.make_name) > 0
       }
     end
     
     # sabshere 1/31/11 add Avanti, DaimlerChrysler, IHC, Tesla, etc.
     process "Derive extra manufacturer names from CAFE data" do
       AutomobileMakeFleetYear.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO automobile_makes(name)
+      INSERT IGNORE %{INTO automobile_makes(name)
         SELECT DISTINCT automobile_make_fleet_years.make_name
         FROM automobile_make_fleet_years
       }

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

@@ -15,8 +15,7 @@ AutomobileMakeModel.class_eval do
     
     process "Derive model names from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO automobile_make_models(name, make_name)
+      INSERT_IGNORE %{INTO automobile_make_models(name, make_name)
         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

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

@@ -18,8 +18,7 @@ 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, make_model_name, year, make_year_name)
+      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

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

@@ -15,13 +15,18 @@ AutomobileMakeYear.class_eval do
     
     process "Derive manufacturer names and years from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO automobile_make_years(name, make_name, year)
+      INSERT_IGNORE %{INTO automobile_make_years(name, make_name, year)
         SELECT
           automobile_make_model_year_variants.make_year_name,
           automobile_make_model_year_variants.make_name,
           automobile_make_model_year_variants.year
         FROM automobile_make_model_year_variants
+        WHERE automobile_make_model_year_variants.make_year_name IS NOT NULL
+        AND LENGTH(automobile_make_model_year_variants.make_year_name) > 0
+        AND automobile_make_model_year_variants.make_name IS NOT NULL
+        AND LENGTH(automobile_make_model_year_variants.make_name) > 0
+        AND automobile_make_model_year_variants.year IS NOT NULL
+        AND LENGTH(automobile_make_model_year_variants.year) > 0
       }
     end
     

data/lib/earth/fuel/fuel/data_miner.rb

@@ -18,13 +18,7 @@ Fuel.class_eval do
     
     process "Derive fuel names from FuelYear" do
       FuelYear.run_data_miner!
-      if Fuel.connection.adapter_name.downcase == 'sqlite'
-        ignorance = ''
-      else
-        ignorance = 'IGNORE'
-      end
-      connection.execute %{
-        INSERT #{ignorance} INTO fuels(name)
+      INSERT_IGNORE %{INTO fuels(name)
         SELECT DISTINCT fuel_years.fuel_name FROM fuel_years
       }
     end

data/lib/earth/hospitality/lodging_class/data_miner.rb

@@ -19,14 +19,14 @@ LodgingClass.class_eval do
     
     process "Convert fuel oil intensities to metric units" do
       conversion_factor = 3.78541178 # Google: 3.78541178 l / gal
-      update_all "fuel_oil_intensity = fuel_oil_intensity * #{conversion_factor} WHERE natural_gas_intensity_units = 'gallons_per_room_night'"
-      update_all "fuel_oil_intensity_units = 'litres_per_room_night' WHERE natural_gas_intensity_units = 'gallons_per_room_night'"
+      update_all "fuel_oil_intensity = fuel_oil_intensity * #{conversion_factor} WHERE fuel_oil_intensity_units = 'gallons_per_room_night'"
+      update_all "fuel_oil_intensity_units = 'litres_per_room_night' WHERE fuel_oil_intensity_units = 'gallons_per_room_night'"
     end
     
     process "Convert district heat intensities to metric units" do
       conversion_factor = 1.05505585 # Google: 1.05505585 MJ / 1000 Btu
-      update_all "district_heat_intensity = district_heat_intensity * #{conversion_factor} WHERE natural_gas_intensity_units = 'thousand_btu_per_room_night'"
-      update_all "district_heat_intensity_units = 'megajoules_per_room_night' WHERE natural_gas_intensity_units = 'thousand_btu_per_room_night'"
+      update_all "district_heat_intensity = district_heat_intensity * #{conversion_factor} WHERE district_heat_intensity_units = 'thousand_btu_per_room_night'"
+      update_all "district_heat_intensity_units = 'megajoules_per_room_night' WHERE district_heat_intensity_units = 'thousand_btu_per_room_night'"
     end
   end
 end

data/lib/earth/locality/egrid_subregion/data_miner.rb

@@ -37,8 +37,7 @@ EgridSubregion.class_eval do
     # end
     
     import "eGRID subregion data",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&single=true&gid=0&output=csv',
-           :select => lambda { |row| row['abbreviation'].length == 4 } do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&single=true&gid=0&output=csv' do
       key 'abbreviation'
       store 'name'
       store 'nerc_abbreviation'

data/lib/earth/locality/urbanity/data_miner.rb

@@ -6,8 +6,7 @@ Urbanity.class_eval do
     
     process "derive from ResidentialEnergyConsumptionSurveyResponse" do
       ResidentialEnergyConsumptionSurveyResponse.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO urbanities(name)
+      INSERT_IGNORE %{INTO urbanities(name)
         SELECT DISTINCT recs_responses.urbanity_id FROM recs_responses WHERE LENGTH(recs_responses.urbanity_id) > 0
       }
     end

data/lib/earth/residence/air_conditioner_use/data_miner.rb

@@ -8,8 +8,7 @@ AirConditionerUse.class_eval do
     
     process "derive from ResidentialEnergyConsumptionSurveyResponse" do
       ResidentialEnergyConsumptionSurveyResponse.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO air_conditioner_uses(name)
+      INSERT_IGNORE %{INTO air_conditioner_uses(name)
         SELECT DISTINCT recs_responses.central_ac_use FROM recs_responses WHERE LENGTH(recs_responses.central_ac_use) > 0
       }
     end

data/lib/earth/residence/clothes_machine_use/data_miner.rb

@@ -8,8 +8,7 @@ ClothesMachineUse.class_eval do
     
     process "derive from ResidentialEnergyConsumptionSurveyResponse" do
       ResidentialEnergyConsumptionSurveyResponse.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO clothes_machine_uses(name)
+      INSERT_IGNORE %{INTO clothes_machine_uses(name)
         SELECT DISTINCT recs_responses.clothes_washer_use FROM recs_responses WHERE LENGTH(recs_responses.clothes_washer_use) > 0
       }
     end

data/lib/earth/residence/dishwasher_use/data_miner.rb

@@ -8,8 +8,7 @@ DishwasherUse.class_eval do
     
     process "derive from ResidentialEnergyConsumptionSurveyResponse" do
       ResidentialEnergyConsumptionSurveyResponse.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO dishwasher_uses(name)
+      INSERT_IGNORE %{INTO dishwasher_uses(name)
         SELECT DISTINCT recs_responses.dishwasher_use_id FROM recs_responses WHERE LENGTH(recs_responses.dishwasher_use_id) > 0
       }
     end

data/lib/earth/residence/residence_class/data_miner.rb

@@ -6,8 +6,7 @@ ResidenceClass.class_eval do
     
     process "derive from ResidentialEnergyConsumptionSurveyResponse" do
       ResidentialEnergyConsumptionSurveyResponse.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO residence_classes(name)
+      INSERT_IGNORE %{INTO residence_classes(name)
         SELECT DISTINCT recs_responses.residence_class_id FROM recs_responses WHERE LENGTH(recs_responses.residence_class_id) > 0
       }
     end

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,178 +16,167 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -08:00
+date: 2011-02-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         version: "3"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: data_miner
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 1
         - 1
         version: 1.1.1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: errata
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: falls_back_on
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: geokit
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: geokit-rails
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cohort_scope
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 0
         - 7
         version: 0.0.7
   type: :runtime
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: conversions
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 4
         - 5
         version: 1.4.5
   type: :runtime
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: weighted_average
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: loose_tight_dictionary
-  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
         - 8
         version: 0.0.8
   type: :runtime
+  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sniff
-  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 6
         - 1
         version: 0.6.1
   type: :development
+  prerelease: false
   version_requirements: *id011
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
@@ -544,7 +532,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3351943495966616780
       segments: 
       - 0
       version: "0"
@@ -553,7 +541,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3351943495966616780
       segments: 
       - 0
       version: "0"