lib/link_checker.rb in link-checker-0.0.0 vs lib/link_checker.rb in link-checker-0.1.0

@@ -3,72 +3,93 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
 require 'colorize'
 
-module Link
+class LinkChecker
 
-  class Checker
+  def initialize(target_path)
+    @target_path = target_path
+  end
 
-    def initialize(target_path)
-      @target_path = target_path
-    end
+  def find_html_files
+    Find.find(@target_path).map {|path|
+      FileTest.file?(path) && (path =~ /\.html?$/) ? path : nil
+    }.reject{|path| path.nil?}
+  end
 
-    def find_html_files
-      Find.find(@target_path).map {|path|
-        FileTest.file?(path) && (path =~ /\.html?$/) ? path : nil
-      }.reject{|path| path.nil?}
-    end
+  def self.find_external_links(file_path)
+    Nokogiri::HTML(open(file_path)).css('a').
+      select{|link| link.attribute('href').value =~ /^https?\:\/\// }
+  end
 
-    def self.find_external_links(file_path)
-      Nokogiri::HTML(open(file_path)).css('a').
-        select{|link| link.attribute('href').value =~ /^https?\:\/\// }
-    end
-
-    def self.check_link(uri)
-      uri = URI.parse(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if uri.scheme == "https"
-      http.start do
-        path = (uri.path.empty?) ? '/' : uri.path
-        http.request_get(path) do |response|
-          case response
-          when Net::HTTPSuccess then
-            return true
-          when Net::HTTPRedirection then
-            return self.check_link(response['location'])
+  def self.check_link(uri, redirected=false)
+    uri = URI.parse(uri)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == "https"
+    http.start do
+      path = (uri.path.empty?) ? '/' : uri.path
+      http.request_get(path) do |response|
+        case response
+        when Net::HTTPSuccess then
+          if redirected
+            return Redirect.new(uri)
           else
-            raise Error.new(response)
+            return Good.new
           end
+        when Net::HTTPRedirection then
+          return self.check_link(response['location'], true)
+        else
+          raise Error.new(response)
         end
       end
     end
+  end
 
-    def check_links
-      find_html_files.each do |file|
-        bad_checks = []  
+  def check_links
+    find_html_files.each do |file|
+      bad_checks = []
+      warnings = []
 
-        self.class.find_external_links(file).each do |link|
-          uri = link.attribute('href').value
-          begin
-            self.class.check_link(uri)
-          rescue => error
-            bad_checks << { :link => link, :error => error }
+      self.class.find_external_links(file).each do |link|
+        uri = link.attribute('href').value
+        begin
+          response = self.class.check_link(uri)
+          if response.class.eql? Redirect
+            warnings << { :link => link, :response => response }
           end
+        rescue => error
+          bad_checks << { :link => link, :response => error }
         end
-        
-        if bad_checks.empty?
+      end
+      
+      if bad_checks.empty?
+        if warnings.empty?
           puts "Checked: #{file}".green
         else
-          puts "Problem: #{file}".red
-          bad_checks.each do |check|
-            puts "   Link: #{check[:link].attribute('href').value}".red
-            puts "     Response: #{check[:error].response.inspect}".red
-          end
+          puts "Checked: #{file}".yellow
         end
+        warnings.each do |warning|
+          puts "   Warning: #{warning[:link].attribute('href').value}".yellow
+          puts "     Redirected to: #{warning[:response].final_destination.to_s}".yellow
+        end
+      else
+        puts "Problem: #{file}".red
+        bad_checks.each do |check|
+          puts "   Link: #{check[:link].attribute('href').value}".red
+          puts "     Response: #{check[:response].response.inspect}".red
+        end
       end
     end
+  end
 
+  class Good; end
+
+  class Redirect
+    attr_reader :final_destination
+    def initialize(final_destination)
+      @final_destination = final_destination
+    end
   end
 
   class Error < StandardError
     attr_accessor :response
     def initialize(response)
\ No newline at end of file