earth 0.3.14 → 0.3.15

data/earth.gemspec

@@ -4,8 +4,8 @@ require "earth/version"
 
 Gem::Specification.new do |s|
   s.name        = "earth"
-  s.version     = Earth::VERSION
-  s.date = "2011-01-27"
+  s.version = "0.3.15"
+  s.date = "2011-01-28"
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Seamus Abshere", "Derek Kastner", "Andy Rossmeissl"]
   s.email = %q{andy@rossmeissl.net}

data/lib/earth/air/flight_seat_class/data_miner.rb

@@ -2,12 +2,16 @@ FlightSeatClass.class_eval do
   data_miner do
     schema Earth.database_options do
       string   'name'
+      string   'distance_class_name'
+      string   'seat_class_name'
       float    'multiplier'
     end
     
     import "a list of Brighter Planet-defined seat classes and pre-calculated multipliers",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG5zSER1QmFVVkhNcTM2cmhCMEJtWVE&hl=en&single=true&gid=0&output=csv' do
       key   'name'
+      store 'distance_class_name'
+      store 'seat_class_name'
       store 'multiplier'
     end
     

data/lib/earth/automobile/automobile_fuel_type/data_miner.rb

@@ -46,9 +46,9 @@ AutomobileFuelType.class_eval do
       fuel_types = AutomobileFuelType.arel_table
       
       AutomobileFuelType.all.each do |fuel_type|
-        current_name = fuel_type.fuel_name_for_efs
+        current_name = fuel_type.name
         
-        if current_name.present?
+        if fuel_type.fuel_name_for_efs.present?
           co2_factor_sql = fuel_years.project(fuel_years[:co2_emission_factor]).where(fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(fuel_years[:year].eq(latest_year))).to_sql
           ch4_factor_sql = AutomobileTypeFuelYear.weighted_average_relation(:ch4_emission_factor, :weighted_by => :total_travel).where(type_fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(type_fuel_years[:year].eq(latest_year))).to_sql
           n2o_factor_sql = AutomobileTypeFuelYear.weighted_average_relation(:n2o_emission_factor, :weighted_by => :total_travel).where(type_fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(type_fuel_years[:year].eq(latest_year))).to_sql
@@ -57,12 +57,12 @@ AutomobileFuelType.class_eval do
           connection.execute %{
             UPDATE automobile_fuel_types
             SET emission_factor = (((#{co2_factor_sql}) * #{co2_gwp} * (1 - blend_portion)) + ((#{ch4_factor_sql}) * #{ch4_gwp}) + ((#{n2o_factor_sql}) * #{n2o_gwp}) + (#{hfc_factor_sql}))
-            WHERE automobile_fuel_types.fuel_name_for_efs = '#{current_name}'
+            WHERE automobile_fuel_types.name = '#{current_name}'
           }
           connection.execute %{
             UPDATE automobile_fuel_types
             SET emission_factor_units = 'kilograms_co2e_per_litre'
-            WHERE automobile_fuel_types.fuel_name_for_efs = '#{current_name}'
+            WHERE automobile_fuel_types.name = '#{current_name}'
           }
         end
       end
@@ -77,6 +77,11 @@ AutomobileFuelType.class_eval do
         SET emission_factor = #{electricity_ef}
         WHERE automobile_fuel_types.name = 'electricity'
       }
+      connection.execute %{
+        UPDATE automobile_fuel_types
+        SET emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+        WHERE automobile_fuel_types.name = 'electricity'
+      }
     end
     
     verify "Annual distance and emission factor should be greater than zero" do

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -438,7 +438,8 @@ AutomobileMakeModelYearVariant.class_eval do
       update_all "make_model_year_name = CONCAT(make_name, ' ', name, ' ', year)"
     end
     
-    process "Calculate adjusted fuel efficiency using the latest EPA equations" do
+    # Note: need to divide by 0.425143707 b/c equation is designed for miles / gallon not km / l
+    process "Calculate adjusted fuel efficiency using the latest EPA equations from EPA Fuel Economy Trends report Appendix A including conversion from miles per gallon to kilometres per litre" do
       update_all 'fuel_efficiency_city = 1 / ((0.003259 / 0.425143707) + (1.1805 / raw_fuel_efficiency_city))'
       update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))'
     end

data/lib/earth/inflectors.rb

@@ -1,9 +1,11 @@
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.uncountable %w(aircraft aircraft Aircraft airline_aircraft AirlineAircraft)
+  inflect.uncountable 'aircraft'
   inflect.uncountable 'commons'
   inflect.uncountable 'food'
   inflect.uncountable 'shelter'
   inflect.uncountable 'transportation'
-  inflect.uncountable 'press_coverage'
+  inflect.uncountable 'species'
   inflect.irregular 'foot', 'feet'
+  inflect.plural /(gas)\z/i, '\1es'
+  inflect.singular /(gas)es\z/i, '\1'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -507,7 +507,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1047447535
+      hash: -661468781
       segments: 
       - 0
       version: "0"
@@ -516,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1047447535
+      hash: -661468781
       segments: 
       - 0
       version: "0"