earth 0.2.0 → 0.2.1

data/lib/earth/industry.rb

@@ -1,10 +1,10 @@
 require 'earth/industry/industry_product_line'
 require 'earth/industry/industry_sector'
 require 'earth/industry/industry'
+require 'earth/industry/industry_product'
 require 'earth/industry/merchant'
 require 'earth/industry/merchant_category_industry'
 require 'earth/industry/merchant_category'
 require 'earth/industry/product_line'
-require 'earth/industry/product_line_sector'
+require 'earth/industry/product_line_industry_product'
 require 'earth/industry/sector'
-

data/lib/earth/industry/industry.rb

@@ -2,11 +2,13 @@ class Industry < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :naics_code
   
+  has_many :merchant_category_industries, :foreign_key => 'naics_code'
+  
   has_many :industry_product_lines, :foreign_key => 'naics_code'
-  has_many :product_lines, :through => :industries_product_lines
+  has_many :product_lines, :through => :industry_product_lines
+  
   has_many :industry_sectors, :foreign_key => 'naics_code'
   has_many :sectors, :through => :industry_sectors
-  has_many :merchant_category_industries, :foreign_key => 'naics_code'
   
   def self.schema_definition
     lambda do

data/lib/earth/industry/industry_product.rb

@@ -0,0 +1,21 @@
+class IndustryProduct < ActiveRecord::Base
+  extend Earth::Base
+  set_primary_key :naics_product_code
+  
+  has_many :product_line_industry_products, :foreign_key => 'naics_product_code'
+  
+  belongs_to :industry, :foreign_key => 'naics_code'
+  
+  def self.schema_definition
+    lambda do
+      string 'naics_product_code'
+      string 'description'
+      float  'value'
+      string 'naics_code'
+    end
+  end
+
+  data_miner do
+    IndustryProduct.define_schema(self)
+  end
+end

data/lib/earth/industry/industry_product_line.rb

@@ -11,7 +11,6 @@ class IndustryProductLine < ActiveRecord::Base
       string 'naics_code'
       float  'ratio'
       string 'ps_code'
-      float  'revenue_allocated'
     end
   end
 

data/lib/earth/industry/industry_sector.rb

@@ -1,10 +1,13 @@
 class IndustrySector < ActiveRecord::Base
   extend Earth::Base
+  set_primary_key :row_hash
+  
   belongs_to :industry,  :foreign_key => 'naics_code'
   belongs_to :sector,    :foreign_key => 'io_code'
 
   def self.schema_definition
     lambda do
+      string 'row_hash'
       string 'naics_code'
       float  'ratio'
       string 'io_code'

data/lib/earth/industry/merchant_category.rb

@@ -8,11 +8,15 @@ class MerchantCategory < ActiveRecord::Base
   def name
     description
   end
-
-  data_miner do
-    schema Earth.database_options do
+  
+  def self.schema_definition
+    lambda do
       string 'mcc'
       string 'description'
     end
   end
+  
+  data_miner do
+    MerchantCategory.define_schema(self)
+  end
 end

data/lib/earth/industry/merchant_category_industry.rb

@@ -1,13 +1,13 @@
 class MerchantCategoryIndustry < ActiveRecord::Base
   extend Earth::Base
+  set_primary_key :row_hash
   
   belongs_to :merchant_category, :foreign_key => 'mcc'
   belongs_to :industry,          :foreign_key => 'naics_code'
-  has_many :industry_product_lines, :through => :industry
-  has_many :industry_sectors, :through => :industry
 
   def self.schema_definition
     lambda do
+      string 'row_hash'
       string 'mcc'
       float  'ratio'
       string 'naics_code'

data/lib/earth/industry/product_line.rb

@@ -2,8 +2,10 @@ class ProductLine < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :ps_code
   
-  has_many :product_line_sectors, :foreign_key => 'ps_code'
-  has_many :sectors, :through => :product_line_sectors
+  has_many :industry_product_lines,         :foreign_key => 'ps_code'
+  
+  has_many :product_line_industry_products, :foreign_key => 'ps_code'
+  has_many :industry_products, :through => :product_line_industry_products
   
   def self.schema_definition
     lambda do

data/lib/earth/industry/product_line_industry_product.rb

@@ -0,0 +1,20 @@
+class ProductLineIndustryProduct < ActiveRecord::Base
+  extend Earth::Base
+  set_primary_key :row_hash
+  
+  belongs_to :product_line,     :foreign_key => 'ps_code'
+  belongs_to :industry_product, :foreign_key => 'naics_product_code'
+
+  def self.schema_definition
+    lambda do
+      string 'row_hash'
+      string 'ps_code'
+      float  'ratio'
+      string 'naics_product_code'
+    end
+  end
+
+  data_miner do
+    ProductLineIndustryProduct.define_schema(self)
+  end
+end

data/lib/earth/industry/sector.rb

@@ -2,14 +2,11 @@ class Sector < ActiveRecord::Base
   extend Earth::Base
   set_primary_key :io_code
 
-  has_many :product_line_sectors, :foreign_key => 'io_code'
-
   def self.schema_definition
     lambda do
       string 'io_code'
       string 'description'
-      float 'emission_factor'
-      string 'emission_factor_units'
+      float  'value'
     end
   end
 

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

@@ -5,15 +5,31 @@ EgridRegion.class_eval do
       float    'loss_factor'
     end
     
+    # NOTE: the following import uses an 18 Mb zip - don't know if two imports will cause it to be downloaded twice...
+    # 
+    # import "eGRID regions and loss factors derived from eGRID 2007 data",
+    #        :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
+    #        :filename => 'eGRID2007_Version1-1/eGRID2007V1_1_year0504_STIE_USGC.xls',
+    #        :sheet => 'STIE05',
+    #        :skip => 4,
+    #        :select => lambda { |row| row['eGRID2007 2005 file State sequence number'].to_i.between?(1, 51) } do
+    #   key   'name', :field_name => 'Grid region (E=Eastern grid, W=Western grid, AK=Alaska, HI=Hawaii, TX=Texas)'
+    #   store 'loss_factor', :field_name => '2005 grid gross loss factor'
+    # end
+    # 
+    # import "the US average grid loss factor derived eGRID 2007 data"
+    #        :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
+    #        :filename => 'eGRID2007_Version1-1/eGRID2007V1_1_year0504_STIE_USGC.xls',
+    #        :sheet => 'USGC',
+    #        :skip => 5 do
+    #   key # the name should be 'US'
+    #   store # store the result of (USTNGN05 + USTNFI05 - USTCON05) / USTNGN05
+    # end
+    
     import "eGRID regions and loss factors derived from eGRID 2007 data",
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
-           :filename => 'eGRID2007_Version1-1/eGRID2007V1_1_year0504_STIE_USGC.xls',
-           :sheet => 'STIE05',
-           :select => lambda { |row| row['eGRID2007 2005 file State sequence number'].to_i.between?(1, 51) },
-           :skip => 4 do
-      key   'name', :field_name => 'Grid region (E=Eastern grid, W=Western grid, AK=Alaska, HI=Hawaii, TX=Texas)'
-      store 'loss_factor', :field_name => '2005 grid gross loss factor'
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHoydC1MdDY0YVZkRE5zN0huOUZYbnc&hl=en&single=true&gid=0&output=csv' do
+      key 'name'
+      store 'loss_factor'
     end
   end
 end
-

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

@@ -9,18 +9,57 @@ EgridSubregion.class_eval do
       string 'egrid_region_name'
     end
     
-    process "Define some unit conversions" do
-      Conversions.register :kilograms_per_kilowatt_hour, :kilograms_per_megawatt_hour, 1_000.0
-    end
+    # process "define some unit conversions" do
+    #   Conversions.register :pounds_per_megawatt_hour, :kilograms_per_kilowatt_hour, 0.00045359237
+    #   Conversions.register :pounds_per_gigawatt_hour, :kilograms_per_kilowatt_hour, 0.00000045359237
+    # end
+    # 
+    # NOTE: the following import uses an 18 Mb zip - don't know if two imports will cause it to be downloaded twice...
+    # 
+    # import "eGRID regions and electricity emission factors derived from eGRID 2007 data",
+    #        :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
+    #        :filename => 'eGRID2007V1_1_year05_aggregation.xls',
+    #        :sheet => 'SRL05',
+    #        :skip => 3,
+    #        :select => lambda { |row| row['eGRID2007 2005 file eGRID subregion location (operator)-based sequence number'].to_i.between?(1, 26) } do
+    #   key   'abbreviation', :field_name => 'eGRID subregion acronym'
+    #   store 'name', :field_name => 'eGRID subregion name associated with eGRID subregion acronym'
+    #   store 'nerc_abbreviation', :field_name => 'NERC region acronym associated with the eGRID subregion acronym'
+    #   store 'electricity_ef_co2', :field_name => 'eGRID subregion annual CO2 output emission rate (lb/MWh)', :from_units => :pounds_per_megawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    #   store 'electricity_ef_ch4', :field_name => 'eGRID subregion annual CH4 output emission rate (lb/GWh)', :from_units => :pounds_per_gigawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    #   store 'electricity_ef_n2o', :field_name => 'eGRID subregion annual N2O output emission rate (lb/GWh)', :from_units => :pounds_per_gigawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    # end
+    # 
+    # import "US average electricity emission factors derived from eGRID 2007 data",
+    #        :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2007_Version1-1.zip',
+    #        :filename => 'eGRID2007V1_1_year05_aggregation.xls',
+    #        :sheet => 'US05',
+    #        :skip => 3,
+    #        :select => lambda { |row| row['eGRID2007 2005 file US sequence number'].to_i.is?(1) } do
+    #   key   # the single row should be keyed 'US'
+    #   store 'name' # the single row should be named 'United States Average'
+    #   store 'electricity_ef_co2', :field_name => 'US annual CO2 output emission rate (lb/MWh)', :from_units => :pounds_per_megawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    #   store 'electricity_ef_ch4', :field_name => 'US annual CH4 output emission rate (lb/GWh)', :from_units => :pounds_per_gigawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    #   store 'electricity_ef_n2o', :field_name => 'US annual N2O output emission rate (lb/GWh)', :from_units => :pounds_per_gigawatt_hour, :to_units => :kilograms_per_kilowatt_hour
+    # end
+    # 
+    # import "the eGRID regions associated with each subregion" do
+    #        :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&single=true&gid=0&output=csv' do
+    #   key 'abbreviation'
+    #   store 'egrid_region_name'
+    # end
+    # 
+    # process "Calculate CO2e emission factor"
+    #   # multiply each gas ef by the gas GWP and sum
+    # end
     
-    import "a list of eGRID subregions and pre-calculated emissions factors",
-           :url => 'http://static.brighterplanet.com/science/data/electricity/egrid/models_export/egrid_subregions.csv' do
+    import "a list of eGRID subregions and emissions factors derived from eGRID 2007 data",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&single=true&gid=0&output=csv' do
       key   'abbreviation'
       store 'name'
-      store 'electricity_emission_factor', :from_units => :kilograms_per_megawatt_hour, :to_units => :kilograms_per_kilowatt_hour
       store 'nerc_abbreviation'
       store 'egrid_region_name'
+      store 'electricity_emission_factor', :units_field_name => 'electricity_emission_factor_units'
     end
   end
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -325,13 +325,14 @@ files:
 - lib/earth/hospitality/lodging_class/data_miner.rb
 - lib/earth/industry.rb
 - lib/earth/industry/industry.rb
+- lib/earth/industry/industry_product.rb
 - lib/earth/industry/industry_product_line.rb
 - lib/earth/industry/industry_sector.rb
 - lib/earth/industry/merchant.rb
 - lib/earth/industry/merchant_category.rb
 - lib/earth/industry/merchant_category_industry.rb
 - lib/earth/industry/product_line.rb
-- lib/earth/industry/product_line_sector.rb
+- lib/earth/industry/product_line_industry_product.rb
 - lib/earth/industry/sector.rb
 - lib/earth/inflectors.rb
 - lib/earth/locality.rb

data/lib/earth/industry/product_line_sector.rb

@@ -1,18 +0,0 @@
-class ProductLineSector < ActiveRecord::Base
-  extend Earth::Base
-  belongs_to :product_line, :foreign_key => 'ps_code'
-  belongs_to :sector,       :foreign_key => 'io_code'
-
-  def self.schema_definition
-    lambda do
-      string 'row_hash'
-      string 'ps_code'
-      float  'ratio'
-      string 'io_code'
-    end
-  end
-
-  data_miner do
-    ProductLineSector.define_schema(self)
-  end
-end