amazon_order 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e865042b91b22077149316ff57d575168bc43635
-  data.tar.gz: ca3967e1120cbcee525fa691d22cd7c9744bba51
+  metadata.gz: e80c9b230fb1e27f402524ea7f87efffb24e27c7
+  data.tar.gz: '09092bccb478e6cfb1a716f07150349cc401b283'
 SHA512:
-  metadata.gz: 99679b709cfe850447a320f941550f0e7d88c23b16b9d44fd43d6df7984f6c76d80275f2278906c24a38fd8fdaf173ddbfaf9ecdbcabf58c4131cf573b00faaa
-  data.tar.gz: 145c6fb0c6eb615b8d92e5c00f686cd7a8f6e869f209c821431504e6e9728edacbdbfe7d8fcfabed0163e379077717561884d804ff101268be208afb5fcfa41c
+  metadata.gz: b764bcb696977cbea344325de6839817e34189ee0a73ff6416d5851203b9c224e5276df54293be36944afe2f54c2672a074400bfda2b4cafe1762f92a5353bf3
+  data.tar.gz: 8b03502b90caf6d6e7f7689348fd4878a5bed2bea16363d4a783813e8280158607381f21c59e087915055c015360d9b25bb52c4e60217e4bcade73d2ad3a2e6d

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
                    ]
@@ -20,33 +19,45 @@ module AmazonOrder
         @_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 ||= case order_type
-        when :item_order
-          @node.css('.shipment .shipment-top-row').present? ? @node.css('.shipment .shipment-top-row .a-row')[1].text.strip : nil
-        when :service_order
-          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 shipments
+        @_shipments ||= @node.css('.shipment')
+          .map do |shipment|
+          AmazonOrder::Parsers::Shipment.new(shipment,
+                                             containing_object: self,
+                                             fetched_at: fetched_at)
+        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 products
+        @products ||= shipment_products + digital_products
       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 shipment_products
+        @shipment_products ||= shipments.flat_map(&: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 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|
@@ -54,9 +65,6 @@ module AmazonOrder
         end
       end
 
-      def order_type
-        @node.css('[id^=Leave-Service-Feedback]').present? ? :service_order : :item_order
-      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.2"
+  VERSION = "0.1.3"
 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

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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_order
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth
@@ -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