caboodle 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/caboodle/app.rb

@@ -1,5 +1,4 @@
 module Caboodle
-  
   class App < Sinatra::Base
     register Sinatra::Compass
       
@@ -22,9 +21,7 @@ module Caboodle
       if File.exists?(config_path)
         Caboodle::Kit.load_config(config_path)
         Caboodle::Kit.setup
-      end
-      
-      puts Caboodle::Site.inspect
+      end      
     end
     # get '/:kit/stylesheet.css' do
     #   header 'Content-Type' => 'text/css; charset=utf-8'

data/lib/caboodle/app/views/layout.haml

@@ -3,6 +3,7 @@
   %head{:profile => "http://gmpg.org/xfn/11"}
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "content-type"}/
     %meta{:content => "index,follow", :name => "robots"}/
+    %meta{:content => "Caboodle", :name => "generator"}/
     
     = meta
     
@@ -20,8 +21,13 @@
     - Caboodle::Javascripts.each do |js|
       %script{:charset => "utf-8", :src => js, :type => "text/javascript"}
 
+    - Caboodle::RSS.each do |rss|
+      %link{:href => rss, :rel => "alternate", :type => "application/rss+xml"}/
+    
     = head
     
+    = root
+    
   %body.caboodle
     = before_page
     #page.hfeed
@@ -37,7 +43,7 @@
             %h1
               %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
                 = Caboodle::Site.title
-        - if description
+        - if Caboodle::Site.description
           #site-description
             %h2= Caboodle::Site.description
         #access
@@ -47,15 +53,18 @@
         - if Caboodle::MenuItems.size > 0
           = before_nav
           %nav
+            = above_nav
             %ul
-              %li
-                %a{:href=>"/"}
-                  = Caboodle::Site.home_title
               - Caboodle::MenuItems.each do |p|
                 %li
+                  = above_nav_item
                   %a{:href=>p[:link]}
+                    = above_nav_item_title
                     = p[:display]
-            
+                    = below_nav_item_title
+                  = below_nav_item
+            = below_nav
+          = after_nav
         = below_header
       = after_header
       = before_main
@@ -70,6 +79,13 @@
           = yield
           = below_content
         = after_content
+        - if credit
+          = before_credit
+          %section#credit
+            = above_credit
+            = credit
+            = below_credit
+          = after_credit
       = after_main
       = before_footer
       %footer#footer

data/lib/caboodle/config.rb

@@ -3,6 +3,8 @@ module Caboodle
   MenuItems        = []
   Javascripts      = []
   Stylesheets      = []
+  RSS              = []
+  
   Defaults         = Hashie::Mash.new(Hashie::Mash.new(YAML.load_file(File.join(File.dirname(__FILE__), 'config','defaults.yml'))))
   RequiredSettings = Hashie::Mash.new()
   Layout           = Hashie::Mash.new()
@@ -10,5 +12,4 @@ module Caboodle
   
   Site.required_settings = []
   Site.kits = [] unless Site.kits
-  puts Site.inspect
 end

data/lib/caboodle/config/defaults.yml

@@ -1,4 +1,5 @@
 home_title: Blog
+home_kit: Posterous
 skimmed: abc123
 has_footer: true
 has_caboodle_link: true

data/lib/caboodle/helpers.rb

@@ -5,6 +5,10 @@ module Sinatra
       Caboodle::Layout[arg]
     end
     
+    def credit
+      #Caboodle::Kit.credit
+    end
+    
   end
   helpers CaboodleHelpers
 end

data/lib/caboodle/kit.rb

@@ -59,7 +59,7 @@ module Caboodle
           kit_name = kit_name.downcase
           puts "Loading Kit: #{kit_name}"
           orig = Caboodle.constants
-          require "caboodle/kits/#{kit_name}/#{kit_name}" rescue puts "Problem loading Kit: #{kit_name}"
+          require "caboodle/kits/#{kit_name}/#{kit_name}" #rescue puts "Problem loading Kit: #{kit_name}"
           added = Caboodle.constants - orig
           added.each do |d| 
             c = Caboodle.const_get(d)
@@ -77,7 +77,7 @@ module Caboodle
           kit_name = kit_name.downcase
           puts "Loading Kit: #{kit_name}"
           orig = Caboodle.constants
-          require "caboodle/kits/#{kit_name}/#{kit_name}" rescue puts "Problem loading Kit: #{kit_name}"
+          require "caboodle/kits/#{kit_name}/#{kit_name}" #rescue puts "Problem loading Kit: #{kit_name}"
           added = Caboodle.constants - orig
           added.each do |d| 
             c = Caboodle.const_get(d)
@@ -101,12 +101,14 @@ module Caboodle
         Site.kits << self.to_s.split("::").last
         Site.kits.uniq!
         Caboodle::Kits << self
+        Caboodle::Kits
       end
       
       def unregister
         Caboodle::Kits.delete(self)
         Caboodle::Site.kits.delete(self.to_s)
         Caboodle::Kit.dump_config
+        Caboodle::Kits
       end      
     
       def require_all
@@ -115,14 +117,17 @@ module Caboodle
         else
           STDERR.puts "Kits not registered"
         end
+        Caboodle::Kits
       end
     
       def use_all
         Caboodle::Kits.each { |p| p.start }
       end
     
-      def menu display, link
-        Caboodle::MenuItems << {:display=>display, :link=>link}
+      def menu display, path, &block
+        path = "/" if Site.home_kit == self.to_s.gsub("Caboodle::","")
+        Caboodle::MenuItems << {:display=>display, :link=>path}
+        self.get path, &block
       end
     
       def required keys
@@ -133,18 +138,40 @@ module Caboodle
         else
           self.required_settings << keys
         end
+        self.required_settings
       end
       
       def stylesheets array_of_css_files
-        array_of_css_files.each { |a| Caboodle::Stylesheets << a }
+        if array_of_css_files.class == Array
+          array_of_css_files.each { |a| Caboodle::Stylesheets << a.to_s }
+        else
+          Caboodle::Stylesheets << array_of_css_files.to_s
+        end
         Caboodle::Stylesheets.uniq!
       end
       
+      alias_method :stylesheet, :stylesheets
+      
       def javascripts array_of_js_files
-        array_of_js_files.each { |a| Caboodle::Javascripts << a }
+        if array_of_js_files.class == Array
+          array_of_js_files.each { |a| Caboodle::Javascripts << a.to_s }
+        else
+          Caboodle::Javascripts << array_of_js_files.to_s
+        end
         Caboodle::Javascripts.uniq!
       end
       
+      alias_method :javascript, :javascripts
+      
+      def rss array_of_feeds
+        if array_of_feeds.class == Array
+          array_of_feeds.each { |a| Caboodle::RSS << a.to_s }
+        else
+          Caboodle::RSS << array_of_feeds.to_s
+        end
+        Caboodle::RSS.uniq!
+      end
+      
       def add_to_layout hash_of_items
         hash_of_items.each do |k,v|
           unless Caboodle::Layout[k.to_sym].blank?
@@ -162,6 +189,10 @@ module Caboodle
           hash.each {|k,v| Site[k] = v }
         end
       end
+      
+      def original url
+        set :credit, "<a href='#{url}' rel='me'>via #{self.class.name.split("::").last}</a>"
+      end
     
       def required_settings
         r = RequiredSettings[self.ancestors.first.to_s.split("::").last] ||= [:title, :description, :logo_url, :author] 

data/lib/caboodle/kits/flickr/flickr.rb

@@ -44,16 +44,12 @@ module Caboodle
 
   class Flickr < Caboodle::Kit
     
-    def home
+    menu "Photography", "/photography" do
       @photosets = FlickrAPI.photosets rescue []
       @title = "Photography"
       haml :photography
     end
     
-    get "/photography" do
-      home
-    end
-    
     get "/photography/:set_id" do |set_id|
       @photosets = FlickrAPI.photosets rescue []
       @set_id = set_id
@@ -64,6 +60,8 @@ module Caboodle
     
     required [:flickr_username, :flickr_api_key]
     
-    menu "Photography", "/photography"
+    javascripts ["/galleria.noconflict.min.js"]
+    
+    original "http://flickr.com/#{Caboodle::Site.flickr_username}"
   end
 end

data/lib/caboodle/kits/flickr/public/galleria.noconflict.min.js

@@ -1,4 +1,4 @@
-$j=jQuery.noConflict();$j(function(){var $$;$$=$j.fn.galleria=function($options){if(!$$.hasCSS()){return false;}
+$j=jQuery;$j(function(){var $$;$$=$j.fn.galleria=function($options){if(!$$.hasCSS()){return false;}
 $j.historyInit($$.onPageLoad);var $defaults={insert:'.galleria_container',history:true,clickNext:true,onImage:function(image,caption,thumb){},onThumb:function(thumb){}};var $opts=$j.extend($defaults,$options);for(var i in $opts){if(i){$j.galleria[i]=$opts[i];}}
 var _insert=($j($opts.insert).is($opts.insert))?$j($opts.insert):jQuery(document.createElement('div')).insertBefore(this);var _div=$j(document.createElement('div')).addClass('galleria_wrapper');var _span=$j(document.createElement('span')).addClass('caption');_insert.addClass('galleria_container').append(_div).append(_span);return this.each(function(){$j(this).addClass('galleria');$j(this).children('li').each(function(i){var _container=$j(this);var _o=$j.meta?$j.extend({},$opts,_container.data()):$opts;_o.clickNext=$j(this).is(':only-child')?false:_o.clickNext;var _a=$j(this).find('a').is('a')?$j(this).find('a'):false;var _img=$j(this).children('img').css('display','none');var _src=_a?_a.attr('href'):_img.attr('src');var _title=_a?_a.attr('title'):_img.attr('title');var _loader=new Image();if(_o.history&&(window.location.hash&&window.location.hash.replace(/\#/,'')==_src)){_container.siblings('.active').removeClass('active');_container.addClass('active');}
 $j(_loader).load(function(){$j(this).attr('alt',_img.attr('alt'));var _thumb=_a?_a.find('img').addClass('thumb noscale').css('display','none'):_img.clone(true).addClass('thumb').css('display','none');if(_a){_a.replaceWith(_thumb);}

data/lib/caboodle/kits/flickr/views/photography.haml

@@ -4,8 +4,6 @@
       Sorry - there was a problem communicating with Flickr
 - else
 
-  %script{:charset => "utf-8", :src => "/galleria.js", :type => "text/javascript"}
-
   :javascript
     jQuery(document).ready(function(){
 	

data/lib/caboodle/kits/github/github.rb

@@ -1,7 +1,7 @@
 module Caboodle
   class Github < Caboodle::Kit
         
-    get "/code" do
+    menu "Code", "/code" do
       @title = "Code"
       @repos = GithubAPI.repositories
       
@@ -15,11 +15,11 @@ module Caboodle
       haml :github
     end
     
-    menu "Code", "/code"
-    
     required [:github_username]
     
     defaults []
+    
+    original "http://gitbhu.com/#{Site.github_username}"
   end
 
   class GithubAPI < Weary::Base

data/lib/caboodle/kits/lazyload/public/lazyload.js

@@ -1,3 +1,5 @@
-$("img").lazyload({ 
-  effect : "fadeIn"
+jQuery(document).ready(function(){
+  $("img").lazyload({ 
+    effect : "fadeIn"
+  });
 });

data/lib/caboodle/kits/linkedin/linkedin.rb

@@ -16,14 +16,14 @@ module Caboodle
 
   class Linkedin < Caboodle::Kit
         
-    get "/cv" do
+    menu "CV", "/cv" do
       @title = "Curriculum Vitae"
       @linkedin = LinkedinAPI.new #rescue nil
       haml :cv
     end
     
-    menu "CV", "/cv"
-    
     required [:linkedin_full_name, :linkedin_profile_url]
+    
+    original Caboodle::Site.linkedin_profile_url
   end
 end

data/lib/caboodle/kits/onepage/onepage.rb

@@ -1,13 +1,13 @@
 module Caboodle
   class Onepage < Caboodle::Kit
         
-    get "/contact" do
+    menu "Contact", "/contact" do
       @title = "Contact"
       haml :contact
     end
     
-    menu "Contact", "/contact"
-    
     required [:onepage_username]
+    
+    original "http://myonepage.com/#{Caboodle::Site.onepage_username}"
   end
 end

data/lib/caboodle/kits/portfolio/portfolio.rb

@@ -11,11 +11,10 @@ module Caboodle
       end
     end
         
-    get "/portfolio" do
+    menu "Portfolio", "/portfolio" do
       @title = "Portfolio"
       haml :portfolio
     end
     
-    menu "Portfolio", "/portfolio"
   end
 end

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

@@ -147,7 +147,7 @@ module Caboodle
     	haml :post, :locals => { :post => post }
     end
     
-    get "/" do
+    menu "Blog", "/blog" do
       @posts = Post.all(:page=>(params[:page] || 1))
       haml :posts.to_sym
     end
@@ -155,6 +155,10 @@ module Caboodle
     required [:posterous_sitename, :posterous_username, :posterous_password, :disqus]
       
     stylesheets ["http://disqus.com/stylesheets/#{Caboodle::Site.disqus}/disqus.css?v=2.0"]
+     
+    rss ["feed://stef.posterous.com/rss.xml"]
+    
+    original "http://#{Caboodle::Site.posterous_sitename}.posterous.com"
   end
 end
 

data/lib/caboodle/kits/soundcloud/soundcloud.rb

@@ -1,14 +1,12 @@
 module Caboodle
   class Soundcloud < Caboodle::Kit
     
-    get "/mixes" do
+    menu "Mixes", "/mixes" do
       @title = "Mixes"
       @mixes = SoundcloudAPI.sets
       haml :soundcloud
     end
-    
-    menu "Mixes", "/mixes"
-    
+
     required [:soundcloud_query]
   end
 

data/lib/caboodle/kits/twitter/twitter.rb

@@ -1,13 +1,13 @@
 module Caboodle
   class Twitter < Caboodle::Kit
     
-    get "/twitter" do
+    menu "Twitter", "/twitter" do
       @title = "Twitter"
       haml :twitter
     end
     
-    menu "Twitter", "/twitter"
-    
     required [:twitter_username]
+    
+    original "http://twitter.com/#{Caboodle::Site.twitter_username}"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - steflewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 +01:00
+date: 2010-08-15 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency