caboodle 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

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

@@ -1,4 +1,5 @@
-:kits:
-  - Flickr
-  - Linkedin
-  - Posterous
+kits:
+- Flickr
+- Linkedin
+- Posterous
+- Skimmed

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"}/
+    = Caboodle::Site.meta
     
     %title= @title || Caboodle::Site.title
     %link{:href => "/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}/
@@ -18,49 +19,71 @@
     - Caboodle::Javascripts.each do |js|
       %script{:charset => "utf-8", :src => js, :type => "text/javascript"}
 
-    / - content_for :javascripts do
-    /   
-    / 
-    /     = yield_content :some_key
+    = Caboodle::Site.head
     
-        
-  %body.sinatra.ruby
+  %body.caboodle.sinatra.ruby
+    = Caboodle::Site.before_page
     #page.hfeed
+      = Caboodle::Site.before_header
       %header#site-header
-        #logo
-          %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
-            %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
-        #site-title
-          %h1
+        = Caboodle::Site.above_header
+        - if Caboodle::Site.logo_url
+          #logo
             %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
-              = Caboodle::Site.title
-        #site-description
-          %h2= Caboodle::Site.description
-        #access
-          .skip-link
-            %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
-        %nav
-          %ul
-            %li
-              %a{:href=>"/"}
-                = Caboodle::Site.home_title
-            - Caboodle::MenuItems.each do |p|
+              %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
+        - if Caboodle::Site.title
+          #site-title
+            %h1
+              %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
+                = Caboodle::Site.title
+        - if Caboodle::Site.description
+          #site-description
+            %h2= Caboodle::Site.description
+        - if Caboodle::Site.has_access
+          #access
+            .skip-link
+              %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
+        
+        - if Caboodle::MenuItems.size > 0
+          = Caboodle::Site.before_nav
+          %nav
+            %ul
               %li
-                %a{:href=>p[:link]}
-                  = p[:display]
-                
+                %a{:href=>"/"}
+                  = Caboodle::Site.home_title
+              - Caboodle::MenuItems.each do |p|
+                %li
+                  %a{:href=>p[:link]}
+                    = p[:display]
+            
+        = Caboodle::Site.below_header
+      = Caboodle::Site.after_header
+      = Caboodle::Site.before_main
       %section#main
         - if @title
           %header#page_title
             %h1
               = @title
+        = Caboodle::Site.before_content
         %section#content
+          = Caboodle::Site.above_content
           = yield
+          = Caboodle::Site.below_content
+        = Caboodle::Site.after_content
+      = Caboodle::Site.after_main
+      = Caboodle::Site.before_footer
       %footer#footer
-        %p
-          \© 
-          = Caboodle::Site.author
-          |
-          Powered by 
-          %a{:href=>"http://github.com/steflewandowski/caboodle"}
-            Caboodle
+        = Caboodle::Site.above_footer
+        - if Caboodle::Site.has_footer
+          %p
+            \© 
+            = Caboodle::Site.author
+            - if Caboodle::Site.has_caboodle_link
+              |
+              Powered by 
+              %a{:href=>"http://github.com/steflewandowski/caboodle"}
+                Caboodle
+        = Caboodle::Site.below_footer     
+      = Caboodle::Site.after_footer
+    = Caboodle::Site.after_page
+  = Caboodle::Site.after_body

data/lib/caboodle/command.rb

@@ -13,7 +13,6 @@ module Caboodle
           puts `cd #{args.first} && cp #{File.expand_path(File.join(File.dirname(__FILE__), 'app'))}/.gems .`
           puts `cd #{args.first} && git init`
           puts `cd #{args.first} && git add .`
-          puts `bundle install`
           puts `cd #{args.first} && git commit -m"initial setup"`
           puts `cd #{args.first} && heroku create #{args.first}`
           puts `cd #{args.first} && git push heroku master`

data/lib/caboodle/config.rb

@@ -1,12 +1,12 @@
-module Caboodle
-  MenuItems = []
-  Defaults = Hashie::Mash.new()
-  Site = Defaults.clone
-  RequiredSettings = Hashie::Mash.new()
+module Caboodle  
   Kits = []
+  MenuItems = []
   Javascripts = []
   Stylesheets = []
+  Defaults = Hashie::Mash.new()
+  RequiredSettings = Hashie::Mash.new()
+  Site = Defaults.clone
   Site.required_settings = []
   Site.kits = [] unless Site.kits
-  Defaults.merge!(Hashie::Mash.new(YAML.load_file(File.join( File.join(File.dirname(__FILE__), 'defaults.yml')))))
+  Defaults.merge!(Hashie::Mash.new(YAML.load_file(File.join( File.join(File.dirname(__FILE__), 'config','defaults.yml')))))
 end

data/lib/caboodle/config/defaults.yml

@@ -0,0 +1,4 @@
+home_title: Blog
+skimmed: abc123
+has_footer: true
+has_caboodle_link: true

data/lib/caboodle/kit.rb

@@ -11,8 +11,6 @@ module Caboodle
 
     template :layout do
       @@template ||= File.open(File.join(File.dirname(__FILE__),"app","views","layout.haml")).read
-      puts @@template.inspect
-      @@template
     end
     
     class << self
@@ -29,7 +27,7 @@ module Caboodle
       end
 
       def dump_config
-        p = File.expand_path(File.join(Caboodle::App.root,"site.yml"))
+        p = File.expand_path(File.join(Caboodle::App.root,"config","site.yml"))
         d = Caboodle::Site.clone
         e = d.to_hash
         e.delete("required_settings")
@@ -43,11 +41,11 @@ module Caboodle
       
       def load_kit name
         unless name.blank?
-          puts "Load kit #{name}"
           kit_name = name.to_s.split("::").last || name
           kit_name = kit_name.downcase
+          puts "Loading Kit: #{kit_name}"
           orig = Caboodle.constants
-          require "caboodle/kits/#{kit_name}/#{kit_name}" rescue puts "No such kit: #{kit_name}"
+          require "caboodle/kits/#{kit_name}/#{kit_name}" rescue puts "Warning! No such kit: #{kit_name}"
           added = Caboodle.constants - orig
           added.each do |d| 
             c = Caboodle.const_get(d)
@@ -73,19 +71,14 @@ module Caboodle
     
       def require_all
         if(Caboodle::Site.kits)
-          Caboodle::Site.kits.each do |k|
-            puts "Load Kit: #{k}"
-            load_kit k
-          end
+          Caboodle::Site.kits.each { |k| load_kit k }
         else
-          puts "Kits not registered"
+          STDERR.puts "Kits not registered"
         end
       end
     
       def use_all
-        Caboodle::Kits.each do |p|
-          p.start
-        end
+        Caboodle::Kits.each { |p| p.start }
       end
     
       def menu display, link
@@ -103,16 +96,12 @@ module Caboodle
       end
       
       def stylesheets array_of_css_files
-        array_of_css_files.each do |a|
-          Caboodle::Stylesheets << a
-        end
+        array_of_css_files.each { |a| Caboodle::Stylesheets << a }
         Caboodle::Stylesheets.uniq!
       end
       
       def javascripts array_of_js_files
-        array_of_js_files.each do |a|
-          Caboodle::Javascripts << a
-        end
+        array_of_js_files.each { |a| Caboodle::Javascripts << a }
         Caboodle::Javascripts.uniq!
       end
       

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

@@ -35,6 +35,7 @@ module Caboodle
   class Flickr < Caboodle::Kit
     
     set :views, File.join(File.dirname(__FILE__), "views")
+    set :public, File.join(File.dirname(__FILE__), "public")
     
     def home
       @photosets = FlickrAPI.photosets rescue []
@@ -54,10 +55,6 @@ module Caboodle
       haml :photography
     end
     
-    get "/galleria.js" do
-      send_file File.join(File.dirname(__FILE__),"galleria.noconflict.min.js")
-    end
-    
     required [:flickr_username, :flickr_user_id, :flickr_api_key]
     
     menu "Photography", "/photography"

data/lib/caboodle/kits/skimmed/skimmed.rb

@@ -0,0 +1,4 @@
+class Skimmed < Caboodle::Kit
+  javascripts ["http://skimlinks.com/js/#{Caboodle::Site.skimmed}.js"]
+  required [:skimmed]
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - steflewandowski
@@ -273,9 +273,10 @@ files:
 - lib/caboodle/app/views/layout.haml
 - lib/caboodle/command.rb
 - lib/caboodle/config.rb
+- lib/caboodle/config/defaults.yml
 - lib/caboodle/kit.rb
 - lib/caboodle/kits/flickr/flickr.rb
-- lib/caboodle/kits/flickr/galleria.noconflict.min.js
+- lib/caboodle/kits/flickr/public/galleria.noconflict.min.js
 - lib/caboodle/kits/flickr/views/photography.haml
 - lib/caboodle/kits/github/github.rb
 - lib/caboodle/kits/github/views/_repo.haml
@@ -298,6 +299,7 @@ files:
 - lib/caboodle/kits/posterous/views/_post.haml
 - lib/caboodle/kits/posterous/views/post.haml
 - lib/caboodle/kits/posterous/views/posts.haml
+- lib/caboodle/kits/skimmed/skimmed.rb
 - lib/caboodle/kits/soundcloud/soundcloud.rb
 - lib/caboodle/kits/soundcloud/views/soundcloud.haml
 - lib/caboodle/kits/twitter/public/images/ajax-loader.gif