earth 1.0.0 → 1.0.1

data/lib/earth/industry/cbecs_energy_intensity/data_miner.rb

@@ -1,5 +1,5 @@
 require 'earth/eia'
-require 'earth/industry'
+require 'earth/industry/industry'
 
 CbecsEnergyIntensity.class_eval do
   const_set(:CBECS, {

data/lib/earth/industry/industry.rb

@@ -30,7 +30,6 @@ EOS
   has_many :industry_sectors, :foreign_key => 'naics_code'
   has_many :sectors, :through => :industry_sectors
   
-  
   class << self
     def format_naics_code(input)
       "%d" % input.to_i
@@ -39,7 +38,7 @@ EOS
   
   def trade_industry?
     prefix = naics_code.to_s[0,2]
-    %w{42 44 45}.include?(prefix)
+    %w{42 44 45}.include? prefix
   end
 
   warn_unless_size 2341

data/lib/earth/industry/mecs_energy.rb

@@ -36,20 +36,19 @@ EOS
 
   self.primary_key = "name"
   
-  
   FUELS = [:electricity, :residual_fuel_oil, :distillate_fuel_oil,
            :natural_gas, :lpg_and_ngl, :coal, :coke_and_breeze, :other_fuel]
   
-   # Find the first record whose naics_code matches code and that has valid fuel ratios.
-   # If no record found chop off the last character of code and try again, and so on.
-   def self.find_by_naics_code(code)
-     find_by_naics_code_and_census_region_number(code, nil)
-   end
+  # Find the first record whose naics_code matches code and that has valid fuel ratios.
+  # If no record found chop off the last character of code and try again, and so on.
+  def self.find_by_naics_code(code)
+    find_by_naics_code_and_census_region_number(code, nil)
+  end
    
-   # Find the first record whose census_region_number matches number, whose naics_code matches code, and that has valid fuel ratios.
-   # If none found and we know census region number, try looking nationwide
-   # If none found and looking nationwide, chop off the last character of code and try again looking in census region
-   # And so on
+  # Find the first record whose census_region_number matches number, whose naics_code matches code, and that has valid fuel ratios.
+  # If none found and we know census region number, try looking nationwide
+  # If none found and looking nationwide, chop off the last character of code and try again looking in census region
+  # And so on
   def self.find_by_naics_code_and_census_region_number(code, number, original_number = number)
     if code.blank?
       record = nil

data/lib/earth/industry/mecs_ratio.rb

@@ -22,7 +22,6 @@ EOS
   
   belongs_to :industry
   
-  
   # Find the first record whose naics_code matches code and whose energy per dollar shipment is present.
   # If no record found chop off the last character of code and try again, and so on.
   def self.find_by_naics_code(code)
@@ -50,4 +49,6 @@ EOS
     end
     record
   end
+  
+  warn_unless_size 395
 end

data/lib/earth/industry/merchant_category.rb

@@ -25,4 +25,5 @@ EOS
     description
   end
 
+  warn_unless_size 285
 end

data/lib/earth/industry/naics_2002.rb

@@ -29,4 +29,6 @@ EOS
   
   has_many :naics_2002_naics_2007_concordances, :foreign_key => :naics_2002_code
   has_many :naics_2007, :through => :naics_2002_naics_2007_concordances
+  
+  warn_unless_size 2341
 end

data/lib/earth/industry/naics_2002_naics_2007_concordance.rb

@@ -28,4 +28,5 @@ EOS
     (note = description.match(/ - (.+)/)) ? note.captures.first : nil
   end
   
+  warn_unless_size 1200
 end

data/lib/earth/industry/naics_2002_sic_1987_concordance.rb

@@ -28,4 +28,5 @@ EOS
     (note = description.match /.+?\((.+)\)/) ? note.captures.first : nil
   end
   
+  warn_unless_size 2164
 end

data/lib/earth/industry/naics_2007.rb

@@ -22,4 +22,5 @@ EOS
   has_many :naics_2002_naics_2007_concordances, :foreign_key => :naics_2007_code
   has_many :naics_2002, :through => :naics_2002_naics_2007_concordances
   
+  warn_unless_size 2328
 end

data/lib/earth/industry/sic_1987.rb

@@ -27,4 +27,5 @@ EOS
     (desc = description.match /^(.+?) \(/) ? desc.captures.first : description
   end
   
+  warn_unless_size 1004
 end

data/lib/earth/locality/census_division.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 require 'earth/locality/census_region'
 require 'earth/locality/climate_division'
@@ -46,6 +45,5 @@ EOS
                 :meeting_building_electricity_intensity => 0.0084323684 / 1.square_feet.to(:square_metres),
                 :meeting_building_district_heat_intensity => 0.0004776370.kbtus.to(:megajoules) / 1.square_feet.to(:square_metres)
   
-
   warn_unless_size 9
 end

data/lib/earth/locality/climate_division.rb

@@ -27,6 +27,5 @@ EOS
   
   RADIUS = 750
   
-
   warn_unless_size 359
 end

data/lib/earth/locality/country.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 require 'earth/locality/electricity_mix'
 require 'earth/rail/rail_company'

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

@@ -23,6 +23,10 @@ Country.class_eval do
       store 'name', :field_number => 5 # romanized version with utf-8 characters
     end
     
+    process "Add Kosovo using the FIPS code 'KV'" do
+      Country.find_or_create_by_iso_3166_code_and_name 'KV', 'Kosovo'
+    end
+    
     import "heating and cooling degree day data from WRI CAIT",
            :url => "file://#{Earth::DATA_DIR}/locality/wri_hdd_cdd_data.csv",
            :select => proc { |record| record['country'] != 'European Union (27)' },

data/lib/earth/locality/egrid_country.rb

@@ -29,7 +29,6 @@ EOS
     end
   end
   
-  
   warn_unless_size 1
   warn_if_any_nulls
 end

data/lib/earth/locality/egrid_region.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 require 'earth/locality/egrid_country'
 require 'earth/locality/egrid_subregion'
@@ -35,7 +34,6 @@ EOS
   falls_back_on :name => 'fallback',
                 :loss_factor => lambda { EgridCountry.us.loss_factor }
   
-  
   warn_unless_size 5
   warn_if_any_nulls
 end

data/lib/earth/locality/egrid_subregion.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 require 'earth/locality/egrid_region'
 require 'earth/locality/electricity_mix'
@@ -50,7 +49,6 @@ EOS
                 :electricity_emission_factor => lambda { weighted_average(:electricity_emission_factor, :weighted_by => :net_generation) },
                 :electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour'
   
-  
   warn_unless_size 26
   warn_if_any_nulls
 end

data/lib/earth/locality/electricity_mix.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 class ElectricityMix < ActiveRecord::Base
   extend Earth::Model
@@ -45,7 +44,6 @@ EOS
                 :n2o_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour',
                 :loss_factor => 0.096 # from ecometrica paper FIXME TODO calculate this
   
-  
-  warn_unless_size 187
+  warn_unless_size 213
   warn_if_any_nulls
 end

data/lib/earth/locality/petroleum_administration_for_defense_district.rb

@@ -25,7 +25,6 @@ EOS
     str
   end
   
-
   warn_if_nulls_except(
     :subdistrict_code,
     :subdistrict_name

data/lib/earth/locality/state.rb

@@ -48,7 +48,6 @@ EOS
     Country.united_states
   end
   
-  
   warn_if_nulls_except(
     :census_division_number,
     :petroleum_administration_for_defense_district_code

data/lib/earth/locality/zip_code.rb

@@ -58,7 +58,6 @@ EOS
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude
   
-  
   warn_unless_size 43770
   warn_if_nonexistent_owner_except :egrid_subregion
 end

data/lib/earth/model.rb

@@ -23,7 +23,7 @@ module Earth
         require path if File.exist?(path + '.rb')
         target.data_miner_script.prepend_once :process, :create_table!
       else
-        target.data_miner_script.prepend_once :sql, "Brighter Planet's reference data", "http://data.brighterplanet.com/#{to_s.underscore.pluralize}.sql"
+        target.data_miner_script.prepend_once :sql, "Brighter Planet's reference data", "http://data.brighterplanet.com/#{target.to_s.underscore.pluralize}.sql"
       end
       target.data_miner_script.append_once :process, :run_data_miner_on_parent_associations!
     end

data/lib/earth/pet/breed.rb

@@ -23,7 +23,6 @@ EOS
   has_many :breed_genders, :foreign_key => 'breed_name'
   belongs_to :species, :foreign_key => 'species_name'
   
-
   warn_if_nulls_except(
     :weight,
     :weight_units

data/lib/earth/pet/breed_gender.rb

@@ -24,6 +24,5 @@ EOS
   belongs_to :breed, :foreign_key => 'breed_name'
   belongs_to :gender, :foreign_key => 'gender_name'
   
-
   warn_unless_size 586
 end

data/lib/earth/pet/gender.rb

@@ -18,6 +18,5 @@ EOS
   
   has_many :breed_genders, :foreign_key => 'gender_name'
   
-
   warn_unless_size 2
 end

data/lib/earth/pet/species.rb

@@ -1,6 +1,5 @@
-require 'falls_back_on'
-
 require 'earth/model'
+require 'falls_back_on'
 
 require 'earth/pet/breed'
 
@@ -31,7 +30,6 @@ EOS
 
   self.primary_key = "name"
   
-
   has_many :breeds, :foreign_key => 'species_name'
   
   scope :thoroughly_researched, :conditions => 'marginal_dietary_requirement IS NOT NULL'

data/lib/earth/rail/country_rail_class.rb

@@ -27,6 +27,5 @@ EOS
 
   self.primary_key = "name"
   
-
   warn_unless_size 4
 end

data/lib/earth/rail/country_rail_traction.rb

@@ -22,6 +22,5 @@ EOS
 
   self.primary_key = "name"
   
-
   warn_unless_size 50
 end

data/lib/earth/rail/country_rail_traction_class.rb

@@ -23,6 +23,5 @@ EOS
 
   self.primary_key = "name"
   
-
   warn_unless_size 125
 end

data/lib/earth/rail/national_transit_database_company.rb

@@ -35,8 +35,7 @@ EOS
   # Methods to calculate summary statistics from rail_records
   [:rail_passengers, :rail_passenger_distance, :rail_vehicle_distance, :rail_vehicle_time, :rail_electricity, :rail_diesel].each do |method|
     define_method method do
-      attribute = method.to_s.split('rail_')[1].to_sym
-      rail_records.sum(attribute) > 0 ? rail_records.sum(attribute) : nil 
+      (sum = rail_records.sum(method.to_s.split('rail_')[1].to_sym)) > 0 ? sum : nil
     end
   end
   
@@ -50,7 +49,6 @@ EOS
     end
   end
   
-
   warn_if_nulls_except(
     :acronym,
     :duns_number

data/lib/earth/rail/national_transit_database_company/data_miner.rb

@@ -1,7 +1,7 @@
 NationalTransitDatabaseCompany.class_eval do
   data_miner do
     import "US transit companies from the National Transit Database",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdHBTZC1GUzg5VEU4QW9NOUo3V1BJWUE&output=csv' do
+           :url => "#{Earth::DATA_DIR}/rail/ntd_companies.csv" do
       key 'id', :field_name => 'trs_id'
       store 'name',          :nullify => true
       store 'acronym',       :nullify => true

data/lib/earth/rail/national_transit_database_mode.rb

@@ -20,7 +20,6 @@ EOS
   def self.rail_modes
     where(:rail_mode => true)
   end
-  
 
   warn_unless_size 14
 end

data/lib/earth/rail/national_transit_database_mode/data_miner.rb

@@ -1,7 +1,7 @@
 NationalTransitDatabaseMode.class_eval do
   data_miner do
     import "National Transit Database modes",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGFTLVpMdFgwSTQzTTFuc2lIVUdfSHc&output=csv' do
+           :url => "#{Earth::DATA_DIR}/rail/ntd_modes.csv" do
       key 'code'
       store 'name',      :nullify => true
       store 'rail_mode', :nullify => true

data/lib/earth/rail/national_transit_database_record.rb

@@ -53,7 +53,6 @@ EOS
     where(:mode_code => NationalTransitDatabaseMode.rail_modes)
   end
   
-
   warn_if_nulls_except(
     :passenger_distance,
     :passenger_distance_units,

data/lib/earth/rail/national_transit_database_record/data_miner.rb

@@ -1,7 +1,7 @@
 NationalTransitDatabaseRecord.class_eval do
   data_miner do
     import "US National Transit Database service data",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdF9Hbktvc3BMNDRWZHhDRU9uMVZfWVE&output=csv' do
+           :url => "#{Earth::DATA_DIR}/rail/ntd_service.csv" do
       key 'name', :synthesize => proc { |row| [row['trs_id'], row['mode_code'], row['service_code']].join(' ') }
       store 'company_id', :field_name => 'trs_id'
       store 'mode_code'
@@ -13,7 +13,7 @@ NationalTransitDatabaseRecord.class_eval do
     end
     
     import "US National Transit Database fuel consumption data",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDItVVR5NjA2Y3FCVjgza25Ccy0zS2c&output=csv' do
+           :url => "#{Earth::DATA_DIR}/rail/ntd_fuel_consumption.csv" do
       key 'name', :synthesize => proc { |row| [row['trs_id'], row['mode_code'], row['service_code']].join(' ') }
       store 'company_id', :field_name => 'trs_id'
       store 'mode_code'

data/lib/earth/rail/rail_class.rb

@@ -14,6 +14,5 @@ EOS
 
   self.primary_key = "name"
   
-
   warn_unless_size 6
 end

data/lib/earth/rail/rail_class/data_miner.rb

@@ -1,16 +1,17 @@
+require 'earth/rail/country_rail_class'
+require 'earth/rail/country_rail_traction_class'
+
 RailClass.class_eval do
   data_miner do
-    process "Ensure CountryRailClass, CountryRailTractionClass, and RailCompanyTractionClass are populated" do
+    process "Ensure CountryRailClass, and CountryRailTractionClass are populated" do
       CountryRailTractionClass.run_data_miner!
       CountryRailClass.run_data_miner!
-      RailCompanyTractionClass.run_data_miner!
     end
     
-    process "Derive rail class names from CountryRailClass, CountryRailTractionClass, and RailCompanyTractionClass" do
+    process "Derive rail class names from CountryRailClass and CountryRailTractionClass" do
       names = []
       names += CountryRailTractionClass.select("DISTINCT rail_class_name").map(&:rail_class_name)
       names += CountryRailClass.select("DISTINCT rail_class_name").map(&:rail_class_name)
-      names += RailCompanyTractionClass.select("DISTINCT rail_class_name").map(&:rail_class_name)
       names.uniq.each do |name|
         RailClass.find_or_create_by_name(name)
       end

data/lib/earth/rail/rail_company.rb

@@ -37,7 +37,6 @@ EOS
   
   belongs_to :country, :foreign_key => 'country_iso_3166_code'
   
-
   warn_if_nulls_except(
     :duns_number,
     :train_time,

data/lib/earth/rail/rail_fuel.rb

@@ -25,6 +25,5 @@ EOS
   
   delegate :density, :density_units, :co2_emission_factor, :co2_emission_factor_units, :co2_biogenic_emission_factor, :co2_biogenic_emission_factor_units, :to => :fuel, :allow_nil => true
   
-
   warn_unless_size 1
 end