dji 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c613192536d1beb1acc577ae701ec56b25dfaf
-  data.tar.gz: df2972a66397e7d063fb3b69b77a0d8a387029c2
+  metadata.gz: 2c537b14753592e862427e2acff55711db4a3493
+  data.tar.gz: 3da898f5726aa3372edcb7f73d2593ed461b0f60
 SHA512:
-  metadata.gz: 0d14ba56c39806c116901a2015b9b1ec3ee36629609dae3ef0cd443b46309f9790bdea2b8fad4cc9c52ef931755263e8cd46079b98a56b59068b3aa7dc42646d
-  data.tar.gz: fbe12e7d0bc3c125b81541173e0ed680c9bbbcc02262db078c17d04b43dfaa383c8006615d3cdd4b0d91b9be23e327b2beceb7d9e1279bb70c248492c28be6b6
+  metadata.gz: ffe1d34948ae6d308009980cb6eda2070aaa80fcae158c74785368bf158b91e37ba4cc461c1d7a9714ae43fa8bfc689cf8c1edf34ad73f6f3f074f8a5c7ce14d
+  data.tar.gz: dd535a177f5cb221fcba32bcad0f29c0a5fdae547c7281e36dcd9a8fa49b15bb9216a401a42028e2a6964468f112cc301b213d2f1b098645ba86b895dc0e394f

data/README.md

@@ -29,6 +29,31 @@ Use your order number in place of ORDER_NUMBER and the last 4 digits of your pho
     Shipping Company : Tba
     Tracking Number  : 
 
+If you want this to repeat automatically at an interval, specify the option for repeat (either -r or --repeat) with the number of seconds. Do not use this nefariously, I suggest a reasonable interval such as 60 seconds, but more useful is probably around 300 seconds (5 minutes) to 600 seconds (10 minutes).
+
+    $ dji track -o 123456789012 -p 1234 -r 60
+
+    Requesting order tracking details every 60 seconds. Press CONTROL-C to stop...
+
+    ORDER TRACKING AS OF 2016-10-27 01:29:36 -0700
+    ------------------------------------------------------
+    Order Number     : 123456789012
+    Total            : USD $1,398.00
+    Payment Status   : Pay Confirmed
+    Shipping Status  : Pending
+    Shipping Company : Tba
+    Tracking Number  : 
+
+
+    ORDER TRACKING AS OF 2016-10-27 01:30:37 -0700
+    ------------------------------------------------------
+    Order Number     : 123456789012
+    Total            : USD $1,398.00
+    Payment Status   : Pay Confirmed
+    Shipping Status  : Pending
+    Shipping Company : Tba
+    Tracking Number  : 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/dji/commands.rb

@@ -1,3 +1,4 @@
 require 'dji/command'
 require 'dji/commands/version/version_command'
+require 'dji/commands/fedex/fedex_command'
 require 'dji/commands/track/track_command'

data/lib/dji/commands/fedex/fedex_command.rb

@@ -0,0 +1,26 @@
+module DJI
+  module Command
+    class FedexCommand < Base
+      desc 'fedex COUNTRY_CODE POSTAL_CODE', 'track FedEx by reference'
+      option :country_code, required: true, aliases: :c
+      option :postal_code, required: true, aliases: :p
+      option :reference, aliases: :ref, default: 'DJIGOODS'
+      option :repeat, aliases: :r
+
+      def fedex
+        if options[:repeat].present?
+          interval = options[:repeat].to_i.presence || 300
+          puts
+          puts "Requesting FedEx tracking by reference #{reference} every #{interval} seconds. Press CONTROL-C to stop..."
+
+          while true
+            DJI::Fedex.track_by_reference(options[:country_code], options[:postal_code], options[:reference])
+            sleep(interval)
+          end
+        else
+          DJI::Fedex.track_by_reference(options[:country_code], options[:postal_code], options[:reference])
+        end
+      end
+    end
+  end
+end

data/lib/dji/fedex.rb

@@ -1,11 +1,14 @@
+require 'json'
 require 'net/http'
 require 'uri'
 
 require 'nokogiri'         
 
-module DJI
-  class Fedex
+require 'dji/fedex/track_packages_response'
 
+module DJI
+  module Fedex
+  
     class << self
 
       # Get the tracking details for an order
@@ -26,9 +29,10 @@ module DJI
           'Referer' => tracking_url
         }
 
-        http = Net::HTTP.new uri.host, uri.port
-        request = Net::HTTP.get(uri, headers)
-        res = http.request(request)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        res = http.get(uri.request_uri, headers)
 
         case res
         when Net::HTTPSuccess, Net::HTTPRedirection
@@ -58,6 +62,113 @@ module DJI
         'https://www.fedex.com/apps/fedextrack/'
       end
 
+      def track_by_reference(country_code, postal_code, reference="DJIGOODS")
+        uri = URI.parse(tracking_url_json)
+
+        params = {
+          'action' => 'altReferenceList',
+          'locale' => 'en_US',
+          'version' => 1,
+          'format' => 'json'
+        }
+        params['data'] = {
+          'TrackPackagesRequest' => {
+            'appType' => 'WTRK',
+            'appDeviceType' => 'DESKTOP',
+            'uniqueKey' => '',
+            'processingParameters' => {},
+            'trackingInfoList' => [
+              {
+                'referenceInfo' => {
+                  'referenceValueList' => [reference],
+                  'shipDate' => Time.now.strftime('%Y-%m-%d'),
+                  'postalCode' => postal_code,
+                  'countryCode' => country_code,
+                  'accountNbr' => ''
+                }
+              }
+            ]
+          }
+        }.to_json
+
+        headers = {
+          'Content-Type' => 'application/x-www-form-urlencoded',
+          'Origin' => 'https://www.fedex.com/',
+          'Referer' => tracking_url,
+          'Accept' => '*/*',
+          'X-Requested-With' => 'XMLHttpRequest'
+        }
+
+        http = Net::HTTP.new uri.host, uri.port
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        request = Net::HTTP::Post.new uri.path, headers
+        request.set_form_data params
+        res = http.request(request)
+
+        case res
+        when Net::HTTPSuccess, Net::HTTPRedirection
+          # OK
+          # puts res.body
+          response = JSON.parse(res.body)['TrackPackagesResponse']
+          tpr = DJI::Fedex::TrackPackagesResponse.new_from_response(response)
+
+          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
+          # page = Nokogiri::HTML(res.body)
+          # content = page.at_xpath('//div[@id="main"]/div[@class="container"]/div[@class="row"]/div[@class="col-xs-9"]/div[@class="col-xs-10 well"][2]')
+          # # puts content
+          # data = {}
+          # data[:order_number] = content.at_xpath('div[1]').text.split(' ')[-1]
+          # data[:total]        = content.at_xpath('div[2]').text.split(' ')[1..-1].join(' ')
+          # data[:payment_status] = content.at_xpath('div[3]').text.split(': ')[1]
+          # data[:shipping_status] = content.at_xpath('div[4]').text.split(': ')[1]
+          # data[:shipping_company] = content.at_xpath('div[5]/span').text
+          # data[:tracking_number] = content.at_xpath('div[6]/a').text
+          
+          # print_tracking_details(data)
+        else
+          puts res.inspect
+          res.error!
+        end
+
+      end
+
+      def tracking_url_json
+        'https://www.fedex.com/trackingCal/track'
+      end
+
+      def print_track_packages_response(data)
+        now = Time.now.to_s
+
+        puts
+        puts "FedEx Packages for Country #{data[:country_code]}, Postal Code #{data[:postal_code]} as of #{now}"
+        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
 

data/lib/dji/fedex/package.rb

@@ -0,0 +1,91 @@
+require 'time'
+
+module DJI
+  module Fedex
+    class Package
+      attr_accessor :tracking_number, :pretty_tracking_number
+      attr_accessor :tracking_qualifier, :tracking_carrier_code, :tracking_carrier_description
+      attr_accessor :shipper_company_name, :shipper_name, :shipper_address, :shipper_address_line_2,
+                    :shipper_city, :shipper_region_code, :shipper_postal_code, :shipper_country_code, 
+                    :shipper_phone_number, :shipped_by
+      attr_accessor :recipient_company_name, :recipient_name, :recipient_address, :recipient_address_line_2,
+                    :recipient_city, :recipient_region_code, :recipient_postal_code, :recipient_country_code,
+                    :recipient_phone_number, :shipped_to
+      attr_accessor :key_status, :key_status_code, :last_scan_status, :last_scan_date_time
+      attr_accessor :received_by, :sub_status, :main_status
+      attr_accessor :tendered_date, :pickup_date, :ship_date, :estimated_delivery_date, :delivery_date
+      attr_accessor :dimensions, :total_weight
+      attr_accessor :scan_events
+
+      def initialize
+        @scan_events = []
+      end
+
+      def destination
+        [recipient_company_name, recipient_name, recipient_address, recipient_address_line_2, recipient_city,
+         recipient_region_code, recipient_country_code].reject(&:blank?).join(', ')
+      end
+
+      def origin
+        [shipper_company_name, shipper_name, shipper_address, shipper_address_line_2, shipper_city,
+         shipper_region_code, shipper_country_code].reject(&:blank?).join(', ')
+      end
+
+      class << self
+
+        def new_from_response_package_item(item)
+          package = Package.new
+          package.tracking_number = item['trackingNbr']
+          package.pretty_tracking_number = item['displayTrackingNbr']
+          package.tracking_qualifier = item['trackingQualifier']
+          package.tracking_carrier_code = item['trackingCarrierCd']
+          package.tracking_carrier_description = item['trackingCarrierDesc']
+
+          package.shipper_company_name = item['shipperCmpnyName']
+          package.shipper_name = item['shipperName']
+          package.shipper_address = item['shipperAddr1']
+          package.shipper_address_line_2 = item['shipperAddr2']
+          package.shipper_city = item['shipperCity']
+          package.shipper_region_code = item['shipperStateCD']
+          package.shipper_postal_code = item['shipperZip']
+          package.shipper_country_code = item['shipperCntryCD']
+          package.shipper_phone_number = item['shipperPhoneNbr']
+          package.shipped_by = item['shippedBy']
+
+          package.recipient_company_name = item['recipientCmpnyName']
+          package.recipient_name = item['recipientName']
+          package.recipient_address = item['recipientAddr1']
+          package.recipient_address_line_2 = item['recipientAddr2']
+          package.recipient_city = item['recipientCity']
+          package.recipient_region_code = item['recipientStateCD']
+          package.recipient_postal_code = item['recipientZip']
+          package.recipient_country_code = item['recipientCntryCD']
+          package.recipient_phone_number = item['recipientPhoneNbr']
+          package.shipped_to = item['shippedTo']
+
+          package.key_status = item['keyStatus']
+          package.key_status_code = item['keyStatusCD']
+          package.last_scan_status = item['lastScanStatus']
+          package.last_scan_date_time = item['lastScanDateTime']
+
+          package.received_by = item['receivedByNm']
+          package.sub_status = item['subStatus']
+          package.main_status = item['mainStatus']
+
+          package.tendered_date = Time.iso8601(item['tenderedDt']) if item['tenderedDt'].present?
+          package.pickup_date = Time.iso8601(item['pickupDt']) if item['pickupDt'].present?
+          package.ship_date = Time.iso8601(item['shipDt']) if item['shipDt'].present?
+          package.estimated_delivery_date = Time.iso8601(item['estDeliveryDt']) if item['estDeliveryDt'].present?
+          package.delivery_date = Time.iso8601(item['actDeliveryDt']) if item['actDeliveryDt'].present?
+
+          package.dimensions = item['dimensions']
+          package.total_weight = { pounds: item['totalLbsWgt'], kilograms: item['totalKgsWgt'] }
+
+          package
+        end
+
+      end
+
+    end
+  end
+end

data/lib/dji/fedex/scan_event.rb

@@ -0,0 +1,8 @@
+
+module DJI
+  module Fedex
+    class ScanEvent
+
+    end
+  end
+end

data/lib/dji/fedex/track_packages_response.rb

@@ -0,0 +1,30 @@
+require 'dji/fedex/package'
+require 'dji/fedex/scan_event'
+
+module DJI
+  module Fedex
+    class TrackPackagesResponse
+      attr_accessor :packages
+
+      def initialize
+        @packages = []
+      end
+
+      class << self
+        def new_from_response(response)
+          return nil if !response.has_key?('successful') || response['successful'].blank?
+
+          tpr = TrackPackagesResponse.new
+
+          response['packageList'].each do |item|
+            package = Package.new_from_response_package_item(item)
+            tpr.packages << package if package.present?
+          end
+
+          tpr
+        end
+      end
+
+    end
+  end
+end

data/lib/dji/version.rb

@@ -1,3 +1,3 @@
 module DJI
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Elliott
@@ -111,9 +111,13 @@ files:
 - lib/dji/command/base.rb
 - lib/dji/command/behavior.rb
 - lib/dji/commands.rb
+- lib/dji/commands/fedex/fedex_command.rb
 - lib/dji/commands/track/track_command.rb
 - lib/dji/commands/version/version_command.rb
 - lib/dji/fedex.rb
+- lib/dji/fedex/package.rb
+- lib/dji/fedex/scan_event.rb
+- lib/dji/fedex/track_packages_response.rb
 - lib/dji/order_tracking.rb
 - lib/dji/version.rb
 homepage: http://github.com/kevinelliott/dji