kindle-highlights 0.0.7 → 0.0.8

data/lib/kindle_highlights.rb

@@ -1,9 +1,10 @@
-require 'rubygems'
-require 'mechanize'
-require 'amazon/aws'
-require 'amazon/aws/search'
-require 'kindle_highlights/kindle_highlight'
-require 'kindle_highlights/highlight'
-
-include Amazon::AWS
-include Amazon::AWS::Search
+require 'rubygems'
+require 'mechanize'
+require 'json'
+require 'kindle_highlights/client'
+
+module KindleHighlights  
+  
+  KINDLE_LOGIN_PAGE      = "http://kindle.amazon.com/login"
+  SIGNIN_FORM_IDENTIFIER = "signIn"
+end

data/lib/kindle_highlights/client.rb

@@ -0,0 +1,50 @@
+module KindleHighlights
+  class Client
+    attr_reader :books
+        
+    def initialize(email_address, password)
+      @email_address   = email_address
+      @password        = password
+      
+      setup_mechanize_agent
+      load_books_from_kindle_account
+    end
+  
+    def highlights_for(asin)
+      highlights = @mechanize_agent.get("https://kindle.amazon.com/kcw/highlights?asin=#{asin}&cursor=0&count=1000")
+      json = JSON.parse(highlights.body)
+      json["items"]
+    end
+    
+    private
+   
+    def load_books_from_kindle_account
+      @books = Hash.new
+      signin_page = @mechanize_agent.get(KINDLE_LOGIN_PAGE)
+      
+      signin_form = signin_page.form(SIGNIN_FORM_IDENTIFIER)
+      signin_form.email = @email_address
+      signin_form.password = @password
+      
+      kindle_logged_in_page = @mechanize_agent.submit(signin_form)
+      highlights_page = @mechanize_agent.click(kindle_logged_in_page.link_with(:text => /Your Books/))
+
+      loop do
+        books = highlights_page.search(".//td[@class='titleAndAuthor']")
+        books.each do |book|
+          asin = book.search("a").first.attributes["href"].value.split("/").last
+          title = book.search("a").first.inner_html
+          @books[asin] = title
+        end
+        break if highlights_page.link_with(text: /Next/).nil?
+        highlights_page = @mechanize_agent.click(highlights_page.link_with(text: /Next/))
+      end
+    end
+    
+    def setup_mechanize_agent
+      @mechanize_agent = Mechanize.new
+      @mechanize_agent.user_agent_alias = 'Windows Mozilla'
+      @mechanize_agent.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindle-highlights
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: ruby-aaws
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 2.7.2
 description: Until there is a Kindle API, this will suffice.
 email: eric@prudentiadigital.com
 executables: []
@@ -50,8 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/kindle_highlights.rb
-- lib/kindle_highlights/kindle_highlight.rb
-- lib/kindle_highlights/highlight.rb
+- lib/kindle_highlights/client.rb
 homepage: https://github.com/speric/kindle-highlights
 licenses: []
 post_install_message: 
@@ -77,3 +60,4 @@ signing_key:
 specification_version: 3
 summary: Kindle highlights
 test_files: []
+has_rdoc: 

data/lib/kindle_highlights/highlight.rb

@@ -1,27 +0,0 @@
-class KindleHighlight::Highlight
-
-  attr_accessor :annotation_id, :asin, :author, :title, :content
-
-  @@amazon_items = Hash.new
-
-  def initialize(highlight)
-    self.annotation_id = highlight.xpath("form/input[@id='annotation_id']").attribute("value").value 
-    self.asin = highlight.xpath("p/span[@class='hidden asin']").text
-    self.content = highlight.xpath("span[@class='highlight']").text
-    amazon_item = lookup_or_get_from_cache(self.asin)
-    self.author = amazon_item.item_attributes.author.to_s
-    self.title = amazon_item.item_attributes.title.to_s
-  end
-
-  def lookup_or_get_from_cache(asin)
-    unless @@amazon_items.has_key?(asin)
-      request = Request.new
-      request.locale = 'us'
-      response = ResponseGroup.new('Small')
-      lookup = Amazon::AWS::ItemLookup.new('ASIN', {'ItemId' => asin, 'MerchantId' => 'Amazon'})
-      amazon_item = request.search(lookup, response).item_lookup_response[0].items.item.first
-      @@amazon_items[asin] = amazon_item
-    end
-    @@amazon_items[asin]
-  end
-end

data/lib/kindle_highlights/kindle_highlight.rb

@@ -1,25 +0,0 @@
-class KindleHighlight
-  
-  attr_accessor :highlights
-	
-  def initialize(email_address, password)
-    @agent = Mechanize.new
-    @agent.user_agent_alias = 'Windows Mozilla'
-    @agent.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    page = @agent.get("https://www.amazon.com/ap/signin?openid.assoc_handle=amzn_kindle&openid.mode=checkid_setup&pageId=amzn_kindle&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.return_to=https%3A%2F%2Fkindle.amazon.com%3A443%2Fauthenticate%2Flogin_callback%3Fwctx%3D%252F&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.pape.max_auth_age=0&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0")
-    @amazon_form = page.form('signIn')
-    @amazon_form.email = email_address
-    @amazon_form.password = password
-    scrape_highlights
-  end
-
-  def scrape_highlights
-    signin_submission = @agent.submit(@amazon_form)
-    highlights_page = @agent.click(signin_submission.link_with(:text => /Your Highlights/))
-    collected_highlights = Array.new
-    highlights_page.search(".//div[@class='highlightRow yourHighlight']").each do |h|
-      collected_highlights << Highlight.new(h)
-    end
-    self.highlights = collected_highlights
-  end
-end