Adding role creation and indexing

Author: adamhjk

chef-server-slice/app/controllers/exceptions.rb

@@ -17,23 +17,17 @@
 # limitations under the License.
 #
 
-class ChefServerSlice::Exceptions < ChefServerSlice::Application
+class Exceptions < ChefServerSlice::Application
 
   provides :html, :json
 
-  # handle NotFound exceptions (404)
-  def not_found
-    display params
-  end
-
-  # handle NotAcceptable exceptions (406)
-  def not_acceptable
-    display params
-  end
-  
-  # handle BadRequest exceptions (400)
-  def bad_request
-    display params
+  def standard_error
+    Merb.logger.warn(request.content_type)
+    if request.accept =~ /application\/json/
+      display({ "error" => request.exceptions }) 
+    else
+      display(params)
+    end
   end
 
 end

chef-server-slice/app/controllers/roles.rb

@@ -0,0 +1,66 @@
+require 'chef/role'
+
+class ChefServerSlice::Roles < ChefServerSlice::Application
+
+  provides :html, :json
+  before :login_required 
+  
+  # GET /roles
+  def index
+    @role_list = Chef::Role.list(true)
+    display @role_list
+  end
+
+  # GET /roles/:id
+  def show
+    render
+  end
+
+  # GET /roles/new
+  def new
+    cl = Chef::CookbookLoader.new
+    @available_recipes = cl.sort{ |a,b| a.name.to_s <=> b.name.to_s }
+    @current_recipes = Array.new
+    render
+  end
+
+  # GET /roles/:id/edit
+  def edit
+    render
+  end
+
+  # GET /roles/:id/delete
+  def delete
+    render
+  end
+
+  # POST /roles
+  def create
+    if params.has_key?("inflated_object")
+      @role = params["inflated_object"]
+      @role.save
+      self.status = 201
+      display({ :uri => slice_url(:role, @role.name) })
+    else
+      @role = Chef::Role.new
+      @role.name(params[:name])
+      @role.recipes(params[:for_role])
+      @role.description(params[:description]) if params[:description] != ''
+      @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.save
+      redirect(slice_url(:roles), :message => { :notice => "Created Role #{@role.name}" })
+    end
+  end
+
+  # PUT /roles/:id
+  def update
+    render
+  end
+
+  # DELETE /roles/:id
+  def destroy
+    render
+  end
+
+end

chef-server-slice/app/helpers/roles_helper.rb

@@ -0,0 +1,5 @@
+module Merb
+  module RolesHelper
+
+  end
+end # Merb

chef-server-slice/app/views/layout/chef_server_slice.html.haml

@@ -4,10 +4,11 @@
   %head
     %meta{ "http-equiv" => "content-type", :content => "text/html; charset=utf-8" }
     %title Chef Server
-    = css_include_tag "base", "themes/djime-cerulean/style", "chef", "/facebox/facebox.css"
-    = js_include_tag "jquery-1.3.1.min", "jquery.jeditable.mini", "jquery.livequery", "jquery.localscroll", "jquery.scrollTo"
+    = css_include_tag "base", "themes/djime-cerulean/style", "chef", "/facebox/facebox.css", "jquery-ui-1.7.1.custom"
+    = js_include_tag "jquery-1.3.2.min", "jquery.jeditable.mini", "jquery.livequery", "jquery.localscroll", "jquery.scrollTo"
     = js_include_tag "/facebox/facebox.js"
     = js_include_tag "chef"
+    = js_include_tag "jquery-ui-1.7.1.custom.min"
         
   %body
     #container
@@ -24,6 +25,7 @@
           %ul
             %li= link_to "Search", slice_url(:searches)
             %li= link_to "Status", slice_url(:status)
+            %li= link_to "Roles", slice_url(:roles)
             %li= link_to "Nodes", slice_url(:nodes)
             %li= link_to "Cookbooks", slice_url(:cookbooks)
             %li= link_to "Registrations", slice_url(:registrations)
@@ -33,7 +35,7 @@
           - unless message.empty?
             .block#block-messages
               .content
-                %h2.title Error Messages
+                %h2.title Messages
                 .inner
                   .flash
                     - message.each do |type, msg|

chef-server-slice/app/views/roles/edit.html.haml

@@ -0,0 +1,5 @@
+%h1 Roles controller, edit action
+
+%p
+  Edit this file in
+  %tt app/views/roles/edit.html.haml

chef-server-slice/app/views/roles/index.html.haml

@@ -0,0 +1,19 @@
+.block#block-tables
+  .content
+    %h2.title Roles 
+    .inner
+      %table.table
+        %tr
+          %th.first Name
+          %th Description
+          %th.last  
+        - even = false;
+        - @role_list.each do |role|
+          %tr{ :class => even ? "even" : "odd" }
+            %td= link_to(role.name, slice_url(:role, role.name))
+            %td= role.description
+            %td
+              = link_to('Edit', slice_url(:edit_role, role.name)) 
+              |
+              = link_to('Destroy', slice_url(:role, role.name))
+            - even ? even = false: even = true

chef-server-slice/app/views/roles/new.html.haml

@@ -0,0 +1,45 @@
+.block#block-tables
+  .content
+    %h2.title Create New Role 
+    .inner
+      = form :action => slice_url(:roles), :method => :post, :id => 'create_role', :class => 'form' do
+        %div.group
+          %label.label Name
+          = text_field :name => "name", :class => "text_field"
+          %span.description The name of the Role
+        %div.group
+          %label.label Description
+          = text_area :name => "description", :class => "text_area"
+          %span.description A description of this Role 
+        %div.group
+          %label.label Default Attributes 
+          = text_area :name => "default_attributes", :class => "text_area", :rows => 10, :cols => 80
+          %span.description A JSON hash for default attributes for nodes of this role.  These attributes will only be applied if the node does not already have a value for the attributes.
+        %div.group
+          %label.label Override Attributes 
+          = text_area :name => "override_attributes", :class => "text_area", :rows => 10, :cols => 80
+          %span.description A JSON hash for the override attributes for nodes which have this role.  These attributes will always apply to every node with this role, regardless of any other value. 
+        %div.group
+          %table.sortable
+            %tr
+              %td 
+                %label.label Available Recipes
+              %td
+                %label.label Recipes for this Role 
+            %tr
+              %td
+                %div.sortable
+                  %ul#available_recipes.connectedSortable
+                    - @available_recipes.each do |cookbook|
+                      %li{ :id => h(cookbook.name), :class => 'ui-state-highlight' }= h cookbook.name
+              %td
+                %div.sortable
+                  %ul#for_role.connectedSortable
+
+              %td.help
+                %span.description
+                  Drag recipes from the list of Available Recipes section on the left, and drop them
+                  in the "Recipes for this Role" section on the right.  Then sort the recipes for this role list to the order you would like to see the recipes applied.
+        %div.group
+          .actions-bar
+            .actions= submit "Create Role", :id => 'create_role_button', :class => 'button'

chef-server-slice/app/views/roles/show.html.haml

@@ -0,0 +1,5 @@
+%h1 Roles controller, show action
+
+%p
+  Edit this file in
+  %tt app/views/roles/show.html.haml

chef-server-slice/config/init.rb

@@ -38,6 +38,6 @@
   c[:session_secret_key]  = Chef::Config.manage_secret_key
   c[:session_store] = 'cookie'
   c[:exception_details] = true
-  c[:reload_classes] = false
+  c[:reload_classes] = true 
 end
 

chef-server-slice/config/router.rb

@@ -1,5 +1,6 @@
 # This file is here so slice can be testing as a stand alone application.
 
 #Merb::Router.prepare do
+#  resources :roles
 #  ... 
-#end
+#end