earth 0.0.30 → 0.0.31

data/Gemfile.lock

@@ -4,27 +4,27 @@ GEM
     GData (0.0.4)
       builder (>= 2.1.2)
       hoe (>= 1.2.1)
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activesupport (3.0.0.rc)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.0)
     andand (1.3.1)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     blockenspiel (0.3.2)
     builder (2.1.2)
-    cohort_scope (0.0.6)
+    cohort_scope (0.0.7)
       activerecord (>= 3.0.0.beta4)
       activesupport (>= 3.0.0.beta4)
     conversions (1.4.5)
       activesupport (>= 2.3.4)
-    data_miner (0.5.2)
+    data_miner (0.5.3)
       activerecord (>= 2.3.4)
       activesupport (>= 2.3.4)
       andand (>= 1.3.1)
@@ -40,13 +40,13 @@ GEM
       activesupport (>= 2.3.4)
       remote_table (>= 0.2.20)
     escape (0.0.4)
-    falls_back_on (0.0.2)
+    falls_back_on (0.0.3)
       activerecord
     fastercsv (1.5.3)
     gemcutter (0.6.1)
     geokit (1.5.0)
     git (1.2.5)
-    hoe (2.6.1)
+    hoe (2.6.2)
       rake (>= 0.8.7)
       rubyforge (>= 2.0.4)
     hpricot (0.8.2)
@@ -55,7 +55,7 @@ GEM
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
-    json_pure (1.4.3)
+    json_pure (1.4.6)
     libxml-ruby (1.1.4)
     log4r (1.1.8)
     mime-types (1.16)
@@ -63,7 +63,7 @@ GEM
     rack (1.2.1)
     rake (0.8.7)
     rcov (0.9.8)
-    rdoc (2.5.9)
+    rdoc (2.5.11)
     remote_table (0.2.27)
       activesupport (>= 2.3.4)
       escape (>= 0.0.4)
@@ -79,14 +79,14 @@ GEM
       libxml-ruby (>= 1.1.3)
       rubyzip (>= 0.9.1)
       spreadsheet (>= 0.6.4)
-    rspec (2.0.0.beta.17)
-      rspec-core (= 2.0.0.beta.17)
-      rspec-expectations (= 2.0.0.beta.17)
-      rspec-mocks (= 2.0.0.beta.17)
-    rspec-core (2.0.0.beta.17)
-    rspec-expectations (2.0.0.beta.17)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.17)
+    rspec-mocks (2.0.0.beta.20)
     ruby-ole (1.2.10.1)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -97,7 +97,7 @@ GEM
     slither (0.99.3)
     spreadsheet (0.6.4.1)
       ruby-ole
-    sqlite3-ruby (1.3.0)
+    sqlite3-ruby (1.3.1)
     taps (0.3.11)
       json_pure (>= 1.2.0, < 1.5.0)
       rack (>= 1.0.1)
@@ -105,7 +105,7 @@ GEM
       sequel (~> 3.13.0)
       sinatra (~> 1.0.0)
       sqlite3-ruby (~> 1.2)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
 
 PLATFORMS
   ruby

data/lib/earth.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'cohort_scope'
+require 'earth/base'
 require 'earth/conversions_ext'
 require 'earth/inflectors'
 require 'data_miner'
@@ -152,9 +153,10 @@ private
 
   def load_data_miner_schemas
     models = Module.constants.select do |k|
-      const = Object.const_get(k)
+      const = Object.const_get(k) if Object.const_defined?(k)
       if const.instance_of?(Class)
-        const.superclass == ActiveRecord::Base
+        const.superclass == ActiveRecord::Base || 
+          const.superclass == Earth::Base
       else
         false
       end

data/lib/earth/base.rb

@@ -0,0 +1,7 @@
+module Earth
+  class Base < ActiveRecord::Base
+    def self.define_schema(data_miner)
+      data_miner.schema Earth.database_options, &self.schema_definition
+    end
+  end
+end

data/lib/earth/industry/data_miner.rb

@@ -1,2 +1,8 @@
+require 'earth/industry/industries_product_lines/data_miner'
+require 'earth/industry/industries_sectors/data_miner'
 require 'earth/industry/industry/data_miner'
+require 'earth/industry/merchant/data_miner'
+require 'earth/industry/merchant_categories_industries/data_miner'
 require 'earth/industry/product_line/data_miner'
+require 'earth/industry/product_lines_sectors/data_miner'
+require 'earth/industry/sector/data_miner'

data/lib/earth/industry/industries_product_lines.rb

@@ -1,11 +1,11 @@
-class IndustriesProductLines < ActiveRecord::Base
+class IndustriesProductLines < Earth::Base
   set_primary_key :row_hash
   
   belongs_to :industry,     :foreign_key => 'naics_code'
   belongs_to :product_line, :foreign_key => 'ps_code'
 
-  data_miner do
-    schema Earth.database_options do
+  def self.schema_definition
+    lambda do
       string 'row_hash'
       string 'naics_code'
       float  'ratio'
@@ -13,4 +13,8 @@ class IndustriesProductLines < ActiveRecord::Base
       float  'revenue_allocated'
     end
   end
+
+  data_miner do
+    IndustriesProductLines.define_schema(self)
+  end
 end

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

@@ -0,0 +1,13 @@
+IndustriesProductLines.class_eval do
+  data_miner do
+    IndustriesProductLines.define_schema(self)
+    
+    import "sectors dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHV2dzdjdGVnLUJCdDA4TURXNThROVE&hl=en&single=true&gid=1&output=csv' do
+      key 'ps_code'
+      store 'naics_code'
+      store 'ratio'
+      store 'revenue_allocated'
+    end
+  end
+end

data/lib/earth/industry/industries_sectors.rb

@@ -1,15 +1,16 @@
-class IndustriesSectors < ActiveRecord::Base
-  set_primary_key :row_hash
-  
+class IndustriesSectors < Earth::Base
   belongs_to :industry,  :foreign_key => 'naics_code'
   belongs_to :sector,    :foreign_key => 'io_code'
 
-  data_miner do
-    schema Earth.database_options do
-      string 'row_hash'
+  def self.schema_definition
+    lambda do
       string 'naics_code'
       float  'ratio'
       string 'io_code'
     end
   end
+
+  data_miner do
+    IndustriesSectors.define_schema(self)
+  end
 end

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

@@ -0,0 +1,12 @@
+IndustriesSectors.class_eval do
+  data_miner do
+    IndustriesSectors.define_schema(self)
+    
+    import "industries to sectors dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDVjVWRJdmVrcEtNd0U5Z3NxdGRlN1E&hl=en&single=true&gid=0&output=csv' do
+      key 'naics_code'
+      store 'ratio'
+      store 'io_code'
+    end
+  end
+end

data/lib/earth/industry/merchant.rb

@@ -1,13 +1,17 @@
-class Merchant < ActiveRecord::Base
+class Merchant < Earth::Base
   set_primary_key :id
   
   belongs_to :merchant_category, :foreign_key => 'mcc'
 
-  data_miner do
-    schema Earth.database_options do
+  def self.schema_definition
+    lambda do
       string 'id'
       string 'name'
       string 'mcc'
     end
   end
+
+  data_miner do
+    Merchant.define_schema(self)
+  end
 end

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

@@ -0,0 +1,12 @@
+Merchant.class_eval do
+  data_miner do
+    Merchant.define_schema(self)
+    
+    import "merchant dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdElxWTd0ckpfVXJ6OVFxLUhwR0ZOVXc&hl=en&single=true&gid=0&output=csv' do
+      key 'id'
+      store 'name'
+      store 'mcc'
+    end
+  end
+end

data/lib/earth/industry/merchant_categories_industries.rb

@@ -1,4 +1,4 @@
-class MerchantCategoriesIndustries < ActiveRecord::Base
+class MerchantCategoriesIndustries < Earth::Base
   set_primary_key :row_hash
   
   belongs_to :merchant_category, :foreign_key => 'mcc'
@@ -6,12 +6,15 @@ class MerchantCategoriesIndustries < ActiveRecord::Base
   has_many :industries_product_lines, :through => :industry, :class_name => 'IndustriesProductLines'
   has_many :industries_sectors, :through => :industry, :class_name => 'IndustriesSectors'
 
-  data_miner do
-    schema Earth.database_options do
-      string 'row_hash'
+  def self.schema_definition
+    lambda do
       string 'mcc'
       float  'ratio'
       string 'naics_code'
     end
   end
+
+  data_miner do
+    MerchantCategoriesIndustries.define_schema(self)
+  end
 end

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

@@ -0,0 +1,12 @@
+MerchantCategoriesIndustries.class_eval do
+  data_miner do
+    MerchantCategoriesIndustries.define_schema(self)
+    
+    import "merchant categories to industries dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHpDbjNwTHBmY252V01CQ1lOUUVMU1E&hl=en&single=true&gid=0&output=csv' do
+      key 'naics_code'
+      store 'mcc'
+      store 'ratio'
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+MerchantCategory.class_eval do
+  data_miner do
+    MerchantCategory.define_schema(self)
+    
+    import "merchant category dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEx2WGZpbTRLdzJub05VR3pyQThRMGc&hl=en&single=true&gid=0&output=csv' do
+      key 'mcc'
+      store 'description'
+    end
+  end
+end

data/lib/earth/industry/product_lines_sectors.rb

@@ -1,15 +1,17 @@
-class ProductLinesSectors < ActiveRecord::Base
-  set_primary_key :row_hash
-  
+class ProductLinesSectors < Earth::Base
   belongs_to :product_line, :foreign_key => 'ps_code'
   belongs_to :sector,       :foreign_key => 'io_code'
 
-  data_miner do
-    schema Earth.database_options do
+  def self.schema_definition
+    lambda do
       string 'row_hash'
       string 'ps_code'
       float  'ratio'
       string 'io_code'
     end
   end
+
+  data_miner do
+    ProductLinesSectors.define_schema(self)
+  end
 end

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

@@ -0,0 +1,14 @@
+ProductLinesSectors.class_eval do
+  data_miner do
+    ProductLinesSectors.define_schema(self)
+    
+    import "product lines to sectors dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHRwWXRWai0tQnpxb2RfNFN3ZXROY1E&hl=en&single=true&gid=0&output=csv' do
+      key 'ps_code'
+      store 'ps_code_meaning'
+      store 'ratio'
+      store 'io_code'
+      store 'io_meaning'
+    end
+  end
+end

data/lib/earth/industry/sector.rb

@@ -1,4 +1,4 @@
-class Sector < ActiveRecord::Base
+class Sector < Earth::Base
   set_primary_key :io_code
 
   has_many :product_lines_sectors, :class_name => 'ProductLinesSectors', :foreign_key => 'io_code'
@@ -16,10 +16,16 @@ class Sector < ActiveRecord::Base
     end
   end
 
-  data_miner do
-    schema Earth.database_options do
+  def self.schema_definition
+    lambda do
       string 'io_code'
       string 'description'
+      float 'emission_factor'
+      string 'emission_factor_units'
     end
   end
+
+  data_miner do
+    Sector.define_schema(self)
+  end
 end

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

@@ -0,0 +1,13 @@
+Sector.class_eval do
+  data_miner do
+    Sector.define_schema(self)
+    
+    import "sectors dictionary",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHV2dzdjdGVnLUJCdDA4TURXNThROVE&hl=en&single=true&gid=1&output=csv' do
+      key 'io_code'
+      store 'description'
+      store 'emission_factor'
+      store 'emission_factor_units'
+    end
+  end
+end

data/spec/lib/earth/industry/industries_product_lines_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe IndustriesProductLines do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/industries_product_lines/data_miner'
+    end
+    it 'should import data' do
+      IndustriesProductLines.destroy_all
+      DataMiner.run :resource_names => 'IndustriesProductLines'
+      IndustriesProductLines.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/industries_sectors_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe IndustriesSectors do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/industries_sectors/data_miner'
+    end
+    it 'should import data' do
+      IndustriesSectors.destroy_all
+      DataMiner.run :resource_names => 'IndustriesSectors'
+      IndustriesSectors.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/industry_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe Industry do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/industry/data_miner'
+    end
+    it 'should import data' do
+      Industry.destroy_all
+      DataMiner.run :resource_names => 'Industry'
+      Industry.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/merchant_categories_industries_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe MerchantCategoriesIndustries do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/merchant/data_miner'
+    end
+    it 'should import data' do
+      MerchantCategoriesIndustries.destroy_all
+      DataMiner.run :resource_names => 'MerchantCategoriesIndustries'
+      MerchantCategoriesIndustries.count.should > 1
+    end
+  end
+end

data/spec/lib/earth/industry/merchant_category_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe MerchantCategory do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+    end
+    it 'should import data' do
+      MerchantCategory.destroy_all
+      DataMiner.run :resource_names => 'MerchantCategory'
+      MerchantCategory.count.should > 1
+    end
+  end
+end

data/spec/lib/earth/industry/merchant_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe Merchant do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/merchant/data_miner'
+    end
+    it 'should import data' do
+      Merchant.destroy_all
+      DataMiner.run :resource_names => 'Merchant'
+      Merchant.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/product_line_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe ProductLine do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/merchant/data_miner'
+    end
+    it 'should import data' do
+      ProductLine.destroy_all
+      DataMiner.run :resource_names => 'ProductLine'
+      ProductLine.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/product_lines_sectors_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe ProductLinesSectors do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/merchant/data_miner'
+    end
+    it 'should import data' do
+      ProductLinesSectors.destroy_all
+      DataMiner.run :resource_names => 'ProductLinesSectors'
+      ProductLinesSectors.count.should > 1
+    end
+  end
+end
+

data/spec/lib/earth/industry/sector_spec.rb

@@ -77,5 +77,18 @@ describe Sector do
       }
     end
   end
+
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/sector/data_miner'
+    end
+    it 'should import data' do
+      Sector.destroy_all
+      DataMiner.run :resource_names => 'Sector'
+      Sector.count.should > 1
+      Sector.first.emission_factor_units.should == 'kilograms_per_2002_dollar'
+    end
+  end
 end
 

data/spec/lib/industries_sectors_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+Earth.init :industry, :apply_schemas => true
+
+describe IndustriesProductLines do
+  describe 'data_miner import' do
+    before :all do
+      require 'data_miner'
+      require 'earth/industry/industries_product_lines/data_miner'
+    end
+    it 'should import data' do
+      IndustriesProductLines.destroy_all
+      DataMiner.run :resource_names => 'IndustriesProductLines'
+      IndustriesProductLines.count.should > 1
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 0
-  - 30
-  version: 0.0.30
+  - 31
+  version: 0.0.31
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -05:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: -1848230024
         segments: 
         - 3
         - 0
@@ -267,6 +267,7 @@ files:
 - lib/earth/automobile/automobile_variant.rb
 - lib/earth/automobile/automobile_variant/data_miner.rb
 - lib/earth/automobile/data_miner.rb
+- lib/earth/base.rb
 - lib/earth/bus.rb
 - lib/earth/bus/bus_class.rb
 - lib/earth/bus/bus_class/data_miner.rb
@@ -288,16 +289,23 @@ files:
 - lib/earth/industry.rb
 - lib/earth/industry/data_miner.rb
 - lib/earth/industry/industries_product_lines.rb
+- lib/earth/industry/industries_product_lines/data_miner.rb
 - lib/earth/industry/industries_sectors.rb
+- lib/earth/industry/industries_sectors/data_miner.rb
 - lib/earth/industry/industry.rb
 - lib/earth/industry/industry/data_miner.rb
 - lib/earth/industry/merchant.rb
+- lib/earth/industry/merchant/data_miner.rb
 - lib/earth/industry/merchant_categories_industries.rb
+- lib/earth/industry/merchant_categories_industries/data_miner.rb
 - lib/earth/industry/merchant_category.rb
+- lib/earth/industry/merchant_category/data_miner.rb
 - lib/earth/industry/product_line.rb
 - lib/earth/industry/product_line/data_miner.rb
 - lib/earth/industry/product_lines_sectors.rb
+- lib/earth/industry/product_lines_sectors/data_miner.rb
 - lib/earth/industry/sector.rb
+- lib/earth/industry/sector/data_miner.rb
 - lib/earth/inflectors.rb
 - lib/earth/locality.rb
 - lib/earth/locality/census_division.rb
@@ -396,8 +404,17 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
+- spec/lib/earth/industry/industries_product_lines_spec.rb
+- spec/lib/earth/industry/industries_sectors_spec.rb
+- spec/lib/earth/industry/industry_spec.rb
+- spec/lib/earth/industry/merchant_categories_industries_spec.rb
+- spec/lib/earth/industry/merchant_category_spec.rb
+- spec/lib/earth/industry/merchant_spec.rb
+- spec/lib/earth/industry/product_line_spec.rb
+- spec/lib/earth/industry/product_lines_sectors_spec.rb
 - spec/lib/earth/industry/sector_spec.rb
 - spec/lib/earth_spec.rb
+- spec/lib/industries_sectors_spec.rb
 - spec/spec_helper.rb
 - Gemfile
 - Gemfile.lock
@@ -436,8 +453,17 @@ signing_key:
 specification_version: 3
 summary: Land, sky, and sea
 test_files: 
+- spec/lib/earth/industry/industries_product_lines_spec.rb
+- spec/lib/earth/industry/industries_sectors_spec.rb
+- spec/lib/earth/industry/industry_spec.rb
+- spec/lib/earth/industry/merchant_categories_industries_spec.rb
+- spec/lib/earth/industry/merchant_category_spec.rb
+- spec/lib/earth/industry/merchant_spec.rb
+- spec/lib/earth/industry/product_line_spec.rb
+- spec/lib/earth/industry/product_lines_sectors_spec.rb
 - spec/lib/earth/industry/sector_spec.rb
 - spec/lib/earth_spec.rb
+- spec/lib/industries_sectors_spec.rb
 - spec/spec_helper.rb
 - Gemfile
 - Gemfile.lock