tap-server 0.4.0 → 0.5.0

data/History

@@ -1,3 +1,8 @@
+== 0.5.0 / 2009-06-17
+
+* added Extname routes
+* Controller.uri can now add scheme, host, port
+
 == 0.4.0 / 2009-05-25
 
 Significant internal rework to utilize Tap-0.17.0.

data/lib/tap/controller/extname.rb

@@ -0,0 +1,29 @@
+module Tap
+  class Controller
+    
+    # Add handling of extnames to controller paths.  The extname of a request
+    # is chomped and stored in the extname attribute for use wherever.
+    module Extname
+      
+      # Returns the extname for the current request, or nil if no extname
+      # was specified in the paths_info.
+      def extname
+        @extname ||= nil
+      end
+      
+      # Overrides route to chomp of the extname from the request path info.
+      # If no extname is specified, extname will be remain nil.
+      def route
+        @extname = File.extname(request.path_info)
+        @extname = nil if @extname.empty?
+        args = super
+
+        unless args.empty? || extname == nil
+          args.last.chomp!(extname)
+        end
+
+        args
+      end
+    end
+  end
+end

data/lib/tap/controller/utils.rb

@@ -24,6 +24,40 @@ module Tap
     
         [200, headers, [content]]
       end
+      
+      def yamlize(obj, indent="")
+        case obj
+        when Hash
+          lines = []
+          obj.each_pair do |key, value|
+            lines << case value
+            when Hash, Array
+              "#{indent}#{key}:\n#{yamlize(value, indent + '  ')}"
+            when '#'
+              next
+            else
+              "#{indent}#{key}: #{value}"
+            end
+          end
+          lines.empty? ? "#{indent}{}" : lines.join("\n")
+        when Array
+          lines = []
+          obj.each do |value|
+            lines << case value
+            when Hash, Array
+              "#{indent}-\n#{yamlize(value, indent + '  ')}"
+            when '#'
+              next
+            else
+              "#{indent}- #{value}"
+            end
+          end
+          lines.empty? ? "#{indent}[]" : lines.join("\n")
+        else
+          obj
+        end
+      end
+      
     end
   end
 end

data/lib/tap/controller.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'tap/server'
+require 'tap/controller/extname'
 require 'tap/controller/rest_routes'
 require 'tap/controller/utils'
 
@@ -31,10 +32,11 @@ module Tap
         end
         
         set_variables.each do |variable|
-          child.set(variable, get(variable))
+          value = get(variable)
+          value = value.dup if Configurable::Delegate.duplicable_value?(value)
+          child.set(variable, value)
         end
         
-        child.set(:actions, actions.dup)
         child.set(:define_action, true)
       end
 
@@ -52,17 +54,14 @@ module Tap
 
       # Sets an instance variable for self (ie the class), short for:
       #
-      #   instance_variable_set(:@attribute, input)
+      #   instance_variable_set(:@attribute, value)
       #
-      # These variables are meaningful to a default Tap::Controller and will
-      # be inherited by subclasses:
-      #
-      #   actions:: sets actions
-      #   default_action:: the default action (:index)
-      #
-      def set(variable, input)
+      # Set variables inherited by subclasses.  The value is duplicated on
+      # the subclass so the parent and child variable may be modified
+      # independently.
+      def set(variable, value)
         set_variables << variable
-        instance_variable_set("@#{variable}", input)
+        instance_variable_set("@#{variable}", value)
       end
       
       # Gets the value of an instance variable set via set.  Returns nil for
@@ -72,7 +71,7 @@ module Tap
         instance_variable_get("@#{variable}")
       end
       
-      # An array of variables set via set.  set_variables are inherited.
+      # An array of variables set via set.
       def set_variables
         @set_variables ||= []
       end
@@ -169,8 +168,21 @@ module Tap
       self.class.actions.include?(action.to_sym)
     end
     
-    # Returns a uri to the specified action on self.
-    def uri(action=nil, params={})
+    # Returns a uri to the specified action on self.  The parameters will
+    # be built into a query string, if specified.  By default the uri will
+    # not specify a protocol or host.  Specifying an option hash will add
+    # these to the uri.
+    def uri(action=nil, params=nil, options=nil)
+      if action.kind_of?(Hash)
+        unless params == nil && options == nil
+          raise "extra arguments specified for uri hash syntax"
+        end
+        
+        options = action
+        params = options[:params]
+        action = options[:action]
+      end
+      
       uri = []
       
       if controller_path
@@ -183,11 +195,25 @@ module Tap
         uri << action
       end
       
-      unless params.empty?
+      unless params == nil || params.empty?
         uri << '?'
         uri << build_query(params)
       end
       
+      if options
+        scheme = (options[:scheme] || request.scheme)
+        port = (options[:port] || request.port)
+        
+        if scheme == "https" && port != 443 ||
+            scheme == "http" && port != 80
+          uri.unshift ":#{port}"
+        end
+        
+        uri.unshift(options[:host] || request.host)
+        uri.unshift("://")
+        uri.unshift(scheme)
+      end
+      
       uri.join
     end
     

data/lib/tap/controllers/data.rb

@@ -3,11 +3,12 @@ require 'tap/controller'
 module Tap
   module Controllers
     # ::controller
-    class Data < Tap::Controller
+    class Data < Tap::Controller  
       include RestRoutes
       include Utils
       
       set :default_layout, 'layout.erb'
+      set :reserved_ids, ['new']
       
       # GET /projects
       def index
@@ -39,6 +40,8 @@ module Tap
       def create(id)
         if id == "new"
           id = data.next_id(type).to_s
+        else
+          check_id(id)
         end
         
         data.create(type, id) {|io| io << parse_entry }
@@ -62,7 +65,8 @@ module Tap
       end
       
       def upload(id=nil)
-        check_id(id)
+        check_id(id) if id
+        
         data.import(type, request[type], id)
         redirect uri
       end
@@ -74,11 +78,21 @@ module Tap
       
       # Renames id to request['name'] in the schema data.
       def rename(id)
-        redirect data.move(type, id, request['new_id'])
+        if new_id = request['new_id']
+          check_id(new_id)
+        else
+          raise "no new id specified"
+        end
+        
+        redirect data.move(type, id, new_id)
       end
       
       def duplicate(id)
-        redirect data.copy(type, id, request['new_id'] || "#{id}_copy")
+        if new_id = request['new_id']
+          check_id(new_id)
+        end
+        
+        redirect data.copy(type, id, new_id || "#{id}_copy")
       end
       
       # Helper methods
@@ -123,7 +137,7 @@ module Tap
       end
       
       def check_id(id)
-        if id == "new"
+        if self.class.get(:reserved_ids).include?(id)
           raise "reserved id: #{id.inspect}"
         end
       end

data/lib/tap/controllers/schema.rb

@@ -4,41 +4,53 @@ module Tap
   module Controllers
     class Schema < Data
       
-      # Adds tasks or joins to the schema.  Parameters:
+      # Adds to the specified schema.  Parameters:
       #
-      # tasks[]::   An array of tasks to add to the schema.
-      # inputs[]::  An array of task indicies used as inputs to a join.
-      # outputs[]:: An array of task indicies used as outputs for a join.
+      # tasks[]:: The specified task ids are added to the schema
+      # queue[]:: Queues with empty inputs are added for the task ids
+      # middleware[]:: Middleware by the specified ids are added
+      #
+      # Joins are a bit more complicated.  A join is added if inputs
+      # and outputs are specified.
+      #
+      # inputs[]::  An array inputs to a join
+      # outputs[]:: An array outputs for a join
+      # join:: The join id, 'join' if unspecified
       #
       def add(id)
         if id == "new"
           id = data.next_id(type).to_s
         end
         
-        tasks = request['tasks'] || []
-        inputs = request['inputs'] || []
-        outputs = request['outputs'] || []
-        queue = request['queue'] || []
-        
         update_schema(id) do |schema|
-          current = schema.tasks
-          tasks.each do |task|
-            key = task
-            while current.has_key?(key)
-              i ||= 0
-              key = "#{task}_#{i}"
-              i += 1
+          # tasks[]
+          if tasks = request['tasks']
+            tasks.each do |task|
+              key = 0
+              key += 1 while schema.tasks.has_key?(key.to_s)
+              schema.tasks[key.to_s] = {'id' => task}
             end
-            
-            current[key] = {'id' => task}
           end
           
+          # inputs[] outputs[] join
+          inputs = request['inputs'] || []
+          outputs = request['outputs'] || []
           if !inputs.empty? && !outputs.empty?
-            schema.joins << [inputs, outputs]
+            schema.joins << [inputs, outputs, {'id' => request['join'] || 'join'}]
           end
           
-          queue.each do |task|
-            schema.queue << [task]
+          # queue[]
+          if queue = request['queue']
+            queue.each do |key|
+              schema.queue << [key, []]
+            end
+          end
+          
+          # middleware[]
+          if middleware = request['middleware']
+            middleware.each do |middleware|
+              schema.middleware << {'id' => middleware}
+            end
           end
         end
         
@@ -49,6 +61,8 @@ module Tap
       #
       # tasks[]:: An array of task keys to remove.
       # joins[]:: An array of join indicies to remove.
+      # queue[]:: An array of queue indicies to remove.
+      # middleware[]:: An array of middleware indicies to remove.
       #
       def remove(id)
         if id == "new"
@@ -58,11 +72,10 @@ module Tap
         tasks = request['tasks'] || []
         joins = request['joins'] || []
         queue = request['queue'] || []
+        middleware = request['middleware'] || []
         
         update_schema(id) do |schema|
-          tasks.each do |key|
-            schema.tasks.delete(key)
-          end
+          tasks.each {|key| schema.tasks.delete(key) }
           
           joins.each {|index| schema.joins[index.to_i] = nil }
           schema.joins.compact!
@@ -70,24 +83,22 @@ module Tap
           queue.each {|index| schema.queue[index.to_i] = nil }
           schema.queue.compact!
           
+          middleware.each {|index| schema.middleware[index.to_i] = nil }
+          schema.middleware.compact!
+          
           schema.cleanup!
         end
     
         redirect uri(id)
       end
       
-      def configure(id)
+      def save(id)
         if id == "new"
           id = data.next_id(type).to_s
         end
         
-        schema = Tap::Schema.new(request['schema'] || {})
-        schema.scrub! do |obj|
-          scrub(obj['config'])
-        end
-        
         data.create_or_update(type, id) do |io| 
-          io << schema.dump
+          io << yamlize(request['schema'] || '')
         end
         
         redirect uri(id)
@@ -111,8 +122,8 @@ module Tap
           Tap::Schema.new
         end
         
-        schema.resolve! do |type, key, data|
-          env.manifest(type)[key]
+        schema.resolve! do |type, key|
+          env[type][key]
         end
         
         render "entry.erb", :locals => {
@@ -121,41 +132,28 @@ module Tap
         }, :layout => true
       end
       
-      def stringify(obj)
-        case obj
-        when String, Numeric, true, false
-          obj.to_s
-        when Symbol, Regexp
-          obj.inspect
-        when nil
-          '~'
-        when $stdout
-          'data/results.txt'
-        else
-          obj
-        end
+      #########################
+      # Helpers
+      #########################
+      
+      def render_config(resource, name="")
+        klass = resource[:class]
+        values = resource[:config] || default_config(klass.configurations)
+        
+        module_render "_configs.erb", klass, 
+          :locals => {
+            :name => name,
+            :configs => klass.configurations, 
+            :values => values
+          }
       end
       
-      def default_config(configurable)
-        configs = configurable.configurations
-        Configurable::DelegateHash.new(configs).to_hash do |hash, key, value|
-          hash[key.to_s] = stringify(value)
-        end
+      def default_config(configs)
+        Configurable::DelegateHash.new(configs).to_hash
       end
       
-      def scrub(obj)
-        case obj
-        when Hash
-          obj.delete_if do |key, value|
-            value ? scrub(value) : true
-          end
-        when Array
-          obj.delete_if do |value| 
-            value ? scrub(value) : true
-          end
-        end
-        
-        false
+      def format_yaml(object)
+        object == nil ? "~" : YAML.dump(object)[4...-1].strip
       end
       
       def update_schema(id)        
@@ -170,6 +168,35 @@ module Tap
         
         id
       end
+      
+      def summarize(schema)
+        summary = {}
+        schema.tasks.each_key do |key|
+          summary[key] = [[],[]]
+        end
+
+        index = 0
+        join_order = []
+        schema.joins.each do |inputs, outputs, join|
+          join_order.concat inputs
+          
+          inputs.each do |key|
+            summary[key][1] << index
+          end
+
+          outputs.each do |key|
+            summary[key][0] << index
+          end
+
+          index += 1
+        end
+
+        summary.keys.sort_by do |key|
+          join_order.index(key) || join_order.length
+        end.collect do |key|
+          [key, *summary[key]]
+        end
+      end
     end
   end
 end

data/views/configurable/_configs.erb

@@ -1,27 +1,32 @@
 <dl class="configs">
-<% configurations.each_pair do |key, config| %>
+<% configs.each_pair do |key, config| %>
 <%  next if config[:type] == :hidden %>
+<%  config_name = "#{name}[#{key.inspect}]" %>
+<%  value = values[key] %>
 <%  if config.is_nest? %>
   <dt class="name"><%= key %></dt>
   <dd class="nested-configs">
+<%    configurations = config.default(false).delegates %>
 <%=   module_render("_configs.erb", obj, :locals => {
-        :id => id,
-        :name => "#{name}[#{key}]",
-        :configurations => config.default(false).delegates, 
-        :values => values[key.to_s]
+        :name => config_name,
+        :configs => configurations, 
+        :values => value || default_config(configurations)
       }) %>
   </dd>
 <%  else %>
   <dt><%= key %></dt>
   <dd class="config">
+<%  if config_template = module_path("_#{config[:type]}.erb", obj)  %>
 <%=   render(
-        :file => module_path("_#{config[:type]}.erb", obj) || module_path("_config.erb", obj), 
+        :file => config_template, 
         :locals => {
-          :id => "#{id}_config_#{key}",
           :obj => obj,
-          :name => "#{name}[#{key}]",
+          :name => config_name,
           :config => config,
-          :value => values[key.to_s]}) %>
+          :value => value}) %>
+<%  else%>
+  <input name="<%= config_name %>" type="text" value="<%= format_yaml(value) %>" />
+<%  end %>
   </dd>
 <%  end %>
 <% end %>

data/views/configurable/_flag.erb

@@ -1,2 +1,2 @@
 <input name="<%= name %>" type="hidden" value="false" />
-<input name="<%= name %>" type="checkbox" value="true" <%= value == "true" ? 'checked="true"' : '' %> />
+<input name="<%= name %>" type="checkbox" value="true" <%= value ? 'checked="true"' : '' %> />

data/views/configurable/_list_select.erb

@@ -1,8 +1,6 @@
-<input type="hidden" name="<%= name %>[][]" value="" />
+<input type="hidden" name="<%= name %>[]" value="#" />
 <select name="<%= name %>[]" multiple="true">
-<% value.collect! {|val| stringify(val) } %>
 <% (config[:options] || []).each do |option| %>
-<%   option = stringify(option) %>
-  <option value="<%= escape_html(option) %>" <%= value.include?(option) ? "selected='true' " : ""%>><%= option %></option>
+  <option value="<%= format_yaml(option) %>" <%= value && value.include?(option) ? "selected='true' " : ""%>><%= option %></option>
 <% end %>
 </select>

data/views/configurable/_select.erb

@@ -1,6 +1,5 @@
 <select name="<%= name %>">
 <% (config[:options] || []).each do |option| %>
-<%   option = stringify(option) %>
-  <option value="<%= escape_html(option) %>" <%= value == option ? "selected='true' " : ""%>><%= option %></option>
+  <option value="<%= format_yaml(option) %>" <%= value == option ? "selected='true' " : ""%>><%= option %></option>
 <% end %>
 </select>

data/views/configurable/_switch.erb

@@ -1,2 +1,2 @@
-<input name="<%= name %>" type="radio" value="true"  <%= value == "true"  ? 'checked="true" ' : '' %>>on</input>
-<input name="<%= name %>" type="radio" value="false" <%= value == "false" ? 'checked="true" ' : '' %>>off</input>
+<input name="<%= name %>" type="radio" value="true"  <%= value  ? 'checked="true" ' : '' %>>on</input>
+<input name="<%= name %>" type="radio" value="false" <%= !value ? 'checked="true" ' : '' %>>off</input>

data/views/tap/controller/help.erb

@@ -0,0 +1,32 @@
+<h1 class="class"><%= obj %></h1>
+
+<ul>
+<li class="source_file">
+  <h2>Source File</h2>
+  <p><%= obj.source_file %><p>
+</li>
+<li>
+  <h2>Summary</h2>
+  <%= obj.desc.subject %>
+</li>
+<li>
+  <h2>Documentation</h2>
+  <pre class="desc"><%= obj.desc.wrap %></pre>
+</li>
+<li class="ancestors">
+  <h2>Actions</h2>
+  <ol>
+<% obj.actions.each do |action| %>
+    <li><%= action %></li>
+<% end %>
+  </ol>
+</li>
+<li class="ancestors">
+  <h2>Ancestors</h2>
+  <ol>
+<% obj.ancestors.each do |ancestor| %>
+    <li><%= ancestor %></li>
+<% end %>
+  </ol>
+</li>
+</ul>

data/views/tap/controllers/schema/entry.erb

@@ -1,14 +1,30 @@
 <%=  render('_build.erb', :locals => {:id => id}) %>
 <%=  render('_controls.erb', :locals => {:id => id}) %>
 
-<h2>Design:</h2>
 <!-- add form --> 
-<% traverse = schema.traverse %>
+<% summary = summarize(schema) %>
 <form id="add_<%= id %>" class="add" method="post" action="<%= uri(id) %>">
   <input type="hidden" name="_method" value="add" />
   
+  <h2>Add:</h2>
+  <p>
+    Select resources to add or enque.  To add a join, select the join 
+    and the input and output indices for the join in the summary table.  
+  </p>
+  
+  <h3>Tasks</h3>
+  <ul>
+<% server.env.minimap.each do |(env_name, env)| %>
+<%   env.manifest(:task).minimap.each do |(name, const)| %>
+<%     key = "#{env_name}:#{name}" %>
+  <li><input name="tasks[]" value="<%= key %>" type="checkbox"><%= key %></input></li>
+<%   end %>
+<% end %>
+  </ul>
+  
+  <h3>Joins</h3>
   <table>
-<% traverse.each do |(key, inputs, outputs)| %>
+<% summary.each do |(key, inputs, outputs)| %>
   <tr>
     <td><input name="outputs[]" value="<%= key %>" type="checkbox" /></td>
     <td><a href="#task_<%= key %>"><%= key %></a></td>
@@ -18,22 +34,32 @@
   </tr>
 <% end %>
   </table>
-  
   <ul>
 <% server.env.minimap.each do |(env_name, env)| %>
-<%   env.manifest(:task).minimap.each do |(name, const)| %>
+<%   env.manifest(:join).minimap.each do |(name, const)| %>
 <%     key = "#{env_name}:#{name}" %>
-  <li><input name="tasks[]" value="<%= key %>" type="checkbox"><%= key %></input></li>
+  <li><input name="join" value="<%= key %>" type="radio"><%= key %></input></li>
 <%   end %>
 <% end %>
   </ul>
   
+  <h3>Middleware</h3>
   <ul>
-<% traverse.each do |(key, inputs, outputs)| %>
+<% server.env.minimap.each do |(env_name, env)| %>
+<%   env.manifest(:middleware).minimap.each do |(name, const)| %>
+<%     key = "#{env_name}:#{name}" %>
+  <li><input name="middleware[]" value="<%= key %>" type="checkbox"><%= key %></input></li>
+<%   end %>
+<% end %>
+  </ul>
+    
+  <h3>Queue</h3>
+  <ul>
+<% summary.each do |(key, inputs, outputs)| %>
   <li><input name="queue[]" value="<%= key %>" type="checkbox"><%= key %></input></li>
 <% end %>
   </ul>
-
+    
   <input type="submit" value="Add" />
 </form>
 
@@ -41,30 +67,36 @@
 <form id="remove_<%= id %>" class="remove" method="post" action="<%= uri(id) %>">
   <input type="hidden" name="_method" value="remove" />
   
+  <h2>Remove:</h2>
+  <p>
+    Select resources to remove.
+  </p>
+  
+  <h3>Tasks</h3>
   <ul>
-<% traverse.each do |(key, inputs, outputs)| %>
-  <li>
-    <input name="tasks[]" value="<%= key %>" type="checkbox" />
-    <a href="#task_<%= key %>"><%= key %></a>
-  </li>
+<% summary.each do |(key, inputs, outputs)| %>
+  <li><input name="tasks[]" value="<%= key %>" type="checkbox"><%= key %></input></li>
 <% end %>
   </ul>
-
+  
+  <h3>Joins</h3>
   <ul>
 <% schema.joins.each_index do |index| %>
-  <li>
-    <input name="joins[]" value="<%= index %>" type="checkbox" />
-    <a href="#join_<%= index %>"><%= index %></a>
-  </li>
+  <li><input name="joins[]" value="<%= index %>" type="checkbox"><%= index %></input></li>
 <% end %>
   </ul>
   
+  <h3>Middleware</h3>
+  <ul>
+<% schema.middleware.each_index do |index| %>
+  <li><input name="middleware[]" value="<%= index %>" type="checkbox"><%= index %></input></li>
+<% end %>
+  </ul>
+    
+  <h3>Queue</h3>
   <ul>
 <% schema.queue.each_index do |index| %>
-  <li>
-    <input name="queue[]" value="<%= index %>" type="checkbox" />
-    <a href="#queue_<%= index %>"><%= index %></a>
-  </li>
+  <li><input name="queue[]" value="<%= index %>" type="checkbox"><%= index %></input></li>
 <% end %>
   </ul>
   
@@ -73,31 +105,28 @@
 
 <!-- configure form --> 
 <form id="configure_<%= id %>" class="configure" method="post" action="<%= uri(id) %>">
-  <input type="hidden" name="_method" value="configure" />
+  <input type="hidden" name="_method" value="save" />
   
   <h2>Configure:</h2>
+  
+  <h3>Tasks</h3>
   <ul class="tasks">
 <% schema.tasks.each_pair do |key, task| %>
-<%  name = "schema[tasks][#{key}]" %>
-<%  task_class = task['class'] %>
-    <li id="task_<%= key %>" class="task">
+<%  name = "schema[:tasks][#{key}]" %>
+    <li id="task_<%= key %>">
       <h3><a href="#add_<%= id %>"><%= key %></a></h3>
       
-      <input type="hidden" name="<%= name %>[id]" value="<%= task['id'] %>">
-<%=   module_render('task.erb', task_class, :locals => {
-        :id => "#{id}_task_#{key}", 
-        :name => name, 
-        :values => task['config'] || default_config(task_class),
-        :task => task }) %>
+      <input type="hidden" name="<%= name %>[:id]" value="<%= task[:id] %>">
+<%=   render_config(task, "#{name}[:config]") %>
     </li>
 <% end %>
   </ul>
   
+  <h3>Joins</h3>
   <ul class="joins">
 <% schema.joins.each_with_index do |(inputs, outputs, join), index| %>
-<%  name = "schema[joins][]" %>
-<%  join_class = join['class'] %>
-    <li id="join_<%= index %>" class="join">
+<%  name = "schema[:joins][]" %>
+    <li id="join_<%= index %>">
       <h3><a href="#add_<%= id %>"><%= index %></a></h3>
 <%    inputs.each do |input| %>
       <input type="hidden" name="<%= name %>[0][]" value="<%= input %>">
@@ -105,31 +134,11 @@
 <%    outputs.each do |output| %>
       <input type="hidden" name="<%= name %>[1][]" value="<%= output %>">
 <%    end %>
-      <input type="hidden" name="<%= name %>[2][id]" value="<%= join['id'] || 'join' %>">
-<%=   module_render('join.erb', join_class, :locals => {
-        :id => "#{id}_join_#{index}", 
-        :name => "#{name}[2]", 
-        :values => join['config'] || default_config(join_class),
-        :join => join }) %>
-    </li>
-<% end %>
-  </ul>
-  
-  <h2>Enque:</h2>
-  <ul class="queue">
-<% schema.queue.each_with_index do |(key, args), index| %>
-<%  name = "schema[queue][]" %>
-<%  task = schema.tasks[key] %>
-    <li id="queue_<%= index %>" class="queue">
-    <h3><%= key %></h3>
-    <input type="hidden" name="<%= name %>[0]" value="<%= key %>">
-<%= module_render('input.erb', task['class'], :locals => {
-      :id => id, 
-      :name => "#{name}[1]",
-      :args => args || [],
-      :task => task }) %>
+      <input type="hidden" name="<%= name %>[2][:id]" value="<%= join[:id] || 'join' %>">
+<%=   render_config(join, "#{name}[2][:config]") %>
     </li>
 <% end %>
   </ul>
+
   <input type="submit" value="Save" />
 </form>

data/views/tap/controllers/server/index.erb

@@ -3,41 +3,40 @@
 </div>
 
 <div id="content_main">
-<dl id="envs" class="manifest">
+<ol id="envs" class="manifest">
 <% env_keys = server.env.minihash(true) %>
 <% server.env.each do |env| %>
 <%   root = env.root %>
 <%   env_key = env_keys[env] %>
-  <dt class="key"><%= env_key %> (<%= root.root %>)</dt>
-  <dd class="value">
 <%   controllers = env.manifest(:controller) %>
+<%   tasks = env.manifest(:task) %>
+<%   next if controllers.empty? && tasks.empty? %>
+  <li>
+    <h2><%= env_key %></h2>
+    <ul>
 <%   unless controllers.empty? %>
-    <dl id="controllers" class="manifest">
-    <dt class="key">controllers</dt>
-    <dd class="value">
-      <ol>
+    <li>
+      <h3>controllers</h3>
+      <ul>
 <%     controllers.minimap.each do |(key, const)| %>
-      <li><a href="<%= escape(key) %>"><%= key %></a> (<a href="<%= help_uri('controller', key) %>"><%= const.require_path %></a>)</li>
+      <li><a href="<%= escape(key) %>"><%= key %></a> (<a href="<%= help_uri('controller', key) %>">?</a>)</li>
 <%     end %>
-      </ol>
-    </dd>
-    </dl>
+      </ul>
+    </li>
 <%   end %>
 
-<%   tasks = env.manifest(:task) %>
 <%   unless tasks.empty? %>
-    <dl id="tasks" class="manifest">
-    <dt class="key">tasks</dt>
-    <dd class="value">
-      <ol>
+    <li>
+      <h3>tasks</h3>
+      <ul>
 <%     tasks.minimap.each do |(key, const)| %>
-      <li><%= key %> (<a href="<%= help_uri('task', key) %>"><%= const.require_path %></a>)</li>
+      <li><%= key %> (<a href="<%= help_uri('task', key) %>">?</a>)</li>
 <%     end %>
-      </ol>
-    </dd>
-    </dl>
+      </ul>
+    </li>
 <%   end %>
-  </dd>
+    </ul>
+  </li>
 <% end %>
-</dl>
+</ol>
 </div>

data/views/tap/task/help.erb

@@ -0,0 +1,49 @@
+<h1 class="class"><%= obj %></h1>
+
+<ul>
+<li class="source_file">
+  <h2>Source File</h2>
+  <p><%= obj.source_file %><p>
+</li>
+<li>
+  <h2>Summary</h2>
+  <%= obj.desc.subject %>
+</li>
+<li>
+  <h2>Documentation</h2>
+  <pre class="desc"><%= obj.desc.wrap %></pre>
+</li>
+<li>
+  <h2>Signature</h2>
+  <%= obj.args %>
+</li>
+<li class="ancestors">
+<% unless obj.configurations.empty? %>
+  <h2>Configurations</h2>
+  <table>
+  <tr>
+  <th>Key</th>
+  <th>Default</th>
+  <th>Type</th>
+  <th>Description</th>
+  </tr>
+<%   obj.configurations.each_pair do |key, delegate| %>
+  <tr>
+  <td><%= key %></td>
+  <td><%= delegate.default %></td>
+  <td><%= delegate[:type] %></td>
+  <td><%= delegate[:desc] %></td>
+  </tr>
+<%   end %>
+  </table>
+<% end %>
+</li>
+<li class="ancestors">
+  <h2>Ancestors</h2>
+  <ol>
+<% obj.ancestors.each do |ancestor| %>
+    <li><%= ancestor %></li>
+<% end %>
+  </ol>
+</li>
+</ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-server
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-25 00:00:00 -06:00
+date: 2009-06-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.17.0
+        version: 0.18.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -45,6 +45,7 @@ extra_rdoc_files:
 files: 
 - cmd/server.rb
 - lib/tap/controller.rb
+- lib/tap/controller/extname.rb
 - lib/tap/controller/rest_routes.rb
 - lib/tap/controller/utils.rb
 - lib/tap/controllers/app.rb
@@ -63,7 +64,6 @@ files:
 - tap.yml
 - views/404.erb
 - views/500.erb
-- views/configurable/_config.erb
 - views/configurable/_configs.erb
 - views/configurable/_flag.erb
 - views/configurable/_list_select.erb
@@ -71,6 +71,7 @@ files:
 - views/configurable/_switch.erb
 - views/layout.erb
 - views/object/obj.erb
+- views/tap/controller/help.erb
 - views/tap/controllers/app/_action.erb
 - views/tap/controllers/app/build.erb
 - views/tap/controllers/app/enque.erb
@@ -83,13 +84,11 @@ files:
 - views/tap/controllers/data/index.erb
 - views/tap/controllers/schema/_build.erb
 - views/tap/controllers/schema/_index_entry.erb
-- views/tap/controllers/schema/join.erb
 - views/tap/controllers/schema/entry.erb
-- views/tap/controllers/schema/task.erb
 - views/tap/controllers/server/access.erb
 - views/tap/controllers/server/admin.erb
-- views/tap/controllers/server/help.erb
 - views/tap/controllers/server/index.erb
+- views/tap/task/help.erb
 - views/tap/task/input.erb
 - views/tap/tasks/load/input.erb
 - README

data/views/configurable/_config.erb

@@ -1 +0,0 @@
-<input name="<%= name %>" type="text" value="<%= escape_html(value) %>" />

data/views/tap/controllers/schema/join.erb

@@ -1,6 +0,0 @@
-<%= module_render("_configs.erb", obj, :locals => {
-      :id => id,
-      :name => "#{name}[config]",
-      :configurations => obj.configurations, 
-      :values => values || {}
-    }) %>

data/views/tap/controllers/schema/task.erb

@@ -1,6 +0,0 @@
-<%= module_render("_configs.erb", obj, :locals => {
-      :id => id,
-      :name => "#{name}[config]",
-      :configurations => obj.configurations, 
-      :values => values
-    }) %>

data/views/tap/controllers/server/help.erb

@@ -1,23 +0,0 @@
-<h1 class="class"><%= obj %></h1>
-<span class="summary"><%= obj.desc.subject %></span>
-
-<h2>Documentation</h2>
-<pre class="desc"><%= obj.desc.wrap %></pre>
-
-<h2>Attributes</h2>
-<table>
-<tr class="source_file">
-  <td>Source File</td>
-  <td><%= obj.source_file %></td>
-<tr>
-<tr class="ancestors">
-  <td>Ancestors</td>
-  <td>
-  <ul>
-<% obj.ancestors.each do |ancestor| %>
-    <li><%= ancestor %></li>
-<% end %>
-  </ul>
-  </td>
-<tr>
-</table>