amazon_order 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52166bb75c3fe54c69163a6878e2b8a34a3d8590
-  data.tar.gz: 35af75fbdcbec9a9de5bdf380b45bb97dcb513ee
+  metadata.gz: e865042b91b22077149316ff57d575168bc43635
+  data.tar.gz: ca3967e1120cbcee525fa691d22cd7c9744bba51
 SHA512:
-  metadata.gz: 8e75e7d9b750bb9bdb970758c100271bc4910d9551ac273d7b8c267505607ac0187189e3f1db67d356464d6ed7c031dfb0b509260993352caa4481e4d5dfc849
-  data.tar.gz: 9ba44f92e89e6e60a44da9a080f44f3d95601c22e3fc57d6c211d0b0fd0eee2766a5a90254e49c89866b51f936f103a0feb0178ac48607bc2c0801a9d5ebf0a1
+  metadata.gz: 99679b709cfe850447a320f941550f0e7d88c23b16b9d44fd43d6df7984f6c76d80275f2278906c24a38fd8fdaf173ddbfaf9ecdbcabf58c4131cf573b00faaa
+  data.tar.gz: 145c6fb0c6eb615b8d92e5c00f686cd7a8f6e869f209c821431504e6e9728edacbdbfe7d8fcfabed0163e379077717561884d804ff101268be208afb5fcfa41c

data/lib/amazon_order/parsers/order.rb

@@ -17,7 +17,7 @@ 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
@@ -26,9 +26,15 @@ module AmazonOrder
       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
+        @_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
+        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')
       end
@@ -38,7 +44,7 @@ module AmazonOrder
       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) }
+        @_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) }
       end
 
 
@@ -47,6 +53,10 @@ module AmazonOrder
           hash.merge!(products: products.map(&:to_hash))
         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/product.rb

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

data/lib/amazon_order/version.rb

@@ -1,3 +1,3 @@
 module AmazonOrder
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 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.2
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Scrape information of amazon orders