earth 0.11.17 → 0.11.18

data/CHANGELOG

@@ -1,4 +1,10 @@
-0.11.7 / 2012-04-17
+0.11.18 / 2012-04-20
+
+* Bug fixes
+
+  * Replace col :foo, :index => true with col :foo; add_index :foo to match new active_record_inline_schema requirement
+
+0.11.17 / 2012-04-17
 
 * Breaking changes
 

data/earth.gemspec

@@ -13,13 +13,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "LICENSE-PREAMBLE",
-     "README.markdown"
-  ]
-  s.require_paths = ["lib"]
-  
+
   s.require_paths = ["lib"]
   
   s.add_runtime_dependency 'activerecord'

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

@@ -8,7 +8,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       key 'id', :field_name => 'PUBID8'
       store 'census_region_number',   :field_name => 'REGION8'
       store 'census_division_number', :field_name => 'CENDIV8'
-      store 'climate_zone_number',    :synthesize => Proc.new { |row| row['CLIMATE8'].to_i == 7 ? nil : row['CLIMATE8'].to_i }
+      store 'climate_zone_number',    :synthesize => proc { |row| row['CLIMATE8'].to_i == 7 ? nil : row['CLIMATE8'].to_i }
       store 'area',                   :field_name => 'SQFT8',   :from_units => :square_feet, :to_units => :square_metres
       store 'principal_activity',     :field_name => 'PBA8',    :dictionary => { :input => 'principal_activity_code', :output => 'principal_activity', :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=2&output=csv' }
       store 'floors',                 :field_name => 'NFLOOR8', :dictionary => { :input => 'floors_code', :output => 'floors', :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=0&output=csv' }
@@ -29,9 +29,9 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       store 'first_activity',        :field_name => 'ACT18',    :dictionary => { :input => 'activity_code', :output => 'activity', :url => 'https://docs.google.com/spreadsheet/pub?&key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=4&output=csv' }
       store 'second_activity',       :field_name => 'ACT28',    :dictionary => { :input => 'activity_code', :output => 'activity', :url => 'https://docs.google.com/spreadsheet/pub?&key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=4&output=csv' }
       store 'third_activity',        :field_name => 'ACT38',    :dictionary => { :input => 'activity_code', :output => 'activity', :url => 'https://docs.google.com/spreadsheet/pub?&key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=4&output=csv' }
-      store 'first_activity_share',  :synthesize => Proc.new { |row| row['ACT1PCT8'].blank? ? nil : row['ACT1PCT8'].to_f / 100.0 }
-      store 'second_activity_share', :synthesize => Proc.new { |row| row['ACT2PCT8'].blank? ? nil : row['ACT2PCT8'].to_f / 100.0 }
-      store 'third_activity_share',  :synthesize => Proc.new { |row| row['ACT3PCT8'].blank? ? nil : row['ACT3PCT8'].to_f / 100.0 }
+      store 'first_activity_share',  :synthesize => proc { |row| row['ACT1PCT8'].blank? ? nil : row['ACT1PCT8'].to_f / 100.0 }
+      store 'second_activity_share', :synthesize => proc { |row| row['ACT2PCT8'].blank? ? nil : row['ACT2PCT8'].to_f / 100.0 }
+      store 'third_activity_share',  :synthesize => proc { |row| row['ACT3PCT8'].blank? ? nil : row['ACT3PCT8'].to_f / 100.0 }
       store 'lodging_rooms',         :field_name => 'LODGRM8'
     end
     
@@ -40,7 +40,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
            :skip => 1,
            :headers => ["PUBID8","REGION8","CENDIV8","SQFT8","SQFTC8","YRCONC8","PBA8","ELUSED8","NGUSED8","FKUSED8","PRUSED8","STUSED8","HWUSED8","HEATP8","HTLS508","FURNAC8","BOILER8","PKGHT8","SLFCON8","HTPMPH8","STHW8","OTHTEQ8","FURNP8","BOILP8","PKGHP8","SLFCNP8","HTPHP8","STHWP8","OTHTP8","MAINHT8","PKGHPS8","SPLHPS8","RMHPS8","AIRHPT8","GRDHPT8","WTRHPT8","NWMNHT8","RDHTNF8","HWRDHT8","COOLP8","PKGCL8","RCAC8","ACWNWL8","HTPMPC8","CHWT8","CHILLR8","EVAPCL8","OTCLEQ8","PKGCP8","RCACP8","ACWNWP8","HTPCP8","CHWTP8","CHILP8","EVAPP8","OTCLP8","MAINCL8","PKGCPS8","SPLCPS8","RMCPS8","AIRCPT8","GRDCPT8","WTRCPT8","NWMNCL8","RDCLNF8","HWRDCL8","VAV8","ECN8","MAINT8","EMCS8","ADJWT8","STRATUM8","PAIR8"] do
       key 'id', :field_name => 'PUBID8'
-      store 'percent_cooled', :synthesize => Proc.new { |row| row['COOLP8'].to_f / 100.0 }
+      store 'percent_cooled', :synthesize => proc { |row| row['COOLP8'].to_f / 100.0 }
     end
     
     import 'electricity use from the 2003 EIA CBECS',
@@ -50,7 +50,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       key 'id', :field_name => 'PUBID8'
       store 'heating_degree_days', :field_name => 'HDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
       store 'cooling_degree_days', :field_name => 'CDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
-      store 'electricity_use',     :synthesize => Proc.new { |row| row['ELCNS8'].to_i }, :units => :kilowatt_hours
+      store 'electricity_use',     :synthesize => proc { |row| row['ELCNS8'].to_i }, :units => :kilowatt_hours
       store 'electricity_energy',  :field_name => 'ELBTU8', :from_units => :kbtus, :to_units => :megajoules
     end
     

data/lib/earth/industry/cbecs_energy_intensity.rb

@@ -3,11 +3,14 @@ require 'earth/locality'
 class CbecsEnergyIntensity < ActiveRecord::Base
   self.primary_key = "name"
   
-  col :name, :index => true
+  col :name
   col :principal_building_activity
-  col :naics_code, :index => true
-  col :census_region_number, :type => :integer, :index => true
-  col :census_division_number, :type => :integer, :index => true
+  col :naics_code
+  col :census_region_number, :type => :integer
+  col :census_division_number, :type => :integer
+  add_index :naics_code
+  add_index :census_region_number
+  add_index :census_division_number
 
   col :electricity, :type => :float
   col :electricity_units

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

@@ -176,25 +176,25 @@ CbecsEnergyIntensity.class_eval do
           import "2003 CBECS #{table.upcase} - Electricity Consumption and Intensity - #{division}",
             :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set#{CbecsEnergyIntensity::FUELS[energy_source][:set]}/2003excel/#{table}.xls",
             :headers => false,
-            :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+            :select => proc { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
             :crop => (21..37) do
-            key :name, :synthesize => Proc.new { |row|
+            key :name, :synthesize => proc { |row|
               "#{Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))}-#{region_number}-#{division_data[:census_division]}"
             }
 
-            store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+            store :principal_building_activity, :synthesize => proc { |row| row[0].gsub(/[\.\(\)]/,'').strip }
             store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
             store :census_region_number, :static => region_number
             store :census_division_number, :static => division_data[:census_division]
 
             fuel_data = CbecsEnergyIntensity::FUELS[energy_source]
-            store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+            store energy_source, :units => :megajoules, :synthesize => proc { |row|
               Earth::EIA.convert_value(row[division_data[:column] + 1], :from => fuel_data[:consumption], :to => :megajoules)
             }
-            store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+            store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => proc { |row|
               Earth::EIA.convert_value(row[division_data[:column] + 4], :from => :million_square_feet, :to => :square_metres)
             }
-            store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+            store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => proc { |row|
               Earth::EIA.convert_value(row[division_data[:column] + 7], :from => fuel_data[:intensity], :to => :megajoules_per_square_metre)
             }
           end
@@ -208,26 +208,26 @@ CbecsEnergyIntensity.class_eval do
       CbecsEnergyIntensity::CBECS[:regions].each do |region, region_data|
         import "2003 CBECS #{table.upcase} - #{energy_source.to_s.titleize} Consumption and Intensity - #{region.capitalize} Region",
           :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set#{CbecsEnergyIntensity::FUELS[energy_source][:set]}/2003excel/#{table}.xls",
-          :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+          :select => proc { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
           :headers => false,
           :crop => (energy_source == :fuel_oil ? (16..19) : (21..37)) do
           
-          key :name, :synthesize => Proc.new { |row|
+          key :name, :synthesize => proc { |row|
             "#{Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))}-#{region_data[:census_region]}"
           }
 
           store :census_region_number, :static => region_data[:census_region]
-          store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+          store :principal_building_activity, :synthesize => proc { |row| row[0].gsub(/[\.\(\)]/,'').strip }
           store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
 
-          store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+          store energy_source, :units => :megajoules, :synthesize => proc { |row|
             Earth::EIA.convert_value(row[region_data[:column]], :from => CbecsEnergyIntensity::FUELS[energy_source][:consumption],
                                                                 :to => :megajoules)
           }
-          store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+          store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => proc { |row|
             Earth::EIA.convert_value(row[region_data[:column] + 4], :from => :million_square_feet, :to => :square_metres)
           }
-          store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+          store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => proc { |row|
             Earth::EIA.convert_value(row[region_data[:column] + 8], :from => CbecsEnergyIntensity::FUELS[energy_source][:intensity],
                                                                 :to => :megajoules_per_square_metre)
           }
@@ -239,16 +239,16 @@ CbecsEnergyIntensity.class_eval do
     import "2003 CBECS C1 - District Heat Consumption and Intensity - US Total",
       :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set9/2003excel/c1.xls",
       :headers => false,
-      :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+      :select => proc { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
       :crop => (21..37) do
-      key :name, :synthesize => Proc.new { |row|
+      key :name, :synthesize => proc { |row|
         Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))
       }
-      store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+      store :principal_building_activity, :synthesize => proc { |row| row[0].gsub(/[\.\(\)]/,'').strip }
       store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
 
       {:electricity => [4,5], :natural_gas => [6], :fuel_oil => [7], :district_heat => [8]}.each do |energy_source, columns|
-        store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+        store energy_source, :units => :megajoules, :synthesize => proc { |row|
           total_energy = nil
           columns.each do |column|
             value = Earth::EIA.convert_value(row[column], :from => :trillion_btus, :to => :megajoules)
@@ -259,10 +259,10 @@ CbecsEnergyIntensity.class_eval do
           end
           total_energy
         }
-        store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+        store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => proc { |row|
           Earth::EIA.convert_value(row[2], :from => :million_square_feet, :to => :square_metres)
         }
-        store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+        store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => proc { |row|
           total_energy = nil
           columns.each do |column|
             value = Earth::EIA.convert_value(row[column])

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

@@ -31,34 +31,34 @@ MecsEnergy.class_eval do
         :url => "http://205.254.135.24/emeu/mecs/mecs2006/excel/Table3_2.xls",
         :crop => data[:crop],
         :headers => ["NAICS Code", "Subsector and Industry", "Total", "BLANK", "Net Electricity", "BLANK", "Residual Fuel Oil", "Distillate Fuel Oil", "Natural Gas", "BLANK", "LPG and NGL", "BLANK", "Coal", "Coke and Breeze", "Other"]) do
-        key :name, :synthesize => Proc.new { |row| "#{Industry.format_naics_code(row['NAICS Code'])}-#{data[:code]}" }
+        key :name, :synthesize => proc { |row| "#{Industry.format_naics_code(row['NAICS Code'])}-#{data[:code]}" }
         store :census_region_number, :static => data[:code]
         store :naics_code, :field_name => 'NAICS Code'
-        store :energy, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :energy, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Total'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :electricity, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :electricity, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Net Electricity'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :residual_fuel_oil, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :residual_fuel_oil, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Residual Fuel Oil'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :distillate_fuel_oil, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :distillate_fuel_oil, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Distillate Fuel Oil'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :natural_gas, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :natural_gas, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Natural Gas'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :lpg_and_ngl, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :lpg_and_ngl, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['LPG and NGL'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :coal, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :coal, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Coal'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :coke_and_breeze, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :coke_and_breeze, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Coke and Breeze'], :from => :trillion_btus, :to => :megajoules)
         }
-        store :other_fuel, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :other_fuel, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Other'], :from => :trillion_btus, :to => :megajoules)
         }
       end

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

@@ -31,10 +31,10 @@ MecsRatio.class_eval do
         :url => "http://205.254.135.24/emeu/mecs/mecs2006/excel/Table6_1.xls",
         :crop => data[:crop],
         :headers => ["NAICS Code", "Subsector and Industry", "Consumption per Employee", "Consumption per Dollar of Value Added", "Consumption per Dollar of Value of Shipments"]) do
-        key :name, :synthesize => Proc.new { |row| "#{Industry.format_naics_code(row["NAICS Code"])}-#{data[:code]}" }
+        key :name, :synthesize => proc { |row| "#{Industry.format_naics_code(row["NAICS Code"])}-#{data[:code]}" }
         store :census_region_number, :static => data[:code]
-        store :naics_code, :synthesize => Proc.new { |row| Industry.format_naics_code row["NAICS Code"] }
-        store :energy_per_dollar_of_shipments, :units => :megajoules, :synthesize => Proc.new { |row|
+        store :naics_code, :synthesize => proc { |row| Industry.format_naics_code row["NAICS Code"] }
+        store :energy_per_dollar_of_shipments, :units => :megajoules, :synthesize => proc { |row|
           Earth::EIA.convert_value(row['Consumption per Dollar of Value of Shipments'], :from => :kbtus, :to => :megajoules)
         }
       end

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

@@ -6,7 +6,7 @@ CensusDivision.class_eval do
            :url => 'http://www.census.gov/popest/about/geo/state_geocodes_v2009.txt',
            :skip => 6,
            :headers => %w{ Region Division FIPS Name },
-           :select => ::Proc.new { |row| row['Division'].to_i > 0 and row['FIPS'].to_i == 0 }) do
+           :select => proc { |row| row['Division'].to_i > 0 and row['FIPS'].to_i == 0 }) do
       key   'number', :field_name => 'Division'
       store 'name', :field_name => 'Name'
       store 'census_region_number', :field_name => 'Region'

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

@@ -20,7 +20,7 @@ Country.class_eval do
     
     import "heating and cooling degree day data from WRI CAIT",
            :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDN4MkRTSWtWRjdfazhRdWllTkVSMkE&output=csv',
-           :select => Proc.new { |record| record['country'] != 'European Union (27)' },
+           :select => proc { |record| record['country'] != 'European Union (27)' },
            :errata => { :url => "file://#{Earth::ERRATA_DIR}/country/wri_errata.csv" } do
       key 'name', :field_name => 'country'
       store 'heating_degree_days', :units => :degrees_celsius

data/lib/earth/utils.rb

@@ -27,7 +27,7 @@ module Earth
     def self.insert_ignore(args = {})
       dest_cols = args[:cols].values
       dest_primary_key = args[:dest].primary_key.to_sym
-      dest_primary_key_in_src = args[:cols].key(dest_primary_key)
+      dest_primary_key_in_src = args[:cols].detect { |k, _| k == dest_primary_key }
       
       sql_items = {}
       args[:cols].each do |src_col, dest_col|

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.11.17"
+  VERSION = "0.11.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -406,10 +406,7 @@ email:
 executables:
 - earth_tester.rb
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- LICENSE-PREAMBLE
-- README.markdown
+extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGELOG