dji 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6160e5fe35970046f9d1720dcb4f5201813c5b2e
-  data.tar.gz: fcc4ec9df200a7b34f2c26a06c99c59dd2aff780
+  metadata.gz: 9dc6efd18b9adfd31bd9ba9b43fa021f1e3ab0fc
+  data.tar.gz: 9ce0895b190909d224f92427f0ac8856155ca4e8
 SHA512:
-  metadata.gz: 6509d5beaf6b45e7fbe1397d4f30b022c22cad4a983b9b8fc301d8dadce66b19c894bc2b97eb282dc557278cd9347f45ad4337479a1360691277f76dbae13e70
-  data.tar.gz: 59be3eb0de717d8ec3913b1b737af47b0145cf4a9d953973866df43e068ada7472d6a1fab3ce5336e9fc8de1f683ec7dd8391fcebbf722f1c46eac9e5e2bdebd
+  metadata.gz: 2ebecfb6548532f2261eeb3d7916966bbbfbf19df882349458ea161b2fa493b4b6381d2c16a38171f9e7f68f323eedad5541647a6f6aea55ac8fb29b5e02fe49
+  data.tar.gz: 5e559b1cb3b36472ffbffa6a3d437843c5657c33435232d454ea565ec32f966b5df62cf60bade092abf5b1fa79b3daf49bdaafd32923445a1e38ef67a249611b

data/lib/dji/order_tracking.rb

@@ -9,11 +9,16 @@ module DJI
 
     class << self
 
+      # The URL for order tracking
+      def tracking_url
+        'http://m.dji.com/orders/tracking'
+      end
+
       # Retrieve an authenticity_token
       def authenticity_token(url, options = {})
         uri      = URI(url)
         http     = Net::HTTP.new uri.host, uri.port
-        request  = Net::HTTP::Get.new uri.path
+        request  = Net::HTTP::Get.new "#{uri.path}?www=v1"
         response = http.request request
         
         if options[:debug].present?
@@ -36,13 +41,13 @@ module DJI
         auth_token = authenticity_token(tracking_url, options)
 
         url = URI.parse(tracking_url)
-        params = { 'number' => options[:order_number], 'phone_tail' => options[:phone_tail], 'utf8' => '✓' }
+        params = { 'www' => 'v1', 'number' => options[:order_number], 'phone_tail' => options[:phone_tail] }
         params[auth_token[:param]] = auth_token[:token]
 
         headers = {
           'Content-Type' => 'application/x-www-form-urlencoded',
           'Cookie' => auth_token[:cookie],
-          'Origin' => 'http://store.dji.com',
+          'Origin' => 'http://m.dji.com',
           'Referer' => tracking_url
         }
 
@@ -62,23 +67,24 @@ module DJI
         when Net::HTTPSuccess, Net::HTTPRedirection
           # OK
           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]')
- 
+
+          content = page.at_xpath('//div[@id="custom-info"]/div[@class="order-tracking"]')
+
           if content.text.blank? || content.text.include?('Sorry, record not found.')
             puts "Order #{options[:order_number]}/#{options[:phone_tail]} not found!" if options[:output]
           else
             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] = if content.at_xpath('div[5]/span').present?
-              content.at_xpath('div[5]/span').text
+            data[:order_number]     = content.at_xpath('p[1]').text.split(' ')[-1]
+            data[:total]            = content.at_xpath('p[2]').text.split(' ')[1..-1].join(' ')
+            data[:payment_status]   = content.at_xpath('p[3]').text.split(': ')[1]
+            data[:shipping_status]  = content.at_xpath('p[4]').text.split(': ')[1]
+            data[:shipping_company] = if content.at_xpath('p[5]/span').present?
+              content.at_xpath('p[5]/span').text
             else
               'Tba'
             end
-            data[:tracking_number]  = if content.at_xpath('div[6]/a').present?
-              content.at_xpath('div[6]/a').text
+            data[:tracking_number]  = if content.at_xpath('p[6]/a').present?
+              content.at_xpath('p[6]/a').text
             else
               nil
             end
@@ -102,11 +108,6 @@ module DJI
         data
       end
 
-      # The URL for order tracking
-      def tracking_url
-        'http://store.dji.com/orders/tracking'
-      end
-
       def print_tracking_details(data)
           now = Time.now.to_s
 

data/lib/dji/version.rb

@@ -1,3 +1,3 @@
 module DJI
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Kevin Elliott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport