routific 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f461bbd6a8c76891619ef0e6eac1a430eb5aa7
-  data.tar.gz: 659b39f98fcd1b8d45d93cbde3b99f59eb8e0a2a
+  metadata.gz: a92a096b9aa04f8eed0c72c8b45d4ca262fd6f15
+  data.tar.gz: fdfe5a0030a05a98a5427484c4368325a7b16d93
 SHA512:
-  metadata.gz: b10a6414354f038e953e4ca3366b8e6322777c92a16c7656b2f02873f49efa80a8499fffe52bc686154bfb39da91cf1b011326845560553db09910c2c7d9d038
-  data.tar.gz: 50130e568b9c6fd4c5a3bab8212968698b938ca699953d7aaaedbeb84578434fb6bf21606f56a93cbf36ea66cc398342a83a01534e693826bc4f7ce1ee863362
+  metadata.gz: d20604a843d68aa9a10bc72ba6e63305b7bb65f0a729c2a58e08dab12c5829ff30eadbe31076d0927c14d351ffe82edf8492ba875bad49c85d6b933afc86ee32
+  data.tar.gz: be1a38259698b29c679446377ce38f1d09497cf2be9be87f2f960bf5f9fa4a5df04781f7eab15fe7ad73b4f2c28003ee747f4cc0b84d1213453e882e3f8a077e

data/README.md

@@ -1,7 +1,7 @@
 Routific Ruby Gem
 =================
 
-[![Build Status](https://secure.travis-ci.org/asoesilo/routific-gem.png)](http://travis-ci.org/asoesilo/routific-gem)
+[![Build Status](https://secure.travis-ci.org/routific/routific-gem.png)](http://travis-ci.org/routific/routific-gem)
 
 This Ruby Gem assists users to easily access the [Routific API][1], which is a practical and scalable solution to the Vehicle Routing Problem.
 

data/lib/routific/route.rb

@@ -1,18 +1,36 @@
 module RoutificApi
   # This class represents the resulting route returned by the Routific API
   class Route
-    attr_reader :status, :fitness, :unserved, :vehicleRoutes
+    attr_reader :status, :unserved, :vehicleRoutes, :total_travel_time, :total_idle_time
 
     # Constructor
-    def initialize(status, fitness, unserved)
+    def initialize(status:, solution: {}, unserved: {}, total_travel_time: 0,
+    total_idle_time: 0, total_break_time: 0, total_working_time: 0)
       @status = status
-      @fitness = fitness
       @unserved = unserved
-      @vehicleRoutes = Hash.new()
+      @total_idle_time = total_idle_time
+      @total_travel_time = total_travel_time
+      @total_break_time = total_break_time
+      @total_working_time = total_working_time
+
+      add_solution(solution)
+    end
+
+    def add_solution(solution)
+      @vehicleRoutes = {}
+
+      solution.each do |vehicle_name, way_points|
+        # Get all way points for this vehicle
+        way_points.each do |waypoint_info|
+          # Get all information for this way point
+          way_point = RoutificApi::WayPoint.new(waypoint_info)
+          add_way_point(vehicle_name, way_point)
+        end
+      end
     end
 
     # Adds a new way point for the specified vehicle
-    def addWayPoint(vehicle_name, way_point)
+    def add_way_point(vehicle_name, way_point)
       if @vehicleRoutes[vehicle_name].nil?
         # No previous way point was added for the specified vehicle, so create a new array
         @vehicleRoutes[vehicle_name] = []
@@ -21,26 +39,26 @@ module RoutificApi
       @vehicleRoutes[vehicle_name] << way_point
     end
 
+    def number_of_unserved
+      @number_of_unserved ||= unserved.count
+    end
+
     class << self
       # Parse the JSON representation of a route, and return it as a Route object
-      def parse(routeJson)
-        status = routeJson["status"]
-        fitness = routeJson["fitness"]
-        unserved = routeJson["unserved"]
-        route = RoutificApi::Route.new(status, fitness, unserved)
-
-        # Get way points for each vehicles
-        routeJson["solution"].each do |vehicle_name, way_points|
-          # Get all way points for this vehicle
-          way_points.each do |waypoint_info|
-            # Get all information for this way point
-            way_point = RoutificApi::WayPoint.new(waypoint_info)
-            route.addWayPoint(vehicle_name, way_point)
-          end
+      def parse(data)
+        data = process_data(data)
+        RoutificApi::Route.new(data)
+      end
+
+      def process_data(hash)
+        hash.keys.each do |key|
+          hash[(key.to_sym rescue key) || key] = hash.delete(key)
         end
 
-        # Return the resulting Route object
-        route
+        hash.delete(:num_unserved)
+        hash.delete(:unserved) if hash[:unserved] == nil
+
+        hash
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: routific
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Marc Kuo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 description: Gem to use Routific API
-email: asoesilo@live.com
+email: andre@routific.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,7 +99,7 @@ homepage: https://routific.com/
 licenses:
 - MIT
 metadata:
-  source_code: https://github.com/asoesilo/routific-gem
+  source_code: https://github.com/routific/routific-gem
 post_install_message: 
 rdoc_options: []
 require_paths: