tap-server 0.5.0 → 0.6.0

data/views/tap/controller/help.erb

@@ -2,8 +2,10 @@
 
 <ul>
 <li class="source_file">
-  <h2>Source File</h2>
-  <p><%= obj.source_file %><p>
+  <h2>Registered As</h2>
+  <ul><% Lazydoc::Document[obj.to_s].each_pair do |type, comment| %>
+  <li><%= type %> (<%= comment.document.source_file %>)</li><% end %>
+  </ul>
 </li>
 <li>
   <h2>Summary</h2>

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

@@ -0,0 +1,47 @@
+<div>
+<% [:run, :stop, :terminate].each do |signal| %>
+<form action="<%= uri(nil, signal) %>" style="display:inline" method="post">
+  <input type="hidden" name="_mode" value="thread" />
+  <input type="submit" value="<%= signal %>" />
+</form>
+<% end %>
+<%= app.info %>
+</div>
+
+<h3>Build:</h3>
+<% env = app.env %>
+<% objects = app.objects %>
+<form action="<%= uri nil, :build %>" method="post">
+<input type="text" name="set" value="<%= objects.length %>">Variable</input><br/>
+<input type="text" name="type">Type</input><br/>
+<input type="text" name="class">Class</input><br/>
+<input type="submit" value="build" />
+</form>
+
+<form method="post" action="<%= uri(nil) %>">
+  <h3>Objects:</h3>
+  
+<% if objects.empty? %>
+  <span>(no workflow built)</span>
+<% end %>
+  <ul>
+<% objects.each_pair do |id, obj| %>
+  <li>
+    <input type="checkbox" name="ids[]" value="<%= id %>" />
+    <a href="<%= uri(id) %>"><%= id %></a> (<%= obj.class %>)
+  </li>
+<% end %>
+  </ul>
+  
+  <ul>
+  <li><a href="javascript:Tap.Utils.select_all_by_name('ids[]')">All</a></li>
+  <li><a href="javascript:Tap.Utils.deselect_all_by_name('ids[]')">None</a></li>
+  </ul>
+  
+  <h3>Action</h3>
+  <ul>
+  <li><input type="radio" name="_method" value="destroy_all">Delete</input></li>
+  </ul>
+  
+  <input type="submit" value="Submit" />
+</form>

data/views/tap/controllers/data/_upload.erb

@@ -2,7 +2,7 @@
   <input type="hidden" name="_method" value="upload" />
   <ul>
   <li><input type="file" name="<%= type %>" /></li>
-  <li><input type="text" name="id" value="" /> Id (if other than file name)</li>
+  <li><input type="text" name="id" value="" /> Name (if other than file name)</li>
   </ul>
   <input type="submit" value="Upload" />
 </form>

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

@@ -1,14 +1,25 @@
 <h1><%= type %></h1>
+
 <%=  render('_upload.erb') %>
-<form id="select_<%= type %>" class="select" method="post" action="<%= uri %>">
-  <input type="hidden" name="_method" value="select" />
-  
+
+<form method="post" action="<%= uri %>">
   <ul>
 <% data.index(type).each do |id| %>
-  <li><input type="checkbox" name="id[]" value="<%= id %>" /> <%= render('_index_entry.erb', :locals => {:id => id})%></li>
+  <li><input type="checkbox" name="id[]" value="<%= id %>" /><%= data.cache[type].include?(id) ? "*" : "" %><a href="<%= uri(id) %>"><%= id %></a></li>
 <% end %>
   <li><a href="<%= uri('new') %>">new</a></li>
   </ul>
   
-  <input type="submit" value="Select" />
+  <ul>
+  <li><a href="javascript:Tap.Utils.select_all_by_name('id[]')">All</a></li>
+  <li><a href="javascript:Tap.Utils.deselect_all_by_name('id[]')">None</a></li>
+  </ul>
+  
+  <ul>
+  <li><input type="radio" name="_method" value="select" checked="true">Select</input></li>
+  <li><input type="radio" name="_method" value="deselect">Deselect</input></li>
+  <li><input type="radio" name="_method" value="destroy_all">Delete</input></li>
+  </ul>
+  
+  <input type="submit" value="Submit" />
 </form>

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

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

data/views/tap/signals/signal/get.erb

@@ -0,0 +1 @@
+"Got"

data/views/tap/signals/signal/index.erb

@@ -0,0 +1,4 @@
+<h2><%= sig %> (<%= obj.class %>)</h2>
+<form action="<%= uri(var, sig) %>" method="post">
+Arguments: <input type="text" name="args"></input> <input type="submit" value="Send" />
+</form>

data/views/tap/signals/signal/post.erb

@@ -0,0 +1 @@
+"Post"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-server
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -06:00
+date: 2009-12-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.0
+        version: 0.19.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -50,52 +50,44 @@ files:
 - lib/tap/controller/utils.rb
 - lib/tap/controllers/app.rb
 - lib/tap/controllers/data.rb
-- lib/tap/controllers/schema.rb
 - lib/tap/controllers/server.rb
-- lib/tap/server/runner.rb
+- lib/tap/generator/generators/controller.rb
 - lib/tap/server.rb
 - lib/tap/server/data.rb
 - lib/tap/server/server_error.rb
 - lib/tap/tasks/echo.rb
 - lib/tap/tasks/render.rb
-- public/javascripts/prototype.js
-- public/javascripts/tap.js
 - public/stylesheets/tap.css
 - tap.yml
+- templates/tap/generator/generators/controller/resource.erb
+- templates/tap/generator/generators/controller/test.erb
+- templates/tap/generator/generators/controller/view.erb
 - views/404.erb
 - views/500.erb
-- views/configurable/_configs.erb
-- views/configurable/_flag.erb
-- views/configurable/_list_select.erb
-- views/configurable/_select.erb
-- views/configurable/_switch.erb
+- views/configurable/configurations.erb
+- views/configurable/default.erb
 - views/layout.erb
 - views/object/obj.erb
+- views/tap/app/api/help.erb
 - views/tap/controller/help.erb
-- views/tap/controllers/app/_action.erb
-- views/tap/controllers/app/build.erb
-- views/tap/controllers/app/enque.erb
-- views/tap/controllers/app/info.erb
-- views/tap/controllers/app/tail.erb
+- views/tap/controllers/app/index.erb
 - views/tap/controllers/data/_controls.erb
-- views/tap/controllers/data/_index_entry.erb
 - views/tap/controllers/data/_upload.erb
 - views/tap/controllers/data/entry.erb
 - views/tap/controllers/data/index.erb
-- views/tap/controllers/schema/_build.erb
-- views/tap/controllers/schema/_index_entry.erb
-- views/tap/controllers/schema/entry.erb
 - views/tap/controllers/server/access.erb
 - views/tap/controllers/server/admin.erb
 - views/tap/controllers/server/index.erb
-- views/tap/task/help.erb
-- views/tap/task/input.erb
-- views/tap/tasks/load/input.erb
+- views/tap/signals/signal/get.erb
+- views/tap/signals/signal/index.erb
+- views/tap/signals/signal/post.erb
 - README
 - MIT-LICENSE
 - History
 has_rdoc: true
 homepage: http://tap.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -121,9 +113,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tap
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A web interface for tap.
 test_files: []
 

data/lib/tap/controllers/schema.rb

@@ -1,202 +0,0 @@
-require 'tap/controllers/data'
-
-module Tap
-  module Controllers
-    class Schema < Data
-      
-      # Adds to the specified schema.  Parameters:
-      #
-      # 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
-        
-        update_schema(id) do |schema|
-          # 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
-          end
-          
-          # inputs[] outputs[] join
-          inputs = request['inputs'] || []
-          outputs = request['outputs'] || []
-          if !inputs.empty? && !outputs.empty?
-            schema.joins << [inputs, outputs, {'id' => request['join'] || 'join'}]
-          end
-          
-          # 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
-        
-        redirect uri(id)
-      end
-      
-      # Removes tasks or joins from a schema.  Parameters:
-      #
-      # 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"
-          id = data.next_id(type).to_s
-        end
-        
-        tasks = request['tasks'] || []
-        joins = request['joins'] || []
-        queue = request['queue'] || []
-        middleware = request['middleware'] || []
-        
-        update_schema(id) do |schema|
-          tasks.each {|key| schema.tasks.delete(key) }
-          
-          joins.each {|index| schema.joins[index.to_i] = nil }
-          schema.joins.compact!
-          
-          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 save(id)
-        if id == "new"
-          id = data.next_id(type).to_s
-        end
-        
-        data.create_or_update(type, id) do |io| 
-          io << yamlize(request['schema'] || '')
-        end
-        
-        redirect uri(id)
-      end
-      
-      # Helper methods
-      protected
-      
-      def env
-        server.env
-      end
-      
-      def type
-        :schema
-      end
-      
-      def display(id)
-        schema = if path = data.find(type, id)
-          Tap::Schema.load_file(path)
-        else
-          Tap::Schema.new
-        end
-        
-        schema.resolve! do |type, key|
-          env[type][key]
-        end
-        
-        render "entry.erb", :locals => {
-          :id => id,
-          :schema => schema
-        }, :layout => true
-      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(configs)
-        Configurable::DelegateHash.new(configs).to_hash
-      end
-      
-      def format_yaml(object)
-        object == nil ? "~" : YAML.dump(object)[4...-1].strip
-      end
-      
-      def update_schema(id)        
-        path = data.find(type, id) || data.create(type, id)
-        schema = Tap::Schema.load_file(path)
-        
-        yield(schema)
-        
-        data.update(type, id) do |io| 
-          io << schema.dump
-        end
-        
-        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