epitools 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-01-30}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [

data/lib/epitools.rb

@@ -1,4 +1,18 @@
-__DIR__ = File.dirname(__FILE__)
+class Object
+
+  unless defined?(__DIR__)
+    # 
+    # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
+    # (taken from Michael Fellinger's Ramaze... thanx, dood! :D)
+    #
+    def __DIR__(*args)
+      filename = caller[0][/^(.*):/, 1]
+      dir = File.expand_path(File.dirname(filename))
+      ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
+    end
+  end
+  
+end
 
 require_wrapper = proc do |mod|
   begin

data/lib/epitools/basetypes.rb

@@ -354,18 +354,6 @@ end
 
 class Object
 
-  unless defined?(__DIR__)
-    # 
-    # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
-    # (taken from Michael Fellinger's Ramaze... thanx, dood! :D)
-    #
-    def __DIR__(*args)
-      filename = caller[0][/^(.*):/, 1]
-      dir = File.expand_path(File.dirname(filename))
-      ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
-    end
-  end
-
   #
   # Instead of:
   #   if cookie_jar.include? cookie

data/lib/epitools/browser/browser_cache.rb

@@ -35,7 +35,6 @@ class CacheDB
     url = page.uri.to_s
 
     p [:page_uri, url]
-    p [:original_url, url]
 
     if url != original_url
       # redirect original_url to url
@@ -49,7 +48,7 @@ class CacheDB
       )
     end
 
-    compressed_body = page.body #Zlib::Deflate.deflate(page.body)
+    compressed_body = Zlib::Deflate.deflate(page.body)
     expire(url) if options[:overwrite]
     db.execute(
       "INSERT INTO cache VALUES ( ?, ?, ?, ? )",
@@ -72,7 +71,7 @@ class CacheDB
     if redirect
       get(redirect)
     else
-      body = compressed_body #Zlib::Inflate.inflate(compressed_body)
+      body = Zlib::Inflate.inflate(compressed_body)
 
       Mechanize::Page.new(
         URI.parse(url),
@@ -151,10 +150,6 @@ class CacheDB
     create_tables
   end
 
-  def delete!
-    File.unlink @filename  
-  end
-
 private
 
   def list_tables

data/spec/browser_spec.rb

@@ -1,71 +1,14 @@
 require 'epitools/browser'
 
-#describe Browser do
-#
-#  before :all do
-#    @browser = Browser.new
-#  end
-#
-#  after :all do
-#    @browser.cache.delete!
-#  end
-#
-#  it "googles" do
-#    page = @browser.get("http://google.com")
-#    page.body["Feeling Lucky"].should_not be_empty
-#  end
-#
-#end
-
-class Mechanize::Page
-  def url
-    uri.to_s
-  end
-end
-
-describe CacheDB do
+describe Browser do
 
   before :all do
-    @agent = Mechanize.new
-    CacheDB.new(@agent).delete!
-    @cache = CacheDB.new(@agent)
-  end
-
-  def new_page(body, url)
-    Mechanize::Page.new(
-      URI.parse(url),
-      {'content-type'=>'text/html'},
-      body,
-      nil,
-      @agent
-    )
-  end
-
-  after :all do
-    #@cache.delete!
+    @browser = Browser.new
   end
-
-  it "writes and reads" do
-    body = "Blah blah blah."
-    url  = "http://example.com/url.html"
-
-    page = new_page(body, url)
-
-    page.body.should == body
-    page.url.should == url
-
-    @cache.put page, url
-
-    p @cache.urls
-
-    @cache.includes?(url).should == true
-
-    result = @cache.get url
-
-    body.should == page.body
-    body.should == result.body
-    url.should == page.url
-    url.should == result.url
+  
+  it "googles" do
+    page = @browser.get("http://google.com")
+    page.body["Feeling Lucky"].should_not be_empty
   end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - epitron
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -05:00
+date: 2011-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -125,6 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -133,6 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"