caboodle 0.2.26 → 0.2.27

data/VERSION

@@ -1 +1 @@
-0.2.26
+0.2.27

data/lib/caboodle/kits/posterous/posterous.rb

@@ -65,7 +65,7 @@ module Caboodle
     def self.from_slug(slug)
       puts "Looking for http://#{Site.posterous_sitename}.posterous.com/#{slug}"
       doc = Caboodle.scrape("http://#{Site.posterous_sitename}.posterous.com/#{slug}")
-      puts doc
+      #puts doc
       opts = {}
       opts["body"] = doc.css('div.bodytext').inner_html
       opts["title"] = doc.css('title').inner_html.split(" - ").first
@@ -78,7 +78,7 @@ module Caboodle
       rescue
         opts["date"] = Date.parse(Time.now)
       end
-      puts opts["date"]
+      #puts opts["date"]
       PosterousPost.new(opts)
     end
   
@@ -92,7 +92,7 @@ module Caboodle
         r = []
         p = PosterousAPI.new
         opts[:site_id] = Site.posterous_site_id 
-        rsp = p.all(opts).perform.parse["rsp"]
+        rsp = p.all(opts).perform_sleepily.parse["rsp"]
         posts = rsp["post"]
         posts = [posts] if posts.class == Hash
         posts.each{|a| r << PosterousPost.new(a) } if posts
@@ -149,8 +149,7 @@ module Caboodle
   	end
 	
   	def date
-  	  puts attributes.inspect
-  	  @date ||= attributes["date"]
+  	  @date ||= Date.parse(attributes["date"]) rescue nil
     end
 
   	def full_url

data/lib/caboodle/scrape.rb

@@ -5,6 +5,14 @@ require 'open-uri'
 
 module Caboodle
   
+  begin
+    require 'memcached'
+    CACHE = Memcached.new
+    puts "Running with memcache"
+  rescue
+    puts "Running without memcache"
+  end
+  
   def self.round_time(integer, factor)
     return integer if(integer % factor == 0)
     return integer - (integer % factor)
@@ -12,20 +20,25 @@ module Caboodle
   
   def self.scrape url
     begin
-      if HAS_MEMCACHE
+      if defined?(CACHE)
+        puts "Scraping with cache optimisation"
         timeout = 60*60*1000
-        sleepy = Memcached.new
-        response = sleepy.get("#{round_time(Time.new.to_i, timeout)}:#{url}") rescue nil
+        response = CACHE.get("#{round_time(Time.new.to_i, timeout)}:#{url}") rescue nil
         response ||= open(url).read
-        sleepy.set("#{round_time(Time.new.to_i, timeout)}:#{url}", response)
-        sleepy.set("0:#{url}", response)
+        CACHE.set("#{round_time(Time.new.to_i, timeout)}:#{url}", response)
+        CACHE.set("0:#{url}", response)
       else
+        puts "Scraping without cache optimisation"
         response = open(url).read
       end
       ::Nokogiri::HTML(response)
     rescue Exception => e
       puts e.inspect
-      ::Nokogiri::HTML("")
+      if defined?(CACHE)
+        response = CACHE.get("0:#{url}")
+      end
+      response ||= ""
+      ::Nokogiri::HTML(response)
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 2
-  - 26
-  version: 0.2.26
+  - 27
+  version: 0.2.27
 platform: ruby
 authors: 
 - Stef Lewandowski