epitools 0.5.61 → 0.5.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26be924f980b182a291581a2f0e0488d3534791
-  data.tar.gz: 3520224c218b45809669f443f0a693f539cd0680
+  metadata.gz: 01cb576c29752c5f1213210a5fde6afbb21d2b24
+  data.tar.gz: cb4ef1ef088ffd7171cc2e4730a21e95d6d858d2
 SHA512:
-  metadata.gz: ea7494f369dfbdffb220748efe22ad695a1d4a7afe3e1ba015369523038a74c4aa01f6c20ac92c7972c44c3ad6c67ccf9e1dec39e0267f8b50d63b32262edaf9
-  data.tar.gz: 703d72d09a223472134a3b0031d0103540b55016bbf0057983c981e901990dd95347ff91aa02753619ec46b38609d8ac570ffe291902d4e89183ee53ca96423e
+  metadata.gz: 1677a2683547b51b9d3f3808859e59a2c3282130d99f35b6d7e41b9d8d0cee4ce595af177305b3450400ca1aaeed1ab05ab6a69b58b7df347ce2e20a80ecfad8
+  data.tar.gz: 309c475a1afa44736c3e6c5baca3c458b4bd7c6d1d6762054b21d4c6a32683e7a0d1351aefe335eb563ffc04ae3566e46bb427669eaa6db4a2e8fcc4598007c7

data/VERSION

@@ -1 +1 @@
-0.5.61
+0.5.63

data/lib/epitools/browser.rb

@@ -40,7 +40,7 @@ class Browser
     @last_get     = Time.at(0)
     @delay        = options[:delay]          || 1
     @delay_jitter = options[:delay_jitter]   || 0.2
-    @use_cache    = options[:cache] == false || true
+    @use_cache    = !!(options[:cache] || options[:cached] || options[:use_cache])
     @use_logs     = options[:logs]           || false
     @cookie_file  = options[:cookiefile]     || "cookies.txt"
     
@@ -136,10 +136,10 @@ class Browser
     # Determine the cache setting
     use_cache = options[:cached].nil? ? @use_cache : options[:cached]
 
-    cached_already = cache.include?(url)
+    cached_already = cache.include?(url) if use_cache
 
     puts
-    puts "[ GET #{url} (using cache: #{use_cache}) ]"
+    puts "[ GET #{url} (using cache: #{!!use_cache}) ]"
     
     delay unless cached_already
     max_retries = 4
@@ -152,7 +152,7 @@ class Browser
       else
         page = agent.get(url)
         @last_get = Time.now
-        cache_put(page, url)
+        cache_put(page, url) if use_cache
       end
 
       puts

data/lib/epitools/core_ext/string.rb

@@ -73,11 +73,26 @@ class String
     dup.titlecase!
   end
 
+
+  #
+  # A Regexp to recognize ANSI escape sequences
+  #
+  COLOR_REGEXP = /\e\[.*?(\d)+m/
+
+  #
+  # This string contains ANSI (VT100) control codes
+  #
+  def contains_color?
+    self[COLOR_REGEXP]
+  end  
+  alias_method :contains_colors?, :contains_color?
+  alias_method :contains_ansi?,  :contains_color?
+
   #
   # Remove ANSI color codes.
   #
   def strip_color
-    gsub(/\e\[.*?(\d)+m/, '')
+    gsub(COLOR_REGEXP, '')
   end
   alias_method :strip_ansi, :strip_color 
 
@@ -102,11 +117,34 @@ class String
   alias_method :chomp_lines,   :each_chomped
 
 
+  #
+  # Indent all the lines, if "prefix" is a string, prepend that string
+  # to each lien. If it's an integer, prepend that many spaces.
+  #
+  def indent(prefix="  ")
+    prefix = (" " * prefix) if prefix.is_an? Integer
+
+    if block_given?
+      lines.each { |line| yield prefix + line }
+    else
+      lines.map { |line| prefix + line }.join('')
+    end
+  end
+
+  #
+  # Use Nokogiri to parse this string as HTML, and return an indented version
+  #
+  def nice_html(indent=2)
+    Nokogiri::HTML.fragment(self).to_xhtml(indent: indent)
+  end
+  alias_method :nicehtml,    :nice_html
+  alias_method :indent_html, :nice_html
+
   #
   # Wrap the lines in the string so they're at most "width" wide.
   # (If no width is specified, defaults to the width of the terminal.)
   #
-  def wrap(width=nil, strip_ansi=true)
+  def wrap(width=nil)
     if width.nil? or width < 0
       require 'io/console'
       _, winwidth = STDIN.winsize
@@ -146,41 +184,17 @@ class String
     end
   end
 
-  #
-  # Indent all the lines, if "prefix" is a string, prepend that string
-  # to each lien. If it's an integer, prepend that many spaces.
-  #
-  def indent(prefix="  ")
-    prefix = (" " * prefix) if prefix.is_an? Integer
-
-    if block_given?
-      lines.each { |line| yield prefix + line }
-    else
-      lines.map { |line| prefix + line }.join('')
-    end
-  end
-
-  #
-  # Use Nokogiri to parse this string as HTML, and return an indented version
-  #
-  def nicehtml(indent=2)
-    Nokogiri::HTML(ARGF).to_xhtml(indent: indent)
-  end
-  alias_method :indent_html, :nicehtml
-
   #
   # Wrap all lines at window size, and indent 
   #
   def wrapdent(prefix, width=nil)
-    prefix_size = prefix.strip_ansi.size
-
     if width
-      width = width - prefix_size
+      width = width - prefix.size
     else
-      width = -prefix_size
+      width = -prefix.size
     end
 
-    wrap(width).map { |line| line + prefix }.join("\n")
+    wrap(width).each_line.map { |line| prefix + line }.join
   end
 
   #

data/spec/core_ext_spec.rb

@@ -223,6 +223,11 @@ describe String do
   it "nice_lineses" do
     "\n\n\nblah\n\n\nblah\n\n\n".nice_lines.should == ["blah", "blah"]    
   end
+
+  it "nice_htmls" do
+    s = "<a><b><p><c>whee</a>"
+    s.nice_html.should_not == s
+  end
   
   it "wraps" do
     s1 = "Hello there, I am a sentence or series of words."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.61
+  version: 0.5.63
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec