RubyGems - shipment - Versions diffs - 0.0.5 → 0.0.6 - Mend

shipment 0.0.5 → 0.0.6

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/features/shipment_committees.feature +104 -90
data/features/shipment_emissions.feature +15 -16
data/features/support/env.rb +1 -1
data/lib/shipment/carbon_model.rb +72 -34
data/lib/shipment/characterization.rb +2 -0
data/lib/shipment/data.rb +4 -2
data/lib/shipment/relationships.rb +2 -4
metadata +13 -15

data/features/shipment_committees.feature CHANGED Viewed

@@ -13,37 +13,34 @@ Feature: Shipment Committee Calculations
     Then the committee should have used quorum "default"
     And the conclusion of the committee should be "1"
-  Scenario: Carrier from nothing
+  Scenario: Segment count from nothing
     Given a shipment emitter
-    When the "carrier" committee is calculated
+    When the "segment_count" committee is calculated
     Then the committee should have used quorum "default"
-    And the conclusion of the committee should be a fallback
-  Scenario: Mode from nothing
-    Given a shipment emitter
-    When the "mode" committee is calculated
-    Then the committee should have used quorum "default"
-    And the conclusion of the committee should be a fallback
+    And the conclusion of the committee should be "5"
   Scenario Outline: Distance from same locality
     Given a shipment emitter
-    And a characteristic "origin_zip_code.name" of "<origin>"
-    And a characteristic "destination_zip_code.name" of "<destination>"
-    When the "distance" committee is calculated
+    And a characteristic "origin" of "<origin>"
+    And a characteristic "destination" of "<destination>"
+    When the "origin_location" committee is calculated
+    And the "destination_location" committee is calculated
+    And the "distance" committee is calculated
     Then the conclusion of the committee should be "<distance>"
     Examples:
       | origin | destination | distance |
       | 05753  | 05753       | 0        |
-      | 05753  | 05401       |          |
   Scenario Outline: Distance from mapquest
     Given a shipment emitter
-    And a characteristic "origin_zip_code.name" of "<origin>"
-    And a characteristic "destination_zip_code.name" of "<destination>"
+    And a characteristic "origin" of "<origin>"
+    And a characteristic "destination" of "<destination>"
     And a characteristic "mode.name" of "ground"
     And a characteristic "mapquest_api_key" of "ABC123"
     And mapquest determines the distance to be "<mapquest_distance>"
-    When the "distance" committee is calculated
+    When the "origin_location" committee is calculated
+    And the "destination_location" committee is calculated
+    And the "distance" committee is calculated
     Then the committee should have used quorum "from mapquest"
     And the conclusion of the committee should be "<distance>"
     Examples:
@@ -53,33 +50,82 @@ Feature: Shipment Committee Calculations
   Scenario Outline: Distance from direct path
     Given a shipment emitter
-    And a characteristic "origin_zip_code.name" of "<origin>"
-    And a characteristic "destination_zip_code.name" of "<destination>"
+    And a characteristic "origin" of "<origin>"
+    And a characteristic "destination" of "<destination>"
     And a characteristic "mode.name" of "air"
     And a characteristic "mapquest_api_key" of "ABC123"
-    When the "distance" committee is calculated
+    When the "origin_location" committee is calculated
+    And the "destination_location" committee is calculated
+    And the "distance" committee is calculated
     Then the committee should have used quorum "from direct path"
     And the conclusion of the committee should be "<distance>"
     Examples:
-      | origin | destination | distance |
-      | 05753  | 05401       | 53       |
+      | origin      | destination          | distance   |
+      | 05753       | San Francisco, CA    | 4140.39274 |
+      | Lansing, MI | Canterbury, Kent, UK | 6192.60039 |
+      | 05753       | Canterbury, Kent, UK | 5384.08989 |
+  Scenario Outline: Origin location from origin
+    Given a shipment emitter
+    And a characteristic "origin" of "<origin>"
+    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  |
+      | Address: San Francisco, CA                     | 37.7749295,-122.4194155 |
+      | Address: 488 Haight Street, San Francisco, CA  | 37.7721568,-122.4302295 |
+      | Address: Canterbury, Kent, UK                  | 51.2772689,1.0805173    |
+  Scenario Outline: Origin location from origin_zip_code
+    Given a shipment emitter
+    And a characteristic "origin_zip_code" of "<origin>"
+    When the "origin" committee is calculated
+    And the "origin_location" committee is calculated
+    Then the conclusion of the committee should be "<location>"
+    Examples:
+      | origin                                         | location                |
+      | 05753                                          | 43.9968185,-73.1491165  |
+  Scenario Outline: Destination location from destination
+    Given a shipment emitter
+    And a characteristic "destination" of "<destination>"
+    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                |
+      | 05753                                          | 43.9968185,-73.1491165  |
+      | Address: 488 Haight Street, San Francisco, CA  | 37.7721568,-122.4302295 |
+      | Address: Canterbury, Kent, UK                  | 51.2772689,1.0805173    |
+  Scenario Outline: Destination location from destination_zip_code
+    Given a shipment emitter
+    And a characteristic "destination_zip_code" of "<destination>"
+    When the "destination" committee is calculated
+    And the "destination_location" committee is calculated
+    Then the conclusion of the committee should be "<location>"
+    Examples:
+      | destination | location                |
+      | 05753       | 43.9968185,-73.1491165  |
-  Scenario Outline: Distance from zip codes not in database or missing lat/lng
+  Scenario: Origin committee from uncodable origin
     Given a shipment emitter
-    And a characteristic "origin_zip_code.name" of "<origin>"
-    And a characteristic "destination_zip_code.name" of "<destination>"
-    When the "distance" committee is calculated
+    And a characteristic "origin" of "Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth"
+    When the "origin_location" committee is calculated
+    Then the conclusion of the committee should be nil
+  Scenario: Destination committee from uncodable destination
+    Given a shipment emitter
+    And a characteristic "destination" of "Bag End, Hobbiton, Westfarthing, The Shire, Eriador, Middle Earth"
+    When the "destination_location" committee is calculated
     Then the conclusion of the committee should be nil
-    Examples:
-      | origin | destination |
-      | 05753  | 20860       |
-      | 05753  | 99999       |
-  Scenario: Route inefficiency factor from nothing
+  Scenario: Route inefficiency factor from default
     Given a shipment emitter
-    When the "mode" committee is calculated
-    And the "route_inefficiency_factor" committee is calculated
-    Then the committee should have used quorum "from mode"
+    When the "route_inefficiency_factor" committee is calculated
+    Then the committee should have used quorum "default"
     And the conclusion of the committee should be "1.05"
   Scenario Outline: Route inefficiency factor from mode
@@ -94,11 +140,12 @@ Feature: Shipment Committee Calculations
       | ground  | 1.0    |
       | air     | 1.1    |
-  Scenario: Dogleg factor from nothing
+  Scenario: Dogleg factor from default segment count
     Given a shipment emitter
-    When the "dogleg_factor" committee is calculated
+    When the "segment_count" committee is calculated
+    And the "dogleg_factor" committee is calculated
     Then the committee should have used quorum "from segment count"
-    And the conclusion of the committee should be "1.8"
+    And the conclusion of the committee should be "5.0625"
   Scenario Outline: Dogleg factor from segment count
     Given a shipment emitter
@@ -109,9 +156,7 @@ Feature: Shipment Committee Calculations
     Examples:
       | segments | factor |
       | 1        | 1.0    |
-      | 2        | 1.8    |
-      | 100      | 1.8    |
-      | -20      | 1.8    |
+      | 2        | 1.5    |
   Scenario: Adjusted distance from default
     Given a shipment emitter
@@ -128,30 +173,30 @@ Feature: Shipment Committee Calculations
     Then the committee should have used quorum "from distance, route inefficiency factor, and dogleg factor"
     And the conclusion of the committee should be "400.0"
-  Scenario: Transport emission factor from default mode
+  Scenario: Transport emission factor from default
     Given a shipment emitter
-    When the "mode" committee is calculated
-    And the "transport_emission_factor" committee is calculated
-    Then the committee should have used quorum "from mode"
+    When the "transport_emission_factor" committee is calculated
+    Then the committee should have used quorum "default"
     And the conclusion of the committee should be "0.00076955"
-  Scenario Outline: Transport emission factor from mode
+  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 "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"
+    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    | emission_factor |
-      | courier | 2.0             |
-      | ground  | 1.0             |
-      | air     | 5.0             |
+      | mode    | weight | adjusted_distance | emission_factor |
+      | courier | 2.0    | 5.0               | 0.2             |
+      | ground  | 2.0    | 50.0              | 1.0             |
+      | air     | 2.0    | 50.0              | 5.0             |
-  Scenario: Corporate emission factor from default carrier
+  Scenario: Corporate emission factor from default
     Given a shipment emitter
-    When the "carrier" committee is calculated
-    And the "corporate_emission_factor" committee is calculated
-    Then the committee should have used quorum "from carrier"
+    When the "corporate_emission_factor" committee is calculated
+    Then the committee should have used quorum "default"
     And the conclusion of the committee should be "0.318"
   Scenario: Corporate emission factor from carrier
@@ -161,30 +206,14 @@ Feature: Shipment Committee Calculations
     Then the committee should have used quorum "from carrier"
     And the conclusion of the committee should be "2.0"
-  Scenario: Transport emission from defaults
+  Scenario: Transport emission from weight, adjusted distance, and transport emission factor
     Given a shipment emitter
-    When the "weight" committee is calculated
-    And the "mode" committee is calculated
-    And the "adjusted_distance" committee is calculated
-    And the "transport_emission_factor" committee is calculated
-    And the "transport_emission" committee is calculated
-    Then the committee should have used quorum "from mode, weight, adjusted distance, and transport emission factor"
-    And the conclusion of the committee should be "8.42296"
-  Scenario Outline: Transport emission from mode, weight, adjusted distance, and transport emission factor
-    Given a shipment emitter
-    And a characteristic "mode.name" of "<mode>"
-    And a characteristic "weight" of "<weight>"
-    And a characteristic "adjusted_distance" of "<adjusted_distance>"
-    And a characteristic "transport_emission_factor" of "<ef>"
+    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 mode, weight, adjusted distance, and transport emission factor"
-    And the conclusion of the committee should be "<emission>"
-    Examples:
-      | mode    | weight | adjusted_distance | ef  | emission |
-      | courier | 2.0    | 100.0             | 2.0 | 2.0      |
-      | ground  | 2.0    | 100.0             | 1.0 | 200.0    |
-      | air     | 2.0    | 100.0             | 5.0 | 1000.0   |
+    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 package count and corporate emission factor
     Given a shipment emitter
@@ -201,18 +230,3 @@ Feature: Shipment Committee Calculations
     When the "emission" committee is calculated
     Then the committee should have used quorum "from transport emission and corporate emission"
     And the conclusion of the committee should be "420.0"
-  # Scenario Outline: Duration from timestamps
-  #   Given a shipment emitter
-  #   And a characteristic "origin_timestamp" of "<origin>"
-  #   And a characteristic "destination_timestamp" of "<destination>"
-  #   When the "duration" committee is calculated
-  #   Then the committee should have used quorum "from timestamps"
-  #   And the conclusion of the committee should be "<duration>"
-  #   Examples:
-  #     | origin                    | destination               | duration |
-  #     | 2010-01-01T00:00:00Z      | 2010-01-02T01:30:00Z      | 01:30:00 | same timezone
-  #     | 2010-01-01T00:00:00Z      | 2010-01-02T09:30:00+08:00 | 01:30:00 | different timezones
-  #     | 2010-01-01T00:00:00Z      | 2009-12-31T20:30:00-05:00 | 01:30:00 | timezone change causes different days
-  #     | 2010-01-01T12:00:00+12:00 | 2009-12-31T13:30:00-12:00 | 01:30:00 | cross intl date line eastwards
-  #     | 2010-01-01T12:00:00-12:00 | 2009-01-02T13:30:00+12:00 | 01:30:00 | cross intl date line westwards

data/features/shipment_emissions.feature CHANGED Viewed

@@ -6,7 +6,7 @@ Feature: Shipment Emissions Calculations
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "8.7"
-  Scenario: Calculations from weight, package count and segment count
+  Scenario: Calculations from weight, package count, segment count
     Given a shipment has "weight" of "10"
     And it has "package_count" of "2"
     And it has "segment_count" of "1"
@@ -14,15 +14,14 @@ Feature: Shipment Emissions Calculations
     Then the emission value should be within "0.1" kgs of "25.4"
   Scenario Outline: Calculations from origin/destination
-    Given a shipment has "origin_zip_code.name" of "<origin>"
-    And it has "destination_zip_code.name" of "<destination>"
-    And mapquest determines the distance to be "<distance>"
+    Given a shipment has "origin" of "<origin>"
+    And it has "destination" of "<destination>"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
-      | origin | destination | mapquest_distance | emission |
-      | 05401  | 05401       |                   | 0.3      |
-      | 05401  | 94128       | 30                | 20.8     |
+      | origin | destination                          | emission |
+      | 05401  | 488 Haight Street, San Francisco, CA | 57.74974 |
+      | 05401  | Canterbury, Kent, UK                 | 74.82651 |
   Scenario: Calculations from carrier
     Given a shipment has "carrier.name" of "FedEx"
@@ -41,15 +40,15 @@ Feature: Shipment Emissions Calculations
   Scenario Outline: Calculations from mode and origin/destination
     Given a shipment has "mode.name" of "<mode>"
-    And it has "origin_zip_code.name" of "<origin>"
-    And it has "destination_zip_code.name" of "<destination>"
+    And it has "origin" of "<origin>"
+    And it has "destination" of "<destination>"
     When emissions are calculated
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
-      | mode    | origin | destination | emission |
-      | courier | 05401  | 05401       | 2.3      |
-      | ground  | 05401  | 05401       | 0.3      |
-      | air     | 05401  | 05401       | 0.3      |
-      | courier | 05401  | 94128       | 2.3      |
-      | ground  | 05401  | 94128       | 25296.2  |
-      | air     | 05401  | 94128       | 139127.8 |
+      | mode    | origin | destination                                   | emission     |
+      | courier | 05753  | Address: 488 Haight Street, San Francisco, CA | 2.318        |
+      | courier | 05753  | Address: Canterbury, Kent, UK                 | 2.318        |
+      | ground  | 05753  | Address: 488 Haight Street, San Francisco, CA | 71283.88938  |
+      | ground  | 05753  | Address: Canterbury, Kent, UK                 | 92673.96537  |
+      | air     | 05753  | Address: 488 Haight Street, San Francisco, CA | 392059.96060 |
+      | air     | 05753  | Address: Canterbury, Kent, UK                 | 509705.37857 |

data/features/support/env.rb CHANGED Viewed

@@ -8,4 +8,4 @@ require 'rspec/expectations'
 require 'cucumber/rspec/doubles'
 require 'sniff'
-Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :cucumber => true, :earth => [:locality, :shipping]
+Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :cucumber => true, :earth => [:shipping]

data/lib/shipment/carbon_model.rb CHANGED Viewed

@@ -3,6 +3,7 @@
 # Contact Brighter Planet for dual-license arrangements.
 require File.expand_path('../../vendor/plugin/mapquest/lib/mapquest_directions', File.dirname(__FILE__))
+require 'geokit'
 ## Shipment carbon model
 # This model is used by [Brighter Planet](http://brighterplanet.com)'s carbon emission [web service](http://carbon.brighterplanet.com) to estimate the **greenhouse gas emissions of a shipment** (e.g. a FedEx package).
@@ -44,14 +45,12 @@ module BrighterPlanet
           end
           committee :transport_emission do
-            quorum 'from mode, weight, adjusted distance, and transport emission factor', :needs => [:mode, :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 here that the number of stops, rather than number of packages carried, is limiting factor on local delivery routes
-              if characteristics[:mode].name == "courier"
-                characteristics[:transport_emission_factor]
-              elsif characteristics[:weight] > 0
+              if characteristics[:weight] > 0
                 characteristics[:weight] * characteristics[:adjusted_distance] * characteristics[:transport_emission_factor]
               else
-                raise "Invalid weight: #{:weight} (must be > 0)"
+                raise "Invalid weight: :weight (must be > 0)"
               end
             end
           end
@@ -60,11 +59,23 @@ module BrighterPlanet
             quorum 'from carrier', :needs => :carrier, do |characteristics|
               characteristics[:carrier].corporate_emission_factor
             end
+            quorum 'default' do
+              Carrier.fallback.corporate_emission_factor
+            end
           end
           committee :transport_emission_factor do
-            quorum 'from mode', :needs => :mode do |characteristics|
-              characteristics[:mode].transport_emission_factor
+            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[:weight] * characteristics[:adjusted_distance])
+              else
+                characteristics[:mode].transport_emission_factor
+              end
+            end
+            quorum 'default' do
+              ShipmentMode.fallback.transport_emission_factor
             end
           end
@@ -74,18 +85,17 @@ module BrighterPlanet
             end
             quorum 'default' do
-              # ASSUMED: arbitrary
-              3219
+              3219 # ASSUMED: arbitrary
             end
           end
           committee :dogleg_factor do
-            quorum 'from segment count', :appreciates => :segment_count do |characteristics|
-              if characteristics[:segment_count] == 1
-                1.0
+            quorum 'from segment count', :needs => :segment_count do |characteristics|
+              if characteristics[:segment_count] > 0
+                # ASSUMED arbitrary
+                1.5 ** (characteristics[:segment_count] - 1)
               else
-                # based on our sample FedEx tracking numbers
-                1.8
+                1.8 # based on our sample FedEx tracking numbers
               end
             end
           end
@@ -94,52 +104,76 @@ module BrighterPlanet
             quorum 'from mode', :needs => :mode do |characteristics|
               characteristics[:mode].route_inefficiency_factor
             end
+            quorum 'default' do
+              ShipmentMode.fallback.route_inefficiency_factor
+            end
           end
           committee :distance do
-            quorum 'from same locality', :needs => [:origin_zip_code, :destination_zip_code] do |characteristics|
-              if characteristics[:origin_zip_code] == characteristics[:destination_zip_code]
+            quorum 'from same locality', :needs => [:origin_location, :destination_location] do |characteristics|
+              if characteristics[:origin_location] == characteristics[:destination_location]
                 0
-              else
-                nil
               end
             end
-            quorum 'from mapquest', :needs => [:origin_zip_code, :destination_zip_code, :mode, :mapquest_api_key] do |characteristics|
+            quorum 'from mapquest', :needs => [:origin_location, :destination_location, :mode, :mapquest_api_key] do |characteristics|
               unless characteristics[:mode].name == 'air'
-                mapquest = MapQuestDirections.new characteristics[:origin_zip_code].name,
-                                                  characteristics[:destination_zip_code].name,
+                mapquest = MapQuestDirections.new characteristics[:origin_location],
+                                                  characteristics[:destination_location],
                                                   characteristics[:mapquest_api_key]
                 mapquest.distance_in_miles
               end
             end
-            quorum 'from direct path', :needs => [:origin_zip_code, :destination_zip_code, :mode] do |characteristics|
-              characteristics[:origin_zip_code].distance_to(characteristics[:destination_zip_code], :units => :kms)
+            quorum 'from direct path', :needs => [:origin_location, :destination_location] do |characteristics|
+              Mapper.distance_between(
+                characteristics[:origin_location],
+                characteristics[:destination_location],
+                :units => :kms)
             end
           end
-          committee :mode do
+          committee :segment_count do
             quorum 'default' do
-              ShipmentMode.fallback
+              # ASSUMED based on the fact that FedEx has a hub-spoke system with central and regional distribution centers so seems reasonable for average package to go through four FedEx facilities
+              5
             end
           end
-          committee :carrier do
-            quorum 'default' do
-              Carrier.fallback
+          committee :destination_location do
+            quorum 'from destination', :needs => :destination do |characteristics|
+              code = Geokit::Geocoders::MultiGeocoder.geocode characteristics[:destination].to_s
+              code.ll == ',' ? nil : code.ll
+            end
+          end
+          committee :destination do
+            quorum 'from destination_zip_code', :needs => :destination_zip_code do |characteristics|
+              characteristics[:destination_zip_code]
+            end
+          end
+          committee :origin_location do
+            quorum 'from origin', :needs => :origin do |characteristics|
+              code = Geokit::Geocoders::MultiGeocoder.geocode characteristics[:origin].to_s
+              code.ll == ',' ? nil : code.ll
+            end
+          end
+          committee :origin do
+            quorum 'from origin_zip_code', :needs => :origin_zip_code do |characteristics|
+              characteristics[:origin_zip_code]
             end
           end
           committee :package_count do
             quorum 'default' do
-              # ASSUMED arbitrary
-              1
+              1 # ASSUMED arbitrary
             end
           end
           committee :weight do
             quorum 'default' do
-              # ASSUMED based on average FedEx air package weight of 7.5 lbs
-              3.4
+              3.4 # ASSUMED based on average FedEx air package weight of 7.5 lbs
             end
           end
@@ -150,6 +184,10 @@ module BrighterPlanet
           end
         end
       end
+      class Mapper
+        include Geokit::Mappable
+      end
     end
   end
 end

data/lib/shipment/characterization.rb CHANGED Viewed

@@ -8,6 +8,8 @@ module BrighterPlanet
           has :carrier
           has :mode
           has :segment_count
+          has :origin
+          has :destination
           has :origin_zip_code
           has :destination_zip_code
           has :mapquest_api_key, :display => lambda { |key| "secret key" }

data/lib/shipment/data.rb CHANGED Viewed

@@ -9,8 +9,10 @@ module BrighterPlanet
             string  'carrier_name'
             string  'mode_name'
             integer 'segment_count'
-            string  'origin_zip_code_name'
-            string  'destination_zip_code_name'
+            string  'origin'
+            string  'destination'
+            string  'origin_zip_code'
+            string  'destination_zip_code'
             string  'mapquest_api_key'
           end

data/lib/shipment/relationships.rb CHANGED Viewed

@@ -2,10 +2,8 @@ module BrighterPlanet
   module Shipment
     module Relationships
       def self.included(base)
-        base.belongs_to :carrier,              :foreign_key => 'carrier_name',  :primary_key => 'name'
-        base.belongs_to :origin_zip_code,      :foreign_key => 'zip_code_name', :primary_key => 'name', :class_name => 'ZipCode'
-        base.belongs_to :destination_zip_code, :foreign_key => 'zip_code_name', :primary_key => 'name', :class_name => 'ZipCode'
-        base.belongs_to :mode,                 :foreign_key => 'mode_name',     :primary_key => 'name', :class_name => 'ShipmentMode'
+        base.belongs_to :carrier, :foreign_key => 'carrier_name',  :primary_key => 'name'
+        base.belongs_to :mode,    :foreign_key => 'mode_name',     :primary_key => 'name', :class_name => 'ShipmentMode'
       end
     end
   end

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors:
 - Andy Rossmeissl
@@ -65,7 +65,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
-  name: sniff
+  name: emitter
   requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -73,14 +73,14 @@ dependencies:
       - !ruby/object:Gem::Version
         segments:
         - 0
-        - 4
         - 3
-        version: 0.4.3
-  type: :development
+        - 0
+        version: 0.3.0
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
-  name: emitter
+  name: earth
   requirement: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -89,23 +89,21 @@ dependencies:
         segments:
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 8
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency
-  name: earth
+  name: geokit
   requirement: &id006 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         segments:
         - 0
-        - 3
-        - 8
-        version: 0.3.8
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -151,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 682105265
+      hash: -38437523
       segments:
       - 0
       version: "0"