earth 0.5.2 → 0.5.3

data/lib/earth/locality/egrid_subregion.rb

@@ -23,7 +23,7 @@ class EgridSubregion < ActiveRecord::Base
                 :electricity_emission_factor => lambda { weighted_average(:electricity_emission_factor, :weighted_by => :net_generation) }, # DEPRECATED
                 :electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour' # DEPRECATED
   
-  create_table do
+  force_schema do
     string 'abbreviation'
     string 'name'
     string 'nerc_abbreviation'

data/lib/earth/locality/petroleum_administration_for_defense_district.rb

@@ -8,7 +8,7 @@ class PetroleumAdministrationForDefenseDistrict < ActiveRecord::Base
     str
   end
   
-  create_table do
+  force_schema do
     string   'code'
     string   'district_code'
     string   'district_name'

data/lib/earth/locality/state.rb

@@ -11,7 +11,7 @@ class State < ActiveRecord::Base
     Country.united_states
   end
 
-  create_table do
+  force_schema do
     string   'postal_abbreviation'
     integer  'fips_code'
     string   'name'

data/lib/earth/locality/urbanity.rb

@@ -3,7 +3,7 @@ class Urbanity < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  create_table do
+  force_schema do
     string 'name'
   end
 end

data/lib/earth/locality/zip_code.rb

@@ -11,7 +11,7 @@ class ZipCode < ActiveRecord::Base
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude
 
-  create_table do
+  force_schema do
     string   'name'
     string   'state_postal_abbreviation'
     string   'description'

data/lib/earth/pet/breed.rb

@@ -4,7 +4,7 @@ class Breed < ActiveRecord::Base
   has_many :breed_genders, :foreign_key => 'breed_name'
   belongs_to :species, :foreign_key => 'species_name'
   
-  create_table do
+  force_schema do
     string   'name'
     string  'species_name'
     float    'weight'

data/lib/earth/pet/breed_gender.rb

@@ -4,7 +4,7 @@ class BreedGender < ActiveRecord::Base
   belongs_to :breed, :foreign_key => 'breed_name'
   belongs_to :gender, :foreign_key => 'gender_name'
   
-  create_table do
+  force_schema do
     string   'name'
     string   'breed_name'
     string   'gender_name'

data/lib/earth/pet/gender.rb

@@ -3,7 +3,7 @@ class Gender < ActiveRecord::Base
   
   has_many :breed_genders, :foreign_key => 'gender_name'
   
-  create_table do
+  force_schema do
     string 'name'
   end
 end

data/lib/earth/pet/species.rb

@@ -1,7 +1,7 @@
 class Species < ActiveRecord::Base
   set_primary_key :name
   
-  create_table do
+  force_schema do
     string   'name'
     integer  'population'
     float    'diet_emission_intensity'

data/lib/earth/rail/rail_class.rb

@@ -1,6 +1,6 @@
 class RailClass < ActiveRecord::Base
   set_primary_key :name
-  create_table do
+  force_schema do
     string 'name'
     string 'description'
     float  'passengers'

data/lib/earth/residence/air_conditioner_use.rb

@@ -6,7 +6,7 @@ class AirConditionerUse < ActiveRecord::Base
   falls_back_on :fugitive_emission => 0.102295.pounds_per_square_foot.to(:kilograms_per_square_metre), # https://brighterplanet.sifterapp.com/projects/30/issues/430
                 :fugitive_emission_units => 'kilograms_per_square_metre'
 
-  create_table do
+  force_schema do
     string 'name'
     float 'fugitive_emission'
     string 'fugitive_emission_units'

data/lib/earth/residence/clothes_machine_use.rb

@@ -3,7 +3,7 @@ class ClothesMachineUse < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  create_table do
+  force_schema do
     string 'name'
     float  'annual_energy_from_electricity_for_clothes_driers'
     string 'annual_energy_from_electricity_for_clothes_driers_units'

data/lib/earth/residence/dishwasher_use.rb

@@ -3,7 +3,7 @@ class DishwasherUse < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  create_table do
+  force_schema do
     string 'name'
     float 'annual_energy_from_electricity_for_dishwashers'
     string 'annual_energy_from_electricity_for_dishwashers_units'

data/lib/earth/residence/residence_appliance.rb

@@ -10,7 +10,7 @@ class ResidenceAppliance < ActiveRecord::Base
     end
   end
 
-  create_table do
+  force_schema do
     string   'name'
     float    'annual_energy_from_electricity'
     string   'annual_energy_from_electricity_units'

data/lib/earth/residence/residence_class.rb

@@ -9,7 +9,7 @@ class ResidenceClass < ActiveRecord::Base
     CLASSIFICATIONS.detect { |c| name.downcase.include? c }
   end
 
-  create_table do
+  force_schema do
     string :name
   end
 end

data/lib/earth/residence/residence_fuel_price.rb

@@ -7,7 +7,7 @@ class ResidenceFuelPrice < ActiveRecord::Base
   belongs_to :fuel, :class_name => 'ResidenceFuelType', :foreign_key => 'residence_fuel_type_name'
   belongs_to :locatable, :polymorphic => true
   
-  create_table do
+  force_schema do
     string  'row_hash'
     string 'residence_fuel_type_name'
     integer 'year'

data/lib/earth/residence/residence_fuel_type.rb

@@ -3,7 +3,7 @@ class ResidenceFuelType < ActiveRecord::Base
   
   has_many :prices, :class_name => 'ResidenceFuelPrice', :foreign_key => 'residence_fuel_type_name'
   
-  create_table do
+  force_schema do
     string   'name'
     float    'emission_factor'
     string   'emission_factor_units'

data/lib/earth/residence/residential_energy_consumption_survey_response.rb

@@ -31,7 +31,7 @@ class ResidentialEnergyConsumptionSurveyResponse < ActiveRecord::Base
   ]
   
   # sabshere 9/20/10 sorted with sort -d -t "'" -k 2 ~/Desktop/parts.txt
-  create_table do
+  force_schema do
     integer  'id'
     string  'air_conditioner_use_id'
     float    'annual_energy_from_electricity_for_air_conditioners'

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

@@ -12,15 +12,15 @@ ResidentialEnergyConsumptionSurveyResponse.class_eval do
            :headers => :upcase do
       key   'id', :field_name => 'DOEID'
       
-      store 'residence_class_id', :field_name => 'TYPEHUQ', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/typehuq/typehuq.csv' }
-      store 'construction_year', :field_name => 'YEARMADE', :dictionary => { :input => 'Code', :sprintf => '%02d', :output => 'Date in the middle (synthetic)', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/yearmade/yearmade.csv' }
-      store 'construction_period', :field_name => 'YEARMADE', :dictionary => { :input => 'Code', :sprintf => '%02d', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/yearmade/yearmade.csv' }
-      store 'urbanity_id', :field_name => 'URBRUR', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/urbrur/urbrur.csv' }
-      store 'dishwasher_use_id', :field_name => 'DWASHUSE', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/dwashuse/dwashuse.csv' }
-      store 'central_ac_use', :field_name => 'USECENAC', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/usecenac/usecenac.csv' }
-      store 'window_ac_use', :field_name => 'USEWWAC', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/usewwac/usewwac.csv' }
-      store 'clothes_washer_use', :field_name => 'WASHLOAD', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/washload/washload.csv' }
-      store 'clothes_dryer_use', :field_name => 'DRYRUSE', :dictionary => { :input => 'Code', :output => 'Description', :url => 'http://github.com/brighterplanet/manually_curated_data/raw/master/dryruse/dryruse.csv' }
+      store 'residence_class_id', :field_name => 'TYPEHUQ', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/typehuq/typehuq.csv' }
+      store 'construction_year', :field_name => 'YEARMADE', :dictionary => { :input => 'Code', :sprintf => '%02d', :output => 'Date in the middle (synthetic)', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/yearmade/yearmade.csv' }
+      store 'construction_period', :field_name => 'YEARMADE', :dictionary => { :input => 'Code', :sprintf => '%02d', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/yearmade/yearmade.csv' }
+      store 'urbanity_id', :field_name => 'URBRUR', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/urbrur/urbrur.csv' }
+      store 'dishwasher_use_id', :field_name => 'DWASHUSE', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/dwashuse/dwashuse.csv' }
+      store 'central_ac_use', :field_name => 'USECENAC', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/usecenac/usecenac.csv' }
+      store 'window_ac_use', :field_name => 'USEWWAC', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/usewwac/usewwac.csv' }
+      store 'clothes_washer_use', :field_name => 'WASHLOAD', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/washload/washload.csv' }
+      store 'clothes_dryer_use', :field_name => 'DRYRUSE', :dictionary => { :input => 'Code', :output => 'Description', :url => 'https://raw.github.com/brighterplanet/manually_curated_data/master/dryruse/dryruse.csv' }
       
       store 'census_division_number', :field_name => 'DIVISION'
       store 'census_division_name', :field_name => 'DIVISION', :dictionary => { :input => 'number', :output => 'name', :url => 'http://data.brighterplanet.com/census_divisions.csv' }

data/lib/earth/shipping/carrier.rb

@@ -8,7 +8,7 @@ class Carrier < ActiveRecord::Base
                 :transport_emission_factor => 0.0005266,
                 :corporate_emission_factor => 0.221
   
-  create_table do
+  force_schema do
     string 'name'
     float  'package_volume'
     float  'route_inefficiency_factor'

data/lib/earth/shipping/carrier_mode.rb

@@ -4,7 +4,7 @@ class CarrierMode < ActiveRecord::Base
   belongs_to :carrier, :foreign_key => 'carrier_name', :primary_key => 'name'
   belongs_to :mode,    :foreign_key => 'mode_name',    :primary_key => 'name', :class_name => 'ShipmentMode'
 
-  create_table do
+  force_schema do
     string 'name'
     string 'carrier_name'
     string 'mode_name'

data/lib/earth/shipping/shipment_mode.rb

@@ -3,7 +3,7 @@ class ShipmentMode < ActiveRecord::Base
   
   has_many :carrier_modes, :foreign_key => 'mode_name', :primary_key => 'name'
   
-  create_table do
+  force_schema do
     string 'name'
     float  'route_inefficiency_factor'
     float  'transport_emission_factor'

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/earth/air/aircraft_spec.rb

@@ -5,7 +5,7 @@ require 'earth/air/aircraft/data_miner'
 describe Aircraft do
   describe 'import', :slow => true do
     it 'should treat empty cells as null' do
-      Aircraft.create_table!
+      Aircraft.force_schema!
       Aircraft.run_data_miner!
       Aircraft.count.should > 1
       Aircraft.where(:brighter_planet_aircraft_class_code => nil).should_not be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-06 00:00:00.000000000 -05:00
-default_executable: 
+date: 2011-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &2155374700 !ruby/object:Gem::Requirement
+  requirement: &2156284520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155374700
+  version_requirements: *2156284520
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2155374280 !ruby/object:Gem::Requirement
+  requirement: &2156300480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155374280
+  version_requirements: *2156300480
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2155373860 !ruby/object:Gem::Requirement
+  requirement: &2156300060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155373860
+  version_requirements: *2156300060
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2155373360 !ruby/object:Gem::Requirement
+  requirement: &2156299560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +56,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155373360
+  version_requirements: *2156299560
 - !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &2155372940 !ruby/object:Gem::Requirement
+  requirement: &2156299140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155372940
+  version_requirements: *2156299140
 - !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &2155372480 !ruby/object:Gem::Requirement
+  requirement: &2156298680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155372480
+  version_requirements: *2156298680
 - !ruby/object:Gem::Dependency
   name: geokit-rails
-  requirement: &2155372060 !ruby/object:Gem::Requirement
+  requirement: &2156298260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155372060
+  version_requirements: *2156298260
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2155371560 !ruby/object:Gem::Requirement
+  requirement: &2156297760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +100,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2155371560
+  version_requirements: *2156297760
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2155371140 !ruby/object:Gem::Requirement
+  requirement: &2156297340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155371140
+  version_requirements: *2156297340
 - !ruby/object:Gem::Dependency
-  name: create_table
-  requirement: &2155370600 !ruby/object:Gem::Requirement
+  name: force_schema
+  requirement: &2156296800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +122,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2155370600
+  version_requirements: *2156296800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155370180 !ruby/object:Gem::Requirement
+  requirement: &2156296380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155370180
+  version_requirements: *2156296380
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2155369720 !ruby/object:Gem::Requirement
+  requirement: &2156295920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155369720
+  version_requirements: *2156295920
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2155369300 !ruby/object:Gem::Requirement
+  requirement: &2156295500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155369300
+  version_requirements: *2156295500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155368880 !ruby/object:Gem::Requirement
+  requirement: &2156295080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155368880
+  version_requirements: *2156295080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155368460 !ruby/object:Gem::Requirement
+  requirement: &2156294660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155368460
+  version_requirements: *2156294660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2155368040 !ruby/object:Gem::Requirement
+  requirement: &2156294240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155368040
+  version_requirements: *2156294240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155384000 !ruby/object:Gem::Requirement
+  requirement: &2156293820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155384000
+  version_requirements: *2156293820
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2155383580 !ruby/object:Gem::Requirement
+  requirement: &2156293400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +210,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155383580
+  version_requirements: *2156293400
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2155383160 !ruby/object:Gem::Requirement
+  requirement: &2156292980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,7 +221,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155383160
+  version_requirements: *2156292980
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables:
@@ -549,7 +548,6 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/brighterplanet/earth
 licenses: []
 post_install_message: 
@@ -571,7 +569,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea