anemone 0.0.4 → 0.0.5

data/bin/anemone_cron.rb

@@ -59,29 +59,27 @@ Anemone.crawl(root, {:discard_page_bodies => true}) do |anemone|
     pages.each_value do |page|
       url = page.url.to_s
       not_found << url if page.not_found?
-    end    
-    if !not_found.empty?
+    end
+    unless not_found.empty?
       puts "\n404's:"
-      not_found.each do |url| 
+
+      missing_links = pages.urls_linking_to(not_found)
+      missing_links.each do |url, links|
         if options.relative
           puts URI(url).path.to_s
-        else 
+        else
           puts url
         end
-        num_linked_from = 0
-        pages.urls_linking_to(url).each do |u|
+        links.slice(0..10).each do |u|
           u = u.path if options.relative
-          num_linked_from += 1
           puts "  linked from #{u}"
-          if num_linked_from > 10
-            puts "  ..."
-            break
-          end
         end
+        
+        puts " ..." if missing_links.size > 10
       end
-      
+
       print "\n"
-    end    
+    end  
     
     # remove redirect aliases, and calculate pagedepths
     pages = pages.shortest_paths!(root).uniq

data/lib/anemone/anemone.rb

@@ -3,7 +3,7 @@ require 'anemone/core'
 
 module Anemone
   # Version number
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   
   # User-Agent string used for HTTP requests
   USER_AGENT = "Anemone/#{self::VERSION}"

data/lib/anemone/core.rb

@@ -31,7 +31,6 @@ module Anemone
       self.new(root) do |core|
         block.call(core) if block
         core.run
-        core.do_after_crawl_blocks
         return core
       end
     end
@@ -136,9 +135,13 @@ module Anemone
 
       @tentacles.each { |t| t.join }
 
+      do_after_crawl_blocks()
+      
       self
     end
     
+    private    
+    
     #
     # Execute the after_crawl blocks
     #

data/lib/anemone/page.rb

@@ -54,7 +54,7 @@ module Anemone
       @links = []
       @aliases = []
 	  
-	  #create empty storage for OpenStructable
+      #create empty storage for OpenStructable
       update({})
 	  
       @aliases << aka if !aka.nil?
@@ -70,7 +70,7 @@ module Anemone
 
         #get a list of distinct links on the page, in absolute url form
         @doc.css('a').each do |a| 
-          u = a.attribute('href')
+          u = a.attributes['href'].content if a.attributes['href']
           next if u.nil?
           
           begin

data/lib/anemone/page_hash.rb

@@ -61,23 +61,56 @@ module Anemone
     end
     
     #
-    # Return an Array of Page objects which link to the given url
+    # If given a single URL (as a String or URI), returns an Array of Pages which link to that URL
+    # If given an Array of URLs, returns a Hash (URI => [Page, Page...]) of Pages linking to those URLs
     #
-    def pages_linking_to url
-      begin
-        url = URI(url) if url.is_a?(String)
-      rescue
-        return []
+    def pages_linking_to(urls)
+      unless urls.is_a?(Array)
+        urls = [urls] unless urls.is_a?(Array)
+        single = true
+      end
+
+      urls.map! do |url|
+        if url.is_a?(String)
+          URI(url) rescue nil
+        else
+          url
+        end
+      end
+      urls.compact
+
+      links = {}
+      urls.each { |url| links[url] = [] }
+      values.each do |page|
+        urls.each { |url| links[url] << page if page.links.include?(url) }
+      end
+
+      if single and !links.empty?
+        return links.first
+      else
+        return links
       end
-      
-      values.delete_if { |p| !p.links.include?(url) }
     end
-    
+
+    #
+    # If given a single URL (as a String or URI), returns an Array of URLs which link to that URL
+    # If given an Array of URLs, returns a Hash (URI => [URI, URI...]) of URLs linking to those URLs
     #
-    # Return an Array of URI objects of Pages linking to the given url
-    def urls_linking_to url
-      pages_linking_to(url).map{|p| p.url}
+    def urls_linking_to(urls)
+      unless urls.is_a?(Array)
+        urls = [urls] unless urls.is_a?(Array)
+        single = true
+      end
+
+      links = pages_linking_to(urls)
+      links.each { |url, pages| links[url] = pages.map{|p| p.url} }
+
+      if single and !links.empty?
+        return links.first
+      else
+        return links
+      end	  
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: anemone
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Chris Kite
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -05:00
+date: 2009-06-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 files: 
 - bin/anemone_pagedepth.rb
 - bin/anemone_url_list.rb
@@ -57,7 +57,7 @@ files:
 - lib/anemone/http.rb
 - lib/anemone/anemone.rb
 - lib/anemone.rb
-- README.txt
+- README.rdoc
 has_rdoc: true
 homepage: http://anemone.rubyforge.org
 licenses: []
@@ -65,7 +65,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - -m
-- README.txt
+- README.rdoc
 - -t
 - Anemone
 require_paths: