RubyGems - shipment - Versions diffs - 0.0.7 → 0.0.8 - Mend

shipment 0.0.7 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/LICENSE-PREAMBLE +52 -0
data/features/shipment_committees.feature +62 -101
data/features/shipment_emissions.feature +41 -41
data/features/step_definitions/shipment_steps.rb +11 -0
data/lib/shipment/carbon_model.rb +10 -26
data/lib/shipment/characterization.rb +1 -0
data/lib/shipment/data.rb +1 -0
metadata +9 -7

data/LICENSE-PREAMBLE ADDED Viewed

@@ -0,0 +1,52 @@
+BRIGHTER PLANET ADDITIONAL PREAMBLE TO THE GNU AFFERO GENERAL PUBLIC LICENSE
+January 7, 2011
+This preamble is meant to help the licensee understand exactly what
+software is being received under the license and set expectations as to
+what is not covered.
+IDENTITY OF THE SOFTWARE MODULE COVERED BY LICENSE:
+This license covers the Brighter Planet carbon model referred to as
+'Shipment,' officially distributed from
+http://github.com/brighterplanet/shipment.
+SCOPE OF THE SOFTWARE MODULE COVERED BY LICENSE:
+The scope of the license includes only those files included in the
+official Brighter Planet distribution package for the particular carbon
+model identified above, including only the carbon model execution files,
+reference data classes, input characterization, fallbacks, summarization
+helpers, tests, and test fixtures.
+WHAT IS NOT COVERED BY LICENSE:
+This license does not extend to the following:
+  * Any element of any Brighter Planet website, including but not
+    limited the copyrights, trademarks, graphic design, text,
+    documentation, method of interaction with clients, runtime
+    environment, technical infrastructure, and software code associated
+    therewith;
+  * Any element of any Brighter Planet website user interface, including
+    but not limited to the copyrights, trademarks, graphic design, text,
+    documentation, method of interaction with clients, runtime
+    environment, technical infrastructure, and software code associated
+    therewith;
+  * Any element of other software modules licensed under any form of
+    license including but not limited to other forms of open source
+    license, commercial license, and the like;
+  * Any element of any Brighter Planet Carbon Middleware web service,
+    including but not limited to the copyrights, trademarks, graphic
+    design, text, documentation, method of interaction with clients,
+    runtime environment, technical infrastructure, and software code, is
+    not covered by the license; and
+  * Any aspect or use of http://carbon.brighterplanet.com.
+If you have any questions, please contact licensing@brighterplanet.com
+Copyright 2010, 2011 Brighter Planet, Inc.

data/features/shipment_committees.feature CHANGED Viewed

@@ -1,46 +1,18 @@
 Feature: Shipment Committee Calculations
   The shipment model should generate correct committee calculations
-  Scenario: Verified weight from nothing
+  Scenario: Weight from default
     Given a shipment emitter
-    When the "verified_weight" committee is calculated
+    When the "weight" committee is calculated
     Then the committee should have used quorum "default"
     And the conclusion of the committee should be "3.4"
-  Scenario: Verified weight from invalid weight
+  Scenario: Package count from default
     Given a shipment emitter
-    And a characteristic "weight" of "0.0"
-    When the "verified_weight" committee is calculated
-    Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "3.4"
-  Scenario: Verified weight from valid weight
-    Given a shipment emitter
-    And a characteristic "weight" of "2.0"
-    When the "verified_weight" committee is calculated
-    Then the committee should have used quorum "from weight"
-    And the conclusion of the committee should be "2.0"
-  Scenario: Verified package count from nothing
-    Given a shipment emitter
-    When the "verified_package_count" committee is calculated
+    When the "package_count" committee is calculated
     Then the committee should have used quorum "default"
     And the conclusion of the committee should be "1"
-  Scenario: Verified package count from invalid package count
-    Given a shipment emitter
-    And a characteristic "package_count" of "0.0"
-    When the "verified_package_count" committee is calculated
-    Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "1"
-  Scenario: Verified package count from valid package count
-    Given a shipment emitter
-    And a characteristic "package_count" of "2"
-    When the "verified_package_count" committee is calculated
-    Then the committee should have used quorum "from package count"
-    And the conclusion of the committee should be "2"
   Scenario Outline: Origin from zip code
     Given a shipment emitter
     And a characteristic "origin_zip_code" of "<zip>"
@@ -54,27 +26,25 @@ Feature: Shipment Committee Calculations
   Scenario Outline: Origin location from geocodeable origin
     Given a shipment emitter
-    And a characteristic "origin" of "<origin>"
+    And a characteristic "origin" of address value "<origin>"
+    And the geocoder will encode the origin as "<geocode>"
     When the "origin_location" committee is calculated
     Then the committee should have used quorum "from origin"
     And the conclusion of the committee should be "<location>"
     Examples:
-      | origin                                        | location                |
-      | 05753                                         | 43.9968185,-73.1491165  |
-      | San Francisco, CA                             | 37.7749295,-122.4194155 |
-      | Address: 488 Haight Street, San Francisco, CA | 37.7722302,-122.4303328 |
-      | Canterbury, Kent, UK                          | 51.2772689,1.0805173    |
+      | origin                               | geocode                 | location                |
+      | 05753                                | 43.9968185,-73.1491165  | 43.9968185,-73.1491165  |
+      | San Francisco, CA                    | 37.7749295,-122.4194155 | 37.7749295,-122.4194155 |
+      | 488 Haight Street, San Francisco, CA | 37.7722302,-122.4303328 | 37.7722302,-122.4303328 |
+      | Canterbury, Kent, UK                 | 51.2772689,1.0805173    | 51.2772689,1.0805173    |
-  Scenario Outline: Origin location from non-geocodeable origin
+  Scenario: Origin location from non-geocodeable origin
     Given a shipment emitter
-    And a characteristic "origin" of "<origin>"
+    And a characteristic "origin" of "Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth"
+    And the geocoder will encode the origin as ","
     When the "origin_location" committee is calculated
     Then the conclusion of the committee should be nil
-    Examples:
-      | origin                                                            |
-      | 00000                                                             |
-      | Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth |
   Scenario Outline: Destination from zip code
     Given a shipment emitter
     And a characteristic "destination_zip_code" of "<zip>"
@@ -89,27 +59,25 @@ Feature: Shipment Committee Calculations
   Scenario Outline: Destination location from geocodeable destination
     Given a shipment emitter
     And a characteristic "destination" of "<destination>"
+    And the geocoder will encode the destination as "<geocode>"
     When the "destination_location" committee is calculated
     Then the committee should have used quorum "from destination"
     And the conclusion of the committee should be "<location>"
     Examples:
-      | destination                                   | location                |
-      | 05401                                         | 44.4774456,-73.2163467  |
-      | San Francisco, CA                             | 37.7749295,-122.4194155 |
-      | Address: 488 Haight Street, San Francisco, CA | 37.7722302,-122.4303328 |
-      | Canterbury, Kent, UK                          | 51.2772689,1.0805173    |
+      | destination                          | geocode                 | location                |
+      | 05753                                | 43.9968185,-73.1491165  | 43.9968185,-73.1491165  |
+      | San Francisco, CA                    | 37.7749295,-122.4194155 | 37.7749295,-122.4194155 |
+      | 488 Haight Street, San Francisco, CA | 37.7722302,-122.4303328 | 37.7722302,-122.4303328 |
+      | Canterbury, Kent, UK                 | 51.2772689,1.0805173    | 51.2772689,1.0805173    |
-  Scenario Outline: Destination location from non-geocodeable destination
+  Scenario: Destination location from non-geocodeable origin
     Given a shipment emitter
-    And a characteristic "destination" of "<destination>"
+    And a characteristic "destination" of "Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth"
+    And the geocoder will encode the destination as ","
     When the "destination_location" committee is calculated
     Then the conclusion of the committee should be nil
-    Examples:
-      | destination                                                                |
-      | 00000                                                                      |
-      | Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth |
-  Scenario: Segment count from nothing
+  Scenario: Segment count from default
     Given a shipment emitter
     When the "segment_count" committee is calculated
     Then the committee should have used quorum "default"
@@ -125,22 +93,20 @@ Feature: Shipment Committee Calculations
   Scenario Outline: Distance by road from locations and mode
     Given a shipment emitter
-    And a characteristic "origin" of "<origin>"
-    And a characteristic "destination" of "<destination>"
+    And a characteristic "origin_location" of "<origin>"
+    And a characteristic "destination_location" of "<destination>"
     And a characteristic "mode.name" of "<mode>"
     And a characteristic "mapquest_api_key" of "ABC123"
     And mapquest determines the distance to be "<mapquest_distance>"
-    When the "origin_location" committee is calculated
-    And the "destination_location" committee is calculated
-    And the "distance" committee is calculated
+    When the "distance" committee is calculated
     Then the committee should have used quorum "by road"
     And the conclusion of the committee should be "<distance>"
     Examples:
       | origin | destination | mode    | mapquest_distance | distance |
-      | 05753  | 05753       | ground  | 0.0               | 0.0      |
-      | 05753  | 05401       | ground  | 57.93638          | 57.93638 |
-      | 05753  | 05753       | courier | 0.0               | 0.0      |
-      | 05753  | 05401       | courier | 57.93638          | 57.93638 |
+      | 43,-73 | 43.-73      | ground  | 0.0               | 0.0      |
+      | 43,-73 | 43.1,-73    | ground  | 57.93638          | 57.93638 |
+      | 43,-73 | 43,-73      | courier | 0.0               | 0.0      |
+      | 43,-73 | 43.1,-73    | courier | 57.93638          | 57.93638 |
   Scenario: Distance by road from undriveable locations and mode
     Given a shipment emitter
@@ -148,7 +114,6 @@ Feature: Shipment Committee Calculations
     And a characteristic "destination" of "Canterbury, Kent, UK"
     And a characteristic "mode.name" of "ground"
     And a characteristic "mapquest_api_key" of "ABC123"
-    # And mapquest determines the distance to be "400 Could not find a data set capable of performing the route."
     When the "origin_location" committee is calculated
     And the "destination_location" committee is calculated
     And the "distance" committee is calculated
@@ -157,27 +122,23 @@ Feature: Shipment Committee Calculations
   Scenario Outline: Distance as the crow flies from locations and mode
     Given a shipment emitter
-    And a characteristic "origin" of "<origin>"
-    And a characteristic "destination" of "<destination>"
+    And a characteristic "origin_location" of "<origin>"
+    And a characteristic "destination_location" of "<destination>"
     And a characteristic "mode.name" of "air"
     And a characteristic "mapquest_api_key" of "ABC123"
-    When the "origin_location" committee is calculated
-    And the "destination_location" committee is calculated
-    And the "distance" committee is calculated
+    When the "distance" committee is calculated
     Then the committee should have used quorum "as the crow flies"
     And the conclusion of the committee should be "<distance>"
     Examples:
-      | origin      | destination          | distance   |
-      | 05753       | 05401                | 53.75967   |
-      | Lansing, MI | Canterbury, Kent, UK | 6192.60039 |
+      | origin                 | destination            | distance   |
+      | 43.9968185,-73.1491165 | 44.4774456,-73.2163467 | 53.75967   |
+      | 42.732535,-84.5555347  | 51.2772689,1.0805173   | 6192.60039 |
   Scenario: Distance as the crow flies from locations
     Given a shipment emitter
-    And a characteristic "origin" of "05753"
-    And a characteristic "destination" of "05401"
-    When the "origin_location" committee is calculated
-    And the "destination_location" committee is calculated
-    And the "distance" committee is calculated
+    And a characteristic "origin_location" of "43.9968185,-73.1491165"
+    And a characteristic "destination_location" of "44.4774456,-73.2163467"
+    When the "distance" committee is calculated
     Then the committee should have used quorum "as the crow flies"
     And the conclusion of the committee should be "53.75967"
@@ -208,7 +169,7 @@ Feature: Shipment Committee Calculations
     Examples:
       | segments | factor |
       | 1        | 1.0    |
-      | 5        | 1.8    |
+      | 2        | 1.8    |
       | -1       | 1.8    |
   Scenario: Adjusted distance from default
@@ -237,35 +198,35 @@ Feature: Shipment Committee Calculations
     And a characteristic "carrier.name" of "FedEx"
     When the "transport_emission_factor" committee is calculated
     Then the committee should have used quorum "from carrier"
-    And the conclusion of the committee should be "1.0"
+    And the conclusion of the committee should be "0.008"
-  Scenario Outline: Transport emission factor from mode, verified weight, and adjusted distance
+  Scenario Outline: Transport emission factor from mode, weight, and adjusted distance
     Given a shipment emitter
     And a characteristic "mode.name" of "<mode>"
-    And a characteristic "verified_weight" of "<weight>"
+    And a characteristic "weight" of "<weight>"
     And a characteristic "adjusted_distance" of "<adjusted_distance>"
     When the "transport_emission_factor" committee is calculated
-    Then the committee should have used quorum "from mode, verified weight, and adjusted distance"
+    Then the committee should have used quorum "from mode, weight, and adjusted distance"
     And the conclusion of the committee should be "<emission_factor>"
     Examples:
       | mode    | weight | adjusted_distance | emission_factor |
-      | courier | 2.0    | 5.0               | 100.0           |
-      | ground  | 2.0    | 50.0              | 1.0             |
-      | air     | 2.0    | 50.0              | 5.0             |
+      | courier | 2.0    | 5.0               | 0.5             |
+      | ground  | 2.0    | 50.0              | 0.0002          |
+      | air     | 2.0    | 50.0              | 0.002           |
-  Scenario Outline: Transport emission factor from carrier mode, verified weight, and adjusted distance
+  Scenario Outline: Transport emission factor from carrier mode, weight, and adjusted distance
     Given a shipment emitter
     And a characteristic "carrier_mode.name" of "<carrier_mode>"
-    And a characteristic "verified_weight" of "<weight>"
+    And a characteristic "weight" of "<weight>"
     And a characteristic "adjusted_distance" of "<adjusted_distance>"
     When the "transport_emission_factor" committee is calculated
-    Then the committee should have used quorum "from carrier mode, verified weight, and adjusted distance"
+    Then the committee should have used quorum "from carrier mode, weight, and adjusted distance"
     And the conclusion of the committee should be "<emission_factor>"
     Examples:
       | carrier_mode    | weight | adjusted_distance | emission_factor |
-      | FedEx courier   | 2.0    | 5.0               | 110.0           |
-      | FedEx ground    | 2.0    | 50.0              | 2.0             |
-      | FedEx air       | 2.0    | 50.0              | 6.0             |
+      | FedEx courier   | 2.0    | 5.0               | 0.2             |
+      | FedEx ground    | 2.0    | 50.0              | 0.0001          |
+      | FedEx air       | 2.0    | 50.0              | 0.001           |
   Scenario: Corporate emission factor from default
     Given a shipment emitter
@@ -278,23 +239,23 @@ Feature: Shipment Committee Calculations
     And a characteristic "carrier.name" of "FedEx"
     When the "corporate_emission_factor" committee is calculated
     Then the committee should have used quorum "from carrier"
-    And the conclusion of the committee should be "1500.0"
+    And the conclusion of the committee should be "0.3"
-  Scenario: Transport emission from verified weight, adjusted distance, and transport emission factor
+  Scenario: Transport emission from weight, adjusted distance, and transport emission factor
     Given a shipment emitter
-    And a characteristic "verified_weight" of "2.0"
+    And a characteristic "weight" of "2.0"
     And a characteristic "adjusted_distance" of "100.0"
     And a characteristic "transport_emission_factor" of "2.0"
     When the "transport_emission" committee is calculated
-    Then the committee should have used quorum "from verified weight, adjusted distance, and transport emission factor"
+    Then the committee should have used quorum "from weight, adjusted distance, and transport emission factor"
     And the conclusion of the committee should be "400.0"
-  Scenario: Corporate emission from verified package count and corporate emission factor
+  Scenario: Corporate emission from package count and corporate emission factor
     Given a shipment emitter
-    And a characteristic "verified_package_count" of "2"
+    And a characteristic "package_count" of "2"
     And a characteristic "corporate_emission_factor" of "2.0"
     When the "corporate_emission" committee is calculated
-    Then the committee should have used quorum "from verified package count and corporate emission factor"
+    Then the committee should have used quorum "from package count and corporate emission factor"
     And the conclusion of the committee should be "4.0"
   Scenario: Emission from transport emission and corporate emission

data/features/shipment_emissions.feature CHANGED Viewed

@@ -6,29 +6,34 @@ Feature: Shipment Emissions Calculations
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "6.0"
-  Scenario: Calculations from weight, package count, segment count
+  Scenario: Calculations from weight, package count, segment count, and distance
     Given a shipment has "weight" of "10"
     And it has "package_count" of "2"
     And it has "segment_count" of "1"
+    And it has "distance" of "1000"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "17.4"
+    Then the emission value should be within "0.1" kgs of "5.9"
   Scenario: Calculations from origin/destination zip code
     Given a shipment has "origin_zip_code" of "05753"
+    And the geocoder will encode the origin_zip_code as "43.9968185,-73.1491165"
     And it has "destination_zip_code" of "05401"
+    And the geocoder will encode the destination_zip_code as "44.4774456,-73.2163467"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "0.4"
   Scenario: Calculations from origin/destination
     Given a shipment has "origin" of "Lansing, MI"
+    And the geocoder will encode the origin as "42.732535,-84.5555347"
     And it has "destination" of "Canterbury, Kent, UK"
+    And the geocoder will encode the destination as "51.2772689,1.0805173"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "20.8"
   Scenario: Calculations from carrier
     Given a shipment has "carrier.name" of "FedEx"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "34333.8"
+    Then the emission value should be within "0.1" kgs of "9.1"
   Scenario Outline: Calculations from mode
     Given a shipment has "mode.name" of "<mode>"
@@ -36,9 +41,9 @@ Feature: Shipment Emissions Calculations
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
       | mode    | emission |
-      | courier | 1000.2   |
-      | ground  | 10944.8  |
-      | air     | 54723.2  |
+      | courier | 5.2      |
+      | ground  | 2.4      |
+      | air     | 22.1     |
   Scenario Outline: Calculations from carrier and mode
     Given a shipment has "mode.name" of "<mode>"
@@ -47,51 +52,44 @@ Feature: Shipment Emissions Calculations
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
       | mode    | emission |
-      | courier | 2600.0   |
-      | ground  | 23389.2  |
-      | air     | 67167.6  |
+      | courier | 2.3      |
+      | ground  | 1.4      |
+      | air     | 11.2     |
   Scenario Outline: Calculations from mode and origin/destination
     Given a shipment has "mode.name" of "<mode>"
     And it has "origin" of "<origin>"
+    And the geocoder will encode the origin as "<origin_location>"
     And it has "destination" of "<destination>"
+    And the geocoder will encode the destination as "<destination_location>"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
-      | mode    | origin      | destination          | emission |
-      | courier | 05753       | 05401                | 1000.2   |
-      | courier | Lansing, MI | Canterbury, Kent, UK | 1000.2   |
-      | ground  | 05753       | 05401                | 329.2    |
-      | ground  | Lansing, MI | Canterbury, Kent, UK | 37898.9  |
-      | air     | 05753       | 05401                | 1809.8   |
-      | air     | Lansing, MI | Canterbury, Kent, UK | 208443.2 |
-  Scenario Outline: Calculations from mode and carrier
-    Given a shipment has "carrier.name" of "FedEx"
-    And it has "mode.name" of "<mode>"
-    When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "<emission>"
-    Examples:
-      | mode    | emission |
-      | courier | 2600.0   |
-      | ground  | 23389.2  |
-      | air     | 67167.6  |
+      | mode    | origin      | origin_location        | destination          | destination_location   | emission |
+      | courier | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 5.2      |
+      | courier | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 5.2      |
+      | ground  | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 0.3      |
+      | ground  | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 7.8      |
+      | air     | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 0.9      |
+      | air     | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 83.6     |
   Scenario Outline: Calculations from mode, carrier, and origin/destination
     Given a shipment has "carrier.name" of "FedEx"
     And it has "mode.name" of "<mode>"
     And it has "origin" of "<origin>"
+    And the geocoder will encode the origin as "<origin_location>"
     And it has "destination" of "<destination>"
+    And the geocoder will encode the destination as "<destination_location>"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
-      | mode    | origin      | destination          | emission |
-      | courier | 05753       | 05401                | 2600.0   |
-      | courier | Lansing, MI | Canterbury, Kent, UK | 2600.0   |
-      | ground  | 05753       | 05401                | 2158.0   |
-      | ground  | Lansing, MI | Canterbury, Kent, UK | 77297.4  |
-      | air     | 05753       | 05401                | 3671.5   |
-      | air     | Lansing, MI | Canterbury, Kent, UK | 251631.5 |
+      | mode    | origin      | origin_location        | destination          | destination_location   | emission |
+      | courier | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 2.3      |
+      | courier | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 2.3      |
+      | ground  | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 0.3      |
+      | ground  | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 4.1      |
+      | air     | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 0.7      |
+      | air     | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 42.0     |
   Scenario Outline: Calculations from everything
     Given a shipment has "weight" of "10.0"
@@ -100,14 +98,16 @@ Feature: Shipment Emissions Calculations
     And it has "carrier.name" of "FedEx"
     And it has "mode.name" of "<mode>"
     And it has "origin" of "<origin>"
+    And the geocoder will encode the origin as "<origin_location>"
     And it has "destination" of "<destination>"
+    And the geocoder will encode the destination as "<destination_location>"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
-      | mode    | origin      | destination          | emission |
-      | courier | 05753       | 05401                | 4100.0   |
-      | courier | Lansing, MI | Canterbury, Kent, UK | 4100.0   |
-      | ground  | 05753       | 05401                | 4075.2   |
-      | ground  | Lansing, MI | Canterbury, Kent, UK | 126852.0 |
-      | air     | 05753       | 05401                | 6548.1   |
-      | air     | Lansing, MI | Canterbury, Kent, UK | 411711.6 |
+      | mode    | origin      | origin_location        | destination          | destination_location   | emission |
+      | courier | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 2.6      |
+      | courier | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 2.6      |
+      | ground  | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 0.7      |
+      | ground  | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 6.8      |
+      | air     | 05753       | 43.9968185,-73.1491165 | 05401                | 44.4774456,-73.2163467 | 1.2      |
+      | air     | Lansing, MI | 42.732535,-84.5555347  | Canterbury, Kent, UK | 51.2772689,1.0805173   | 68.7     |

data/features/step_definitions/shipment_steps.rb CHANGED Viewed

@@ -2,3 +2,14 @@ Given /^mapquest determines the distance to be "([^\"]*)"$/ do |distance|
   mockquest = mock MapQuestDirections, :distance_in_kilometres => distance
   MapQuestDirections.stub!(:new).and_return mockquest
 end
+Given /^the geocoder will encode the (.*) as "(.*)"$/ do |component, location|
+  @expectations << lambda do
+    components = @characteristics ? @characteristics : @activity_hash
+    component_value = components[component.to_sym].to_s
+    code = mock Object, :ll => location
+    Geokit::Geocoders::MultiGeocoder.should_receive(:geocode).
+      with(component_value).
+      and_return code
+  end
+end

data/lib/shipment/carbon_model.rb CHANGED Viewed

@@ -35,15 +35,15 @@ module BrighterPlanet
           end
           committee :corporate_emission do
-            quorum 'from verified package count and corporate emission factor', :needs => [:verified_package_count, :corporate_emission_factor] do |characteristics|
-              characteristics[:verified_package_count] * characteristics[:corporate_emission_factor]
+            quorum 'from package count and corporate emission factor', :needs => [:package_count, :corporate_emission_factor] do |characteristics|
+              characteristics[:package_count] * characteristics[:corporate_emission_factor]
             end
           end
           committee :transport_emission do
-            quorum 'from verified weight, adjusted distance, and transport emission factor', :needs => [:verified_weight, :adjusted_distance, :transport_emission_factor] do |characteristics|
+            quorum 'from weight, adjusted distance, and transport emission factor', :needs => [:weight, :adjusted_distance, :transport_emission_factor] do |characteristics|
               # we're assuming that the number of stops, rather than number of packages carried, is limiting factor on local delivery routes
-              characteristics[:verified_weight] * characteristics[:adjusted_distance] * characteristics[:transport_emission_factor]
+              characteristics[:weight] * characteristics[:adjusted_distance] * characteristics[:transport_emission_factor]
             end
           end
@@ -58,17 +58,17 @@ module BrighterPlanet
           end
           committee :transport_emission_factor do
-            quorum 'from carrier mode, verified weight, and adjusted distance', :needs => [:carrier_mode, :verified_weight, :adjusted_distance] do |characteristics|
+            quorum 'from carrier mode, weight, and adjusted distance', :needs => [:carrier_mode, :weight, :adjusted_distance] do |characteristics|
               if characteristics[:carrier_mode].mode_name == "courier"
-                characteristics[:carrier_mode].transport_emission_factor / (characteristics[:verified_weight] * characteristics[:adjusted_distance])
+                characteristics[:carrier_mode].transport_emission_factor / (characteristics[:weight] * characteristics[:adjusted_distance])
               else
                 characteristics[:carrier_mode].transport_emission_factor
               end
             end
-            quorum 'from mode, verified weight, and adjusted distance', :needs => [:mode, :verified_weight, :adjusted_distance] do |characteristics|
+            quorum 'from mode, weight, and adjusted distance', :needs => [:mode, :weight, :adjusted_distance] do |characteristics|
               if characteristics[:mode].name == "courier"
-                characteristics[:mode].transport_emission_factor / (characteristics[:verified_weight] * characteristics[:adjusted_distance])
+                characteristics[:mode].transport_emission_factor / (characteristics[:weight] * characteristics[:adjusted_distance])
               else
                 characteristics[:mode].transport_emission_factor
               end
@@ -176,29 +176,13 @@ module BrighterPlanet
             end
           end
-          committee :verified_package_count do
-            quorum 'from package count', :needs => :package_count do |characteristics|
-              if characteristics[:package_count] > 0
-                characteristics[:package_count]
-              else
-                nil
-              end
-            end
+          committee :package_count do
             quorum 'default' do
               1 # ASSUMED arbitrary
             end
           end
-          committee :verified_weight do
-            quorum 'from weight', :needs => :weight do |characteristics|
-              if characteristics[:weight] > 0
-                characteristics[:weight]
-              else
-                nil
-              end
-            end
+          committee :weight do
             quorum 'default' do
               3.4 # ASSUMED based on average FedEx air package weight of 7.5 lbs
             end

data/lib/shipment/characterization.rb CHANGED Viewed

@@ -12,6 +12,7 @@ module BrighterPlanet
           has :destination
           has :origin_zip_code      # for backwards compatability - note that this is a string, not a ZipCode
           has :destination_zip_code # for backwards compatability - note that this is a string, not a ZipCode
+          has :distance
           has :mapquest_api_key, :display => lambda { |key| "secret key" }
         end
       end

data/lib/shipment/data.rb CHANGED Viewed

@@ -13,6 +13,7 @@ module BrighterPlanet
             string  'destination'
             string  'origin_zip_code'      # For backwards compatability
             string  'destination_zip_code' # For backwards compatability
+            float   'distance'
             string  'mapquest_api_key'
           end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shipment
 version: !ruby/object:Gem::Version
-  hash: 17
+  hash: 15
   prerelease: false
   segments:
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors:
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-16 00:00:00 -05:00
+date: 2011-01-12 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -76,12 +76,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 7
+        hash: 1
         segments:
         - 0
         - 4
-        - 4
-        version: 0.4.4
+        - 7
+        version: 0.4.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
@@ -138,6 +138,7 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
+- LICENSE-PREAMBLE
 - README.rdoc
 files:
 - LICENSE
@@ -150,6 +151,7 @@ files:
 - lib/shipment/relationships.rb
 - lib/shipment/summarization.rb
 - lib/test_support/shipment_record.rb
+- LICENSE-PREAMBLE
 - features/step_definitions/shipment_steps.rb
 - features/support/env.rb
 - features/shipment_committees.feature