epitools 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2010-12-05}
+  s.date = %q{2010-12-09}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
     "lib/epitools/zopen.rb",
     "spec/basetypes_spec.rb",
     "spec/browser_spec.rb",
-    "spec/highlight_spec.rb",
     "spec/lcs_spec.rb",
     "spec/metaclass_spec.rb",
     "spec/permutations_spec.rb",
@@ -65,7 +64,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/basetypes_spec.rb",
     "spec/browser_spec.rb",
-    "spec/highlight_spec.rb",
+    "spec/clitools_spec.rb",
     "spec/lcs_spec.rb",
     "spec/metaclass_spec.rb",
     "spec/permutations_spec.rb",

data/lib/epitools/basetypes.rb

@@ -16,8 +16,20 @@ class Object
   def integer?; false; end
 end
 
-class Float
+class Numeric
   def integer?; true; end
+
+  def commatize  
+    to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/,'\1,\2')
+  end
+end
+
+class Float
+  def blank?; self == 0.0; end
+end
+
+class NilClass
+  def blank?; true; end
 end
 
 class String
@@ -26,9 +38,13 @@ class String
   # Could this string be cast to an integer?
   #
   def integer?
-    self.strip.match(/^\d+$/) ? true : false
+    strip.match(/^\d+$/) ? true : false
   end
-    
+
+  def blank?
+    strip.size == 0
+  end
+
   #
   # Convert \r\n to \n
   #
@@ -54,7 +70,7 @@ class String
   # Like #lines, but skips empty lines and removes \n's.
   #
   def nice_lines
-    self.split("\n").map(&:strip).select(&:any?)
+    split("\n").select{|l| not l.blank? }
   end
   
   alias_method :clean_lines, :nice_lines
@@ -63,10 +79,8 @@ end
 
 class Integer
   
-  def integer?
-    true
-  end
-    
+  def blank?; self == 0; end
+
   def to_hex
     "%0.2x" % self
   end
@@ -84,7 +98,9 @@ end
 
 
 class Array
-  
+
+  def blank?; not self.any?; end
+
   #
   # flatten.compact.uniq
   #
@@ -122,6 +138,10 @@ end
 
 module Enumerable
 
+  def blank?
+    not self.any?
+  end
+
   #
   # Split this enumerable into an array of pieces given some 
   # boundary condition.
@@ -365,6 +385,10 @@ end
 
 class Hash
 
+  def blank?
+    not self.any?
+  end
+
   #
   # Runs remove_blank_lines on self. 
   #  

data/lib/epitools/browser.rb

@@ -2,10 +2,12 @@ require 'mechanize'
 require 'uri'
 require 'fileutils'
 
+require 'epitools/browser/browser_cache'
 require 'epitools/browser/mechanize_progressbar'
 
 # TODO: Make socksify optional (eg: if proxy is specified)
 #require 'socksify'
+class SOCKSError < Exception; end
 
 # TODO: Put options here.
 =begin
@@ -98,7 +100,6 @@ class Browser
 
   def init_cache!
     # TODO: Rescue "couldn't load" exception and disable caching
-    require 'epitools/browser/browser_cache'
     @cache = CacheDB.new(agent) if @use_cache
   end
 
@@ -133,27 +134,20 @@ class Browser
     #end
 
     # Determine the cache setting
-    options[:use_cache] ||= @use_cache
-    
-    if options[:use_cache] == false
-      options[:read_cache]  = false
-      options[:write_cache] = false
-    end
-    
-    options[:read_cache]  = true   if options[:read_cache].nil?
-    options[:write_cache] = true   if options[:write_cache].nil? 
 
-    read_cache  = options[:read_cache] && cache.include?(url) 
-    write_cache = options[:write_cache]
+
+    use_cache = options[:use_cache] || @use_cache
+
+    cached_already = cache.include?(url)
 
     puts
-    puts "[ #{url.inspect} (read_cache=#{options[:read_cache]}, write_cache=#{options[:write_cache]}) ]"
+    puts "[ #{url.inspect} (use_cache=#{use_cache}) ]"
     
-    delay unless read_cache
+    delay unless cached_already
 
     begin
       
-      if read_cache
+      if cached_already
         page = cache.get(url)
         if page.nil?
           puts "  |_ CACHE FAIL! Re-getting page."
@@ -165,7 +159,7 @@ class Browser
         @last_get = Time.now
       end
 
-      cache_put(page, url) if write_cache and not read_cache
+      cache_put(page, url) unless cached_already
 
       puts
 

data/lib/epitools/browser/browser_cache.rb

@@ -1,4 +1,4 @@
-#require 'mechanize'
+require 'mechanize'
 require 'sqlite3'
 
 class CacheDB
@@ -28,10 +28,14 @@ class CacheDB
   alias_method :size, :count
 
   def put(page, original_url=nil, options={})
+    p [:put, original_url]
+
     raise "Invalid page" unless [:body, :content_type, :uri].all?{|m| page.respond_to? m }
 
     url = page.uri.to_s
 
+    p [:page_uri, url]
+
     if url != original_url
       # redirect original_url to url
       expire(original_url) if options[:overwrite]
@@ -69,7 +73,7 @@ class CacheDB
     else
       body = Zlib::Inflate.inflate(compressed_body)
 
-      WWW::Mechanize::Page.new(
+      Mechanize::Page.new(
         URI.parse(url),
         {'content-type'=>content_type},
         body,
@@ -80,6 +84,7 @@ class CacheDB
   end
 
   def pages_via_sql(*args, &block)
+    p [:pages_via_sql, args]
     if block_given?
       db.execute(*args) do |row|
         yield row_to_page(row)

data/spec/basetypes_spec.rb

@@ -63,6 +63,17 @@ describe Object do
   
 end
 
+describe Numeric do
+
+  it "commatizes" do
+    123.commatize.should == "123"
+    1234.commatize.should == "1,234"
+    12983287123.commatize.should == "12,983,287,123"
+    -12983287123.commatize.should == "-12,983,287,123"
+    -12983287123.4411.commatize.should == "-12,983,287,123.4411"
+  end
+
+end
 
 describe Integer do
   

data/spec/{highlight_spec.rb → clitools_spec.rb}

@@ -1,4 +1,4 @@
-require 'epitools/highlight'
+require 'epitools/clitools'
 
 describe String do
 
@@ -12,4 +12,4 @@ describe String do
     "xxxmatchzzz".highlight(/MATCH/i, color).should  == highlighted
   end
   
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - epitron
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 -05:00
+date: 2010-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,6 @@ files:
 - lib/epitools/zopen.rb
 - spec/basetypes_spec.rb
 - spec/browser_spec.rb
-- spec/highlight_spec.rb
 - spec/lcs_spec.rb
 - spec/metaclass_spec.rb
 - spec/permutations_spec.rb
@@ -109,6 +108,7 @@ files:
 - spec/spec_helper.rb
 - spec/sys_spec.rb
 - spec/zopen_spec.rb
+- spec/clitools_spec.rb
 has_rdoc: true
 homepage: http://github.com/epitron/epitools
 licenses: 
@@ -144,7 +144,7 @@ summary: NOT UTILS... METILS!
 test_files: 
 - spec/basetypes_spec.rb
 - spec/browser_spec.rb
-- spec/highlight_spec.rb
+- spec/clitools_spec.rb
 - spec/lcs_spec.rb
 - spec/metaclass_spec.rb
 - spec/permutations_spec.rb