philologic-client 0.0.9 → 0.0.10

data/HISTORY.rdoc

@@ -1,5 +1,11 @@
 = Philologic::Client History
 
+== 2012-01-18 v0.0.10
+
+* Added +Philologic::TableRow+
+* +Philologic::Client#frequency()+ improvements
+* Added +Philologic::Client#colocation()+
+
 == 2012-01-12 v0.0.9
 
 * Added +Philologic::Document#html()+

data/README.rdoc

@@ -15,21 +15,34 @@
    html  = doc.html
    txt   = doc.text
 
-   # Simple search
+
+   # Simple (concordance) search
    client.search('sartre').each { |result| puts result }
 
    # Search by arbitrary key-value pairs
    client.search( :query => 'sartre', :foo => 1 ).each { |result| puts result }
 
+
+   # Simple collocation table search.
+   client.collocation('sartre').each { |result| puts result }
+
+   # Collocation table search by arbitrary key-value pairs
+   client.collocation( :query => 'sartre', :foo => 1 ).each { |result| puts result }
+
+   # Links for first result in collocation table search
+   client.collocation('sartre').first.links.each { |link| puts link }
+
+
    # Simple frequency table search.
    client.frequency('sartre').each { |result| puts result }
 
-   # Frequency search by arbitrary key-value pairs
+   # Frequency table search by arbitrary key-value pairs
    client.frequency( :query => 'sartre', :foo => 1 ).each { |result| puts result }
 
    # Links for first result in frequency table search
    client.frequency('sartre').first.links.each { |link| puts link }
 
+
    # Get/Set encoding
    encoding        = client.encoding 
    client.encoding = 'utf-8' # Default
@@ -58,6 +71,6 @@ https://github.com/blairc/philologic-client/
 * Add collocation table searching
 * Add +children+ to Philologic::Document
 * Add +parent+ to Philologic::Document
-* Unify (as much as possible) Philologic::Document, Philologic::Key, Philologic::Link
+* Unify (as much as possible) Philologic::Document, Philologic::Link, Philologic::TableRow
 * Cache results?
 

data/lib/philologic-client.rb

@@ -23,21 +23,34 @@ require 'open-uri'
 #    html  = doc.html
 #    txt   = doc.text
 #
-#    # Simple search
+#
+#    # Simple (concordance) search
 #    client.search('sartre').each { |result| puts result }
 #
 #    # Search by arbitrary key-value pairs
 #    client.search( :query => 'sartre', :foo => 1 ).each { |result| puts result }
 #
+#
+#    # Simple collocation table search.
+#    client.collocation('sartre').each { |result| puts result }
+#
+#    # Collocation table search by arbitrary key-value pairs
+#    client.collocation( :query => 'sartre', :foo => 1 ).each { |result| puts result }
+#
+#    # Links for first result in collocation table search
+#    client.collocation('sartre').first.links.each { |link| puts link }
+#
+#
 #    # Simple frequency table search.
 #    client.frequency('sartre').each { |result| puts result }
 #
-#    # Frequency search by arbitrary key-value pairs
+#    # Frequency table search by arbitrary key-value pairs
 #    client.frequency( :query => 'sartre', :foo => 1 ).each { |result| puts result }
 #
 #    # Links for first result in frequency table search
 #    client.frequency('sartre').first.links.each { |link| puts link }
 #
+#
 #    # Get/Set encoding
 #    encoding        = client.encoding 
 #    client.encoding = 'utf-8' # Default
@@ -66,7 +79,7 @@ require 'open-uri'
 # * Add collocation table searching
 # * Add +children+ to Philologic::Document
 # * Add +parent+ to Philologic::Document
-# * Unify (as much as possible) Philologic::Document, Philologic::Key, Philologic::Link
+# * Unify (as much as possible) Philologic::Document, Philologic::Link, Philologic::TableRow
 # * Cache results?
 #
 module Philologic # :nodoc:
@@ -115,6 +128,21 @@ module Philologic # :nodoc:
       return doc.kind_of?(Array) ? doc : nil
     end
 
+    #
+    # Return +Array+ of Philologic::TableRow objects.
+    #
+    # *NOTE:* Currently only returns the first page of results by default.
+    #
+    # Params:
+    # +query+:: Search for this query +String+ or +Hash+ key-value pairs.
+    #
+    def collocation(query)
+      raise('no query specified') if ( query.nil? || !( [ Hash,  String ].include?( query.class ) )) || query.empty?
+      defaults = { :report => 'frequency', :field => 'collocates' }
+      doc = search( query.kind_of?(String) ? defaults.merge(:query => query) : defaults.merge(query) )
+      return doc.kind_of?(Array) ? doc : nil
+    end
+
     #
     # Return Philologic::Document object or +nil+.
     #
@@ -127,7 +155,7 @@ module Philologic # :nodoc:
     end
 
     #
-    # Return +Array+ of TODO objects.
+    # Return +Array+ of Philologic::TableRow objects.
     #
     # *NOTE:* Currently only returns the first page of results by default.
     #
@@ -196,10 +224,10 @@ module Philologic # :nodoc:
         return Philologic::Document.new( doc.css('div.philologic_object').first )
       elsif !doc.css('table.philologic_frequency').first.nil?
         results = []
-        doc.css('table.philologic_frequency').css('td.philologic_frequency_key').each do |key|
-          key.css('a').each do |a|
-            results << Philologic::Key.new(self, a) # TODO Why not a select?  
-          end
+        # Results are keyed off of this field.
+        field = doc.css('table.philologic_frequency').first.attributes['title'].value
+        doc.css('table.philologic_frequency').css('tr.philologic_frequency_row').each do |row|
+          results << Philologic::TableRow.new(self, field, row)
         end
         return results
       # TODO else
@@ -260,12 +288,12 @@ module Philologic # :nodoc:
 
 
   #
-  # Philologic key.
+  # Philologic link.
   #
-  class Key
+  class Link
 
     #
-    # Initialize Philologic::Key object.
+    # Initialize Philologic::Link object.
     #
     # Params:
     # +client+:: Philologic::Client object
@@ -274,84 +302,116 @@ module Philologic # :nodoc:
     def initialize(client, document)
       @client     = client
       @doc        = document
+      # TODO Prefer lazy initialization?
+      @properties = {}
+      @doc.css('span.philologic_property').each do |span|
+        @properties[ span.attributes['title'].value ] = span.children.text
+      end
     end
 
     #
     # Returns value of attribute +key+ or +nil+.
     #
     def [](key)
-      @doc.attributes.key?(key) ? @doc.attributes[key].value : nil
-    end
-
-    #
-    # Returns Philologic::Link objects referenced by this Philologic::Key object.
-    #
-    def links
-      q = self['href'].sub( %r{^\./\?}, '' ).split('&')
-      @client.search( Hash[ *q.collect { |v| v.split('=', 2) }.flatten ] )
+      @doc.attributes.key?(key) ? @doc.attributes[key].value : @properties[key]
     end
 
     #
-    # Returns key text.
+    # Returns Philologic::Document referenced by this Philologic::Link object.
     #
-    def text
-      @text = @doc.text.lstrip.rstrip if @text.nil?
-      @text
+    def document
+      @client.document( self['href'] )
     end
 
     #
     # Return String representation of object.
     #
     def to_s
-      [ self['href'], self.text ].join(' | ')
+      [ self['href'], self['title'], self['author'] ].join(' | ')
     end
 
-  end # class Philologic::Key
+  end # class Philologic::Link
 
 
   #
-  # Philologic link.
+  # Philologic table row.
   #
-  class Link
+  class TableRow
 
     #
-    # Initialize Philologic::Link object.
+    # Get +count+
+    #
+    attr_reader :count
+
+    #
+    # Get +field+
+    #
+    attr_reader :field
+
+    #
+    # Get +href+
+    #
+    attr_reader :href
+
+    #
+    # Get +text+
+    #
+    attr_reader :text
+
+
+    #
+    # Initialize Philologic::TableRow object.
     #
     # Params:
     # +client+:: Philologic::Client object
+    # +field+:: Row is keyed off of this field
     # +document+:: Nokogiri document
     #
-    def initialize(client, document)
-      @client     = client
-      @doc        = document
-      # TODO Prefer lazy initialization?
-      @properties = {}
-      @doc.css('span.philologic_property').each do |span|
-        @properties[ span.attributes['title'].value ] = span.children.text
+    def initialize(client, field, document)
+      @client = client
+      @field  = field
+      @doc    = document
+
+      @doc.css('td.philologic_frequency_key').each do |key|
+        key.css('a').each do |a|
+          @href = a.attributes['href'].value
+          @text = a.text.lstrip.rstrip
+          break
+        end
+      end
+      raise('invalid TableRow - no href') unless @href
+      raise('invalid TableRow - no text') unless @text
+
+      @doc.css('td.philologic_frequency_value').each do |value|
+        @count = value.text.to_i
+        break
       end
+      raise('invalid TableRow - no count') unless @count
+
     end
 
     #
     # Returns value of attribute +key+ or +nil+.
     #
     def [](key)
-      @doc.attributes.key?(key) ? @doc.attributes[key].value : @properties[key]
+      @doc.attributes.key?(key) ? @doc.attributes[key].value : nil
     end
 
     #
-    # Returns Philologic::Document referenced by this Philologic::Link object.
+    # Returns Philologic::Link objects referenced by this Philologic::TableRow object.
     #
-    def document
-      @client.document( self['href'] )
+    def links
+      q = @href.sub( %r{^\./\?}, '' ).split('&')
+      @client.search( Hash[ *q.collect { |v| v.split('=', 2) }.flatten ] )
     end
 
     #
     # Return String representation of object.
     #
     def to_s
-      [ self['href'], self['title'], self['author'] ].join(' | ')
+      [ @field, @count, @text ].join(' | ')
     end
 
-  end # class Philologic::Link
+  end # class Philologic::TableRow
 
 end # module Philologic

data/lib/philologic-client/version.rb

@@ -5,6 +5,6 @@ module Philologic
     #
     # Philologic::Client version
     #
-    VERSION = '0.0.9'
+    VERSION = '0.0.10'
   end
 end

data/test/data/collocation_links.html

@@ -0,0 +1,145 @@
+<html><head><title>TLFsorted: search for sartre</title></head><body><div class='philologic_concordance'><p class='description'>running query for sartre @ TLFsorted with arg 0.  displaying 1 - 48 of 48 hits.</p><ol start='1'><li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/3/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... qui se destinait à la psychiatrie. À la surprise générale, Jean-Paul <span class="hilite">Sartre</span> avait échoué à l'écrit. Le concours me parut difficile, mais je ne perdis pas co...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ades. Je les connaissais presque tous. Seul me demeurait hermétique le clan formé par <span class="hilite">Sartre</span>, Nizan et Herbaud; ils ne frayaient avec personne; ils n'assistaient q...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...lf et derrière ses grosses lunettes d'écaille je lui trouvais un regard très intimidant. <span class="hilite">Sartre</span> n'avait pas une mauvaise tête, mais on disait qu'il était le plus terrible des trois e...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...me paraissait accessible: Herbaud. Il était marié lui aussi. En compagnie de <span class="hilite">Sartre</span> et de Nizan, il m'ignorait. Quand je le rencontrais seul, nous échangions ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...existerais jamais. Un après-midi, je l'avais aperçu rue Soufflot, accompagné de <span class="hilite">Sartre</span> et de Nizan, et donnant le bras à une femme en gris: je m'étais sentie exclue...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...t il était monté à Paris pour préparer normale. Il avait connu en hypo-khâgne <span class="hilite">Sartre</span> et Nizan et il me parla beaucoup d'eux; il admirait Nizan, pour sa dis...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...; il admirait Nizan, pour sa distinction désinvolte, mais il était surtout lié avec <span class="hilite">Sartre</span> qu'il disait prodigieusement intéressant. Nos autres condisciples, il les méprisai...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ditais ainsi sur mon destin, j'aperçus Herbaud qui longeait le bassin en compagnie de <span class="hilite">Sartre</span>: il me vit, et il m'ignora. Mystère et mensonge des journaux intimes: je ne mention...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... la Sorbonne. Vêtu d'un costume d'été beige clair, il était assis à côté de <span class="hilite">Sartre</span> sur le rebord d'une fenêtre. Il me tendit la main, dans un long geste affectueux, e...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...r en faisant allusion à notre rencontre, au Luxembourg; il aurait aimé me présenter <span class="hilite">Sartre</span>, "mais si je ne respecte pas les ruminations de Clairaut, dit-il, je ne me perm...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... Il me remit, de la   part de <span class="hilite">Sartre</span>, un dessin que celui-ci m'avait dédié et qui représentait: Leibniz au bai...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...cosmologie eugénique", inventée à partir du potomak, et à laquelle il avait rallié <span class="hilite">Sartre</span> et Nizan; tous trois appartenaient à la plus haute caste, celle des eugènes, ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...le est très bien d'ailleurs votre voix, mais elle est rauque. Elle nous divertit beaucoup, <span class="hilite">Sartre</span> et moi."  Je découvris que j'avais une démarche, une voix: c'était nouveau. J...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...reuves; puis il comptait quitter Paris, et à son retour il préparerait son oral avec <span class="hilite">Sartre</span> et Nizan. Finies, nos rencontres à la nationale: comme j'allais les regret...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...Orne; à son retour, dans une dizaine de jours, il préparerait l'oral du concours avec <span class="hilite">Sartre</span> et Nizan qui m'invitaient cordialement à me joindre à eux. D'ici là, ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...artre et Nizan qui m'invitaient cordialement à me joindre à eux. D'ici là, <span class="hilite">Sartre</span> voulait faire ma connaissance: il me proposait un rendez-vous pour un soir prochain. ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... Mais Herbaud me demanda de ne pas y aller: <span class="hilite">Sartre</span> profiterait de son absence pour m'accaparer."  Je ne veux pas qu'on touche à mes pl...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...nts " me dit Herbaud d'un ton complice. Nous décidâmes que ma soeur retrouverait <span class="hilite">Sartre</span> à l'heure et à l'endroit prévus; elle lui dirait que j'étais partie brusquement pour...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... je flânai, je me donnai du bon temps. Pendant la soirée que Poupette passa avec <span class="hilite">Sartre</span>, je récapitulai joyeusement l'année qui venait de s'écouler, et toute ma jeunesse; je...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ent en ce monde. Quand ma soeur rentra, elle me félicita d'être restée à la maison. <span class="hilite">Sartre</span> avait courtoisement encaissé notre mensonge; il l'avait emmenée au cinéma et s'était...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...tait montré très aimable; mais la conversation avait chômé."  Tout ce qu'il raconte de <span class="hilite">Sartre</span>, Herbaud l'invente lui-même " me dit ma soeur qui connaissait un peu Herba...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...travailler Leibniz. J'étais un peu effarouchée quand j'entrai dans la chambre de <span class="hilite">Sartre</span>; il y avait un grand désordre de livres et de papiers, des mégots dans tous les coins,...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...and désordre de livres et de papiers, des mégots dans tous les coins, une énorme fumée. <span class="hilite">Sartre</span> m'accueillit mondainement; il fumait la pipe. Silencieux, une cigarette collée au c...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...elai. Leibniz nous ennuyait et il fut décidé que nous le connaissions assez. <span class="hilite">Sartre</span> se chargea de nous expliquer le contrat social, sur lequel il avait des lumière...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ement Herbaud tandis que Nizan contemplait ses ongles d'un air absorbé; mais <span class="hilite">Sartre</span> avait toujours le dessus. Impossible de lui en vouloir: il se mettait en quatre pour...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... turnes de l'école normale, je grimpai rituellement sur les toits. Pendant ces promenades, <span class="hilite">Sartre</span> et Herbaud chantaient à pleine  ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... titre d'un chapitre de Descartes: "de Dieu. Derechef qu'il existe."  <span class="hilite">Sartre</span> avait une belle voix et un vaste répertoire: old man river et tous les airs de ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... De Beauvoir."  "Bien, bien", fit Nizan d'un ton sardonique, et <span class="hilite">Sartre</span> dit: "soit " avec bonhomie. Herbaud était morose, ce jour-là, parce qu'il...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...de Michel-Ange. Puis il me parla des différences qui le distinguaient de <span class="hilite">Sartre</span> et de Nizan. Il se donnait sans arrière-pensée aux joies de ce monde: les...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...nature, les voyages, les intrigues et les plaisirs."  Eux, ils veulent toujours comprendre; <span class="hilite">Sartre</span> surtout " me dit-il. Il ajouta sur un ton de frayeur admirative: "Sartre, s...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...mprendre; Sartre surtout " me dit-il. Il ajouta sur un ton de frayeur admirative: "<span class="hilite">Sartre</span>, sauf peut-être quand il dort, il pense tout le temps! " Il accepta que Sartre...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...: "Sartre, sauf peut-être quand il dort, il pense tout le temps! " Il accepta que <span class="hilite">Sartre</span> passât avec nous la soirée du 14 juillet. Après un dîner dans un restaurant alsa...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...urant alsacien, nous regardâmes le feu d'artifice, assis sur une pelouse de la cité. Puis <span class="hilite">Sartre</span>, dont la munificence était légendaire, nous embarqua dans un taxi, et, au falstaff, ru...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ontaient un tas d'histoires. J'étais aux anges. Ma soeur s'était trompée: je trouvai <span class="hilite">Sartre</span> encore plus amusant qu'Herbaud; néanmoins, nous convînmes tous trois que celu...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...Je vous aime vraiment beaucoup, Castor " me disait-il. Comme je devais dîner avec <span class="hilite">Sartre</span> chez les Nizan, et qu'il n'était pas libre, il me demanda avec une tendre auto...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...endemain, je me dirigeai vers la Sorbonne le coeur battant; à la porte, je rencontrai <span class="hilite">Sartre</span>: j'étais admissible ainsi que Nizan et lui. Herbaud avait échou..</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...e l'aie revu: "tu diras au Castor tout le bonheur que je lui souhaite " écrivit-il à <span class="hilite">Sartre</span> dans un pneu où il l'avisait de son départ. Il réapparut une semaine plus tard, e...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ions tous deux que j'avais menti. "À partir de maintenant, je vous prends en main " me dit <span class="hilite">Sartre</span> quand il m'eut annoncé mon admissibilité. Il avait le goût des amitiés féminine...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... plus souvent nous nous promenions tous les deux seuls. Sur les quais de la Seine, <span class="hilite">Sartre</span> m'achetait des pardaillan et des fantomas qu'il préférait de loin à l...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...nd ils prétendaient m'expliquer, les autres gens m'annexaient à leur monde, ils m'irritaient; <span class="hilite">Sartre</span> au contraire essayait de me situer dans mon propre système, il me comprenait à la lumi...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ments, les vies dangereuses, les hommes perdus, les excès d'alcool, de drogue, de passion. <span class="hilite">Sartre</span> soutenait que, quand on a quelque chose à dire, tout gaspillage est criminel. L'oeu...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... par les nouvelles littéraires.  " Nous avons reçu de J-P <span class="hilite">Sartre</span> des pages remarquables", écrivit Roland Alix en présentant sa répon...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...ent qui se supposerait libre."  Comparant sa génération à celle qui l'avait précédée, <span class="hilite">Sartre</span> concluait: "nous sommes plus malheureux, mais plus sympathiques."  Cette dernière p...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...x, mais plus sympathiques."  Cette dernière phrase m'avait fait rire; mais en causant avec <span class="hilite">Sartre</span> j'entrevis la richesse de ce qu'il appelait sa " théorie de la contingence", où se tro...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...e très insolite; impossible de s'inspirer d'aucune mode, d'aucun modèle: autant la pensée de <span class="hilite">Sartre</span> m'avait frappée par sa maturité, autant je fus déconcertée par la gaucherie des essa...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...Nodier m'en avaient imposé: mais de loin, vaguement, sans que je me confronte à eux. <span class="hilite">Sartre</span>, tous les jours, toute la journée je me mesurais à lui et dans nos discussions, je ne ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+... la première: une parmi d'autres, et soudain incertaine de ses véritables capacités. Car <span class="hilite">Sartre</span> n'était pas le seul qui m'obligeât à la modestie: Nizan, Aron, ...</li>
+<li class='philologic_occurence'>
+<a class='philologic_cite' href='./1839/4/0/0'><span class='philologic_property' title='author'>Beauvoir S. de</span>, <span class='philologic_property' title='title'>Memoires Jeune Fille Rangee</span> <span class='philologic_property' title='date'>(1958)</span></a>
+...marqués par une sorte de grâce funeste; impossible de communiquer avec eux sans réserve. <span class="hilite">Sartre</span> répondait exactement au voeu de mes quinze ans: il était le double en qui je retrouvai...</li>
+</ol><div class='more'><a href='./?query=sartre&title=&author=Beauvoir+S.+de&q_start=1&q_end=48'>1-48</a> </div></div></body></html>

data/test/data/collocation_sartre.html

@@ -0,0 +1,67 @@
+<html><head><title>TLFsorted: frequency table for "sartre"</title></head>
+<body>
+<p class='description'>running query for sartre @ TLFsorted: 151 total hits. aggregating.</p>
+<table class='philologic_frequency tablesorter' title='author'>
+<thead><tr class='philologic_frequency_header_row'><th>Author</th><th>Frequency</th></tr></thead>
+<tbody>  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Beauvoir+S.+de&title='>Beauvoir S. de</a></td>
+    <td class='philologic_frequency_value'>48</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Sartre+J.-P.&title='>Sartre J.-P.</a></td>
+    <td class='philologic_frequency_value'>42</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Gide+A.&title='>Gide A.</a></td>
+    <td class='philologic_frequency_value'>12</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Ricoeur+P.&title='>Ricoeur P.</a></td>
+    <td class='philologic_frequency_value'>10</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Lacroix+J.&title='>Lacroix J.</a></td>
+    <td class='philologic_frequency_value'>10</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Vuillemin+J.&title='>Vuillemin J.</a></td>
+    <td class='philologic_frequency_value'>7</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Peiresc+N.+de&title='>Peiresc N. de</a></td>
+    <td class='philologic_frequency_value'>4</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Nizan+P.&title='>Nizan P.</a></td>
+    <td class='philologic_frequency_value'>3</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Mounier+E.&title='>Mounier E.</a></td>
+    <td class='philologic_frequency_value'>3</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Bachelard+G.&title='>Bachelard G.</a></td>
+    <td class='philologic_frequency_value'>3</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Green+J.&title='>Green J.</a></td>
+    <td class='philologic_frequency_value'>3</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Merleau-Ponty+M.&title='>Merleau-Ponty M.</a></td>
+    <td class='philologic_frequency_value'>2</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Benda+J.&title='>Benda J.</a></td>
+    <td class='philologic_frequency_value'>2</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Mauriac+F.&title='>Mauriac F.</a></td>
+    <td class='philologic_frequency_value'>1</td>
+  </tr>
+  <tr class='philologic_frequency_row'>
+    <td class='philologic_frequency_key'><a href='./?query=sartre&author=Schaeffer+P.&title='>Schaeffer P.</a></td>
+    <td class='philologic_frequency_value'>1</td>
+  </tr>
+</tbody></table>
+</body></html>

data/test/data/frequency_sartre.html

@@ -64,4 +64,4 @@
     <td class='philologic_frequency_value'>1</td>
   </tr>
 </tbody></table>
-</body></html>
+</body></html>

data/test/test_philologic_client.rb

@@ -18,6 +18,12 @@ class TestPhilologicClient < Test::Unit::TestCase
 
     @endpoint         = @data_dir
 
+    @coll_path        = 'collocation_sartre.html'
+    @coll_file        = File.join( @data_dir, @coll_path )
+
+    @coll_links_path  = 'collocation_links.html'
+    @coll_links_file  = File.join( @data_dir, @coll_links_path )
+
     @freq_path        = 'frequency_sartre.html'
     @freq_file        = File.join( @data_dir, @freq_path )
 
@@ -308,23 +314,30 @@ class TestPhilologicClient < Test::Unit::TestCase
       assert_kind_of  Array, results
       assert_equal    15,    results.size
       results.each do |result|
-        assert_kind_of Philologic::Key, result
-        assert_nil     result['class']
-        assert_not_nil result['href']
-        assert_nil     result['some random attribute']
-        assert_nil     result['author']
-        assert_nil     result['filename']
-        assert_nil     result['title']
-        assert_not_nil result.text
+        assert_kind_of  Philologic::TableRow, result
+        assert_equal    'philologic_frequency_row', result['class']
+        assert_nil      result['href']
+        assert_nil      result['some random attribute']
+        assert_nil      result['author']
+        assert_nil      result['filename']
+        assert_nil      result['title']
+        assert_not_nil  result.count
+        assert_not_nil  result.field
+        assert_not_nil  result.href
+        assert_not_nil  result.text
       end
 
-      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=',                  results.first['href']
-      assert_equal  'Beauvoir S. de',                                                results.first.text
-      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title= | Beauvoir S. de', results.first.to_s
-
-      assert_equal  './?query=sartre&author=Schaeffer+P.&title=',                results.last['href']
-      assert_equal  'Schaeffer P.',                                              results.last.text
-      assert_equal  './?query=sartre&author=Schaeffer+P.&title= | Schaeffer P.', results.last.to_s
+      assert_equal  'author',                                       results.first.field
+      assert_equal  48,                                             results.first.count
+      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=', results.first.href
+      assert_equal  'Beauvoir S. de',                               results.first.text
+      assert_equal  'author | 48 | Beauvoir S. de',                 results.first.to_s
+
+      assert_equal  'author',                                     results.last.field
+      assert_equal  1,                                            results.last.count
+      assert_equal  './?query=sartre&author=Schaeffer+P.&title=', results.last.href
+      assert_equal  'Schaeffer P.',                               results.last.text
+      assert_equal  'author | 1 | Schaeffer P.',                  results.last.to_s
     end
   end
 
@@ -339,27 +352,35 @@ class TestPhilologicClient < Test::Unit::TestCase
       assert_kind_of  Array, results
       assert_equal    15,    results.size
       results.each do |result|
-        assert_kind_of Philologic::Key, result
-        assert_nil     result['class']
-        assert_not_nil result['href']
-        assert_nil     result['some random attribute']
-        assert_nil     result['author']
-        assert_nil     result['filename']
-        assert_nil     result['title']
-        assert_not_nil result.text
+        assert_kind_of  Philologic::TableRow, result
+        assert_equal    'philologic_frequency_row', result['class']
+        assert_nil      result['href']
+        assert_nil      result['some random attribute']
+        assert_nil      result['author']
+        assert_nil      result['filename']
+        assert_nil      result['title']
+        assert_not_nil  result.count
+        assert_not_nil  result.field
+        assert_not_nil  result.href
+        assert_not_nil  result.text
       end
 
-      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=',                  results.first['href']
-      assert_equal  'Beauvoir S. de',                                                results.first.text
-      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title= | Beauvoir S. de', results.first.to_s
+      assert_equal  'author',                                       results.first.field
+      assert_equal  48,                                             results.first.count
+      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=', results.first.href
+      assert_equal  'Beauvoir S. de',                               results.first.text
+      assert_equal  'author | 48 | Beauvoir S. de',                 results.first.to_s
+
+      assert_equal  'author',                                     results.last.field
+      assert_equal  1,                                            results.last.count
+      assert_equal  './?query=sartre&author=Schaeffer+P.&title=', results.last.href
+      assert_equal  'Schaeffer P.',                               results.last.text
+      assert_equal  'author | 1 | Schaeffer P.',                  results.last.to_s
 
-      assert_equal  './?query=sartre&author=Schaeffer+P.&title=',                results.last['href']
-      assert_equal  'Schaeffer P.',                                              results.last.text
-      assert_equal  './?query=sartre&author=Schaeffer+P.&title= | Schaeffer P.', results.last.to_s
     end
   end
 
-  def test_philologic_key_links
+  def test_philologic_frequency_tablerow_links
     Philologic::Client.new(@endpoint) do |client|
       freq_doc       = client.send( :_parse, Nokogiri::HTML( open(@freq_file) ) )
       freq_links_doc = client.send( :_parse, Nokogiri::HTML( open(@freq_links_file) ) )
@@ -403,5 +424,134 @@ class TestPhilologicClient < Test::Unit::TestCase
     end
   end
 
+  def test_collocation_search_with_invalid_queries
+    Philologic::Client.new(@endpoint) do |client|
+      [ nil, [], {}, '', [ '' ], [ nil ], Object.new ].each do |q|
+        assert_raise(RuntimeError, 'invalid query') { client.collocation(q) }
+      end
+    end
+  end
+
+  def test_collocation_search
+    Philologic::Client.new(@endpoint) do |client|
+      doc = client.send( :_parse, Nokogiri::HTML( open(@coll_file) ) )
+      client.stubs(:_get).with('?field=collocates&query=sartre&report=frequency').returns(doc)
+
+      results = client.collocation('sartre')
+
+      assert_not_nil  results
+      assert_kind_of  Array, results
+      assert_equal    15,    results.size
+      results.each do |result|
+        assert_kind_of  Philologic::TableRow, result
+        assert_equal    'philologic_frequency_row', result['class']
+        assert_nil      result['href']
+        assert_nil      result['some random attribute']
+        assert_nil      result['author']
+        assert_nil      result['filename']
+        assert_nil      result['title']
+        assert_not_nil  result.count
+        assert_not_nil  result.field
+        assert_not_nil  result.href
+        assert_not_nil  result.text
+      end
+
+      assert_equal  'author',                                       results.first.field
+      assert_equal  48,                                             results.first.count
+      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=', results.first.href
+      assert_equal  'Beauvoir S. de',                               results.first.text
+      assert_equal  'author | 48 | Beauvoir S. de',                 results.first.to_s
+
+      assert_equal  'author',                                     results.last.field
+      assert_equal  1,                                            results.last.count
+      assert_equal  './?query=sartre&author=Schaeffer+P.&title=', results.last.href
+      assert_equal  'Schaeffer P.',                               results.last.text
+      assert_equal  'author | 1 | Schaeffer P.',                  results.last.to_s
+    end
+  end
+
+  def test_collocation_search_with_key_value_pairs
+    Philologic::Client.new(@endpoint) do |client|
+      doc = client.send( :_parse, Nokogiri::HTML( open(@coll_file) ) )
+      client.stubs(:_get).with('?field=collocates&query=sartre&report=frequency').returns(doc)
+
+      results = client.collocation( :query => 'sartre' )
+
+      assert_not_nil  results
+      assert_kind_of  Array, results
+      assert_equal    15,    results.size
+      results.each do |result|
+        assert_kind_of  Philologic::TableRow, result
+        assert_equal    'philologic_frequency_row', result['class']
+        assert_nil      result['href']
+        assert_nil      result['some random attribute']
+        assert_nil      result['author']
+        assert_nil      result['filename']
+        assert_nil      result['title']
+        assert_not_nil  result.count
+        assert_not_nil  result.field
+        assert_not_nil  result.href
+        assert_not_nil  result.text
+      end
+
+      assert_equal  'author',                                       results.first.field
+      assert_equal  48,                                             results.first.count
+      assert_equal  './?query=sartre&author=Beauvoir+S.+de&title=', results.first.href
+      assert_equal  'Beauvoir S. de',                               results.first.text
+      assert_equal  'author | 48 | Beauvoir S. de',                 results.first.to_s
+
+      assert_equal  'author',                                     results.last.field
+      assert_equal  1,                                            results.last.count
+      assert_equal  './?query=sartre&author=Schaeffer+P.&title=', results.last.href
+      assert_equal  'Schaeffer P.',                               results.last.text
+      assert_equal  'author | 1 | Schaeffer P.',                  results.last.to_s
+
+    end
+  end
+
+  def test_philologic_collocation_tablerow_links
+    Philologic::Client.new(@endpoint) do |client|
+      coll_doc       = client.send( :_parse, Nokogiri::HTML( open(@coll_file) ) )
+      coll_links_doc = client.send( :_parse, Nokogiri::HTML( open(@coll_links_file) ) )
+      client.stubs(:_get).with('?field=collocates&query=sartre&report=frequency').returns(coll_doc)
+      client.stubs(:_get).with('?author=Beauvoir+S.+de&query=sartre&title=').returns(coll_links_doc)
+
+      results = client.collocation( :query => 'sartre' )
+      assert_not_nil results
+
+      links = results.first.links
+
+      assert_not_nil  links
+      assert_kind_of  Array, links
+      assert_equal    48,    links.size
+
+      links.each do |link|
+        assert_kind_of Philologic::Link, link
+        assert_equal   'philologic_cite', link['class']
+        assert_not_nil link['href']
+        assert_nil     link['some random attribute']
+        assert_not_nil link['author']
+        assert_nil     link['filename']
+        assert_not_nil link['title']
+        assert_raise(NoMethodError) { link.text }
+      end
+
+      assert_equal './1839/3/0/0',                links.first['href']
+      assert_equal 'Beauvoir S. de',              links.first['author']
+      assert_equal 'Memoires Jeune Fille Rangee', links.first['title']
+      assert_nil   links.first['filename']
+      assert_raise(NoMethodError) { links.first.text }
+      assert_equal './1839/3/0/0 | Memoires Jeune Fille Rangee | Beauvoir S. de', links.first.to_s
+
+      assert_equal './1839/4/0/0',                links.last['href']
+      assert_equal 'Beauvoir S. de',              links.last['author']
+      assert_equal 'Memoires Jeune Fille Rangee', links.last['title']
+      assert_nil   links.last['filename']
+      assert_raise(NoMethodError) { links.last.text }
+      assert_equal './1839/4/0/0 | Memoires Jeune Fille Rangee | Beauvoir S. de', links.last.to_s
+
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philologic-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70245904566480 !ruby/object:Gem::Requirement
+  requirement: &70093876599220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245904566480
+  version_requirements: *70093876599220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70245904566040 !ruby/object:Gem::Requirement
+  requirement: &70093876864820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245904566040
+  version_requirements: *70093876864820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70245904565620 !ruby/object:Gem::Requirement
+  requirement: &70093879163480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245904565620
+  version_requirements: *70093879163480
 - !ruby/object:Gem::Dependency
   name: rdoc-readme
-  requirement: &70245904565120 !ruby/object:Gem::Requirement
+  requirement: &70093879782440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *70245904565120
+  version_requirements: *70093879782440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70245904564700 !ruby/object:Gem::Requirement
+  requirement: &70093879916440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245904564700
+  version_requirements: *70093879916440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70245904564240 !ruby/object:Gem::Requirement
+  requirement: &70093880007360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245904564240
+  version_requirements: *70093880007360
 description: Ruby client for interacting with the Philologic API.
 email:
 - blair.christensen@gmail.com
@@ -93,6 +93,8 @@ files:
 - lib/philologic-client.rb
 - lib/philologic-client/version.rb
 - philologic-client.gemspec
+- test/data/collocation_links.html
+- test/data/collocation_sartre.html
 - test/data/doc_file.html
 - test/data/frequency_links.html
 - test/data/frequency_sartre.html
@@ -113,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -899217601091423703
+      hash: -1051070454611838584
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -899217601091423703
+      hash: -1051070454611838584
 requirements: []
 rubyforge_project: philologic-client
 rubygems_version: 1.8.7
@@ -130,6 +132,8 @@ signing_key:
 specification_version: 3
 summary: Ruby client for interacting with the Philologic API.
 test_files:
+- test/data/collocation_links.html
+- test/data/collocation_sartre.html
 - test/data/doc_file.html
 - test/data/frequency_links.html
 - test/data/frequency_sartre.html