caboodle 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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

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

data/lib/caboodle/command.rb

@@ -16,7 +16,6 @@ module Caboodle
           puts `cd #{args.first} && git add .`
           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`
           
         when /kit:add/
           Caboodle::Kit.load_kit args.first.capitalize

data/lib/caboodle/kit.rb

@@ -74,14 +74,16 @@ module Caboodle
         unless name.blank?
           kit_name = name.to_s.split("::").last || name
           kit_name = kit_name.downcase
-          puts "Loading Kit: #{kit_name}"
+          puts "))) Loading Kit: #{kit_name}"
           orig = Caboodle.constants
           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)
-              c.register 
+              puts "*** Register #{c}"
+              c.register_kit
             end
           end
         end
@@ -92,36 +94,42 @@ module Caboodle
         unless name.blank?
           kit_name = name.to_s.split("::").last || name
           kit_name = kit_name.downcase
-          puts "Loading Kit: #{kit_name}"
+          puts "Unloading Kit: #{kit_name}"
           orig = Caboodle.constants
           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)
             if c.respond_to?(:is_a_caboodle_kit)
-              c.unregister 
+              c.unregister_kit
             end
           end
         end
         Caboodle::Kits
       end
       
-      def register
+      def name
+        self.to_s.split("::").last
+      end
+      
+      def register_kit
         required_settings.each do |r|
-          unless Caboodle::Site[r]
+          puts "checking #{r}"
+          puts "value: #{Caboodle::Site[r]}"
+          if Caboodle::Site[r].blank?
             puts "Please set a value for #{r}:"
             v = STDIN.gets
             Caboodle::Site[r] = v
             Caboodle::Kit.dump_config
           end
         end
-        Site.kits << self.to_s.split("::").last
+        Site.kits << name
         Site.kits.uniq!
         Caboodle::Kits << self
         Caboodle::Kits
       end
       
-      def unregister
+      def unregister_kit
         Caboodle::Kits.delete(self)
         Caboodle::Site.kits.delete(self.to_s)
         Caboodle::Kit.dump_config
@@ -145,6 +153,9 @@ 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
       end
     
       def required keys

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

@@ -1,14 +1,18 @@
+require "open-uri"
+
 module Caboodle
   
   class FlickrAPI < Weary::Base
   
     def self.flickr_user_id
       return Site.flickr_user_id unless Site.flickr_user_id.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))
-      val = doc.css("owner").first.attributes["nsid"].value
-      Site.flickr_user_id = val
-      Caboodle::Kit.dump_config
+      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)
+        val = doc.css("owner").first.attributes["nsid"].value
+        Site.flickr_user_id = val
+        Caboodle::Kit.dump_config
+      end
       Site.flickr_user_id
     end
     
@@ -45,17 +49,25 @@ module Caboodle
   class Flickr < Caboodle::Kit
     
     menu "Photography", "/photography" do
-      @photosets = FlickrAPI.photosets rescue []
-      @title = "Photography"
-      haml :photography
+      unless Site.flickr_user_id.blank?
+        @photosets = FlickrAPI.photosets rescue []
+        @title = "Photography"
+        haml :photography
+      else
+        "<h2>Please set your Flickr username</h2>"
+      end
     end
     
     get "/photography/:set_id" do |set_id|
-      @photosets = FlickrAPI.photosets rescue []
-      @set_id = set_id
-      @photoset = Caboodle::FlickrAPI.photoset_info(@set_id) rescue nil
-      @title = "Photography: #{@photoset.title if @photoset.respond_to?(:title)}"
-      haml :photography
+      unless Site.flickr_user_id.blank?
+        @photosets = FlickrAPI.photosets rescue []
+        @set_id = set_id
+        @photoset = Caboodle::FlickrAPI.photoset_info(@set_id) rescue nil
+        @title = "Photography: #{@photoset.title if @photoset.respond_to?(:title)}"
+        haml :photography
+      else
+        "<h2>Please set your Flickr username</h2>"
+      end
     end
     
     required [:flickr_username, :flickr_api_key]

data/lib/caboodle/kits/history/config/history.yml

@@ -1,4 +1,4 @@
-:portfolio_years:
+:history_years:
   2010:
     - 
       title: Something I did

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - steflewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +01:00
+date: 2010-08-24 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency