amazon_order 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a6bf0fa3f7452a0d5902ad1f18573a91533e3b
-  data.tar.gz: 20b21eb7ee25fb98487583bb8369f371acef22bc
+  metadata.gz: 52166bb75c3fe54c69163a6878e2b8a34a3d8590
+  data.tar.gz: 35af75fbdcbec9a9de5bdf380b45bb97dcb513ee
 SHA512:
-  metadata.gz: 56ee5c0283f97849f9cc461b780ceab6cbc4e468fd039066cef4f1ba3968b60b1cc5e34192c100eb8f8ec786435aa5e9d3b0620d2e0009d516fba0a53b00be81
-  data.tar.gz: 3679036cfa689b836654f8c57c4bcd093fecdc3ca4a17a900f49457ba424d71bb99eb36aa53bd3d2fc0b14c3fb01c2a8b6525ca92e71568ccc4262a6cf5c9b9f
+  metadata.gz: 8e75e7d9b750bb9bdb970758c100271bc4910d9551ac273d7b8c267505607ac0187189e3f1db67d356464d6ed7c031dfb0b509260993352caa4481e4d5dfc849
+  data.tar.gz: 9ba44f92e89e6e60a44da9a080f44f3d95601c22e3fc57d6c211d0b0fd0eee2766a5a90254e49c89866b51f936f103a0feb0178ac48607bc2c0801a9d5ebf0a1

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.4
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 before_install: gem install bundler -v 1.14.6

data/README.md

@@ -37,11 +37,14 @@ Or install it yourself as:
 
 [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) is required. Please [download chromedriver](http://chromedriver.storage.googleapis.com/index.html) and update chromedriver regularly.  
 
-Create _.env_ following the instructions of https://github.com/kyamaguchi/amazon_auth
+Create credentials following the instructions of https://github.com/kyamaguchi/amazon_auth  
+Use `envchain` or _.env_
 
 ```
 amazon_auth
 
+envchain amazon ...
+# OR
 vi .env
 ```
 
@@ -53,7 +56,7 @@ In console
 
 ```ruby
 require 'amazon_order'
-client = AmazonOrder::Client.new(verbose: true, limit: 10)
+client = AmazonOrder::Client.new(keep_cookie: true, verbose: true, limit: 10)
 client.fetch_amazon_orders
 # Fetch orders of specified year
 client.fetch_orders_for_year(year: 2016)
@@ -65,8 +68,8 @@ client.go_to_amazon_order_page
 client.fetch_orders_for_year(year: 2015)
 ```
 
-Downloaded pages will be stored into `order` directory.
-You can reset by moving that directory.
+Downloaded pages will be stored into `tmp/orders` directory.  
+`tmp` comes from `Capybara.save_path`.  
 
 Once `fetch_amazon_orders` succeeds, you can load orders information of downloaded pages anytime.
 (You don't need to fetch pages with launching browser every time.)
@@ -86,7 +89,7 @@ products.size
 orders.group_by{|o| o.order_placed.strftime('%Y') }.sort_by{|year,_| year }.map{|year,records| puts [year, records.map(&:order_total).sum].inspect };nil
 ```
 
-Example of data
+#### Example of data
 
 ```ruby
 console> pp orders.first.to_hash
@@ -111,16 +114,24 @@ console> pp products.first.to_hash
  "https://images-fe.ssl-images-amazon.com/images/I/51TODrMIEnL.jpg"}
 ```
 
+#### Export csv
+
+```ruby
+client.generate_csv
+```
+
 #### Options
 
 Limit fetching with number of pages: `client = AmazonOrder::Client.new(limit: 5)`
-`limit: nil` for no limit. default is 5
+(`limit: nil` for no limit. default is 5)
 
 Set year range: `client = AmazonOrder::Client.new(year_from: 2012, year_to: 2013)`
-default is Time.current.year
+(default is Time.current.year)
 
 ##### Options of amazon_auth gem
 
+Keep cookies(keep signin): `keep_cookie: true`
+
 Firefox: `driver: :firefox`
 
 Output debug log: `debug: true`

data/amazon_order.gemspec

@@ -21,7 +21,7 @@ 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.3.3"
+  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"

data/lib/amazon_order/client.rb

@@ -6,11 +6,14 @@ module AmazonOrder
 
     def initialize(options = {})
       @options = options
-      @base_dir = @options.fetch(:base_dir, 'orders')
       @client = AmazonAuth::Client.new(@options)
       extend(AmazonAuth::SessionExtension)
     end
 
+    def base_dir
+      options.fetch(:base_dir, 'orders')
+    end
+
     def year_from
       options.fetch(:year_from, Time.current.year)
     end
@@ -37,7 +40,7 @@ module AmazonOrder
 
     def load_amazon_orders
       orders = []
-      Dir.glob("#{@base_dir}/*html").each do |filepath|
+      Dir.glob(file_glob_pattern).each do |filepath|
         log "Loading #{filepath}"
         parser = AmazonOrder::Parser.new(filepath)
         orders += parser.orders
@@ -45,6 +48,18 @@ module AmazonOrder
       orders.sort_by{|o| -o.fetched_at.to_i }.uniq(&:order_number)
     end
 
+    def file_glob_pattern
+      File.join(Capybara.save_path, base_dir, '*html')
+    end
+
+    def generate_csv
+      writer.generate_csv
+    end
+
+    def writer
+      @_writer ||= AmazonOrder::Writer.new(file_glob_pattern)
+    end
+
     def sign_in
       @client.sign_in
     end
@@ -83,7 +98,7 @@ module AmazonOrder
     def save_page_for(year, page)
       log "Saving year:#{year} page:#{page}"
       path = ['order', year.to_s, "p#{page}", Time.current.strftime('%Y%m%d%H%M%S')].join('-') + '.html'
-      session.save_page(File.join(@base_dir, path))
+      session.save_page(File.join(base_dir, path))
     end
 
     def selected_year

data/lib/amazon_order/version.rb

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

data/lib/amazon_order/writer.rb

@@ -1,7 +1,7 @@
 module AmazonOrder
   class Writer
-    def initialize(base_dir, options = {})
-      @base_dir = base_dir
+    def initialize(file_glob_pattern, options = {})
+      @file_glob_pattern = file_glob_pattern
       @output_dir = options.fetch(:output_dir, 'tmp')
     end
 
@@ -32,7 +32,7 @@ module AmazonOrder
     def data
       @_data ||= begin
         data = {'orders' => [], 'products' => []}
-        Dir.glob("#{@base_dir}/*html").each do |filepath|
+        Dir.glob(@file_glob_pattern).each do |filepath|
           puts "    Parsing #{filepath}"
           parser = AmazonOrder::Parser.new(filepath)
           data['orders'] += parser.orders.map(&:values)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_order
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement