tap-server 0.5.0 → 0.6.0

data/History

@@ -1,3 +1,7 @@
+== 0.6.0 / 2009-12-3
+
+Updated for use with Tap-0.19.0
+
 == 0.5.0 / 2009-06-17
 
 * added Extname routes

data/MIT-LICENSE

@@ -1,19 +1,21 @@
 Copyright (c) 2009, Regents of the University of Colorado.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the "Software"), to deal in the Software
-without restriction, including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2009, Simon Chiang.
 
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README

@@ -30,20 +30,11 @@ should not be considered stable.
 
 == Installation
 
-Tap Server is available as a gem on RubyForge[http://rubyforge.org/projects/tap].  Use:
+Tap Server is available as a gem on Gemcutter[http://gemcutter.org/gems/tap-server].
 
   % gem install tap-server
-
-Tap requires an updated version of RubyGems[http://docs.rubygems.org/] 
-(>= 1.2.0).  To check the version and update RubyGems:
-
-  % gem --version
-  % gem --update system
     
 == Info 
 
-Copyright (c) 2009, Regents of the University of Colorado.
-Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com], {Biomolecular Structure Program}[http://biomol.uchsc.edu/], {Hansen Lab}[http://hsc-proteomics.uchsc.edu/hansenlab/] 
-Support:: CU Denver School of Medicine Deans Academic Enrichment Fund
+Developer:: {Simon Chiang}[http://bahuvrihi.wordpress.com]
 License:: {MIT-Style}[link:files/MIT-LICENSE.html]
-

data/cmd/server.rb

@@ -3,52 +3,38 @@
 # Initializes a tap server.
 #
 
-require 'tap'
 require 'tap/server'
 
-env = Tap::Env.instance
 app = Tap::App.instance
+opts = ConfigParser.new(app.config)
+opts.separator ""
+opts.separator "configurations:"
+opts.add(Tap::Server.configurations)
+opts.add(Tap::App.configurations)
 
-begin
-  opts = ConfigParser.new('env' => env, 'app' => app)
-  opts.separator ""
-  opts.separator "configurations:"
-  opts.add(Tap::Server.configurations)
-  
-  opts.separator ""
-  opts.separator "options:"
-  
-  opts.on('--config FILE', 'Specifies a config file') do |config_file|
-    opts.config.merge! Configurable::Utils.load_file(config_file)
-  end
-  
-  opts.on("-h", "--help", "Show this message") do
-    puts Lazydoc.usage(__FILE__)
-    puts opts
-    exit
-  end
-  
-  # (note defaults are not added so they will not
-  # conflict with string keys from a config file)
-  args = opts.parse!(ARGV, :clear_config => false, :add_defaults => false)
-  
-  if args.empty?
-    args << 'server'
-  end
-  
-  controller = env[:controller][args.shift]
-  
-  unless args.empty?
-    warn "ignoring args: #{args.inspect}"
-  end
-  
-  Tap::Server.new(controller, opts.nested_config).run!
-rescue
-  raise if $DEBUG
-  puts $!.message
-  exit(1)
+opts.separator ""
+opts.separator "options:"
+
+opts.on('--config FILE', 'Specifies a config file') do |config_file|
+  opts.config.merge! Configurable::Utils.load_file(config_file)
 end
 
-exit(0)
+opts.on("-h", "--help", "Show this message") do
+  puts Lazydoc.usage(__FILE__)
+  puts opts
+  exit
+end
+
+# (note defaults are not added so they will not
+# conflict with string keys from a config file)
+args = opts.parse!(ARGV, :clear_config => false, :add_defaults => false)
 
+server = Tap::Server.new(opts.nested_config)
+server.bind(args.shift || 'tap-server:server')
 
+unless args.empty?
+  warn "ignoring args: #{args.inspect}"
+end
+
+server.run!
+exit(0)

data/lib/tap/controller.rb

@@ -26,14 +26,9 @@ module Tap
       def inherited(child) # :nodoc:
         super
         
-        unless child.instance_variable_defined?(:@source_file)
-          caller[0] =~ Lazydoc::CALLER_REGEXP
-          child.instance_variable_set(:@source_file, File.expand_path($1)) 
-        end
-        
         set_variables.each do |variable|
           value = get(variable)
-          value = value.dup if Configurable::Delegate.duplicable_value?(value)
+          value = value.dup if Configurable::Config.duplicable_value?(value)
           child.set(variable, value)
         end
         
@@ -146,10 +141,9 @@ module Tap
     # not be actions in subclasses. 
     set :define_action, false
     
+    # References the Tap::Server running this controller.
     attr_accessor :server
     
-    attr_accessor :controller_path
-    
     # A Rack::Request wrapping env, set during call.
     attr_accessor :request
 
@@ -160,7 +154,7 @@ module Tap
     
     # Initializes a new instance of self.
     def initialize
-      @request = @response = @server = @controller_path = nil
+      @request = @response = @server = nil
     end
     
     # Returns true if action is registered as an action for self.
@@ -174,7 +168,7 @@ module Tap
     # these to the uri.
     def uri(action=nil, params=nil, options=nil)
       if action.kind_of?(Hash)
-        unless params == nil && options == nil
+        unless params.nil? && options.nil?
           raise "extra arguments specified for uri hash syntax"
         end
         
@@ -185,9 +179,8 @@ module Tap
       
       uri = []
       
-      if controller_path
-        uri << '/'
-        uri << controller_path
+      if request
+        uri << request.env['SCRIPT_NAME']
       end
       
       if action
@@ -195,7 +188,7 @@ module Tap
         uri << action
       end
       
-      unless params == nil || params.empty?
+      unless params.nil? || params.empty?
         uri << '?'
         uri << build_query(params)
       end
@@ -217,14 +210,6 @@ module Tap
       uri.join
     end
     
-    def template_path(path)
-      server.env.path(:views, path) {|file| File.file?(file) }
-    end
-    
-    def module_path(path, klass=self.class)
-      server.env.module_path(:views, klass.ancestors, path) {|file| File.file?(file) }
-    end
-    
     # Routes the request to an action and returns the response.  Routing is
     # simple and fixed (see route):
     #
@@ -253,8 +238,6 @@ module Tap
     #
     def call(env)
       @server = env['tap.server']
-      @controller_path = env['tap.controller_path']
-      
       @request = Rack::Request.new(env)
       @response = Rack::Response.new
       
@@ -269,8 +252,8 @@ module Tap
       end
     end
 
-    # Returns the action, args, and extname for the request.path_info.  Routing
-    # is simple and fixed:
+    # Returns the action, args, and extname for the request.path_info. 
+    # Routing is simple and fixed:
     #
     #   route             returns
     #   /                 [:index, []]
@@ -284,6 +267,7 @@ module Tap
       route
     end
     
+    # Inputs a route like [action, *args] and dispatches it to the action.
     def dispatch(route)
       action, *args = route
       
@@ -292,7 +276,7 @@ module Tap
       end
       
       unless action?(action)
-        raise ServerError.new("404 Error: page not found", 404)
+        not_found
       end
       
       send(action, *args)
@@ -314,9 +298,9 @@ module Tap
       when options[:file]
         options[:file]
       when options[:template]
-        self.template_path(options[:template])
+        server.template_path(options[:template])
       else
-        self.module_path(path)
+        server.module_path(path, self.class)
       end
 
       unless template_path
@@ -379,8 +363,7 @@ module Tap
     end
     
     def module_render(path, obj, options={})
-      obj = obj.class unless obj.kind_of?(Module)
-      options[:file] = module_path(path, obj) || module_path(path)
+      options[:file] = server.module_path(path, obj.class)
       
       locals = options[:locals] ||= {}
       locals[:obj] ||= obj
@@ -398,6 +381,14 @@ module Tap
       response.finish
     end
     
+    def not_found
+      error("404 Error: page not found", 404)
+    end
+    
+    def error(msg, status=500)
+      raise ServerError.new(msg, status)
+    end
+    
     private
     
     # Generates an empty binding to self without any locals assigned.

data/lib/tap/controllers/app.rb

@@ -1,135 +1,39 @@
 require 'tap/controller'
-require 'tap/controllers/schema'
 
 module Tap
   module Controllers
     
-    # :startdoc::controller builds and runs workflows
+    # :startdoc::controller dispatches signals to an app
     class App < Tap::Controller
-      set :default_action, :info
+      include RestRoutes
       
-      nest :schema, Schema do
-        def dispatch(route)
-          route.unshift rest_action(route)
-          super(route)
-        end
-      end
-      
-      # Returns the state of app.
-      def state
-        app.state.to_s
-      end
-      
-      # Returns the controls and current application info.
-      def info
-        render 'info.erb', :locals => {
-          :actions => [:run, :stop, :terminate, :reset],
-        }, :layout => true
-      end
-      
-      # Runs app on a separate thread (on post).
-      def run
-        if request.post?
-          server.thread ||= Thread.new { app.run; server.thread = nil; }
-        end
-        
-        redirect uri(:info)
-      end
-      
-      def reset
-        app.reset if request.post?
-        redirect uri(:info)
-      end
-      
-      # Stops app (on post).
-      def stop
-        app.stop if request.post?
-        redirect uri(:info)
-      end
-      
-      # Teminates app (on post).
-      def terminate
-        app.terminate if request.post?
-        redirect uri(:info)
+      def route
+        unescape(request.path_info)
       end
       
-      def build
-        schema = request[:schema] || server.data.read(:schema, request[:id])
-        
-        unless request.post?
-          return render('build.erb', :schema => schema, :layout => true)
+      def dispatch(route)
+        if route == "/"
+          return render('index.erb', :layout => true)
         end
         
-        schema = Tap::Schema.load(schema).resolve! do |type, key, data|
-          server.env.manifest(type)[key]
-        end.validate!
-        
-        if request[:reset] == "on"
-          app.reset
-        end
+        route =~ Tap::Parser::SIGNAL
+        signal = app.route($1, $2)
         
-        tasks.merge!(server.env.build(schema, app))
-        
-        if request[:run] == "on"
-          run
+        request_method = request.request_method
+        case request_method
+        when /GET/i
+          module_render('get.erb', signal)
+        when /POST/i
+          result = signal.call(request.params)
+          module_render('post.erb', signal, :locals => {:result => result})
         else
-          redirect uri(:enque)
+          error("cannot signal via: #{request_method}")
         end
       end
       
-      def enque
-        unless request.post?
-          return render('enque.erb', :layout => true)
-        end
-        
-        queue = if request[:load]
-          YAML.load(request[:queue] || "{}")
-        else
-          request[:queue] || {}
-        end
-        
-        queue.each do |(key, inputs)|
-          unless task = tasks[key]
-            raise "no task for: #{key}"
-          end
-          app.enq(task, *inputs)
-        end
-        
-        redirect uri(:info)
-      end
-      
-      def tail(id)
-        unless data.has?("#{id}.log")
-          raise Tap::ServerError.new("invalid id: #{id}", 404)
-        end
-        
-        path = data.path("#{id}.log")
-        pos = request['pos'].to_i
-        if pos > File.size(path)
-          raise Tap::ServerError.new("tail position out of range (try update)", 500)
-        end
-
-        content = File.open(path) do |file|
-          file.pos = pos
-          file.read
-        end
-    
-        if request.post?
-          content
-        else
-          render('tail.erb', :locals => {
-            :id => id,
-            :path => File.basename(path),
-            :update => true,
-            :content => content
-          }, :layout => true)
-        end
-      end
-      
-      protected
-      
-      def tasks
-        app.cache[:tasks] ||= {}
+      def uri(obj, sig=nil)
+        obj, sig = nil, obj unless sig
+        super(obj ? "#{obj}/#{sig}" : sig)
       end
       
       def app