chef-server-webui 0.8.16 → 0.9.0.a3

data/app/controllers/cookbook_definitions.rb

@@ -19,7 +19,7 @@
 
 require 'chef' / 'mixin' / 'checksum'
 
-class ChefServerWebui::CookbookDefinitions < ChefServerWebui::Application
+class CookbookDefinitions < Application
   
   provides :html
 

data/app/controllers/cookbook_files.rb

@@ -21,7 +21,7 @@ require 'chef' / 'mixin' / 'checksum'
 require 'chef' / 'cookbook_loader'
 require 'chef' / 'mixin' / 'find_preferred_file'
 
-class ChefServerWebui::CookbookFiles < ChefServerWebui::Application
+class CookbookFiles < Application
   
   provides :html
   before :login_required 

data/app/controllers/cookbook_libraries.rb

@@ -20,7 +20,7 @@
 require 'chef' / 'mixin' / 'checksum'
 require 'chef' / 'cookbook_loader'
 
-class ChefServerWebui::CookbookLibraries < ChefServerWebui::Application
+class CookbookLibraries < Application
   
   provides :html
   before :login_required 

data/app/controllers/cookbook_recipes.rb

@@ -19,7 +19,7 @@
 
 require 'chef' / 'mixin' / 'checksum'
 
-class ChefServerWebui::CookbookRecipes < ChefServerWebui::Application
+class CookbookRecipes < Application
   
   provides :html
   before :login_required 

data/app/controllers/cookbook_templates.rb

@@ -21,7 +21,7 @@ require 'chef' / 'mixin' / 'checksum'
 require 'chef' / 'cookbook_loader'
 require 'chef' / 'mixin' / 'find_preferred_file'
 
-class ChefServerWebui::CookbookTemplates < ChefServerWebui::Application
+class CookbookTemplates < Application
   
   provides :html
   before :login_required 

data/app/controllers/cookbooks.rb

@@ -20,10 +20,16 @@
 
 require 'chef' / 'cookbook_loader'
 
-class ChefServerWebui::Cookbooks < ChefServerWebui::Application
+class Cookbooks < Application
   
   provides :html, :json
-  before :login_required 
+  before :login_required
+  before :params_helper
+  
+  attr_reader :cookbook_id
+  def params_helper
+    @cookbook_id = params[:id] || params[:cookbook_id]
+  end
   
   def index
     @cl = begin
@@ -38,7 +44,19 @@ class ChefServerWebui::Cookbooks < ChefServerWebui::Application
 
   def show
     begin
-      @cookbook = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("cookbooks/#{params[:id]}")
+      # array of versions, sorted from large to small e.g. ["0.20.0", "0.1.0"]
+      versions = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("cookbooks/#{cookbook_id}")[cookbook_id].sort!{|x,y| y <=> x }      
+      # if version is not specified in the url, get the most recent version, otherwise get the specified version
+      version = if params[:cb_version].nil? || params[:cb_version].empty?
+                  versions.first
+                else
+                  params[:cb_version]
+                end
+                
+      @cookbook = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("cookbooks/#{cookbook_id}/#{version}")
+      
+      # by default always show the largest version number (assuming largest means most recent)
+      @other_versions = versions - [version]
       raise NotFound unless @cookbook
       display @cookbook
     rescue => e

data/app/controllers/databag_items.rb

@@ -18,7 +18,7 @@
 
 require 'chef' / 'data_bag_item'
 
-class ChefServerWebui::DatabagItems < ChefServerWebui::Application
+class DatabagItems < Application
   
   provides :html, :json
   before :login_required 
@@ -41,7 +41,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       @databag_item.raw_data = JSON.parse(params[:json_data])
       raise ArgumentError, "Updating id is not allowed" unless @databag_item.raw_data['id'] == params[:id] #to be consistent with other objects, changing id is not allowed.
       @databag_item.save
-      redirect(slice_url(:databag_databag_items, :databag_id => params[:databag_id], :id => @databag_item.name), :message => { :notice => "Updated Databag Item #{@databag_item.name}" })
+      redirect(url(:databag_databag_items, :databag_id => params[:databag_id], :id => @databag_item.name), :message => { :notice => "Updated Databag Item #{@databag_item.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = { :error => "Could not update the databag item" }
@@ -63,7 +63,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       @databag_item.data_bag @databag_name
       @databag_item.raw_data = JSON.parse(params[:json_data])
       @databag_item.create
-      redirect(slice_url(:databag_databag_items, :databag_id => @databag_name), :message => { :notice => "Databag item created successfully" })
+      redirect(url(:databag_databag_items, :databag_id => @databag_name), :message => { :notice => "Databag item created successfully" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = { :error => "Could not create databag item" } 
@@ -84,7 +84,7 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
       display @databag_item
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      redirect(slice_url(:databag_databag_items), {:message => { :error => "Could not show the databag item" }, :permanent => true})
+      redirect(url(:databag_databag_items), {:message => { :error => "Could not show the databag item" }, :permanent => true})
     end 
   end
   
@@ -92,10 +92,10 @@ class ChefServerWebui::DatabagItems < ChefServerWebui::Application
     begin
       @databag_item = Chef::DataBagItem.new
       @databag_item.destroy(databag_id, item_id)
-      redirect(slice_url(:databag_databag_items), {:message => { :notice => "Databag item deleted successfully" }, :permanent => true})
+      redirect(url(:databag_databag_items), {:message => { :notice => "Databag item deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      redirect(slice_url(:databag_databag_items), {:message => { :error => "Could not delete databag item" }, :permanent => true})
+      redirect(url(:databag_databag_items), {:message => { :error => "Could not delete databag item" }, :permanent => true})
     end 
   end 
   

data/app/controllers/databags.rb

@@ -18,7 +18,7 @@
 
 require 'chef' / 'data_bag'
 
-class ChefServerWebui::Databags < ChefServerWebui::Application
+class Databags < Application
   
   provides :html, :json
   before :login_required 
@@ -33,7 +33,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
       @databag = Chef::DataBag.new
       @databag.name params[:name]
       @databag.create
-      redirect(slice_url(:databags), :message => { :notice => "Created Databag #{@databag.name}" })
+      redirect(url(:databags), :message => { :notice => "Created Databag #{@databag.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = { :error => "Could not create databag" } 
@@ -71,7 +71,7 @@ class ChefServerWebui::Databags < ChefServerWebui::Application
     begin
       r = Chef::REST.new(Chef::Config[:chef_server_url])
       r.delete_rest("data/#{params[:id]}")
-      redirect(absolute_slice_url(:databags), {:message => { :notice => "Data bag #{params[:id]} deleted successfully" }, :permanent => true})
+      redirect(absolute_url(:databags), {:message => { :notice => "Data bag #{params[:id]} deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @databags = Chef::DataBag.list

data/app/controllers/main.rb

@@ -1,4 +1,4 @@
-class ChefServerWebui::Main < ChefServerWebui::Application
+class Main < Application
   
   def index
     render

data/app/controllers/nodes.rb

@@ -20,32 +20,32 @@
 
 require 'chef' / 'node'
 
-class ChefServerWebui::Nodes < ChefServerWebui::Application
+class Nodes < Application
   
   provides :html
   
   before :login_required
-  before :authorized_node, :only => [ :update, :destroy ]
   
   def index
-    @node_list =  begin
-                    Chef::Node.list 
-                  rescue => e
-                    Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-                    @_message = {:error => "Could not list nodes"}
-                    {}
-                  end 
+    begin
+      node_hash = Chef::Node.list
+      @node_list = node_hash.keys.sort_by {|a,b| node_hash[a] <=> node_hash[b]}
+    rescue => e
+      Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
+      @_message = {:error => "Could not list nodes"}
+      @node_hash = {}
+    end
     render
   end
 
   def show
-    @node = begin      
-              Chef::Node.load(params[:id])
-            rescue => e
-              Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-              @_message = {:error => "Could not load node #{params[:id]}"}
-              Chef::Node.new
-            end 
+    begin      
+      @node =Chef::Node.load(params[:id])
+    rescue => e
+      Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
+      @_message = {:error => "Could not load node #{params[:id]}"}
+      @node = Chef::Node.new
+    end 
     render
   end
 
@@ -86,14 +86,14 @@ class ChefServerWebui::Nodes < ChefServerWebui::Application
     begin      
       @node = Chef::Node.new
       @node.name params[:name]
-      @node.attribute = JSON.parse(params[:attributes])
+      @node.normal_attrs = JSON.parse(params[:attributes])
       @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
       raise ArgumentError, "Node name cannot be blank" if (params[:name].nil? || params[:name].length==0)
       @node.create
-      redirect(slice_url(:nodes), :message => { :notice => "Created Node #{@node.name}" })
+      redirect(url(:nodes), :message => { :notice => "Created Node #{@node.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @node.attribute = JSON.parse(params[:attributes])
+      @node.normal_attrs = JSON.parse(params[:attributes])
       @available_recipes = get_available_recipes 
       @available_roles = Chef::Role.list.keys.sort
       @node.run_list params[:for_node]
@@ -107,7 +107,7 @@ class ChefServerWebui::Nodes < ChefServerWebui::Application
     begin
       @node = Chef::Node.load(params[:id])
       @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
-      @node.attribute = JSON.parse(params[:attributes])
+      @node.normal_attrs = JSON.parse(params[:attributes])
       @node.save
       @_message = { :notice => "Updated Node" }
       render :show
@@ -126,7 +126,7 @@ class ChefServerWebui::Nodes < ChefServerWebui::Application
     begin
       @node = Chef::Node.load(params[:id])
       @node.destroy
-      redirect(absolute_slice_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted successfully" }, :permanent => true})
+      redirect(absolute_url(:nodes), {:message => { :notice => "Node #{params[:id]} deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @node_list = Chef::Node.list()

data/app/controllers/openid_consumer.rb

@@ -22,7 +22,7 @@ require 'pathname'
 require 'openid'
 require (Chef::Config[:openid_cstore_couchdb] ?   'openid-store-couchdb' : 'openid/store/filesystem')
 
-class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
+class OpenidConsumer < Application
 
   provides :html
 
@@ -42,8 +42,8 @@ class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
       raise BadRequest, "Discovery failed for #{oid}: #{e}"
     end
 
-    return_to = absolute_slice_url(:openid_consumer_complete)
-    realm = absolute_slice_url(:openid_consumer)
+    return_to = absolute_url(:openid_consumer_complete)
+    realm = absolute_url(:openid_consumer)
 
     if oidreq.send_redirect?(realm, return_to, params[:immediate])
       return redirect(oidreq.redirect_url(realm, return_to, params[:immediate]))
@@ -55,7 +55,7 @@ class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
 
   def login
     if session[:user] 
-      redirect(slice_url(:nodes), :message => { :warning => "You've already logged in with user #{session[:user]}"  })
+      redirect(url(:nodes), :message => { :warning => "You've already logged in with user #{session[:user]}"  })
     else
       oid = params[:openid_identifier]
       raise(Unauthorized, "Sorry, #{oid} is not an authorized OpenID.") unless is_authorized_openid_identifier?(oid, Chef::Config[:authorized_openid_identifiers])
@@ -66,7 +66,7 @@ class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
 
   def complete
     # FIXME - url_for some action is not necessarily the current URL.
-    current_url = absolute_slice_url(:openid_consumer_complete)
+    current_url = absolute_url(:openid_consumer_complete)
     parameters = params.reject{|k,v| k == "controller" || k == "action"}
     oidresp = consumer.complete(parameters, current_url)
     case oidresp.status
@@ -95,11 +95,11 @@ class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
           end
         end        
         if session[:user].nil?
-          redirect(slice_url(:openid_consumer),  :message => { :error => "No user is associated with this OpenID." })
+          redirect(url(:openid_consumer),  :message => { :error => "No user is associated with this OpenID." })
           return "No user is associated with this OpenID."
         end 
         #end
-        redirect_back_or_default(absolute_slice_url(:nodes))
+        redirect_back_or_default(absolute_url(:nodes))
         return "Verification of #{oidresp.display_identifier} succeeded."
       when OpenID::Consumer::SETUP_NEEDED
         return "Immediate request failed - Setup Needed"
@@ -107,12 +107,12 @@ class ChefServerWebui::OpenidConsumer < ChefServerWebui::Application
         return "OpenID transaction cancelled."
       else
     end
-    redirect absolute_slice_url(:openid_consumer)
+    redirect absolute_url(:openid_consumer)
   end
 
   def logout
     cleanup_session
-    redirect slice_url(:top)
+    redirect url(:top)
   end
 
   private

data/app/controllers/roles.rb

@@ -19,7 +19,7 @@
 
 require 'chef/role'
 
-class ChefServerWebui::Roles < ChefServerWebui::Application
+class Roles < Application
 
   provides :html
   before :login_required 
@@ -92,7 +92,7 @@ class ChefServerWebui::Roles < ChefServerWebui::Application
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
       @role.create
-      redirect(slice_url(:roles), :message => { :notice => "Created Role #{@role.name}" })
+      redirect(url(:roles), :message => { :notice => "Created Role #{@role.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @available_recipes = get_available_recipes 
@@ -134,7 +134,7 @@ class ChefServerWebui::Roles < ChefServerWebui::Application
     begin
       @role = Chef::Role.load(params[:id])
       @role.destroy
-      redirect(absolute_slice_url(:roles), :message => { :notice => "Role #{@role.name} deleted successfully." }, :permanent => true)
+      redirect(absolute_url(:roles), :message => { :notice => "Role #{@role.name} deleted successfully." }, :permanent => true)
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @role_list = Chef::Role.list()

data/app/controllers/search.rb

@@ -18,7 +18,7 @@
 
 require 'chef' / 'search' / 'query'
 
-class ChefServerWebui::Search < ChefServerWebui::Application
+class Search < Application
   
   provides :html
   before :login_required 

data/app/controllers/search_entries.rb

@@ -20,7 +20,7 @@
 #require 'chef' / 'search'
 #require 'chef' / 'queue'
 
-class ChefServerWebui::SearchEntries < ChefServerWebui::Application
+class SearchEntries < Application
   
   provides :html
   before :login_required 

data/app/controllers/status.rb

@@ -19,7 +19,7 @@
 
 require 'chef' / 'node'
 
-class ChefServerWebui::Status < ChefServerWebui::Application
+class Status < Application
 
   provides :html
   before :login_required 

data/app/controllers/users.rb

@@ -20,7 +20,7 @@ require 'chef'/'webui_user'
 require 'uri'
 require 'merb-param-protection'
 
-class ChefServerWebui::Users < ChefServerWebui::Application
+class Users < Application
 
   provides :html
   before :login_required, :exclude => [:login, :login_exec, :complete]
@@ -114,7 +114,7 @@ class ChefServerWebui::Users < ChefServerWebui::Application
       @user.admin = true if params[:admin]
       (params[:openid].length == 0 || params[:openid].nil?) ? @user.set_openid(nil) : @user.set_openid(URI.parse(params[:openid]).normalize.to_s)
       @user.create
-      redirect(slice_url(:users), :message => { :notice => "Created User #{params[:name]}" })
+      redirect(url(:users), :message => { :notice => "Created User #{params[:name]}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = { :error => "Could not create user" }
@@ -124,7 +124,7 @@ class ChefServerWebui::Users < ChefServerWebui::Application
 
   def login
     @user = Chef::WebUIUser.new
-    session[:user] ? redirect(slice_url(:nodes), :message => { :warning => "You've already logged in with user #{session[:user]}"  }) : (render :layout => 'login') 
+    session[:user] ? redirect(url(:nodes), :message => { :warning => "You've already logged in with user #{session[:user]}"  }) : (render :layout => 'login') 
   end 
   
   def login_exec
@@ -143,12 +143,12 @@ class ChefServerWebui::Users < ChefServerWebui::Application
   def complete    
     session[:user] = params[:name]
     session[:level] = (@user.admin == true ? :admin : :user)
-    (@user.name == Chef::Config[:web_ui_admin_user_name] && @user.verify_password(Chef::Config[:web_ui_admin_default_password])) ? redirect(slice_url(:users_edit, :user_id => @user.name), :message => { :warning => "Please change the default password" }) : redirect_back_or_default(absolute_slice_url(:nodes))
+    (@user.name == Chef::Config[:web_ui_admin_user_name] && @user.verify_password(Chef::Config[:web_ui_admin_default_password])) ? redirect(url(:users_edit, :user_id => @user.name), :message => { :warning => "Please change the default password" }) : redirect_back_or_default(absolute_url(:nodes))
   end
 
   def logout
     cleanup_session
-    redirect slice_url(:top)
+    redirect url(:top)
   end
   
   def destroy
@@ -158,7 +158,7 @@ class ChefServerWebui::Users < ChefServerWebui::Application
       @user = Chef::WebUIUser.load(params[:user_id])
       @user.destroy
       logout if params[:user_id] == session[:user]
-      redirect(absolute_slice_url(:users), {:message => { :notice => "User #{params[:user_id]} deleted successfully" }, :permanent => true})
+      redirect(absolute_url(:users), {:message => { :notice => "User #{params[:user_id]} deleted successfully" }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       session[:level] != :admin ? set_user_and_redirect : redirect_to_list_users({ :error => $! })
@@ -173,7 +173,7 @@ class ChefServerWebui::Users < ChefServerWebui::Application
       rescue
         logout_and_redirect_to_login
       else  
-        redirect(slice_url(:users_show, :user_id => session[:user]), {:message => { :error => $! }, :permanent => true})
+        redirect(url(:users_show, :user_id => session[:user]), {:message => { :error => $! }, :permanent => true})
       end 
     end 
   

data/app/helpers/application_helper.rb

@@ -1,161 +1,6 @@
 require 'chef/mixin/deep_merge'
 
 module Merb
-  module ChefServerWebui
-    module ApplicationHelper
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def image_path(*segments)
-        public_path_for(:image, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def javascript_path(*segments)
-        public_path_for(:javascript, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def stylesheet_path(*segments)
-        public_path_for(:stylesheet, *segments)
-      end
-      
-      # Construct a path relative to the public directory
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def public_path_for(type, *segments)
-        ::ChefServerWebui.public_path_for(type, *segments)
-      end
-      
-      # Construct an app-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the host application, with added segments.
-      def app_path_for(type, *segments)
-        ::ChefServerWebui.app_path_for(type, *segments)
-      end
-      
-      # Construct a slice-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the slice source (Gem), with added segments.
-      def slice_path_for(type, *segments)
-        ::ChefServerWebui.slice_path_for(type, *segments)
-      end
-
-      def build_tree(name, node, default={}, override={})
-        node = Chef::Mixin::DeepMerge.merge(default, node)
-        node = Chef::Mixin::DeepMerge.merge(node, override)
-        html = "<table id='#{name}' class='tree table'>"
-        html << "<tr><th class='first'>Attribute</th><th class='last'>Value</th></tr>"
-        count = 0
-        parent = 0
-        append_tree(name, html, node, count, parent, override)
-        html << "</table>"
-        html
-      end
-
-      def append_tree(name, html, node, count, parent, override)
-        node.sort{ |a,b| a[0] <=> b[0] }.each do |key, value|
-          to_send = Array.new
-          count += 1
-          is_parent = false
-          local_html = ""
-          local_html << "<tr id='#{name}-#{count}' class='collapsed #{name}"
-          if parent != 0
-            local_html << " child-of-#{name}-#{parent}' style='display: none;'>"
-          else
-            local_html << "'>"
-          end
-          local_html << "<td class='table-key'><span toggle='#{name}-#{count}'/>#{key}</td>"
-          case value
-          when Hash
-            is_parent = true 
-            local_html << "<td></td>"
-            p = count
-            to_send << Proc.new { append_tree(name, html, value, count, p, override) }
-          when Array
-            is_parent = true 
-            local_html << "<td></td>"
-            as_hash = {}
-            value.each_index { |i| as_hash[i] = value[i] }
-            p = count
-            to_send << Proc.new { append_tree(name, html, as_hash, count, p, override) }
-          else
-            local_html << "<td><div class='json-attr'>#{value}</div></td>"
-          end
-          local_html << "</tr>"
-          local_html.sub!(/class='collapsed/, 'class=\'collapsed parent') if is_parent
-          local_html.sub!(/<span/, "<span class='expander'") if is_parent
-          html << local_html
-          to_send.each { |s| count = s.call }
-          count += to_send.length
-        end
-        count
-      end
-      
-      def syntax_highlight(uri)
-        code = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest(uri)
-        CodeRay.encode_tokens(CodeRay.scan(code, :ruby), :span)
-      end
-      
-      def str_to_bool(str)
-        str =~ /true/ ? true : false
-      end
-      
-      #for showing search result
-      def determine_name(type, object)
-        case type
-        when :node, :role, :client
-          object.name
-        else
-          params[:id]
-        end
-      end 
-
-      # Recursively build a tree of lists.
-      #def build_tree(node)
-      #  list = "<dl>"
-      #  list << "\n<!-- Beginning of Tree -->"
-      #  walk = lambda do |key,value|
-      #    case value
-      #      when Hash, Array
-      #        list << "\n<!-- Beginning of Enumerable obj -->"
-      #        list << "\n<dt>#{key}</dt>"
-      #        list << "<dd>"
-      #        list << "\t<dl>\n"
-      #        value.each(&walk)
-      #        list << "\t</dl>\n"
-      #        list << "</dd>"
-      #        list << "\n<!-- End of Enumerable obj -->"
-      #        
-      #      else
-      #        list << "\n<dt>#{key}</dt>"
-      #        list << "<dd>#{value}</dd>"
-      #    end
-      #  end
-      #  node.sort{ |a,b| a[0] <=> b[0] }.each(&walk)
-      #  list << "</dl>"
-      #end
-      
-    end
+  module ApplicationHelper
   end
 end