caboodle 0.2.10 → 0.2.11

data/Rakefile

@@ -20,6 +20,7 @@ begin
     gem.add_dependency "nokogiri",">=1.4.0"
     gem.add_dependency "weary",">=0.7.2"
     gem.add_dependency "sleepy",">=0.1.4"
+    gem.add_dependency "tumblr-rb"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/caboodle/app/config/site.yml

@@ -6,4 +6,6 @@ kits:
 - Skimmed
 - Susy
 - Jquery
-- Gravatar
+- Gravatar
+- Lazyload
+- SEO

data/lib/caboodle/app/views/stylesheets/screen.scss

@@ -51,9 +51,6 @@ header#site-header {
       color: #ddd;
     }
   }
-  #access {
-    @include skip-link();
-  }
   nav {
     @include trailer(1,32px);
     @include prefix(2);
@@ -66,6 +63,10 @@ header#site-header {
   }
 }
 
+#access {
+  @include skip-link();
+}
+
 section#main {
   @include full;
   header#page_title

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

@@ -15,7 +15,6 @@ module Caboodle
       
         sites.each do |site|
           if site.url.include?("http://#{Caboodle::Site.posterous_sitename}.posterous.com")
-            puts "GOT SITE ID: #{site.id}"
             Caboodle::Site.posterous_site_id = site.id
           end
         end
@@ -105,6 +104,7 @@ module Caboodle
       a << "y#{date.year}"
       a << "m#{date.month}"
       a << "d#{date.day}"
+      a
     end
   
     def url
@@ -152,8 +152,10 @@ module Caboodle
       haml :posts.to_sym
     end
     
-    required [:posterous_sitename, :posterous_username, :posterous_password, :disqus]
-      
+    required [:posterous_sitename, :posterous_username, :posterous_password]
+    
+    optional [:disqus]
+    
     stylesheets ["http://disqus.com/stylesheets/#{Caboodle::Site.disqus}/disqus.css?v=2.0"]
      
     rss ["feed://stef.posterous.com/rss.xml"]

data/lib/caboodle/kits/seo/seo.rb

@@ -1,6 +1,6 @@
 module Caboodle
   class SEO < Caboodle::Kit
     add_to_layout "meta" => "<meta type='keywords' value='#{Caboodle::Site.seo_keywords}' /><meta type='description' value='#{Caboodle::Site.seo_description}' />"    
-    required [:seo_keywords,:seo_description]
+    optional [:seo_keywords,:seo_description]
   end
 end

data/lib/caboodle/kits/susy/susy.rb

@@ -13,13 +13,9 @@ module Caboodle
   class Susy < Caboodle::Kit
             
     get("/susy/:name.css") do
-      puts "*** root"
-      puts Caboodle::App.root
       content_type 'text/css', :charset => 'utf-8'
       sass_dir = File.expand_path(File.join(File.dirname(__FILE__),"views","susy"))
-      #puts sass_dir
       load_paths = [Caboodle::App.root, File.join(Caboodle::App.root,"views"), File.join(Caboodle::App.root,"views","stylesheets"), sass_dir] + ::Compass.sass_engine_options[:load_paths]
-      #puts load_paths.inspect
       Caboodle::Kits.each do |name|
         kit_name = name.to_s.split("::").last || name
         kit_name = kit_name.downcase
@@ -31,13 +27,11 @@ module Caboodle
       Caboodle::SASS.each do |s|
         the_sass << "\n"
         add_file = "@import \"#{s}\";"
-        puts add_file
         the_sass << add_file
       end
       
       opts = options.merge!(::Compass.sass_engine_options)
       opts[:load_paths] = load_paths
-      puts opts.inspect
       sass the_sass, opts
     end
 

data/lib/caboodle/kits/tumblr/tumblr.rb

@@ -0,0 +1,43 @@
+gem "tumblr-rb"
+require 'tumblr'
+
+module Caboodle
+  class Tumblr < Caboodle::Kit   
+     
+    helpers do
+      def semantic_date post
+        date = Date.parse(post.date)
+        a = []
+        a << "slug-#{post.slug}"
+        a << "y#{date.year}"
+        a << "m#{date.month}"
+        a << "d#{date.day}"
+        a.join(" ")
+      end
+    end
+     
+    required [:tumblr_email, :tumblr_password, :tumblr_sitename]
+    
+    menu "Tumblr", "/tumblr" do
+      puts "Get tumblr"
+      tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
+      req = tumblr.read(Caboodle::Site.tumblr_sitename, {:num=>10}).perform_sleepily
+      puts req.inspect
+      posts = ::Tumblr::Reader.get_posts(req)
+      puts posts.inspect
+
+      #posts = tumblr.get_posts(result)
+      haml :tumblr, :locals => { :posts => posts }
+    end
+    
+    get "/tumblr/page/:page" do
+      tumblr = ::Tumblr::Reader.new(Caboodle::Site.tumblr_email,Caboodle::Site.tumblr_password)
+      result
+      posts = tumblr.get_posts()
+      haml :tumblr, :locals => { :posts => posts }
+    end
+    
+    add_sass ["tumblr"]
+    
+  end
+end

data/lib/caboodle/kits/tumblr/views/_photo.haml

@@ -0,0 +1,5 @@
+- if post.click_through_url
+  %a{:href=>post.click_through_url}
+    %img{:src=>post.source}
+- else
+  %img{:src=>post.source}

data/lib/caboodle/kits/tumblr/views/tumblr.haml

@@ -0,0 +1,16 @@
+#tumblr.page
+  %section.tumblr_posts
+    - posts.each do |post|
+      %article{:id=>"tumblr_#{post.post_id}", :class=>"hentry tumblr_post #{post.format} #{post.type} #{post.slug} #{semantic_date(post)}"}
+        = haml :"_#{post.type}", :layout=>false, :locals=>{:post=>post}
+        %aside.entry-meta
+          %span.meta-prep.meta-prep-author By
+          %span.author.vcard
+            %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 => Date.parse(post.date).strftime("%d")}= Date.parse(post.date).strftime("%b")
+          %small
+            %span.tag-links
+              = post.type

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Stef Lewandowski
@@ -177,6 +177,20 @@ dependencies:
         version: 0.1.4
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: tumblr-rb
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
 description: Caboodle is a Rack and Sinatra-based framework for creating websites which combine information from various online services. There are Kits for many of the larger services, which provide a way to retrieve and display photos, videos, blog posts, status updates and so on. Caboodle normalises the display of all of these discrete Kits so that you can create a website which looks seamless but is made up of a variety of things from a variety of sources.
 email: stef@stef.io
 executables: 
@@ -277,6 +291,16 @@ files:
 - lib/caboodle/kits/susy/views/susy/ie.scss
 - lib/caboodle/kits/susy/views/susy/print.scss
 - lib/caboodle/kits/susy/views/susy/screen.scss
+- lib/caboodle/kits/tumblr/tumblr.rb
+- lib/caboodle/kits/tumblr/views/_audio.haml
+- lib/caboodle/kits/tumblr/views/_conversation.haml
+- lib/caboodle/kits/tumblr/views/_image.haml
+- lib/caboodle/kits/tumblr/views/_link.haml
+- lib/caboodle/kits/tumblr/views/_photo.haml
+- lib/caboodle/kits/tumblr/views/_quote.haml
+- lib/caboodle/kits/tumblr/views/_regular.haml
+- lib/caboodle/kits/tumblr/views/_video.haml
+- lib/caboodle/kits/tumblr/views/tumblr.haml
 - lib/caboodle/kits/twitter/public/images/ajax-loader.gif
 - lib/caboodle/kits/twitter/public/images/link.png
 - lib/caboodle/kits/twitter/twitter.rb