franklin 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60b3b782b0df4bd93a1447868027d174ac5a409e
-  data.tar.gz: 4ed253ddbaa8f65eebb2f106cc2e99edbb5e4fef
+  metadata.gz: 609ae9a3826ac3f2c416a293f8c714420b904646
+  data.tar.gz: 639c32c3fe2346aa6e358a237d52bcfaef8ad4b0
 SHA512:
-  metadata.gz: f74fd76d5773419e171f91525295437db57a2cef6381fb11ad60ed10e960018ba68a46165093ef2cc6294d870d1c7ba317df2f23c42390cc511cff67980b53c1
-  data.tar.gz: 0a2cd4d19d25c811bd35ba1a7421e57578729ef61edc29bb5a305a7165e48092d7ebbe65b65599374503d2e06ba60007bddeb93b468f149dc4689ff91c0190e8
+  metadata.gz: 7a7963ae9f09b9bb14aeaab91c76d2e0a5940849ad9d8e3622a2345e8391fd96b249b30d8706616e08bb1bddfc47a97f63514d0ebe8abbf73d4d57e5f3b3b09b
+  data.tar.gz: 49c25f0bfe6b9eb2604a2d417b5a755b9f4945e8cb2ac4dfb6537b4917fedd83f985a692075d56c1e912f290963807d0add70362d22b084d75a4dc395fdba4b6

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+# 0.3.0
+- Accomodate changes in OverDrive. Public libraries now have a new format

data/lib/franklin/search.rb

@@ -1,16 +1,20 @@
 require "franklin/item"
 require "franklin/availability"
 require "mechanize"
+require "json"
 
 module Franklin
   class Search
+    JS_VARIABLE = /window\.OverDrive\.mediaItems/
+
     def initialize(library)
       @library = library
     end
 
     def perform(search_term)
-      results = search_library(search_term)
-      parse_results(results)
+      results_page = search_library(search_term)
+      results_json = extract_json(page: results_page)
+      parse(json: results_json)
     end
 
     private
@@ -18,41 +22,35 @@ module Franklin
     attr_reader :library
 
     def search_library(search_term)
-      form = prepare_form(search_term)
-      form.submit
+      prepare_form(search_term).submit
     end
 
     def prepare_form(search_term)
-      ::Mechanize.new.get(library.url).forms.first.tap { |form|
-        form.FullTextCriteria = search_term
+      ::Mechanize.new.get(library.url).form_with(action: "/search") { |form|
+        form.query = search_term
       }
     end
 
-    def parse_results(results)
-      results.search("div.containAll").each_with_object({}) { |container, result|
-        result[parse_item(container)] = parse_availability(container)
-      }
+    def extract_json(page:)
+      script_tag = page.search("script").find { |script| script.text =~ JS_VARIABLE }
+      var_assignment_line = script_tag.text.lines.find { |line| line =~ JS_VARIABLE }
+      raw_javascript_object = var_assignment_line.scan(/{.*}/).first
+      JSON.parse(raw_javascript_object)
     end
 
-    def parse_item(container)
-      item_info = container.css("a.share-links").first.attributes
-      id = item_info["data-sharecrid"].value
-      title = item_info["data-sharetitle"].value
-      author = item_info["data-sharecreator"].value
-
-      format = container.css("span.tcc-icon-span").first.attributes["data-iconformat"].value
-
-      Item.new(id, title, author, format)
+    def parse(json:)
+      json.each_with_object({}) { |raw, result|
+        id, data = raw
+        result[parse_item(id: id, data: data)] = parse_availability(data: data)
+      }
     end
 
-    def parse_availability(container)
-      copies_info = container.css("div.img-and-info-contain.title-data").first.attributes
-
-      total_copies = copies_info["data-copiestotal"].value.to_i
-      available_copies = copies_info["data-copiesavail"].value.to_i
-      wait_list_size = copies_info["data-numwaiting"].value.to_i
+    def parse_item(id:, data:)
+      Item.new(id, data["title"], data["firstCreatorName"], data["type"]["name"])
+    end
 
-      Availability.new(library, total_copies, available_copies, wait_list_size)
+    def parse_availability(data:)
+      Availability.new(library, data["ownedCopies"], data["availableCopies"], data["holdsCount"])
     end
   end
 end

data/lib/franklin/version.rb

@@ -1,3 +1,3 @@
 module Franklin
-  VERSION = "0.2.2".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franklin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ylan Segal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: CLI utility for searching Overdrive-powered public libraries