scotsman_obituaries 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67127d4a4006a9601902aabf73d9bfd1110d6578
-  data.tar.gz: 0abea0a938bea6ab9d323afc4bddc1569ce1056a
+  metadata.gz: 637bef29f84d5e89e5784e9a12c43917aea361ef
+  data.tar.gz: 71b7983ac4d3c2ae7f021c62a08eafbaf62437e0
 SHA512:
-  metadata.gz: 01275c6869b398516657082c8c8d07cea78719aaacf4ca78a1604677381ab7ef9ec645dca29e1a6edd6e0e83f56136754d331838d14a3a9e22384b67f69e185d
-  data.tar.gz: 88c731883d5beaf0c31ce238c812f108587122f288a4a78cf06c5d13329f42411cf75d2780535213b7bb41ba1b226fb172c4b920cd3b5557eef4421e56f5b9fd
+  metadata.gz: 4e08843ab70dc832700ebb5633a807252394a6dc5ccbe62f53f4e7abcd1e38cd31297fa02127e1adafb018fc4059770723676908c4453b18e8dbef55ded6cf61
+  data.tar.gz: 4c09772f9c540579e25ab07afbc73cbe7e93d4721bc468a2491bc2f6219b0bac59cf38033677ad9eabb9294395e1c506972c4ee5002b1208958f51ec17f5a8a8

data/lib/scotsman_obituaries.rb

@@ -25,7 +25,7 @@ class ScotsmanObituaries
 
     @cookie = raw_cookie.to_a.map {|key,val| "%s=%s" % [key, val]}.join '; '
 
-    @url_base = 'http://announce.jpress.co.uk/'
+    @url_base = 'http://announce.jpress.co.uk'
     
   end
 
@@ -39,24 +39,34 @@ class ScotsmanObituaries
       last_month: 31
     }
 
-    url = ''
-
-    url = @url_base + "search?keywords=#{title}&" + \
+    search_url = @url_base + "/search?keywords=#{title}&" + \
      "date_limit=#{days[date_range.to_sym]}&date=" + \
           "&type=obit&_fstatus=search&s_source=jpsc_scot"
 
-    s = open(url, "Cookie" => @cookie).read
+    s = open(search_url, "Cookie" => @cookie).read
     doc = Nokorexi.new(s).to_doc
     e = doc.at_css '.results'
 
     e.xpath('li/div[@class="notice"]').inject([]) do |r,notice|
+      
       heading = notice.text('h2/a')
       short_text = notice.text('p').strip
       pubdate = Date.parse(notice.\
            element('meta[@itemprop="datePublished"]').attributes[:content])
-      r << {heading: heading, short_text: short_text, pubdate: pubdate}
+      id = notice.element('div/a').attributes[:href][/\/(\d+)\?/,1]
+
+      r << {id: id, heading: heading, short_text: short_text, pubdate: pubdate}
     end
     
   end
+  
+  def more_info(id)
+
+    url = @url_base + '/edinburgh-evening-news-and-' + \
+                                     'scotsman-publications/obituary/' + id
+    s = open(url, "Cookie" => @cookie).read
+    Nokorexi.new(s).to_doc.at_css('.notice_text').text('p')
+    
+  end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scotsman_obituaries
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson