reliefweb_scraper 0.1.0 → 0.2.0

data/lib/glidenumber.rb

@@ -38,6 +38,9 @@ module Glidenumber
     end
     link = links.first
     glidenumber = link.text.strip
+    glidenumber.match /([A-Z]{2})-\d{4}-\d{6}-([A-Z]{3})/
+    disaster_type, country_code = $1, $2
+
     agent.get(link.attributes["href"].to_s)
 
     country = agent.page.parser.css("table tr td table.basefontSmall tr[3] td.bgLightLight strong").text.strip.split.last
@@ -45,7 +48,11 @@ module Glidenumber
     date = agent.page.parser.css("table tr td table.basefontSmall tr[5] td.bgLightLight[2]").text.strip
     date = Date.strptime(date, '%Y-%m-%d')
 
-    Record.new({:country => country, :date => date, :glidenumber => glidenumber})
+    Record.new({:country => country,
+                :country_code => country_code,
+                :date => date,
+                :glidenumber => glidenumber,
+                :disaster_type => disaster_type})
   end
 end
 

data/lib/reliefweb.rb

@@ -25,7 +25,7 @@ module Reliefweb
       reliefweb_glide = fetch_glidenumber(href)
       puts "== Fetching glide details for #{reliefweb_glide}..." if options[:verbose]
       record = Glidenumber.find(reliefweb_glide)
-      Disaster.new({:title => title}.merge(record.to_hash))
+      Disaster.new({:title => title, :url => URI.join("http://reliefweb.int", href).to_s}.merge(record.to_hash))
     end
   end
 

data/reliefweb_scraper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "reliefweb_scraper"
-  s.version     = "0.1.0"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nathan Broadbent", "Stanley Lau"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/spec/lib/glidenumber_spec.rb

@@ -7,9 +7,11 @@ describe Glidenumber do
   it 'should find the details of a disaster by glide number' do
     record = Glidenumber.find('OT-2011-000110-UGA')
     record.should be_a(Glidenumber::Record)
+    record.glidenumber.should == 'MS-2011-000110-UGA'
     record.country.should == "Uganda"
+    record.country_code.should == 'UGA'
+    record.disaster_type.should == 'MS'
     record.date.should == Date.strptime('2011-8-12', '%Y-%m-%d')
-    record.glidenumber.should == 'MS-2011-000110-UGA'
   end
 
   it 'should raise an error on invalid glide number' do

data/spec/lib/reliefweb_spec.rb

@@ -15,6 +15,7 @@ describe Reliefweb do
     disasters.should_not be_empty
     disaster = disasters.first
     disaster.should be_a(Reliefweb::Disaster)
+    disaster.url.should == "http://reliefweb.int/horn-africa-crisis2011"
     disaster.country.should == "Uganda"
     disaster.date.should == Date.strptime('2011-8-12', '%Y-%m-%d')
     disaster.glidenumber.should == 'MS-2011-000110-UGA'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reliefweb_scraper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &84035110 !ruby/object:Gem::Requirement
+  requirement: &78537160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *84035110
+  version_requirements: *78537160
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &84034830 !ruby/object:Gem::Requirement
+  requirement: &78536880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *84034830
+  version_requirements: *78536880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84034550 !ruby/object:Gem::Requirement
+  requirement: &78536610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *84034550
+  version_requirements: *78536610
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &84034300 !ruby/object:Gem::Requirement
+  requirement: &78536300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.11.1
   type: :development
   prerelease: false
-  version_requirements: *84034300
+  version_requirements: *78536300
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &84034030 !ruby/object:Gem::Requirement
+  requirement: &78535740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.7.0
   type: :development
   prerelease: false
-  version_requirements: *84034030
+  version_requirements: *78535740
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &84033770 !ruby/object:Gem::Requirement
+  requirement: &78535430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *84033770
+  version_requirements: *78535430
 description: Scrapes reliefweb's featured disasters, and pulls additional information
   from glidenumber.net
 email:
@@ -111,12 +111,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -664477265
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -664477265
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6