kindle_manager 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb02e5a3a67d8232fbff330bdc508c7b2a841e09
-  data.tar.gz: 2641e09f54bb46cf8ca1dfe3b70950ce213ab43c
+  metadata.gz: 065a28c7130f475f85b34e66fa86d22169a91ac5
+  data.tar.gz: e525336b3c853df970cff3e00e840fb3bc3a5111
 SHA512:
-  metadata.gz: c695ef3285f6d530a8ad13ba16bf75105f782736bb0eccd05cdf97171789474caa51c385da23a16a6bce9d21f5764975d8f7bb5ef682ca7d9f2f12cdf9964b10
-  data.tar.gz: f80af23783b9af78e220cfb16aa42a6340d86ed9c667db43831aa1ac41de1c5869d73c46f23df80b38debc02c1b7d232952f558fd04932c2bc60facd348017a0
+  metadata.gz: 4c922354219deb9a6ff7840d94c1a1891d0f5507c735e6a7135c22975ef87c4657297668619d21db3d813eb6c16c51bf5f3e125dc5d1f381e11bbb96976372f3
+  data.tar.gz: 2646eeb5c522ca77fd0c1ebb1c4ab815150c9f71fb622a0097e392cae609dc3990a629d798e500b797980b6dc19f1e35d32cbdfbfcfc32bb05fb08874b692b8c

data/.travis.yml

@@ -2,4 +2,6 @@ sudo: false
 language: ruby
 rvm:
   - 2.2.4
+  - 2.2.6
+  - 2.3.3
 before_install: gem install bundler -v 1.14.6

data/README.md

@@ -1,5 +1,7 @@
 # KindleManager
 
+[![Build Status](https://travis-ci.org/kyamaguchi/kindle_manager.svg?branch=master)](https://travis-ci.org/kyamaguchi/kindle_manager)
+
 Scrape information of kindle books from amazon site
 
 ## Installation

data/kindle_manager.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.1.2"
+  spec.add_runtime_dependency "amazon_auth", "~> 0.1.3"
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/kindle_manager/client.rb

@@ -1,6 +1,6 @@
 module KindleManager
   class Client
-    attr_accessor :page
+    attr_accessor :session
 
     def initialize(options = {})
       @debug = options.fetch(:debug, false)
@@ -14,13 +14,17 @@ module KindleManager
       end
     end
 
+    def session
+      @session ||= @client.session
+    end
+
     def store
-      # Create file store without session(page) by default
+      # Create file store without session(session) by default
       @store ||= KindleManager::FileStore.new(nil, latest: true)
     end
 
     def setup_file_store_with_session
-      @store = KindleManager::FileStore.new(page)
+      @store = KindleManager::FileStore.new(session)
     end
 
     def fetch_kindle_list
@@ -46,15 +50,12 @@ module KindleManager
     end
 
     def sign_in
-      @page = @client.sign_in
+      @client.sign_in
     end
 
     def go_to_kindle_management_page
-      wait_for_selector('#shopAllLinks')
-      page.within('#shopAllLinks') do
-        page.find('a', text: 'コンテンツと端末の管理').click
-      end
-      page
+      wait_for_selector('#shopAllLinks', 5)
+      session.all('a').find{|e| e['href'] =~ %r{/gp/digital/fiona/manage/} }.click
     end
 
     def load_next_kindle_list
@@ -67,48 +68,56 @@ module KindleManager
           debug_print_page
           @current_loop = 0
 
-          puts "Clicking もっと表示"
-          page.execute_script "window.scrollBy(0,-800)"
-          page.click_on('もっと表示')
+          puts "Clicking 'Show More'"
+          session.execute_script "window.scrollBy(0,-800)"
+          show_more_button.click
           sleep 1
           raise('Clicking of more button may have failed') if has_more_button?
         else
           puts "Scrolling #{@current_loop}"
-          page.execute_script "window.scrollBy(0,10000)"
+          session.execute_script "window.scrollBy(0,10000)"
         end
         sleep 5
         @current_loop += 1
       end
-      debug_print_page
+      snapshot_page
     end
 
     def quit
-      page.driver.quit
+      session.driver.quit
     end
 
     def wait_for_selector(selector, seconds = 3)
-      seconds.times { sleep(1) unless page.first(selector) }
+      seconds.times { sleep(1) unless session.first(selector) }
     end
 
     def has_more_button?
-      page.all('#contentTable_showMore_myx').map(&:text).include?('もっと表示')
+      !!show_more_button
+    end
+
+    def show_more_button
+      session.all('#contentTable_showMore_myx').find{|e| e['outerHTML'].match(/showmore_button/) }
     end
 
     def number_of_fetched_books
-      m = page.first('.contentCount_myx').text.match(/(\d+)を表示中/)
-      m.nil? ? nil : m[1].to_i
+      m = session.first('.contentCount_myx').text.match(/(\d+) - (\d+)/)
+      m.nil? ? nil : m[2].to_i
     end
 
     def loading?
-      page.first('.myx-popover-loading-wrapper').present?
+      session.first('.myx-popover-loading-wrapper').present?
+    end
+
+    def snapshot_page
+      store.record_page
+      debug_print_page
     end
 
     def debug_print_page
       if @debug
-        store.record_page
         puts Time.current.strftime("%Y-%m-%d %H:%M:%S")
         puts "Loop: #{@current_loop}"
-        puts page.first('.contentCount_myx').text if page.first('.contentCount_myx')
+        puts session.first('.contentCount_myx').text if session.first('.contentCount_myx')
         puts
       end
     end

data/lib/kindle_manager/list_parser.rb

@@ -27,8 +27,14 @@ module KindleManager
 
       def date
         @_date ||= begin
-          m = @node.css("div[id^='date']").text.match(/\A(?<year>\d{4})年(?<month>\d{1,2})月(?<day>\d{1,2})日\z/)
-          Date.new(m[:year].to_i, m[:month].to_i, m[:day].to_i)
+          date_text = @node.css("div[id^='date']").text
+          begin
+            Date.parse(date_text)
+          rescue ArgumentError => e
+            byebug
+            m = date_text.match(/\A(?<year>\d{4})年(?<month>\d{1,2})月(?<day>\d{1,2})日\z/)
+            Date.new(m[:year].to_i, m[:month].to_i, m[:day].to_i)
+          end
         end
       end
 

data/lib/kindle_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindle_manager
 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-03-15 00:00:00.000000000 Z
+date: 2017-04-03 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.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement