earth 0.3.6 → 0.3.7

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    earth (0.3.0)
-      activerecord (>= 3.0.0.beta4)
+    earth (0.3.6)
+      activerecord (~> 3)
       cohort_scope (>= 0.0.7)
       conversions (>= 1.4.5)
       data_miner (~> 0.5.6)
@@ -29,7 +29,7 @@ GEM
     activesupport (3.0.3)
     amatch (0.2.5)
     andand (1.3.1)
-    arel (2.0.4)
+    arel (2.0.6)
     blockenspiel (0.3.2)
     builder (2.1.2)
     cohort_scope (0.1.1)
@@ -57,12 +57,11 @@ GEM
       activerecord
     geokit (1.5.0)
     git (1.2.5)
-    hoe (2.7.0)
+    hoe (2.8.0)
       rake (>= 0.8.7)
-      rubyforge (>= 2.0.4)
     hpricot (0.8.3)
-    i18n (0.4.2)
-    jeweler (1.5.0)
+    i18n (0.5.0)
+    jeweler (1.5.1)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
@@ -93,17 +92,15 @@ GEM
       libxml-ruby (>= 1.1.3)
       rubyzip (>= 0.9.1)
       spreadsheet (>= 0.6.4)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.2.0)
     ruby-ole (1.2.11.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     rubyzip (0.9.4)
     sequel (3.17.0)
     sinatra (1.0)
@@ -128,18 +125,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.0.beta4)
+  activerecord (~> 3)
   cohort_scope (>= 0.0.7)
   conversions (>= 1.4.5)
   data_miner (~> 0.5.6)
   earth!
   falls_back_on (>= 0.0.3)
   geokit (>= 1.5.0)
-  jeweler (= 1.5.0)
+  jeweler (~> 1.4)
   loose_tight_dictionary (>= 0.0.8)
   rake
   rcov
   rdoc
-  rspec (>= 2.0.0.beta.17)
-  sqlite3-ruby (>= 1.3.0)
+  rspec (~> 2)
+  sqlite3-ruby
   weighted_average (>= 0.0.4)

data/lib/earth/all.rb

@@ -9,3 +9,4 @@ require 'earth/locality'
 require 'earth/pet'
 require 'earth/rail'
 require 'earth/residence'
+require 'earth/shipping'

data/lib/earth/data_miner.rb

@@ -8,3 +8,4 @@ require 'earth/locality/data_miner'
 require 'earth/pet/data_miner'
 require 'earth/rail/data_miner'
 require 'earth/residence/data_miner'
+require 'earth/shipping/data_miner'

data/lib/earth/shipping.rb

@@ -0,0 +1,2 @@
+require 'earth/shipping/carrier'
+require 'earth/shipping/shipment_mode'

data/lib/earth/shipping/carrier.rb

@@ -0,0 +1,9 @@
+class Carrier < ActiveRecord::Base
+  set_primary_key :name
+  
+  falls_back_on :corporate_emission_factor => 0.318#Carrier.average(:corporate_emission_factor)
+  
+  data_miner do
+    tap "Brighter Planet's shipping company data", Earth.taps_server
+  end
+end

data/lib/earth/shipping/carrier/data_miner.rb

@@ -0,0 +1,23 @@
+Carrier.class_eval do
+  data_miner do
+    schema Earth.database_options do
+      string 'name'
+      float  'corporate_emission_factor'
+      string 'corporate_emission_factor_units'
+    end
+    
+    import "a list of shipping companies and their characteristics",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG1ONU1HZDdZTFJNclFYVkRzR0k5Z2c&hl=en&single=true&gid=0&output=csv' do
+      key   'name'
+      store 'corporate_emission_factor', :units_field_name => 'corporate_emission_factor_units'
+    end
+    
+    verify "All entries should have corporate_emission_factor >= 0" do
+      all.each do |record|
+        unless record[:corporate_emission_factor] >= 0
+          raise "Invalid corporate_emission_factor for Carrier #{record[:name]}: #{record[:corporate_emission_factor]}"
+        end
+      end
+    end
+  end
+end

data/lib/earth/shipping/data_miner.rb

@@ -0,0 +1,2 @@
+require 'earth/shipping/carrier/data_miner'
+require 'earth/shipping/shipment_mode/data_miner'

data/lib/earth/shipping/shipment_mode.rb

@@ -0,0 +1,10 @@
+class ShipmentMode < ActiveRecord::Base
+  set_primary_key :name
+  
+  falls_back_on :route_inefficiency_factor => 1.05,#ShipmentMode.where(not(:name => 'courier')).average(:route_inefficiency_factor),
+                :transport_emission_factor => 3.0#ShipmentMode.where(not(:name => 'courier')).average(:route_inefficiency_factor)
+  
+  data_miner do
+    tap "Brighter Planet's shipment mode data", Earth.taps_server
+  end
+end

data/lib/earth/shipping/shipment_mode/data_miner.rb

@@ -0,0 +1,17 @@
+ShipmentMode.class_eval do
+  data_miner do
+    schema Earth.database_options do
+      string 'name'
+      float  'route_inefficiency_factor'
+      float  'transport_emission_factor'
+      string 'transport_emission_factor_units'
+    end
+    
+    import "a list of shipment modes and their characteristics",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGR2a2RYcEg2RnRKbkRQcXc0ZkQ5U0E&hl=en&single=true&gid=0&output=csv' do
+      key   'name'
+      store 'route_inefficiency_factor'
+      store 'transport_emission_factor', :units_field_name => 'transport_emission_factor_units'
+    end
+  end
+end

data/spec/earth_spec.rb

@@ -27,7 +27,7 @@ describe Earth do
   describe '.resources' do
     it 'should get a list of resources' do
       resources = Earth.resources
-      resources.keys.count.should == 56
+      resources.keys.count.should == 58
       resources['FuelType'][:domain].should == 'fuel'
     end
     it 'should exclude data_miner files' do
@@ -37,7 +37,7 @@ describe Earth do
 
   describe '.resource_names' do
     it 'should get a list of all resource names' do
-      Earth.resource_names.count.should == 56
+      Earth.resource_names.count.should == 58
       Earth.resource_names.should include('Aircraft')
       Earth.resource_names.should include('Industry')
     end
@@ -49,7 +49,7 @@ describe Earth do
 
   describe '.domains' do
     it 'should return a list of all domains' do
-      Earth.domains.should == %w{air automobile bus diet fuel hospitality industry locality pet rail residence}
+      Earth.domains.should == %w{air automobile bus diet fuel hospitality industry locality pet rail residence shipping}
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -05:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         version: "3"
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 5
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 0
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 5
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 0
@@ -106,7 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 4
@@ -122,7 +115,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -138,7 +130,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
@@ -154,7 +145,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         version: "2"
@@ -168,7 +158,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -182,11 +171,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
-        - 5
-        version: "1.5"
+        - 4
+        version: "1.4"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -197,7 +185,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -211,7 +198,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -225,12 +211,208 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        version: "3"
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: data_miner
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  type: :runtime
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: falls_back_on
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: geokit
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: cohort_scope
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
+  type: :runtime
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: conversions
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 5
+        version: 1.4.5
+  type: :runtime
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: weighted_average
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: loose_tight_dictionary
+  prerelease: false
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 8
+        version: 0.0.8
+  type: :runtime
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id028
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: []
@@ -373,6 +555,12 @@ files:
 - lib/earth/residence/residence_fuel_type/data_miner.rb
 - lib/earth/residence/residential_energy_consumption_survey_response.rb
 - lib/earth/residence/residential_energy_consumption_survey_response/data_miner.rb
+- lib/earth/shipping.rb
+- lib/earth/shipping/carrier.rb
+- lib/earth/shipping/carrier/data_miner.rb
+- lib/earth/shipping/data_miner.rb
+- lib/earth/shipping/shipment_mode.rb
+- lib/earth/shipping/shipment_mode/data_miner.rb
 - vendor/geokit-rails/CHANGELOG.rdoc
 - vendor/geokit-rails/MIT-LICENSE
 - vendor/geokit-rails/README.markdown
@@ -415,18 +603,18 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
+- Gemfile
+- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- Gemfile
-- Gemfile.lock
 has_rdoc: true
 homepage: http://github.com/brighterplanet/earth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -434,7 +622,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -443,7 +630,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -455,8 +641,8 @@ signing_key:
 specification_version: 3
 summary: Land, sky, and sea
 test_files: 
+- Gemfile
+- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- Gemfile
-- Gemfile.lock