dji 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea334a81926d812f389b361107c36a3f8410ef4
-  data.tar.gz: 3f4ea4d8e6cec8807105a69d16c55f7924f88e1e
+  metadata.gz: 89bee1947fd5fb1fd18d6ff55bc7df1a3ab40221
+  data.tar.gz: a764b6f12a17fea87e8cab0f55ec3bbf8479d3a5
 SHA512:
-  metadata.gz: 36a63f2eeb4e53feb7e48172461d586e3c480c84f7bf6eeb1d240c0cec2af57b2061f819777f071b11b8d5258b880d7732e6df4ceacd7edbede434796b12e32a
-  data.tar.gz: f4d2a5cf9da4ea195f2f71d6117f8dac6d8fed829509158f8a10807a829719eb76e03831690945f99043a17c488caea8492cc81965396e76102dc492095acd93
+  metadata.gz: 9b7ebbf6aa341c2c271609ec34bb547f144a3b1a192e9fd6f0e768974f2bccd7c3891a3d0277e2870c211300760e237907dd21465cda69d8edeecd3b68bd90ed
+  data.tar.gz: c573eda472a8b359c21321685eb57a2fe4e5c2d35875de4047d079af28c5cb2336d2c8d02dbd91e20bd8438bc28ddf36b8001f48e77757b23870917b3886cc25

data/README.md

@@ -1,5 +1,6 @@
 # DJI
 
+CLI and Ruby tools for drone-maker DJI's store, account, order status and more.
 
 
 ## Installation

data/lib/dji.rb

@@ -11,6 +11,7 @@ require 'dji/version'
 module DJI
   extend ActiveSupport::Autoload
 
+  autoload :DHL
   autoload :Fedex
   autoload :OrderTracking
 end

data/lib/dji/dhl.rb

@@ -0,0 +1,108 @@
+require 'json'
+require 'net/http'
+require 'uri'
+
+require 'nokogiri'         
+
+require 'dji/dhl/tracking_results'
+
+module DJI
+  module DHL
+  
+    class << self
+
+      # Get the tracking details for a waybill
+      def track(waybill)
+        uri = URI.parse(tracking_url_json)
+        params = {
+          'AWB' => waybill,
+          'languageCode' => 'en'
+        }
+        uri.query = URI.encode_www_form(params)
+
+        headers = {
+          'Origin' => 'http://www.dhl.com/',
+          'Referer' => tracking_url_json
+        }
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        res = http.get(uri.request_uri, headers)
+
+        case res
+        when Net::HTTPSuccess, Net::HTTPRedirection
+          puts res.body
+
+          results = JSON.parse(res.body)['results']
+          tr = DJI::DHL::TrackingResults.new_from_results(results)
+
+          # data = { country_code: country_code, postal_code: postal_code }
+          # if tpr.present?
+          #   data[:track_packages_response] = tpr
+          #   print_track_packages_response(data)
+          # else
+          #   puts response
+          #   puts "Nothing parsed!"
+          # end
+          
+          # print_tracking_details(data)
+        else
+          puts res.inspect
+          res.error!
+        end
+
+      end
+
+          # OK
+          # puts res.body
+
+      def tracking_url_json
+        'http://www.dhl.com/shipmentTracking'
+      end
+
+      def print_tracking_response(data)
+        now = Time.now.to_s
+
+        puts
+        puts "DHL Tracking for Airway Bill: #{data[:waybill]}"
+        puts "-------------------------------------------------------------------------------------------------------"
+        puts
+
+        data[:track_packages_response].packages.each_with_index do |package, index|
+          puts "PACKAGE #{index+1}"
+          puts
+          puts "Origin       : #{package.origin}"
+          puts "Destination  : #{package.destination}"
+          puts "Tendered     : #{package.tendered_date}"
+          puts "Picked Up    : #{package.pickup_date}"
+          puts "Shipped      : #{package.ship_date}"
+          puts "Est. Deliver : #{package.estimated_delivery_date}" if package.estimated_delivery_date.present?
+          puts "Delivered    : #{package.delivery_date}" if package.delivery_date.present?
+          puts "Dimensions   : #{package.dimensions}"
+          puts "Total Weight : #{package.total_weight[:pounds]} lbs (#{package.total_weight[:kilograms]} kgs)"
+          puts "Status       : #{package.key_status}"
+          puts
+        end
+      end
+
+      def print_tracking_details(data)
+          now = Time.now.to_s
+
+          puts
+          puts "ORDER TRACKING AS OF #{now}"
+          puts "------------------------------------------------------"
+          puts "Order Number     : #{data[:order_number]}"
+          puts "Total            : #{data[:total]}"
+          puts "Payment Status   : #{data[:payment_status]}"
+          puts "Shipping Status  : #{data[:shipping_status]}"
+          puts "Shipping Company : #{data[:shipping_company]}"
+          puts "Tracking Number  : #{data[:tracking_number]}"
+          puts
+      end
+
+    end
+    
+  end
+end
+
+# http://www.dhl.com/shipmentTracking?AWB=5902444026&languageCode=en
+

data/lib/dji/dhl/checkpoint.rb

@@ -0,0 +1,29 @@
+require 'time'
+
+module DJI
+  module DHL
+
+    class Checkpoint
+      attr_accessor :counter
+      attr_accessor :description
+      attr_accessor :time_value, :date_value
+      attr_accessor :datetime
+
+      class << self
+
+        def new_from_item(item)
+          c = Checkpoint.new
+          c.counter = item['counter']
+          c.description = item['description']
+          c.time_value = item['time']
+          c.date_value = item['date']
+          c.datetime = Time.parse("#{c.date_value}#{c.time_value}")
+          c
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/dji/dhl/shipment.rb

@@ -0,0 +1,57 @@
+require 'date'
+require 'time'
+
+require 'dji/dhl/checkpoint'
+
+module DJI
+  module DHL
+
+    class Shipment
+      attr_accessor :waybill
+      attr_accessor :delivery_code, :delivery_status
+      attr_accessor :origin, :destination
+      attr_accessor :origin_country, :origin_region, :origin_city
+      attr_accessor :destination_country, :destination_region, :destination_city
+      attr_accessor :checkpoints
+      attr_accessor :estimated_delivery_date, :estimated_delivery_product
+
+      def initialize
+        @checkpoints = []
+      end
+
+      def destination=(value)
+        @destination = value
+        self.destination_city, self.destination_region, self.destination_country = value.split(' - ')
+      end
+
+      def origin=(value)
+        @origin = value
+        self.origin_city, self.origin_region, self.origin_country = value.split(' - ')
+      end
+
+      class << self
+
+        def new_from_item(item)
+          shipment                 = Shipment.new
+          shipment.waybill         = item['id']
+          shipment.delivery_code   = item['delivery']['code']
+          shipment.delivery_status = item['delivery']['status']
+          shipment.destination     = item['destination']['value']
+          shipment.origin          = item['origin']['value']
+          shipment.estimated_delivery_date = Date.parse(item['edd']['date'])
+          shipment.estimated_delivery_product = item['edd']['product']
+
+          item['checkpoints'].each do |item|
+            checkpoint = Checkpoint.new_from_item(item)
+            shipment.checkpoints << checkpoint
+          end
+
+          shipment
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/dji/dhl/tracking_results.rb

@@ -0,0 +1,33 @@
+require 'dji/dhl/shipment'
+
+module DJI
+  module DHL
+
+    class TrackingResults
+      attr_accessor :shipments
+
+      def initialize
+        @shipments = []
+      end
+
+      class << self
+
+        def new_from_results(results)
+          return nil if results.blank?
+
+          tr = TrackingResults.new
+
+          results.each do |item|
+            shipment = DJI::DHL::Shipment.new_from_item(item)
+            tr.shipments << shipment
+          end
+
+          tr
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/dji/version.rb

@@ -1,3 +1,3 @@
 module DJI
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Kevin Elliott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,9 +125,14 @@ files:
 - lib/dji/command/base.rb
 - lib/dji/command/behavior.rb
 - lib/dji/commands.rb
+- lib/dji/commands/dhl/dhl_command.rb
 - lib/dji/commands/fedex/fedex_command.rb
 - lib/dji/commands/track/track_command.rb
 - lib/dji/commands/version/version_command.rb
+- lib/dji/dhl.rb
+- lib/dji/dhl/checkpoint.rb
+- lib/dji/dhl/shipment.rb
+- lib/dji/dhl/tracking_results.rb
 - lib/dji/fedex.rb
 - lib/dji/fedex/package.rb
 - lib/dji/fedex/scan_event.rb