amazon_order 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52166bb75c3fe54c69163a6878e2b8a34a3d8590
-  data.tar.gz: 35af75fbdcbec9a9de5bdf380b45bb97dcb513ee
+SHA256:
+  metadata.gz: 403169c4d75b77f2b0902673f841adc2e5b26a919321303054e76ce3e78b3363
+  data.tar.gz: 48a1cb6dca6655144a6c3aa2aaf9bc9bc92cf5d93f0efa133620eb762c5984ff
 SHA512:
-  metadata.gz: 8e75e7d9b750bb9bdb970758c100271bc4910d9551ac273d7b8c267505607ac0187189e3f1db67d356464d6ed7c031dfb0b509260993352caa4481e4d5dfc849
-  data.tar.gz: 9ba44f92e89e6e60a44da9a080f44f3d95601c22e3fc57d6c211d0b0fd0eee2766a5a90254e49c89866b51f936f103a0feb0178ac48607bc2c0801a9d5ebf0a1
+  metadata.gz: 6ad026411155d3359878e9dcdb9dc16886e102b5807bd34487778009d9d3a60a348dc9935d6357eb8b09ba16099425eb65b4626608d54cfc51acd048e48113ae
+  data.tar.gz: 87d829052e7e65f6a2d0eff5c7ee897fcfa2982de28ebac707a546611aa0ada4bd3151fb5ca257060b09720608af3d25ed4246666b4cd898ea462864d21f31c5

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+before_install: gem install bundler -v 1.17.3

data/amazon_order.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "amazon_auth", "~> 0.4.0"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_runtime_dependency "amazon_auth", "~> 0.6.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "pry-rescue"
   spec.add_development_dependency "pry-stack_explorer"

data/lib/amazon_order.rb

@@ -3,6 +3,7 @@ require "amazon_order/version"
 require "amazon_order/client"
 require "amazon_order/parsers/base"
 require "amazon_order/parsers/order"
+require "amazon_order/parsers/shipment"
 require "amazon_order/parsers/product"
 require "amazon_order/parser"
 require "amazon_order/writer"

data/lib/amazon_order/client.rb

@@ -65,8 +65,17 @@ module AmazonOrder
     end
 
     def go_to_amazon_order_page
+      if doc.css('.cvf-account-switcher').present?
+        log "Account switcher page was displayed"
+        session.first('.cvf-account-switcher-profile-details').click
+        wait_for_selector('#nav-main') # Wait for page loading
+      end
       link = links_for('a').find{|link| link =~ %r{/order-history} }
-      session.visit link
+      if link.present?
+        session.visit link
+      else
+        log "Link for order history wasn't found in #{session.current_url}"
+      end
     end
 
     def fetch_orders_for_year(options = {})

data/lib/amazon_order/parsers/base.rb

@@ -6,6 +6,7 @@ module AmazonOrder
       def initialize(node, options = {})
         @node = node
         @fetched_at = options[:fetched_at]
+        @containing_object = options[:containing_object]
       end
 
       def inspect

data/lib/amazon_order/parsers/order.rb

@@ -3,7 +3,6 @@ module AmazonOrder
     class Order < Base
       ATTRIBUTES = %w[
                      order_placed order_number order_total
-                     shipment_status shipment_note
                      order_details_path
                      all_products_displayed
                    ]
@@ -17,36 +16,55 @@ module AmazonOrder
       end
 
       def order_total
-        @_order_total ||= @node.css('.order-info .a-col-left .a-column')[1].css('.value').text.strip.gsub(/[^\d\.]/,'').to_f
+        @_order_total ||= @node.css('.order-info .a-col-left .a-column')[1].css('.value').text.strip.gsub(/[^\d\.]/, '').to_f
       end
 
-      def shipment_status
-        # class names like "shipment-is-delivered" in '.shipment' node may be useful
-        @_shipment_status ||= @node.css('.shipment .shipment-top-row').present? ? @node.css('.shipment .shipment-top-row .a-row')[0].text.strip : nil
+      def order_details_path
+        @_order_details_path ||= @node.css('.order-info .a-col-right .a-row')[1].css('a.a-link-normal')[0].attr('href')
       end
 
-      def shipment_note
-        @_shipment_note ||= @node.css('.shipment .shipment-top-row').present? ? @node.css('.shipment .shipment-top-row .a-row')[1].text.strip : nil
+      def order_type
+        if @node.css('[id^=Leave-Service-Feedback]').present?
+          return :service_order
+        elsif @node.css('.shipment').present?
+          :shipment_order
+        else
+          :digital_order
+        end
       end
 
-      def order_details_path
-        @_order_details_path ||= @node.css('.order-info .a-col-right .a-row')[1].css('a.a-link-normal')[0].attr('href')
+      def shipments
+        @_shipments ||= @node.css('.shipment')
+          .map do |shipment|
+          AmazonOrder::Parsers::Shipment.new(shipment,
+                                             containing_object: self,
+                                             fetched_at: fetched_at)
+        end
       end
 
-      def all_products_displayed
-        @_all_products_displayed ||= @node.css('.a-box.order-info ~ .a-box .a-col-left .a-row').last.css('.a-link-emphasis').present?
+      def products
+        @products ||= shipment_products + digital_products
       end
 
-      def products
-        @_products ||= @node.css('.a-box.order-info ~ .a-box .a-col-left .a-row')[0].css('.a-fixed-left-grid').map{|e| AmazonOrder::Parsers::Product.new(e, fetched_at: fetched_at) }
+      def shipment_products
+        @shipment_products ||= shipments.flat_map(&:products)
+      end
+
+      def digital_products
+        @_products ||= @node.css('.a-box:not(.shipment) .a-fixed-left-grid').map { |e| AmazonOrder::Parsers::Product.new(e, fetched_at: fetched_at) }
       end
 
+      # might be broken now that orders have multiple shipments
+      def all_products_displayed
+        @_all_products_displayed ||= @node.css('.a-box.order-info ~ .a-box .a-col-left .a-row').last.css('.a-link-emphasis').present?
+      end
 
       def to_hash
         super do |hash|
           hash.merge!(products: products.map(&:to_hash))
         end
       end
+
     end
   end
 end

data/lib/amazon_order/parsers/product.rb

@@ -21,7 +21,10 @@ module AmazonOrder
       end
 
       def image_url
-        @_image_url ||= get_original_image_url(@node.css('.a-col-left img')[0].attr('src'))
+        @_image_url ||= begin
+          img = @node.css('.a-col-left img')[0]
+          get_original_image_url(img.attr('data-a-hires').presence || img.attr('src'))
+        end
       end
     end
   end

data/lib/amazon_order/parsers/shipment.rb

@@ -0,0 +1,38 @@
+module AmazonOrder
+  module Parsers
+    class Shipment < Base
+      ATTRIBUTES = %w[
+                     shipment_status
+                     shipment_note
+                   ]
+
+      # TODO shipment_date
+
+      def order
+        @containing_object
+      end
+
+      def shipment_status
+        # class names like "shipment-is-delivered" in '.shipment' node may be useful
+        @_shipment_status ||= @node.css('.shipment-top-row').present? ? @node.css('.shipment .shipment-top-row .a-row')[0].text.strip : nil
+      end
+
+      def shipment_note
+        @_shipment_note ||= case order.order_type
+        when :shipment_order
+          @node.css('.shipment-top-row').present? ? @node.css('.shipment .shipment-top-row .a-row')[1].text.strip : nil
+        when :service_order
+          nil
+        when :digital_order
+          nil
+        end
+      end
+
+
+      def products
+        @_products ||= @node.css('.a-fixed-left-grid').map { |e| AmazonOrder::Parsers::Product.new(e, fetched_at: fetched_at) }
+      end
+
+    end
+  end
+end

data/lib/amazon_order/version.rb

@@ -1,3 +1,3 @@
 module AmazonOrder
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

data/lib/amazon_order/writer.rb

@@ -9,7 +9,7 @@ module AmazonOrder
       data['orders']
     end
 
-    def print_produts
+    def print_products
       data['products']
     end
 
@@ -21,7 +21,8 @@ module AmazonOrder
         csv_file = "#{@output_dir}/#{resource}#{Time.current.strftime('%Y%m%d%H%M%S')}.csv"
         puts "    Writing #{csv_file}"
         CSV.open(csv_file, 'wb') do |csv|
-          data[resource].each{|r| csv << r }
+          csv << attributes_for(resource)
+          data[resource].each { |r| csv << r }
         end
         csv_file
       end
@@ -41,5 +42,14 @@ module AmazonOrder
         data
       end
     end
+
+    def attributes_for(resource)
+      case resource
+      when 'orders'
+        AmazonOrder::Parsers::Order::ATTRIBUTES
+      when 'products'
+        AmazonOrder::Parsers::Product::ATTRIBUTES
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_order
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - lib/amazon_order/parsers/base.rb
 - lib/amazon_order/parsers/order.rb
 - lib/amazon_order/parsers/product.rb
+- lib/amazon_order/parsers/shipment.rb
 - lib/amazon_order/version.rb
 - lib/amazon_order/writer.rb
 homepage: https://github.com/kyamaguchi/amazon_order
@@ -152,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Scrape information of amazon orders