automobile_trip 0.1.0 → 0.2.0

data/lib/automobile_trip/characterization.rb

@@ -4,6 +4,7 @@ module BrighterPlanet
       def self.included(base)
         base.characterize do
           has :date
+          has :country
           has :make
           has :make_year
           has :make_model
@@ -23,7 +24,7 @@ module BrighterPlanet
           has :distance
           has :fuel_use
           has :automobile_fuel # don't call this fuel b/c then if you specify fuel.name in tests sniff will try to look it up in the fuels fixture, not automobile_fuels
-          has :mapquest_api_key, :display => lambda { |key| "secret key" }
+          has(:mapquest_api_key) { 'secret key' }
         end
       end
     end

data/lib/automobile_trip/data.rb

@@ -5,6 +5,7 @@ module BrighterPlanet
         base.data_miner do
           schema do
             date    'date'
+            string  'country_iso_3166_code'
             string  'make_name'
             string  'make_year_name'
             string  'make_model_name'

data/lib/automobile_trip/fallback.rb

@@ -2,12 +2,7 @@ module BrighterPlanet
   module AutomobileTrip
     module Fallback
       def self.included(base)
-        base.falls_back_on :urbanity_estimate => 0.43,
-                           :city_speed => 19.9.miles.to(:kilometres),
-                           :highway_speed => 57.1.miles.to(:kilometres),
-                           :hybridity_multiplier => 1.0,
-                           :fuel_efficiency => 20.182.miles_per_gallon.to(:kilometres_per_litre),
-                           :distance => 10.15.miles.to(:kilometres)
+        base.falls_back_on :hybridity_multiplier => 1.0,
       end
     end
   end

data/lib/automobile_trip/relationships.rb

@@ -2,6 +2,7 @@ module BrighterPlanet
   module AutomobileTrip
     module Relationships
       def self.included(target)
+        target.belongs_to :country,                 :class_name => 'Country',                        :foreign_key => 'country_iso_3166_code'
         target.belongs_to :make,                    :class_name => 'AutomobileMake',                 :foreign_key => 'make_name'
         target.belongs_to :make_year,               :class_name => 'AutomobileMakeYear',             :foreign_key => 'make_year_name'
         target.belongs_to :make_model,              :class_name => 'AutomobileMakeModel',            :foreign_key => 'make_model_name'

data/lib/automobile_trip/version.rb

@@ -1,5 +1,5 @@
 module BrighterPlanet
   module AutomobileTrip
-    VERSION = '0.1.0'
+    VERSION = "0.2.0"
   end
 end

data/lib/test_support/db/fixtures/automobile_fuels.csv

@@ -1,4 +1,4 @@
-name,code,base_fuel_name,blend_fuel_name,distance_key,ef_key,blend_portion
-regular gasoline,R,Motor Gasoline,,gasoline,gasoline
-diesel,D,Distillate Fuel Oil No. 2,,diesel,diesel
-B20,BP-B20,Distillate Fuel Oil No. 2,Biodiesel,diesel,diesel,0.2
+name,code,co2_emission_factor,co2_emission_factor_units,co2_biogenic_emission_factor,co2_biogenic_emission_factor_units,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,hfc_emission_factor,hfc_emission_factor_units
+regular gasoline,R,2.3,kilograms_co2_per_litre,0,kilograms_co2_per_litre,0.002,kilograms_co2e_per_litre,0.008,kilograms_co2e_per_litre,0.1,kilograms_co2e_per_litre
+diesel,D,2.7,kilograms_co2_per_litre,0,kilograms_co2_per_litre,0.0001,kilograms_co2e_per_litre,0.002,kilograms_co2e_per_litre,0.12,kilograms_co2e_per_litre
+B20,BP-B20,2.2,kilograms_co2_per_litre,0.5,kilograms_co2_per_litre,0.0001,kilograms_co2e_per_litre,0.002,kilograms_co2e_per_litre,0.12,kilograms_co2e_per_litre

data/lib/test_support/db/fixtures/automobile_make_model_year_variants.csv

@@ -1,2 +1,2 @@
 row_hash,name,make_name,make_year_name,make_model_name,make_model_year_name,year,fuel_efficiency_city,fuel_efficiency_city_units,fuel_efficiency_highway,fuel_efficiency_highway_units,fuel_code
-xxx1,Prius,Toyota,Toyota 2003,Toyota Prius,Toyota Prius 2003,2003,50,kilometres_per_litre,40,kilometres_per_litre,R
+xxx1,Prius,Toyota,Toyota 2003,Toyota Prius,Toyota Prius 2003,2003,50,kilometres_per_litre,40,kilometres_per_litre,D

data/lib/test_support/db/fixtures/automobile_type_fuel_year_ages.csv

@@ -0,0 +1,3 @@
+name,year,annual_distance,annual_distance_units,vehicles,
+Light-duty trucks diesel 2008 age 0,2008,23000,kilometres,237
+Passenger cars gasoline 2008 age 0,2008,17800,kilometres,9763

data/lib/test_support/db/fixtures/countries.csv

@@ -0,0 +1,2 @@
+iso_3166_code,name,automobile_urbanity,automobile_fuel_efficiency,automobile_fuel_efficiency_units,automobile_city_speed,automobile_city_speed_units,automobile_highway_speed,automobile_highway_speed_units,automobile_trip_distance,automobile_trip_distance_units,
+US,United States,0.43,9,kilometres_per_litre,32,kilometres_per_hour,92,kilometres_per_hour,16,kilometres

data/lib/test_support/db/fixtures/fuels.csv

@@ -1,4 +1,3 @@
 name,co2_emission_factor,co2_biogenic_emission_factor
 Motor Gasoline
 Distillate Fuel Oil No. 2,2.7,0
-Biodiesel,0,2.5

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: automobile_trip
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,65 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-06-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sniff
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+        version: 0.8.0
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: emitter
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: geokit
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id002
 description: A software model in Ruby for the greenhouse gas emissions of an automobile trip
 email: andy@rossmeissl.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- LICENSE-PREAMBLE
+- README.rdoc
 files: 
 - .document
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - LICENSE-PREAMBLE
 - README.rdoc
@@ -105,8 +81,10 @@ files:
 - lib/test_support/db/fixtures/automobile_make_years.csv
 - lib/test_support/db/fixtures/automobile_makes.csv
 - lib/test_support/db/fixtures/automobile_size_classes.csv
+- lib/test_support/db/fixtures/automobile_type_fuel_year_ages.csv
 - lib/test_support/db/fixtures/automobile_type_fuel_years.csv
 - lib/test_support/db/fixtures/automobile_type_years.csv
+- lib/test_support/db/fixtures/countries.csv
 - lib/test_support/db/fixtures/fuel_years.csv
 - lib/test_support/db/fixtures/fuels.csv
 - lib/test_support/db/fixtures/greenhouse_gases.csv
@@ -119,7 +97,7 @@ files:
 - vendor/plugin/mapquest/spec/lib/mapquest_directions_spec.rb
 - vendor/plugin/mapquest/spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/brighterplanet/automobile_trip
+homepage: https://github.com/brighterplanet/automobile_trip
 licenses: []
 
 post_install_message: 
@@ -132,6 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 703293003608571182
       segments: 
       - 0
       version: "0"
@@ -140,13 +119,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 703293003608571182
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A carbon model

data/Gemfile.lock

@@ -1,200 +0,0 @@
-PATH
-  remote: .
-  specs:
-    automobile_trip (0.1.0)
-      emitter (~> 0.4.1)
-      geokit
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    aaronh-chronic (0.3.9)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.4)
-    amatch (0.2.5)
-    andand (1.3.1)
-    arel (2.0.8)
-    blockenspiel (0.4.1)
-    bueller (0.0.4)
-      bundler (~> 1.0.9)
-      git (>= 1.2.5)
-      rake
-    builder (2.1.2)
-    characterizable (0.1.2)
-      activesupport (>= 2.3.5)
-      blockenspiel (>= 0.3.2)
-    cohort_scope (0.1.4)
-      activerecord (>= 3.0.0.beta4)
-      activesupport (>= 3.0.0.beta4)
-    common_name (0.1.5)
-      activesupport (>= 2.3.4)
-    conversions (1.4.5)
-      activesupport (>= 2.3.4)
-    cucumber (0.10.0)
-      builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    data_miner (1.1.4)
-      activerecord (>= 2.3.4)
-      activesupport (>= 2.3.4)
-      blockenspiel (>= 0.3.2)
-      conversions (>= 1.4.4)
-      errata (>= 1.0.1)
-      escape (>= 0.0.4)
-      remote_table (>= 1.1.0)
-      taps (>= 0.3.11)
-    diff-lcs (1.1.2)
-    earth (0.4.0)
-      activerecord (~> 3)
-      cohort_scope (>= 0.0.7)
-      conversions (>= 1.4.5)
-      data_miner (~> 1.1.1)
-      errata
-      falls_back_on (>= 0.0.3)
-      geokit (>= 1.5.0)
-      geokit-rails
-      loose_tight_dictionary (>= 0.0.8)
-      weighted_average (>= 0.0.4)
-    emitter (0.4.1)
-      activesupport (>= 2.3.4)
-      characterizable
-      cohort_scope
-      data_miner (>= 1.1)
-      earth
-      falls_back_on
-      leap
-      summary_judgement
-      timeframe
-      weighted_average
-    errata (1.0.1)
-      activesupport (>= 2.3.4)
-      remote_table (~> 1)
-    escape (0.0.4)
-    falls_back_on (0.0.3)
-      activerecord
-    fast_timestamp (0.0.4)
-    fastercsv (1.5.4)
-    geokit (1.5.0)
-    geokit-rails (1.1.4)
-      geokit (>= 1.5.0)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
-    git (1.2.5)
-    google-spreadsheet-ruby (0.1.2)
-      nokogiri (>= 1.4.3.1)
-      oauth (>= 0.3.6)
-    i18n (0.5.0)
-    json (1.4.6)
-    leap (0.4.6)
-      activesupport (>= 2.3.4)
-      blockenspiel (>= 0.3.2)
-      builder
-      i18n
-    loose_tight_dictionary (0.0.9)
-      activesupport (>= 2.3.4)
-      amatch (>= 0.2.5)
-      andand (>= 1.3.1)
-    mime-types (1.16)
-    mustache (0.12.0)
-    nokogiri (1.4.4)
-    oauth (0.4.4)
-    rack (1.2.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rdiscount (1.6.8)
-    rdoc (3.5.3)
-    remote_table (1.1.0)
-      activesupport (>= 2.3.4)
-      builder
-      escape (>= 0.0.4)
-      fastercsv (>= 1.5.0)
-      google-spreadsheet-ruby
-      i18n
-      nokogiri (>= 1.4.1)
-      roo (~> 1.9)
-      slither (>= 0.99.4)
-      spreadsheet
-      zip
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    rocco (0.5)
-      mustache
-      rdiscount
-    roo (1.9.3)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    ruby-ole (1.2.11.1)
-    sequel (3.17.0)
-    sinatra (1.0)
-      rack (>= 1.0)
-    slither (0.99.4)
-    sniff (0.6.1)
-      aaronh-chronic (~> 0.3.9)
-      activerecord (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      bueller (~> 0.0.4)
-      common_name (~> 0.1.5)
-      cucumber (~> 0.10.0)
-      earth
-      fast_timestamp (~> 0.0.4)
-      rake
-      rcov
-      rdoc
-      rocco
-      rspec (~> 2.0.0)
-      sqlite3-ruby (~> 1.3.0)
-      timecop
-      timeframe (~> 0.0.8)
-    spreadsheet (0.6.5.2)
-      ruby-ole (>= 1.0)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    summary_judgement (1.3.8)
-      activesupport (>= 2.3.4)
-      verbs (>= 2.0.6)
-    taps (0.3.15)
-      json (~> 1.4.6)
-      rack (>= 1.0.1)
-      rest-client (>= 1.4.0, < 1.7.0)
-      sequel (~> 3.17.0)
-      sinatra (~> 1.0.0)
-      sqlite3-ruby (~> 1.2)
-    term-ansicolor (1.0.5)
-    timecop (0.3.5)
-    timeframe (0.0.8)
-      activesupport (>= 2.3.5)
-    tzinfo (0.3.24)
-    verbs (2.0.9)
-      activesupport (>= 2.3.4)
-      andand (>= 1.3.1)
-    weighted_average (0.0.6)
-      activerecord (~> 3)
-      arel (~> 2)
-    zip (2.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  automobile_trip!
-  roo (~> 1.9.3)
-  sniff (~> 0.6.0)