kindle_manager 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5df40793942c890de33041d60b6e27efe076a695
-  data.tar.gz: 31a5cbce41c6b166de7954cb876f041fc4ddf3ec
+SHA256:
+  metadata.gz: 94b27bae732e8c8a50d463380a7fbcc499ad5ea46f810bed185ed469f3ae0c8b
+  data.tar.gz: 8f902074660f6774d95a32e37afafa96e06cbfedfc7cc9ee20b215f3f83364e9
 SHA512:
-  metadata.gz: 4d9ac40336b50f1f6f10c201f11eef301eb11ae373e8bd9fd88c5167edd00e4cf6edc95fda3b82f2436d440d1dff8f9ca8e459708967d66fd0756086927a6b30
-  data.tar.gz: 315a3ae71152310075fe4d855355bd93c280af92c6d400f2bbb5ae2333941380f598b8092373f3aa3d63b0a371162e1a050407e772b437abe181a96b28b17c11
+  metadata.gz: d759c1c3b06ec52cb47dfc5ebbdfbe29693899758b55b66853c0a6d088edf5c2e53e0a383d7939d6021f64b009c05d03bc3b4d9501753579194bd190dddc0fe0
+  data.tar.gz: c4bf70715590d1e9c7840e9736a1bfcca77369ed0370af5afa1f31dee2a32b423769f39fd52db71c8a14e915eea78bd2c7d89e122c4b7875587c51540448bb3e

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.4.5
+  - 2.5.3
+  - 2.6.0
+before_install: gem install bundler

data/README.md

@@ -142,6 +142,11 @@ Login and password: `login: 'xxx', password: 'yyy'`
 
 Output debug log: `debug: true`
 
+## Issues
+
+There may be problems with capybara 3.  
+Use older version with `gem 'capybara', '~> 2.18.0'` in that case.
+
 ## TODO
 
 - Limit the number of fetching books by date

data/kindle_manager.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   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 "bundler"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
 end

data/lib/kindle_manager/adapters/books_adapter.rb

@@ -1,5 +1,7 @@
 module KindleManager
   class BooksAdapter < BaseAdapter
+    URL_FOR_KINDLE_CONTENTS = 'https://www.amazon.co.jp/gp/digital/fiona/manage?ie=UTF8&ref_=nav_youraccount_myk'
+
     def fetch
       go_to_kindle_management_page
       begin
@@ -14,10 +16,8 @@ module KindleManager
 
     def go_to_kindle_management_page
       log "Visiting kindle management page"
-      wait_for_selector('#shopAllLinks', wait_time: 5)
       3.times do
-        link = links_for('#navFooter a').find{|link| link =~ %r{/gp/digital/fiona/manage/} }
-        session.visit link
+        session.visit URL_FOR_KINDLE_CONTENTS
         wait_for_selector('.navHeader_myx')
         if session.first('.navHeader_myx')
           log "Page found '#{session.first('.navHeader_myx').text}'"
@@ -41,8 +41,7 @@ module KindleManager
           log "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?
+          sleep fetching_interval
         else
           log "Loading books with scrolling #{current_loop+1}"
           session.execute_script "window.scrollBy(0,10000)"
@@ -79,7 +78,7 @@ module KindleManager
     end
 
     def show_more_button
-      session.all('#contentTable_showMore_myx').find{|e| e['outerHTML'].match(/showmore_button/) }
+      session.all('.contentTableShowMore_myx').find{|e| e['outerHTML'].match(/cnt_shw_more/) }
     end
 
     def number_of_fetched_books

data/lib/kindle_manager/parsers/common.rb

@@ -11,8 +11,9 @@ module KindleManager
         begin
           Date.parse(date_text)
         rescue ArgumentError => e
-          m = date_text.match(/\A(?<year>\d{4})年(?<month>\d{1,2})月(?<day>\d{1,2})日\z/)
+          m = date_text.match(/\A(?<year>\d{4})年(?<month>\d{1,2})月(?<day>\d{1,2})日/)
           m = date_text.match(/(?<month>\d{1,2})月\D+(?<day>\d{1,2}),\D+(?<year>\d{4})/) if m.nil?
+          raise("Failed to parse date [#{date_text}]") if m.nil?
           Date.new(m[:year].to_i, m[:month].to_i, m[:day].to_i)
         end
       end

data/lib/kindle_manager/parsers/highlights_parser.rb

@@ -21,7 +21,7 @@ module KindleManager
       end
 
       def author
-        @_author ||= @node.css('h1.kp-notebook-metadata').first.text
+        @_author ||= @node.css('p.kp-notebook-metadata.a-size-base').first.text
       end
 
       def last_annotated_on
@@ -40,13 +40,18 @@ module KindleManager
         @_highlights_and_notes ||= begin
           # Excluding the first element which has book info
           @node.css('.a-spacing-base')[1..-1].map do |node|
-            location = node.css('#kp-annotation-location').first['value'].to_i
-            highlight_node = node.css('.kp-notebook-highlight').first
-            highlight = highlight_node && highlight_node.css('#highlight').first.text
-            color = highlight_node && highlight_node['class'].split.find{|v| v =~ /kp-notebook-highlight-/ }.split('-').last
-            note = node.css('#note').first.text
-            {'location' => location, 'highlight' => highlight, 'color' => color, 'note' => note}
-          end
+            begin
+              location = node.css('#kp-annotation-location').first['value'].to_i
+              highlight_node = node.css('.kp-notebook-highlight').first
+              highlight = highlight_node && highlight_node.css('#highlight').first.text
+              color = highlight_node && highlight_node['class'].split.find{|v| v =~ /kp-notebook-highlight-/ }.split('-').last
+              note = node.css('#note').first.text
+              {'location' => location, 'highlight' => highlight, 'color' => color, 'note' => note}
+            rescue => e
+              puts "[DEBUG] #{e.class}: #{e.message}\n#{node.to_html}\n"
+              next
+            end
+          end.compact
         end
       end
 
@@ -61,7 +66,7 @@ module KindleManager
       # This can be used to verify the count of hightlights and notes
       def count_summary
         @_count_summary ||= begin
-          text = @node.css('h1.kp-notebook-metadata').last.text.strip
+          text = @node.css('.kp-notebook-row-separator > .kp-notebook-metadata').last.text.strip
           a, b = text.split('|').map{|text| m = text.match(/\d+/); m.nil? ? nil : m[0].to_i }
           {'text' => text, 'highlights_count' => a, 'notes_count' => b}
         end

data/lib/kindle_manager/version.rb

@@ -1,3 +1,3 @@
 module KindleManager
-  VERSION = "0.5.0"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindle_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth
@@ -28,30 +28,30 @@ dependencies:
   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: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +127,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.8
 signing_key: 
 specification_version: 4
 summary: Scrape information of kindle books from amazon site