sla 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e98d12594ea7a28b2dc3d13bc739052d94e5b6
-  data.tar.gz: 7e3cfcd96379993df956f848ada469bd51d60680
+  metadata.gz: 50ec41399fd977f97a9987ff148f9846f1aecae2
+  data.tar.gz: 93d2d55e73f5f812a5615a324af9b41031a183cd
 SHA512:
-  metadata.gz: 1097f835963ed1be41a4b71fa14aace3a9d3ea03398d182125a96bdd6c893fe9d98fd604514184b8d727590376964d26641cb97d0b03b7f5ddafbe22523920f9
-  data.tar.gz: e2a63d7e2210d7f78863cb8032dd2128276d7ba8417bb12076f7beba40a373d93e9f85f43daeb69c43d5ab3ee9e15ca80956ba21e6a153a170d7bb0c6ff203c0
+  metadata.gz: eb27195220e441b517b7eac34466479117c1a4e4f195f39fe753abb1348b9270833c00278834921b80f1af92cf17cf70da51330516e339d53b28ce11d30d72a1
+  data.tar.gz: 465e9965dddb77655299f70d04f79694746ca81af7333052fa43f2748a3e4e397c5a9f869f5bdd6f802c278bc0662b8e37655f87c7bad58ea6e140aa3e995433

data/lib/sla.rb

@@ -6,7 +6,6 @@ require 'docopt'
 require 'uri'
 
 require 'sla/version'
-require 'sla/page'
 require 'sla/link'
 require 'sla/checker'
 require 'sla/command_line'

data/lib/sla/checker.rb

@@ -2,43 +2,30 @@ module SLA
   class Checker
     include Colsole
 
-    attr_accessor :checked_links, :max_depth, :next_check
+    attr_accessor :max_depth, :checked_links
 
     def initialize
       @max_depth = 10
       @checked_links = []
-      @next_check ||= []
     end
 
     def count
       checked_links.count
     end
 
-    def on_check(urls, depth=1, &block)
-      urls = [urls] if urls.is_a? String
+    def check(link, depth=1, &block)
+      link = Link.new link, depth: depth if link.is_a? String
+      link.validate
+      yield link if block_given?
 
-      self.next_check = []
+      return if checked_links.include? link.url
+      checked_links.push link.url
 
-      urls.each do |url|
-        check_url url, depth, &block
-        if depth < max_depth && !next_check.empty?
-          on_check next_check, depth+1, &block
-        end
-      end
-    end
-
-    def check_url(url, depth, &_block)
-      page = Page.new url, depth: depth
-      page.validate
-
-      yield page if block_given? 
+      return unless link.valid?
       return if depth >= max_depth
-      return if checked_links.include? url
-
-      checked_links.push url
-
-      page.links.each do |link|
-        next_check.push link.url unless next_check.include? link.url
+      
+      link.sublinks.each do |sublink|
+        check sublink, depth+1, &block
       end
     end
   end

data/lib/sla/command_line.rb

@@ -40,15 +40,15 @@ module SLA
 
       log = []
 
-      checker.on_check start_url do |page|
-        indent = '-' * page.depth
+      checker.check start_url do |link|
+        indent = '-' * link.depth
 
-        status = page.status
+        status = link.status
         colored_status = color_status status
         failed +=1 if status != '200'
 
-        say "#{count} #{colored_status} #{indent} #{page.name}"
-        log.push "#{count} #{status} #{indent} #{page.name}" unless @no_log
+        say "#{count} #{colored_status} #{indent} #{link.ident}"
+        log.push "#{count} #{status} #{indent} #{link.ident}" unless @no_log
         count += 1
       end
 

data/lib/sla/link.rb

@@ -1,12 +1,59 @@
 module SLA
   class Link
-    attr_accessor :text, :href
+    attr_accessor :text, :href, :status, :depth, :real_uri
     attr_reader :parent
 
     def initialize(href, opts={})
-      @href = href
-      @text = opts[:text]
-      self.parent = opts[:parent] || @href
+      @href         = href
+      @text         = opts[:text]
+      @depth        = opts[:depth] || 1
+      self.parent   = opts[:parent] || @href
+    end
+
+    def valid?
+      validate
+      status == '200'
+    end
+
+    def validate
+      content
+    end
+
+    def content
+      @content ||= content!
+    end
+
+    def content!
+      response = Cache.get url
+      self.status = response.error ? '404' : '200'
+      self.real_uri = response.base_uri
+      response.content
+    end
+
+    def ident
+      full_uri.request_uri
+    end
+
+    def url
+      full_uri.to_s
+    end
+
+    def doc
+      @doc ||= Nokogiri::HTML content
+    end
+
+    def sublinks
+      @sublinks ||= sublinks!
+    end
+
+    def sublinks!
+      anchors = doc.css('a')
+      result = []
+      anchors.each do |a|
+        link = Link.new a['href'], text: a.text, parent: real_uri, depth: depth+1
+        result.push link if link.interesting?
+      end
+      result
     end
 
     def uri
@@ -26,10 +73,6 @@ module SLA
       URI.join parent, href
     end
 
-    def url
-      full_uri.to_s
-    end
-
     def external?
       parent.host != full_uri.host
     end

data/lib/sla/version.rb

@@ -1,3 +1,3 @@
 module SLA
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sla
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -165,7 +165,6 @@ files:
 - lib/sla/command_line.rb
 - lib/sla/docopt.txt
 - lib/sla/link.rb
-- lib/sla/page.rb
 - lib/sla/version.rb
 homepage: https://github.com/DannyBen/sla
 licenses:

data/lib/sla/page.rb

@@ -1,65 +0,0 @@
-module SLA
-  class Page
-    attr_accessor :depth, :status, :base_uri
-    attr_reader :url
-
-    def initialize(url, opts={})
-      @url = url
-      @base_uri = url
-      @status = '000'
-      self.depth = opts[:depth] if opts[:depth]
-    end
-
-    def valid?
-      validate
-      status == '200'
-    end
-
-    def validate
-      content
-    end
-
-    def name
-      @name ||= name!
-    end
-
-    def name!
-      uri = URI.parse url
-      if uri.request_uri.empty? || uri.request_uri == '/'
-        url 
-      else
-        uri.request_uri
-      end
-    end
-
-    def content
-      @content ||= content!
-    end
-
-    def content!
-      response = Cache.get url
-      self.status = response.error ? '404' : '200'
-      self.base_uri = response.base_uri
-      response.content
-    end
-
-    def doc
-      @doc ||= Nokogiri::HTML content
-    end
-
-    def links
-      @links ||= links!
-    end
-
-    def links!
-      anchors = doc.css('a')
-      result = []
-      anchors.each do |a|
-        link = Link.new a['href'], text: a.text, parent: base_uri
-        result.push link if link.interesting?
-      end
-      result
-    end
-  end
-
-end