gulesider 0.2.0 → 0.2.1

data/lib/screen_scraper.rb

@@ -24,32 +24,54 @@ class ScreenScraper
   end
   
   def scraped_person_data
+    search_result = []
+    
     vcard = @result.search "div.vcard"
-    address = vcard.search("span.adr").first
+    profile_info = vcard.search "div.profile-info"
+    
+    profile_info.search("p").each do |p|
+      name = vcard.search("span.given-name").text + " " + vcard.search("span.family-name").text
+      phone = p.search("span.tel > a").text.strip
+      address = p.search("span.adr")
+      street_name = address.search("span.street-address").text
+      postal_code = address.search("span.postal-code").text
+      city = address.search("span.locality").text
+      lat = address.search("span.latitude").text
+      long = address.search("span.longitude").text
+
+      if phone != ""
+        search_result.push SearchResult.new({
+          :person => true,
+          :name => name,
+          :phone => phone,
+          :street_name => street_name,
+          :postal_code => postal_code,
+          :city => city,
+          :latitude => lat,
+          :longitude => long
+        })
+      end
+    end
     
-    return SearchResult.new({
-      :person => true,
-      :name => vcard.search("span.given-name").text + " " + vcard.search("span.family-name").text,
-      :phone => vcard.search("li.tel:first-child").text,
-      :street_name => address.search("span.street-address").text,
-      :postal_code => address.search("span.postal-code").text,
-      :city => address.search("span.locality").text,
-      :latitude => address.search("span.latitude").text,
-      :longitude => address.search("span.longitude").text
-    })
+    return search_result
   end
   
   def scraped_company_data
+    search_result = []
     list = @result.search "#result-list"
-    first_hit = list.search "div.company-hit:first-child"
+    hits = list.search("div.company-hit")
+    
+    hits.each do |hit|
+      search_result.push SearchResult.new({
+        :company => true,
+        :name => hit.search("div.header").search("a").text,
+        :phone => hit.search("li.tel:first-child").text,
+        :street_name => hit.search("span.street-address").text,
+        :postal_code => hit.search("span.postal-code").text,
+        :city => hit.search("span.locality").text
+      })
+    end
     
-    return SearchResult.new({
-      :company => true,
-      :name => first_hit.search("div.header").search("a").text,
-      :phone => first_hit.search("li.tel:first-child").text,
-      :street_name => first_hit.search("span.street-address").text,
-      :postal_code => first_hit.search("span.postal-code").text,
-      :city => first_hit.search("span.locality").text
-    })
+    return search_result
   end
 end

data/lib/terminal_search.rb

@@ -2,8 +2,17 @@
 require 'gulesider'
 
 puts "Søker på gulesider.no"
-result = Gulesider.search("#{ARGV[0]}")
+
+query = 46823378 #ARGV[0]
+result = Gulesider.search("#{query}")
+
 puts ""
-puts "#{result[:name]}"
-address = "#{result[:street_name]}, #{result[:postal_code]} #{result[:city]}"
-puts address if address != ",  "
+puts "\t#{result.length} resultater"
+
+result.each do |entry|
+  puts "\tNavn: " + entry[:name]
+  puts "\tNummer: " + entry[:phone]
+  address = "\t#{entry[:street_name]}, #{entry[:postal_code]} #{entry[:city]}"
+  puts address if !entry[:street_name].empty? and address != ", "
+  puts ""
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gulesider
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70271940132260 !ruby/object:Gem::Requirement
+  requirement: &70330773791800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70271940132260
+  version_requirements: *70330773791800
 description: 
 email: mail@goeran.no
 executables: