caboodle 0.2.25 → 0.2.26

data/VERSION

@@ -1 +1 @@
-0.2.25
+0.2.26

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

@@ -4,6 +4,13 @@ require 'weary'
 require 'nokogiri'
 
 module Caboodle
+  
+  class PosterousPostNotFound < Exception
+  end
+  
+  class PosterousProblem < Exception
+  end
+  
   class PosterousAPI < Weary::Base
   
     def initialize(opts={})
@@ -31,6 +38,7 @@ module Caboodle
       r.url = "http://posterous.com/api/getsites"
       r.via = :get
       r.authenticates = true
+      r.follows = true
       r.headers = {'Accept' => 'application/xml'}
     end
     
@@ -40,6 +48,7 @@ module Caboodle
       r.with = [:site_id,:tag,:num_posts,:page]
       r.requires = [:site_id]
       r.authenticates = true
+      r.follows = true
       r.headers = {'Accept' => 'application/xml'}
     end
     
@@ -54,6 +63,7 @@ module Caboodle
     end
   
     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
       opts = {}
@@ -61,10 +71,14 @@ module Caboodle
       opts["title"] = doc.css('title').inner_html.split(" - ").first
       opts["link"] = "http://#{Site.posterous_sitename}.posterous.com/#{slug}"
       perma = doc.css('.permalink').inner_html
-      date = doc.css('article time').first["datetime"] if doc.css('article time').first
-      date ||= doc.css('.date .permalink').first.inner_html if doc.css('.date .permalink').first
-      puts date
-      opts["date"] = Date.parse(date) if date
+      begin
+        date = doc.css('article time').first["datetime"] if doc.css('article time').first
+        date ||= doc.css('.date .permalink').first.inner_html if doc.css('.date .permalink').first
+        opts["date"] = Date.parse(date) if date
+      rescue
+        opts["date"] = Date.parse(Time.now)
+      end
+      puts opts["date"]
       PosterousPost.new(opts)
     end
   
@@ -74,18 +88,26 @@ module Caboodle
     end
   
     def self.all(opts={})
-      r = []
-      p = PosterousAPI.new
-      opts[:site_id] = Site.posterous_site_id 
-      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
-      r
+      begin
+        r = []
+        p = PosterousAPI.new
+        opts[:site_id] = Site.posterous_site_id 
+        rsp = p.all(opts).perform.parse["rsp"]
+        posts = rsp["post"]
+        posts = [posts] if posts.class == Hash
+        posts.each{|a| r << PosterousPost.new(a) } if posts
+        r
+      rescue Exception => e
+        raise PosterousProblem.new(e.message)
+      end
     end
   
     def self.get(slug)
-      PosterousPost.new(PosterousAPI.new.all().perform.parse)
+      begin
+        PosterousPost.new(PosterousAPI.new.all().perform.parse)
+      rescue Exception => e
+        raise PosterousProblem.new(e.message)
+      end
     end
   
     def [] k
@@ -109,24 +131,26 @@ module Caboodle
     def semantic_tags
       a = tags.collect{|t| "tag-#{t}"}
       a << "slug-#{slug}"
-      a << "y#{date.year}"
-      a << "m#{date.month}"
-      a << "d#{date.day}"
+      if date
+        a << "y#{date.year}"
+        a << "m#{date.month}"
+        a << "d#{date.day}"
+      end
       a
     end
   
     def url
   		d = date
-  		"/#{d.year}/#{d.month}/#{slug}"
+  		if d
+  		  "/#{d.year}/#{d.month}/#{slug}"
+  		else
+  		  "/#{slug}"
+		  end
   	end
 	
   	def date
-  	  return @date if defined?(@date) 
-  	  if attributes["date"].class == String
-  	    @date = Date.parse(attributes["date"])
-  	  else
-  	    @date = attributes["date"]
-  	  end
+  	  puts attributes.inspect
+  	  @date ||= attributes["date"]
     end
 
   	def full_url
@@ -152,18 +176,28 @@ module Caboodle
       haml :posts
     end
 
-    get "/:year/:month/:slug" do |year, month, slug|
-      STDERR.puts "Get a post"
-    	post = PosterousPost.from_slug(slug)
-    	STDERR.puts "Slug not found: #{slug}"
-    	not_found unless post
-    	@title = post.title
+    get %r{/(\d+)/(\d+)/(.*$)} do |year, month, slug|
+      puts "Blog post: #{params.inspect}"
+      begin
+    	  post = PosterousPost.from_slug(slug)
+    	  @title = post.title
+    	rescue Caboodle::PosterousPostNotFound
+    	  not_found unless post
+    	rescue Caboodle::PosterousProblem
+    	  post = nil
+    	end
     	haml :post, :locals => { :post => post }
     end
     
     menu "Blog", "/posterous" do
-      @posts = PosterousPost.all(:page=>(params[:page] || 1))
-      haml :posts.to_sym
+      begin
+        @posts = PosterousPost.all(:page=>(params[:page] || 1))
+      rescue Caboodle::PosterousProblem
+        @posts = nil
+        puts "Problem accessing posts on Posterous.com"
+      end
+      
+      haml :posts
     end
 
     stylesheets ["http://disqus.com/stylesheets/#{disqus}/disqus.css?v=2.0"] if disqus

data/lib/caboodle/kits/posterous/views/_post.haml

@@ -1,5 +1,5 @@
 - post = locals[:post]
-
+      
 %article.post.hentry.publish{:class=>post.semantic_tags}
   - if locals[:full]
 
@@ -18,8 +18,9 @@
       %a.url.fn.n{:href => "/about", :title => "About the author"}= Caboodle::Site.author
     %span.meta-sep.meta-sep-entry-date |
     %span.meta-prep.meta-prep-entry-date Published:
-    %span.entry-date
-      %abbr.published{:title => post.date.strftime("%d")}= post.date.strftime("%b")
+    - if post.date
+      %span.entry-date
+        %abbr.published{:title => post.date.strftime("%d")}= post.date.strftime("%b")
     %small
       %span.tag-links
         = post.linked_tags

data/lib/caboodle/kits/posterous/views/post.haml

@@ -1,9 +1,20 @@
 - if ENV["RACK_ENV"] == "development"
   :javascript
     var disqus_developer = true;
+
     
 %div.posterous
-  = haml :_post, :locals=>{:post=>post, :full=>true}, :layout=>false
+
+  - if post.nil?
+    %h3
+      Sorry, there's a problem communicating with Posterous.com
+    %p
+      You can view this post at
+      %a{:href=>"http://#{Site.posterous_sitename}.posterous.com/#{params[:slug]}"}
+        = posterous_sitename
+        on Posterous.com
+  - else      
+    = haml :_post, :locals=>{:post=>post, :full=>true}, :layout=>false
   - if Caboodle::Site.disqus
     #disqus_thread
     %script{:src => "http://disqus.com/forums/#{Caboodle::Site.disqus}/embed.js", :type => "text/javascript"}

data/lib/caboodle/kits/posterous/views/posts.haml

@@ -2,6 +2,11 @@
   - if defined?(@posts) && @posts.nil?
     %h3
       Sorry, there's a problem communicating with Posterous.com
+    %p
+      You can view all of the posts at
+      %a{:href=>"http://#{Caboodle::Site.posterous_sitename}.posterous.com"}
+        = Caboodle::Site.posterous_sitename
+        on Posterous.com
   - else
     - @posts.each do |post|
       - puts post.inspect

data/lib/caboodle/scrape.rb

@@ -1,10 +1,32 @@
 require 'nokogiri'
 require 'hashie'
 require 'net/http'
+require 'open-uri'
 
 module Caboodle
+  
+  def self.round_time(integer, factor)
+    return integer if(integer % factor == 0)
+    return integer - (integer % factor)
+  end
+  
   def self.scrape url
-    ::Nokogiri::HTML(Weary.get(url).perform_sleepily.body)
+    begin
+      if HAS_MEMCACHE
+        timeout = 60*60*1000
+        sleepy = Memcached.new
+        response = sleepy.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)
+      else
+        response = open(url).read
+      end
+      ::Nokogiri::HTML(response)
+    rescue Exception => e
+      puts e.inspect
+      ::Nokogiri::HTML("")
+    end
   end
   
   def self.mash req

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 2
-  - 25
-  version: 0.2.25
+  - 26
+  version: 0.2.26
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +01:00
+date: 2010-09-18 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency