kindle 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aab8778c3a0be8f8dcdc26f08a8a38b65bfb7e0
-  data.tar.gz: ebc53336f7b9b95e94868fe43b0a097664450dd4
+  metadata.gz: a15b6f219ad45232674d51107a9b19c6f7012e67
+  data.tar.gz: ec18a3312046a01027bf3b2dc57a595d7638b613
 SHA512:
-  metadata.gz: d2836557deb6e61cebac2ebcaa06cab72d5c9544627b57c5db9b1015aac428c2c88c0a754ead347f7005635f713c7cc7d9d21c209eae8e3a93ca2c95d98b921e
-  data.tar.gz: 41f54e665092e900d815e7fde9a78d6e917ba50359b86fcc45da9a06af4dc66e35c3287fb91f74db1eb3dca74219be4a3bb7cfc46bbf8292f67ec3671c970bae
+  metadata.gz: 7f4471c2183ccb818046f1fc84dbee45676c256f214a4d2a6b46a295cefbb56f9bb743e34b6f7a3cc1c99dc55111fe45933e75f3eb58fb94edaf5f68e52e9705
+  data.tar.gz: d6316c16e858c0b60677d8cda16a969e600ff220a84b949a99f7a2d08efbc18dc35c09ee73ab4ed45d70d673d9be305beb351622d43ab4e9b8e97ea600ceb533

data/Changelog

@@ -1,3 +1,8 @@
+# Version 0.1.0
+
+* Confirm the script still works as of 2014-04-10
+* Make the default command line output semi-colon delimited
+
 # Version 0.0.3
 
 * Update headers in requests to get pages of highlights

data/bin/kindle

@@ -1,22 +1,21 @@
 #!/usr/bin/env ruby
- 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-require 'kindle'
+require_relative "../lib/kindle"
 require 'highline/import'
 
-
-unless login = ARGV[0]
-  login = ask("Enter your username:  ") { |q| q.echo = true }
-end
-passwd = ask("Enter your password (This is not stored):  ") { |q| q.echo = "*" }
+login = ask("Enter your Amazon.com username:  ") { |q| q.echo = true } unless login = ARGV[0]
+passwd = ask("Enter your Amazon.com password (This is not stored):  ") { |q| q.echo = "*" }
 
 begin
-  k = Kindle::Kindle.new(:login => login, :password => passwd)
+  k = Kindle::Highlights.new(:login => login, :password => passwd)
   puts "Getting your kindle highlights..."
-  highlights = k.get_kindle_highlights
-  puts highlights
+  highlights = k.get_kindle_highlights # TODO: Pass in something to bide our time
+  # TODO: Multiple output formats. CSV, JSON, Pretty, HTML?
+  highlights.each do |highlight|
+    puts "#{highlight.asin};#{highlight.title};#{highlight.author};#{highlight.highlight}"
+  end
 rescue => ex
+  # TODO Actually handle this!
+  puts ex
   puts "Crud, something went wrong..."
 end

data/lib/kindle.rb

@@ -1,96 +1,21 @@
 require 'nokogiri'
 require 'mechanize'
+require_relative 'kindle/highlight'
+require_relative 'kindle/reader'
 
 module Kindle
 
-  class Highlight
-    attr_reader :highlight, :asin
-    def initialize(highlight, asin)
-      @highlight, @asin = highlight, asin
-    end
-  end
-
-  class Kindle
-    include Nokogiri
-    
-    KINDLE_URL = 'http://kindle.amazon.com'
+  class Highlights
 
-    attr_reader :agent, :current_page, :asins, :highlights
-
-    def initialize(options = {:login => nil, :password => nil})
-      @highlights = [] 
-      @current_offset = 25
-      @current_highlights = 1
-      @current_upcoming = []
-      options.each_pair do |k,v|
-        instance_variable_set("@#{k}", v)
-      end
-      @agent = Mechanize.new
-      @agent.redirect_ok = true
-      @agent.user_agent_alias = 'Windows IE 7'
-    end
-
-    def first_page
-      @current_page = @agent.get(KINDLE_URL)
-    end
-
-    def login(page=first_page)
-      lp = page.link_with(:text => "Sign in").click
-      lp.forms.first.email = @login
-      lp.forms.first.password = @password
-      @current_page = lp.forms.first.submit
-      @current_page.forms.first.submit
+    def initialize(options = {})
+      options.each { |k,v| instance_variable_set("@#{k}", v) }
     end
 
     def fetch_highlights
-      @asins = []
-      @current_page = @current_page.link_with(:text => 'Your Highlights').click
-      extract_highlights(@current_page)
-      until @current_highlights.length == 0 do
-        next_highlights
-      end
-    end
-
-    def extract_highlights(page)
-      @current_highlights = hls = (page/".yourHighlight")
-      asins = (page/".asin").collect{|asin| asin.text}
-      if hls.length > 0 
-        @current_upcoming = (page/".upcoming").first.text.split(',') rescue [] 
-        @current_offset = ((current_page/".yourHighlightsHeader").collect{|h| h.attributes['id'].value }).first.split('_').last
-        (page/".yourHighlight").each do |hl|
-          highlight = parse_highlight(hl)
-          @highlights << highlight
-          if !@asins.include?(highlight.asin)
-            @asins << highlight.asin unless @asins.include?(highlight.asin)
-          end
-        end
-      end
-    end
-
-    def next_highlights
-      asins_string = @asins.map{|l| "used_asins[]=#{l}" } * '&'
-      upcoming_string = @current_upcoming.map{|l| "upcoming_asins[]=#{l}" } * '&'
-      current_offset = @current_offset 
-      url = "https://kindle.amazon.com/your_highlights/next_book?#{asins_string}&current_offset=#{@current_offset}&#{upcoming_string}"
-      ajax_headers = { 'X-Requested-With' => 'XMLHttpRequest', 'Host' => 'kindle.amazon.com' }
-      @current_page = @agent.get(url,[],'https://kindle.amazon.com/your_highlight', ajax_headers)
-      extract_highlights(@current_page)
-      @current_page
-    end
-
-    def parse_highlight(hl)
-      highlight = (hl/".highlight").text
-      asin      = (hl/".asin").text
-      Highlight.new(highlight, asin)
-    end
-
-    def get_kindle_highlights
-      login
-      fetch_highlights
-      return highlights.map(&:highlight)
+      parser = HighlightsParser.new(login: @login, password: @password)
+      parser.get_highlights
     end
 
   end
 
-
 end

data/lib/kindle/highlight.rb

@@ -0,0 +1,13 @@
+module Kindle
+
+  class Highlight
+
+    attr_reader :highlight, :asin, :title, :author
+
+    def initialize(highlight, asin, title, author)
+      @highlight, @asin, @title, @author = highlight, asin, title, author
+    end
+
+  end
+
+end

data/lib/kindle/highlights_parser.rb

@@ -0,0 +1,104 @@
+module Kindle
+
+  class HighlightsParser
+
+    include Nokogiri
+    
+    KINDLE_URL = 'http://kindle.amazon.com'
+
+    def initialize(options = {:login => nil, :password => nil})
+      options.each_pair { |k,v| instance_variable_set("@#{k}", v) }
+    end
+
+    def get_highlights(args)
+      state = {
+                current_offset:   25,
+                current_upcoming: []
+              }
+
+      page = login
+      fetch_highlights(page, state)
+    end
+
+    private
+
+    def agent
+      return @agent if @agent
+      @agent = Mechanize.new
+      @agent.redirect_ok = true
+      @agent.user_agent_alias = 'Windows IE 9'
+      @agent
+    end
+
+    def get_login_page
+      page = agent.get(KINDLE_URL)
+      page.link_with(:text => "Sign in").click
+    end
+
+    def login
+      login_form = get_login_page.forms.first
+      login_form.email    = @login
+      login_form.password = @password
+
+      page = login_form.submit
+      page.forms.first.submit
+    end
+
+    def fetch_highlights(page, state)
+      page = get_the_first_highlight_page_from(page, state)
+
+      highlights = []
+
+      new_highlights = extract_highlights_from(page, state)
+
+      until new_highlights.length == 0 do
+        highlights << new_highlights
+        page = get_the_next_page(state, highlights.flatten)
+        new_highlights = extract_highlights_from(page, state)
+      end
+
+      highlights.flatten
+    end
+
+    def get_the_first_highlight_page_from(page, state)
+      page = page.link_with(:text => 'Your Highlights').click
+      initialize_state_with_page state, page
+      page
+    end
+
+    def extract_highlights_from(page, state)
+      return [] if (page/".yourHighlight").length == 0
+      (page/".yourHighlight").map { |hl| parse_highlight(hl, state) }
+    end
+
+    def initialize_state_with_page(state, page)
+      return if (page/".yourHighlight").length == 0
+      state[:current_upcoming] = (page/".upcoming").first.text.split(',') rescue [] 
+      state[:title] = (page/".yourHighlightsHeader .title").text.to_s.strip
+      state[:author] = (page/".yourHighlightsHeader .author").text.to_s.strip
+      state[:current_offset] = ((page/".yourHighlightsHeader").collect{|h| h.attributes['id'].value }).first.split('_').last
+    end
+
+    def get_the_next_page(state, previously_extracted_highlights = [])
+      asins           = previously_extracted_highlights.map(&:asin).uniq
+      asins_string    = asins.collect { |asin| "used_asins[]=#{asin}" } * '&'
+      upcoming_string = state[:current_upcoming].map { |l| "upcoming_asins[]=#{l}" } * '&'
+      url = "https://kindle.amazon.com/your_highlights/next_book?#{asins_string}&current_offset=#{state[:current_offset]}&#{upcoming_string}"
+      ajax_headers = { 'X-Requested-With' => 'XMLHttpRequest', 'Host' => 'kindle.amazon.com' }
+      page = agent.get(url,[],'https://kindle.amazon.com/your_highlight', ajax_headers)
+
+      initialize_state_with_page state, page
+
+      page
+    end
+
+    def parse_highlight(hl, state)
+      highlight = (hl/".highlight").text
+      asin      = (hl/".asin").text
+      Highlight.new(highlight, asin, state[:title], state[:author])
+    end
+
+  end
+
+end
+

data/lib/kindle/version.rb

@@ -1,3 +1,3 @@
 module Kindle
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: kindle
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Matt Petty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Manage your kindle highlights with ruby
@@ -60,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".rvmrc"
 - Changelog
 - Gemfile
 - LICENSE
@@ -70,6 +70,8 @@ files:
 - bin/kindle
 - kindle.gemspec
 - lib/kindle.rb
+- lib/kindle/highlight.rb
+- lib/kindle/highlights_parser.rb
 - lib/kindle/version.rb
 homepage: ''
 licenses: []
@@ -80,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: kindle
-rubygems_version: 2.0.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Manage your kindle highlights with ruby