alexandria-book-collection-manager 0.6.9 → 0.7.0

data/alexandria-book-collection-manager.gemspec

@@ -46,11 +46,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('gettext', ['~> 3.1'])
   s.add_runtime_dependency('hpricot', ['~> 0.8.5'])
   s.add_runtime_dependency('htmlentities', ['~> 4.3'])
-  s.add_runtime_dependency('gtk2', ['~> 3.0'])
+  s.add_runtime_dependency('gtk3', ['~> 3.0.9'])
+  s.add_runtime_dependency('gio2', ['~> 3.0.9'])
   s.add_runtime_dependency('gstreamer', ['~> 3.0'])
 
   s.add_development_dependency('minitest', ['~> 5.0'])
-  s.add_development_dependency('rake', ['~> 10.0'])
+  s.add_development_dependency('rake', ['~> 11.1'])
   s.add_development_dependency('rspec', ['~> 3.0'])
 
   s.require_paths = ['lib']

data/bin/alexandria

@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007, 2008 Joseph Method
 # Copyright (C) 2007, 2009 Cathal Mc Ginley
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2015 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as

data/lib/alexandria.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -34,13 +34,11 @@ require 'alexandria/about'
 
 module Alexandria
   def self.set_proxy
-    ENV['http_proxy'] = nil if !ENV['http_proxy'].nil? and URI.parse(ENV['http_proxy']).userinfo.nil?
+    ENV['http_proxy'] = nil if !ENV['http_proxy'].nil? && URI.parse(ENV['http_proxy']).userinfo.nil?
   end
 
   def self.set_log_level
-    if $DEBUG
-      Alexandria.log.level = Logger::DEBUG
-    end
+    Alexandria.log.level = Logger::DEBUG if $DEBUG
     Alexandria.log.debug { 'Initializing Alexandria...' }
   end
 
@@ -64,7 +62,6 @@ require 'alexandria/version'
 #    VERSION = OSX::NSBundle.mainBundle.infoDictionary.objectForKey('CFBundleVersion').to_s
 #  end
 # end
-require 'alexandria/utils'
 
 require 'alexandria/models/book'
 require 'alexandria/models/library'

data/lib/alexandria/about.rb

@@ -19,13 +19,13 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  TITLE = 'Alexandria'
-  TEXTDOMAIN = 'alexandria'
+  TITLE = 'Alexandria'.freeze
+  TEXTDOMAIN = 'alexandria'.freeze
   extend GetText
   bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
   DESCRIPTION = _('A program to help you manage your book collection.')
   COPYRIGHT = "Copyright (C) 2004-2006 Laurent Sansonetti\n" \
-    'Copyright (C) 2007-2010,2014,2015 Alexandria Contributors'
+    'Copyright (C) 2007-2010,2014,2015 Alexandria Contributors'.freeze
   AUTHORS = [
     'Alexander McCormmach <alexander@tunicate.org>',
     'Aymeric Nys <aymeric@nnx.com>',
@@ -48,11 +48,11 @@ module Alexandria
     'Takayuki Kusano <AE5T-KSN@asahi-net.or.jp>',
     'Timothy Malone <timothy.malone@gmail.com>',
     'Zachary P. Landau <kapheine@hypa.net>'
-  ]
+  ].freeze
   DOCUMENTERS = [
     'Cathal Mc Ginley <cathal.alexandria@gnostai.org>',
     'Liam Davison <registrations@liamjdavison.info>'
-  ]
+  ].freeze
   TRANSLATORS = [
     'Adrián Chaves Fernández <adriyetichaves@gmail.com> (gl)',
     'Cathal Mc Ginley <cathal.alexandria@gnostai.org> (ga)',
@@ -72,11 +72,11 @@ module Alexandria
     'Petr Vanek <vanous@penguin.cz> (cs)',
     'Piotr Drąg <piotrdrag@gmail.com> (pl)',
     'Serhij Dubyk <dubyk@library.lviv.ua> (uk)'
-  ]
+  ].freeze
   ARTISTS = [
     'Andreas Nilsson <nisses.mail@home.se>',
     'Stefanie Dijoux <stefanie.dijoux@gmail.com>'
-  ]
-  BUGREPORT_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager/issues'
-  WEBSITE_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager'
+  ].freeze
+  BUGREPORT_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager/issues'.freeze
+  WEBSITE_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager'.freeze
 end

data/lib/alexandria/book_providers.rb

@@ -57,7 +57,7 @@ module Alexandria
         # sanity check if at least one valid result is actually found
         results.delete_if { |book, _cover| book.nil? }
 
-        if results.length == 0
+        if results.empty?
           instance.changed
           instance.notify_observers(:not_found, factory.fullname) # new
           raise NoResultsError
@@ -187,7 +187,7 @@ module Alexandria
         each do |var|
           message = @provider.variable_name(var)
           val = Alexandria::Preferences.instance.send(message)
-          var.value = val unless val.nil? or (val == '' and var.mandatory?)
+          var.value = val unless val.nil? || ((val == '') && var.mandatory?)
         end
       end
     end
@@ -199,7 +199,7 @@ module Alexandria
 
       def initialize(name, fullname = nil)
         @name = name
-        @fullname = (fullname or name)
+        @fullname = (fullname || name)
         @prefs = Preferences.new(self)
         @prefs.add('enabled', _('Enabled'), true, [true, false])
       end
@@ -231,7 +231,7 @@ module Alexandria
           ary.delete(@name)
           prefs.abstract_providers = ary
         end
-        if (ary = prefs.providers_priority) and ary.include?(@name)
+        if (ary = prefs.providers_priority) && ary.include?(@name)
           ary.delete(@name)
           prefs.providers_priority = ary
         end
@@ -266,7 +266,7 @@ module Alexandria
       end
 
       def self.abstract?
-        (!included_modules.include?(Singleton))
+        !included_modules.include?(Singleton)
       end
 
       def <=>(provider)
@@ -333,10 +333,10 @@ module Alexandria
         md = /(.+)Provider$/.match(constant)
         next unless md
         klass = self.class.module_eval(constant.to_s)
-        if klass.ancestors.include?(AbstractProvider) and
-            klass != GenericProvider and
-            klass != WebsiteBasedProvider and
-            klass != AbstractProvider
+        if klass.ancestors.include?(AbstractProvider) &&
+            (klass != GenericProvider) &&
+            (klass != WebsiteBasedProvider) &&
+            (klass != AbstractProvider)
 
           if klass.abstract?
             @abstract_classes << klass
@@ -363,12 +363,12 @@ module Alexandria
       end
       clear
       rejig_providers_priority
-      priority = (@prefs.providers_priority or [])
+      priority = (@prefs.providers_priority || [])
       priority.map!(&:strip)
       rest = providers.keys - priority
       priority.each { |pname| self << providers[pname] }
       rest.sort.each { |pname| self << providers[pname] }
-      self.compact!
+      compact!
     end
 
     # FIXME: Define the handful of methods that use this.
@@ -383,7 +383,7 @@ module Alexandria
     private
 
     def rejig_providers_priority
-      priority = (@prefs.providers_priority or [])
+      priority = (@prefs.providers_priority || [])
       unless priority.empty?
         changed = false
 

data/lib/alexandria/book_providers/adlibris.rb

@@ -33,12 +33,12 @@ module Alexandria
     class AdLibrisProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.adlibris.com/se/'
+      SITE = 'http://www.adlibris.com/se/'.freeze
 
       BASE_SEARCH_URL = "#{SITE}searchresult.aspx?search=advanced&%s=%s" \
-        '&fromproduct=False' # type/term
+        '&fromproduct=False'.freeze # type/term
 
-      PRODUCT_URL = "#{SITE}product.aspx?isbn=%s"
+      PRODUCT_URL = "#{SITE}product.aspx?isbn=%s".freeze
 
       def initialize
         super('AdLibris', 'AdLibris (Sweden)')
@@ -76,17 +76,17 @@ module Alexandria
         if search_type == SEARCH_BY_ISBN
           PRODUCT_URL % Library.canonicalise_isbn(search_term)
         else
-          search_type_code = {
+          (search_type_code = {
             SEARCH_BY_AUTHORS => 'author',
             SEARCH_BY_TITLE => 'title',
             SEARCH_BY_KEYWORD => 'keyword'
-          }[search_type] or 'keyword'
+          }[search_type]) || 'keyword'
           search_term_encoded = CGI.escape(search_term)
           BASE_SEARCH_URL % [search_type_code, search_term_encoded]
         end
       end
 
-      # TODO use Iconv to pre-convert the html.body to UTF-8 everywhere
+      # TODO: use Iconv to pre-convert the html.body to UTF-8 everywhere
       # before sending it to the parser methods
 
       def get_book_from_search_result(rslt)
@@ -187,28 +187,24 @@ module Alexandria
 
           isbn_tds.each do |isbn_td|
             isbn = isbn_td.inner_text
-            unless isbn =~ /[0-9x]{10,13}/i
-              next
-            end
+            next unless isbn =~ /[0-9x]{10,13}/i
             isbn.gsub(/(\n|\r)/, ' ')
             if isbn =~ /:[\s]*([0-9x]+)/i
               isbn = Regexp.last_match[1]
             end
             isbns << isbn
           end
-          isbn =  isbns.first
-          if isbn
-            isbn = Library.canonicalise_isbn(isbn)
-          end
+          isbn = isbns.first
+          isbn = Library.canonicalise_isbn(isbn) if isbn
 
           # cover
           image_url = nil
           if (cover_img = doc.search('span.imageWithShadow img[@id$="ProductImageNotLinked"]').first)
-            if cover_img['src'] =~ /^http\:\/\//
-              image_url = cover_img['src']
-            else
-              image_url = "#{SITE}/#{cover_img['src']}" # HACK use html base
-            end
+            image_url = if cover_img['src'] =~ /^http\:\/\//
+                          cover_img['src']
+                        else
+                          "#{SITE}/#{cover_img['src']}" # HACK: use html base
+                        end
             if image_url =~ /noimage.gif$/
               # no point downloading a "no image" graphic
               # Alexandria has its own generic book icon...

data/lib/alexandria/book_providers/amazon_aws.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Cathal Mc Ginley
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -31,7 +31,7 @@ module Alexandria
 
       # CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache')
 
-      LOCALES = ['ca', 'de', 'fr', 'jp', 'uk', 'us']
+      LOCALES = ['ca', 'de', 'fr', 'jp', 'uk', 'us'].freeze
 
       def initialize
         super('Amazon', 'Amazon')
@@ -46,17 +46,17 @@ module Alexandria
         # kill old (shorter) tokens, or previously distributed Access Key Id (see #26250)
 
         if token
-          if (token.value != token.value.strip)
+          if token.value != token.value.strip
             token.new_value = token.value.strip
           end
         end
-        if token and (token.value.size != 20 or token.value == '0J356Z09CN88KB743582')
+        if token && ((token.value.size != 20) || (token.value == '0J356Z09CN88KB743582'))
           token.new_value = ''
         end
 
         secret = prefs.variable_named('secret_key')
         if secret
-          if (secret.value != secret.value.strip)
+          if secret.value != secret.value.strip
             secret.new_value = secret.value.strip
           end
         end
@@ -66,7 +66,7 @@ module Alexandria
           if associate.value.strip.empty?
             associate.new_value = 'rubyalexa-20'
           end
-          if (associate.value != associate.value.strip)
+          if associate.value != associate.value.strip
             associate.new_value = associate.value.strip
           end
         end
@@ -76,13 +76,13 @@ module Alexandria
         prefs.read
 
         if prefs['secret_key'].empty?
-          raise Amazon::RequestError.new('Secret Access Key required for Authentication: you must sign up for your own Amazon AWS account')
+          raise Amazon::RequestError, 'Secret Access Key required for Authentication: you must sign up for your own Amazon AWS account'
         end
 
         if (config = Alexandria::Preferences.instance.http_proxy_config)
           host, port, user, pass = config
           url = 'http://'
-          url += user + ':' + pass + '@' if user and pass
+          url += user + ':' + pass + '@' if user && pass
           url += host + ':' + port.to_s
           ENV['http_proxy'] = url
         end
@@ -105,7 +105,7 @@ module Alexandria
           when SEARCH_BY_ISBN
             criterion = Library.canonicalise_isbn(criterion)
             # This isn't ideal : I'd like to do an ISBN/EAN-specific search
-            res = Amazon::Ecs.item_search(criterion,  response_group: 'ItemAttributes,Images', country: request_locale)
+            res = Amazon::Ecs.item_search(criterion, response_group: 'ItemAttributes,Images', country: request_locale)
             res.items.each do |item|
               products << item
             end
@@ -129,10 +129,10 @@ module Alexandria
             end
 
           when SEARCH_BY_TITLE
-            res = Amazon::Ecs.item_search(criterion,  response_group: 'ItemAttributes,Images', country: request_locale)
+            res = Amazon::Ecs.item_search(criterion, response_group: 'ItemAttributes,Images', country: request_locale)
 
             res.items.each do |item|
-              if /#{criterion}/i.match(item.get('itemattributes/title'))
+              if item.get('itemattributes/title') =~ /#{criterion}/i
                 products << item
               end
             end
@@ -140,14 +140,14 @@ module Alexandria
 
           when SEARCH_BY_AUTHORS
             criterion = "author:#{criterion}"
-            res = Amazon::Ecs.item_search(criterion,  response_group: 'ItemAttributes,Images', country: request_locale, type: 'Power')
+            res = Amazon::Ecs.item_search(criterion, response_group: 'ItemAttributes,Images', country: request_locale, type: 'Power')
             res.items.each do |item|
               products << item
             end
             # #req.author_search(criterion) do |product|
 
           when SEARCH_BY_KEYWORD
-            res = Amazon::Ecs.item_search(criterion,  response_group: 'ItemAttributes,Images', country: request_locale)
+            res = Amazon::Ecs.item_search(criterion, response_group: 'ItemAttributes,Images', country: request_locale)
 
             res.items.each do |item|
               products << item
@@ -172,25 +172,13 @@ module Alexandria
           atts = item.search_and_convert('itemattributes')
           title = normalize(atts.get('title'))
 
-          # Work around Amazon US encoding bug. Amazon US apparently
-          # interprets UTF-8 titles as ISO-8859 titles and then converts
-          # the garbled titles to UTF-8. This tries to convert back into
-          # valid UTF-8. It does not always work - see isbn 2259196098
-          # (from the mailing list) for an example.
-          # if req.locale == 'us'
-          #    title = title.convert('ISO-8859-1','UTF-8')
-          # end
-          # Cathal Mc Ginley 2008-02-18, still a problem for that ISBN!! Yep 2009-12-09!
-
           media = normalize(atts.get('binding'))
           media = nil if media == 'Unknown Binding'
 
           isbn = normalize(atts.get('isbn'))
-          if isbn and Library.valid_isbn?(isbn)
-            isbn = Library.canonicalise_ean(isbn)
-          else
-            isbn = nil # it may be an ASIN which is not an ISBN
-          end
+          isbn = if isbn && Library.valid_isbn?(isbn)
+                   Library.canonicalise_ean(isbn)
+                 end
           # hack, extract year by regexp (not Y10K compatible :-)
           /([1-9][0-9]{3})/ =~ atts.get('publicationdate')
           publishing_year = Regexp.last_match[1] ? Regexp.last_match[1].to_i : nil
@@ -251,9 +239,7 @@ module Alexandria
       end
 
       def normalize(str)
-        unless str.nil?
-          str = str.squeeze(' ').strip
-        end
+        str = str.squeeze(' ').strip unless str.nil?
         str
       end
     end

data/lib/alexandria/book_providers/amazon_ecs_util.rb

@@ -45,8 +45,7 @@ module Amazon
                      ca: 'http://webservices.amazon.ca/onca/xml?Service=AWSECommerceService',
                      de: 'http://webservices.amazon.de/onca/xml?Service=AWSECommerceService',
                      jp: 'http://webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService',
-                     fr: 'http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService'
-    }
+                     fr: 'http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService' }.freeze
 
     @@options = {}
     @@debug = false
@@ -202,12 +201,12 @@ module Amazon
 
     def self.prepare_url(opts)
       country = opts.delete(:country)
-      country = (country.nil?) ? 'us' : country
+      country = country.nil? ? 'us' : country
       request_url = SERVICE_URLS[country.to_sym]
       raise Amazon::RequestError, "Invalid country '#{country}'" unless request_url
 
       qs = ''
-      opts.each {|k, v|
+      opts.each { |k, v|
         next unless v
         v = v.join(',') if v.is_a? Array
         qs << "&#{camelize(k.to_s)}=#{URI.encode(v.to_s)}"
@@ -317,7 +316,7 @@ module Amazon
     # Find Hpricot::Elements matching the given path. Example: element/"author".
     def /(path)
       elements = @element / path
-      return nil if elements.size == 0
+      return nil if elements.empty?
       elements
     end
 
@@ -374,7 +373,7 @@ module Amazon
       result = element / path
       if (result.is_a? Hpricot::Elements) || (result.is_a? Array)
         parsed_result = []
-        result.each {|item|
+        result.each { |item|
           parsed_result << Element.get(item)
         }
         parsed_result

data/lib/alexandria/book_providers/barnes_and_noble.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2011, 2014 Matijs van Zuijlen
+# Copyright (C) 2011, 2014, 2015 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -35,13 +35,12 @@ module Alexandria
     class BarnesAndNobleProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.barnesandnoble.com'
+      SITE = 'http://www.barnesandnoble.com'.freeze
 
-      BASE_ISBN_SEARCH_URL = 'http://search.barnesandnoble.com/books' \
-        '/product.aspx?ISBSRC=Y&ISBN=%s'
+      BASE_ISBN_SEARCH_URL = 'http://www.barnesandnoble.com/s/%s'.freeze
 
       BASE_SEARCH_URL = 'http://search.barnesandnoble.com/booksearch' \
-        '/results.asp?%s=%s' # type, term
+        '/results.asp?%s=%s'.freeze # type, term
 
       def initialize
         super('BarnesAndNoble', 'BarnesAndNoble')
@@ -50,25 +49,28 @@ module Alexandria
       end
 
       def agent
-        unless @agent
-          @agent = Alexandria::WWWAgent.new
-        end
+        @agent = Alexandria::WWWAgent.new unless @agent
         @agent
       end
 
       def fetch_redirectly(uri_str, limit = 5)
-        raise NoResultsError, 'HTTP redirect too deep' if limit == 0
-        response = agent.get(uri_str)
+        raise NoResultsError, 'HTTP redirect too deep' if limit.zero?
         if limit < 10
           sleep 0.1
-          puts "Redirectly :: #{uri_str}"
+          log.debug { "Redirectly :: #{uri_str}" }
         else
-          puts "Fetching   :: #{uri_str}"
+          log.debug { "Fetching   :: #{uri_str}" }
         end
-        puts response.inspect
+        response = agent.get(uri_str)
+        log.debug { response.inspect }
         case response
         when Net::HTTPSuccess     then response
-        when Net::HTTPRedirection then fetch_redirectly(response['Location'], (limit - 1))
+        when Net::HTTPRedirection then
+          redirect = URI.parse response['Location']
+          if redirect.relative?
+            redirect = URI.parse(uri_str) + redirect
+          end
+          fetch_redirectly(redirect.to_s, (limit - 1))
         else
           response.error!
         end
@@ -97,11 +99,11 @@ module Alexandria
       end
 
       def create_search_uri(search_type, search_term)
-        search_type_code = {
+        (search_type_code = {
           SEARCH_BY_AUTHORS => 'ATH',
           SEARCH_BY_TITLE => 'TTL',
-          SEARCH_BY_KEYWORD => 'WRD'    # SEARCH_BY_PUBLISHER => 'PBL' # not implemented
-        }[search_type] or ''
+          SEARCH_BY_KEYWORD => 'WRD' # SEARCH_BY_PUBLISHER => 'PBL' # not implemented
+        }[search_type]) || ''
         if search_type == SEARCH_BY_ISBN
           BASE_ISBN_SEARCH_URL % Library.canonicalise_ean(search_term) # isbn-13
         else
@@ -112,7 +114,7 @@ module Alexandria
 
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:url]}" }
-        html_data =  transport.get_response(URI.parse(result[:url]))
+        html_data = transport.get_response(URI.parse(result[:url]))
         parse_result_data(html_data.body)
       end
 
@@ -146,71 +148,44 @@ module Alexandria
         doc = html_to_doc(html)
         begin
           book_data = {}
-          title_header = doc % '//div.wgt-productTitle/h1'
-          if title_header
-            title = ''
-            title_header.children.each do |node|
-              if node.text?
-                title += ' ' + node.to_s
-              end
-            end
-            title.strip!
-            if title.empty?
-              log.warn { 'Unexpectedly found no title in BarnesAndNoble lookup' }
-              raise NoResultsError
-            end
-            book_data[:title] = title.strip.squeeze(' ')
-            subtitle_span = title_header % 'span.subtitle'
-            if subtitle_span
-              book_data[:title] += " #{subtitle_span.inner_text}"
-            end
-          end
-
-          isbn_links = doc / '//a.isbn-a'
-          isbns = isbn_links.map(&:inner_text)
-          book_data[:isbn] =  Library.canonicalise_ean(isbns.first)
 
-          authors = []
-          author_links = title_header / 'a[@href*="ATH"]'
-          author_links.each do |a|
-            authors << a.inner_text
+          dl = (doc / 'dl').first
+          dts = dl.children_of_type('dt')
+          dts.each do |dt|
+            value = dt.next_sibling.inner_text
+            case dt.inner_text
+            when /ISBN-13/
+              book_data[:isbn] = Library.canonicalise_ean(value)
+            when /Publisher/
+              book_data[:publisher] = value
+            when /Publication data/
+              value =~ /\d{2}.\d{2}.(\d{4})/
+              year = Regexp.last_match[1]
+              book_data[:publisher] = year
+            end
           end
-          book_data[:authors] = authors
 
-          publisher_item = doc % 'li.publisher'
-          if publisher_item
-            publisher_item.inner_text =~ /Publisher:\s*(.+)/
-            book_data[:publisher] = Regexp.last_match[1]
+          meta = doc / 'meta'
+          meta.each do |it|
+            attrs = it.attributes
+            property = attrs['property']
+            next unless property
+            case property
+            when 'og:title'
+              book_data[:title] = attrs['content']
+            when 'og:image'
+              book_data[:image_url] = attrs['content']
+            end
           end
 
-          date_item = doc % 'li.pubDate'
-          if date_item
-            date_item.inner_text =~ /Date: ([^\s]*)\s*([\d]{4})/
-            year = Regexp.last_match[2].to_i if Regexp.last_match[2]
-            book_data[:publication_year] = year
-          end
+          author_links = doc / 'span.contributors a'
+          authors = author_links.map(&:inner_text)
+          book_data[:authors] = authors
 
           book_data[:binding] = ''
-          format_list_items = doc / '//div.col-one/ul/li'
-          format_list_items.each do |li|
-            if li.inner_text =~ /Format:\s*(.*),/
-              book_data[:binding] = Regexp.last_match[1]
-            end
-          end
-
-          product_image_div = doc % 'div#product-image'
-          if product_image_div
-            images = product_image_div / 'img'
-            if images.size == 1
-              book_data[:image_url] = images.first['src']
-            else
-              if images.first['src'] =~ /see_inside.gif/
-                # the first image is the "See Inside!" label
-                book_data[:image_url] = images[1]['src']
-              else
-                book_data[:image_url] = images.first['src']
-              end
-            end
+          selected_format = (doc / '#availableFormats li.selected a.tabTitle').first
+          if selected_format
+            book_data[:binding] = selected_format.inner_text
           end
 
           book = Book.new(book_data[:title], book_data[:authors],