caboodle 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

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

@@ -37,7 +37,7 @@
       = before_header
       %header#site-header
         = above_header
-        - unless Caboodle::Site.logo_url.blank?
+        - unless Caboodle::Site.logo_url.to_s.blank?
           #logo
             %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
               %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
@@ -46,7 +46,7 @@
             %h1
               %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
                 = Caboodle::Site.title
-        - unless Caboodle::Site.description.blank?
+        - unless Caboodle::Site.description.to_s.blank?
           #site-description
             %h2= Caboodle::Site.description
         #access

data/lib/caboodle/command.rb

@@ -26,6 +26,10 @@ module Caboodle
           puts `git commit -m"kit:add #{args}" -a`
           puts `git push heroku master`
           puts "Done!"
+        when /kit:home/
+          if Caboodle::Kit.available_kits.include?(args.first.capitalize)
+            Caboodle::Site.home_kit = args.first.capitalize
+          end
         when /kit:remove/
           Caboodle::Kit.unload_kit args.first.capitalize
           puts "Pushing to Heroku"

data/lib/caboodle/config/defaults.yml

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

data/lib/caboodle/kit.rb

@@ -74,22 +74,18 @@ module Caboodle
         unless name.blank?
           kit_name = name.to_s.split("::").last || name
           kit_name = kit_name.downcase
-          puts "))) Loading Kit: #{kit_name}"
           orig = Caboodle.constants
           begin
             require "caboodle/kits/#{kit_name}/#{kit_name}" #rescue puts "Problem loading Kit: #{kit_name}"
             added = Caboodle.constants - orig
-            puts added
             added.each do |d| 
               c = Caboodle.const_get(d)
               if c.respond_to?(:is_a_caboodle_kit)
-                puts "*** Register #{c}"
                 c.register_kit
               end
             end
           rescue Exception=>e
             if ENV["RACK_ENV"] == "production"
-              puts e.inspect
               Caboodle::Errors << Hashie::Mash.new({:title=>"Failed to load #{name} kit", :reason=>e.backtrace})
             else
               raise e
@@ -152,7 +148,7 @@ module Caboodle
         if(Caboodle::Site.kits)
           Caboodle::Site.kits.each { |k| load_kit k }
         else
-          STDERR.puts "Kits not registered"
+          STDERR.puts "No kits to register"
         end
         Caboodle::Kits
       end
@@ -165,11 +161,13 @@ module Caboodle
         path = "/" if Site.home_kit == self.to_s.gsub("Caboodle::","")
         Caboodle::MenuItems << {:display=>display, :link=>path, :kit=>self}
         self.get path, &block
-        if Site.home_kit.blank?
-          Site.home_kit = name
-        end
+        @@has_menu = true
       end
-    
+      
+      def has_menu?
+        defined?(@@has_menu)
+      end
+      
       def required keys
         if keys.class == Array
           keys.each do |k| 
@@ -251,6 +249,10 @@ module Caboodle
         RequiredSettings[self.ancestors.first.to_s.split("::").last]
       end
     
+      def available_kits
+        Dir.new(File.join(File.dirname(__FILE__),"kits")).entries.delete_if{|a| a[0,1]=="."}
+      end
+      
       def start
         errors = []
         puts self.required_settings.inspect

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

@@ -1,4 +1,5 @@
 require "open-uri"
+require "nokogiri"
 
 module Caboodle
   
@@ -8,7 +9,7 @@ module Caboodle
       return Site.flickr_user_id unless Site.flickr_user_id.blank?
       unless Site.flickr_username.blank?
         url = "http://query.yahooapis.com/v1/public/yql?q=use%20%22http%3A%2F%2Fisithackday.com%2Fapi%2Fflickr.whois.xml%22%20as%20flickr.whois%3Bselect%20*%20from%20flickr.whois%20where%20owner%3D%22#{Site.flickr_username}%22&format=xml"
-        doc = Nokogiri::XML.parse(open(url).read)
+        doc = ::Nokogiri::XML.parse(open(url).read)
         val = doc.css("owner").first.attributes["nsid"].value
         Site.flickr_user_id = val
         Caboodle::Kit.dump_config

data/lib/caboodle/kits/standard/standard.rb

@@ -2,8 +2,10 @@ module Caboodle
   class Standard < Caboodle::Kit
     required [:title, :description, :logo_url, :author]
     
-    get "/" do
-      "The default home page"
+    if Caboodle::Site.home_kit.to_s.blank?   
+      get "/" do
+        haml :standard
+      end
     end
   end
 end

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

@@ -0,0 +1,25 @@
+#standard.page
+  %h2 
+    Welcome to Caboodle
+  
+  %h3 
+    Get started by adding Kits
+
+  %p
+    Add a Kit to your Caboodle by typing a command like this in your terminal:
+
+  %pre
+    caboodle kit:add flickr
+  
+  %p 
+    Then follow the on-screen commands. You can use any of the following: 
+  
+  %p
+    = Caboodle::Kit.available_kits.join(", ") 
+    \.
+    
+  %p
+    Set a home page Kit
+    
+  %pre
+    caboodle kit:home flickr

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - steflewandowski
@@ -314,6 +314,7 @@ files:
 - lib/caboodle/kits/soundcloud/soundcloud.rb
 - lib/caboodle/kits/soundcloud/views/soundcloud.haml
 - lib/caboodle/kits/standard/standard.rb
+- lib/caboodle/kits/standard/views/standard.haml
 - lib/caboodle/kits/susy/susy.rb
 - lib/caboodle/kits/susy/views/susy/_base.scss
 - lib/caboodle/kits/susy/views/susy/_defaults.scss