dji 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709b42b533db5c7dd69ba5875661fa008d06f8f0
-  data.tar.gz: ba9c86ae0d78b2d9e1208296a141fd22e0879bdb
+  metadata.gz: d6c7466dc976d6bab33aa9d69de6c9aa92145f6e
+  data.tar.gz: 0222e16f71c237dfedb3932dd334f352a11a9890
 SHA512:
-  metadata.gz: 9deae5ba1a44390df1625e75313b662572ed85f59d03a26fe7d0f8c9969f3aaac9cc759d7e2c008c281429924c7cf560c2e312001f54b76ee276a9779b6007de
-  data.tar.gz: b692e03ab6e77e5a565761604e7f2ae2629d8f295d088b48889e02c6865a5ce7af1364ce8d447956dcc75b2cc09fb5e7b7d36d26aa61b2e696ccbe8e4e21b574
+  metadata.gz: 87e29875f092a73d57e8831f1e8c85b0b0fb4ba9ecef1829aba29d9755c2fd316ebc96d0db313b4904a86f12598b37e6c082dde89b0b7a97f19448a6dd34c45e
+  data.tar.gz: a93faf41a6518d1e0374b6617d4f08acff7bbb2f927007870ed8d4396a689c6a8f246beaccbcad9229204e397415b774f1ba6a4067e525e826073848bdc9fae3

data/lib/dji/commands/track/track_command.rb

@@ -6,15 +6,20 @@ module DJI
       option :phone_tail, required: true, aliases: :p
       option :repeat, aliases: :r
       option :publish, required: false, default: false
+      
       option :country, required: false, aliases: :c
+      option :debug, required: false, default: false, aliases: :d
       option :dji_username, required: false, aliases: [:username, :u]
-      
+      option :email_address, required: false, aliases: [:email, :e]
+
       def track
         provided_options = {
           order_number: options[:order_number],
           phone_tail:   options[:phone_tail],
           country:      options[:country],
-          dji_username: options[:dji_username]
+          debug:        options[:debug],
+          dji_username: options[:dji_username],
+          email:        options[:email_address],
         }
 
         if options[:repeat].present?

data/lib/dji/order_tracking.rb

@@ -10,12 +10,19 @@ module DJI
     class << self
 
       # Retrieve an authenticity_token
-      def authenticity_token(url)
+      def authenticity_token(url, options = {})
         uri      = URI(url)
         http     = Net::HTTP.new uri.host, uri.port
         request  = Net::HTTP::Get.new uri.path
         response = http.request request
         
+        if options[:debug].present?
+          puts "DEBUG: -------------------------------------------------------------------"
+          puts "DEBUG: Authenticity Token Body"
+          puts "DEBUG: #{response.body}"
+          puts "DEBUG: -------------------------------------------------------------------"
+        end
+
         page      = Nokogiri::HTML(response.body)
         token_dom = page.at_xpath('//meta[@name="csrf-token"]/@content')
         token     = token_dom.text if token_dom.present?
@@ -26,7 +33,7 @@ module DJI
 
       # Get the tracking details for an order
       def tracking_details(options = {})
-        auth_token = authenticity_token(tracking_url)
+        auth_token = authenticity_token(tracking_url, options)
 
         url = URI.parse(tracking_url)
         params = { 'number' => options[:order_number], 'phone_tail' => options[:phone_tail], 'utf8' => '✓' }
@@ -42,12 +49,19 @@ module DJI
         http = Net::HTTP.new url.host, url.port
         request = Net::HTTP::Post.new url.path, headers
         request.set_form_data params
-        res = http.request(request)
+        response = http.request(request)
+
+        if options[:debug].present?
+          puts "DEBUG: -------------------------------------------------------------------"
+          puts "DEBUG: Tracking Page Body"
+          puts "DEBUG: #{response.body}"
+          puts "DEBUG: -------------------------------------------------------------------"
+        end
 
-        data = case res
+        data = case response
         when Net::HTTPSuccess, Net::HTTPRedirection
           # OK
-          page = Nokogiri::HTML(res.body)
+          page = Nokogiri::HTML(response.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]')
  
           data                    = {}
@@ -58,13 +72,15 @@ module DJI
           data[:shipping_company] = content.at_xpath('div[5]/span').text
           data[:tracking_number]  = content.at_xpath('div[6]/a').text
 
-          data[:shipping_country] = options[:country] if options[:country].present?
+          data[:email_address]    = options[:email_address] if options[:email_address].present?
+          data[:debug]            = options[:debug] if options[:debug].present?
           data[:dji_username]     = options[:dji_username] if options[:dji_username].present?
+          data[:shipping_country] = options[:country] if options[:country].present?
           
           print_tracking_details(data)
           data
         else
-          puts "There was an error: #{res.message}"
+          puts "There was an error: #{response.message}"
           nil
         end
         
@@ -118,14 +134,14 @@ module DJI
         http = Net::HTTP.new url.host, url.port
         request = Net::HTTP::Post.new url.path, headers
         request.body = params.to_json
-        res = http.request(request)
+        response = http.request(request)
 
-        case res
+        case response
         when Net::HTTPSuccess, Net::HTTPRedirection
           puts "You have successfully published your latest order status."
           puts "See order statuses reported by others at #{publish_url}"
         else
-          puts "There was an error trying to publish your order status: #{res.message}"
+          puts "There was an error trying to publish your order status: #{response.message}"
         end
         
       end

data/lib/dji/version.rb

@@ -1,3 +1,3 @@
 module DJI
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Kevin Elliott