tap-server/views/tap/controllers/schema/_configs.erb tap-server/views/tap/controllers/schema/join.erb tap-server/views/tap/controllers/schema/task.erb @@ -5,5 +5,6 @@ backup tap-server/log tap-server/schema tap-server/data +tap-server/dataset tap-server/session.yml *~ .gitignore @@ -1 +1 @@ -Subproject commit 72d821580256bf5c006d03d0e09280b1dd90c471 +Subproject commit acbfa368ee49664e3830589ecaace4cc7a244130 configurable @@ -3,38 +3,45 @@ module Tap # ::task class Echo < Tap::Task - config :key, 'default', :short => 'k' # a simple config with short - config :flag, false, &c.flag # a flag config - config :falseswitch, false, &c.switch # a --[no-]switch config - config :trueswitch, true, &c.switch # a --[no-]switch config - config :num, 10, &c.integer # integer only - config :range, 1..10, &c.range # range only + config :key, 'default' # a basic config + + config :flag_false, false, &c.flag # a flag config (false) + config :flag_true, true, &c.flag # a flag config (true) + + config :switch_false, false, &c.switch # a switch config (false) + config :switch_true, true, &c.switch # a switch config (true) + + config :string, "string", &c.string # string + config :sym, :sym, &c.symbol # sym + config :integer, 10, &c.integer # integer + config :numeric, 10, &c.numeric # numeric + config :float, 10, &c.float # float + + config :string_or_nil, nil, &c.string_or_nil # string_or_nil (nil) + config :sym_or_nil, nil, &c.symbol_or_nil # symbol_or_nil (nil) + config :integer_or_nil, nil, &c.integer_or_nil # integer_or_nil (nil) + config :number_or_nil, nil, &c.numeric_or_nil # number_or_nil (nil) + config :float_or_nil, nil, &c.float_or_nil # float_or_nil (nil) + + config :range, 1..10, &c.range # range config :array, [1,2,3], &c.array # array + config :hash, {}, &c.hash # hash + config :regexp, /abc/, &c.regexp # regexp config :select, 3, &c.select(12,3, &c.integer) # list - #config :list_select, [3], &c.list_select(1,4,12,3, &c.integer) # list - config :hash, {}, &c.hash # hash - # config :regexp, /abc/, &c.regexp # regexp - config :output, $stdout, &c.io # regexp - nest :nest do # desc - config :key, 'default', :short => 'k' # a simple config with short - config :flag, false, &c.flag # a flag config - config :falseswitch, false, &c.switch # a --[no-]switch config - nest :nest do # desc - config :key, 'default', :short => 'k' # a simple config with short - config :flag, false, &c.flag # a flag config - config :falseswitch, false, &c.switch # a --[no-]switch config - config :trueswitch, true, &c.switch # a --[no-]switch config - config :num, 10, &c.integer # integer only + config :list_select, [3], &c.list_select(1,4,12,3, &c.integer) # list select + + # + # + # config :output, $stdout, &c.io # regexp + + nest :nest do # nest desc + config :a, 'default' # a nested config (before) + nest :nest do # double-nest desc + config :key, 'default' # a double-nested config end - config :trueswitch, true, &c.switch # a --[no-]switch config - config :num, 10, &c.integer # integer only - end - def process(*args) - args = args.flatten - args << name - log name, args.inspect - args + config :z, 'default' # a nested config (after) end + end end end \ No newline at end of file tap-server/lib/tap/tasks/echo.rb @@ -1,8 +1 @@ -<% case value %> -<% when Hash, Array %> - <textarea name="<%= name %>"><%= value.to_yaml[4..-1] %></textarea> -<% when Regexp %> - <input name="<%= name %>" type="text" value="<%= value.inspect %>" /> -<% else %> - <input name="<%= name %>" type="text" value="<%= value %>" /> -<% end %> \ No newline at end of file +<input id="<%= id %>" name="<%= name %>" type="text" value="<%= escape_html(value || "( #{config.default(false).inspect} )") %>" /> \ No newline at end of file tap-server/views/configurable/delegate/default.erb @@ -1 +1 @@ - <input name="<%= name %>" type="checkbox" value="true" <%= value ? 'checked="true"' : '' %> /> \ No newline at end of file +<input id="<%= id %>" name="<%= name %>" type="checkbox" value="true" <%= value || config.default ? 'checked="true"' : '' %> /> \ No newline at end of file tap-server/views/configurable/delegate/flag.erb @@ -1,6 +1,6 @@ -<% raise "list select configuration is currently not supported" %> - <select name="<%= name %>[]" multiple="true"> -<% config[:values].each do |v| %> - <option value="<%= v %>" <%= value.include?(v) ? "selected='true' " : ""%>><%= v %></option> +<select id="<%= id %>" name="<%= name %>[]" multiple="true"> +<% value ||= config.default %> +<% (config[:options] || []).each do |option| %> + <option value="<%= option %>" <%= value.include?(option) ? "selected='true' " : ""%>><%= option %></option> <% end %> - </select> \ No newline at end of file +</select> \ No newline at end of file tap-server/views/configurable/delegate/list_select.erb @@ -1,5 +1,6 @@ - <select name="<%= name %>"> -<% config[:values].each do |v| %> - <option value="<%= v %>" <%= value == v ? "selected='true' " : ""%>><%= v %></option> +<select id="<%= id %>" name="<%= name %>"> +<% value ||= config.default %> +<% (config[:options] || []).each do |option| %> + <option value="<%= option %>" <%= value == option ? "selected='true' " : ""%>><%= option %></option> <% end %> - </select> \ No newline at end of file +</select> \ No newline at end of file tap-server/views/configurable/delegate/select.erb @@ -1,2 +1,2 @@ - <input name="<%= name %>" type="radio" value="true" <%= value ? 'checked="true" ' : '' %>>on</input> - <input name="<%= name %>" type="radio" value="false" <%= value ? '' : 'checked="true" ' %>>off</input> \ No newline at end of file +<input id="<%= id %>" name="<%= name %>" type="radio" value="true" <%= value || config.default ? 'checked="true" ' : '' %>>on</input> +<input id="<%= id %>" name="<%= name %>" type="radio" value="false" <%= value || config.default ? '' : 'checked="true" ' %>>off</input> \ No newline at end of file tap-server/views/configurable/delegate/switch.erb @@ -1,5 +1,5 @@ <form id="rename_<%= id %>" class="rename" method="post" action="<%= uri(id) %>"> - <input type="input" name="new_id" value="<%= id %>" /> + <input type="text" name="new_id" value="<%= id %>" /> <input type="hidden" name="_method" value="rename" /> <input type="submit" value="Rename" /> </form> tap-server/views/tap/controllers/data/_controls.erb @@ -2,7 +2,7 @@ <input type="hidden" name="_method" value="upload" /> <ul> <li><input type="file" name="<%= type %>" /></li> - <li><input type="input" name="id" value="" /> Id (if other than file name)</li> + <li><input type="text" name="id" value="" /> Id (if other than file name)</li> </ul> <input type="submit" value="Upload" /> </form> \ No newline at end of file tap-server/views/tap/controllers/data/_upload.erb @@ -83,8 +83,8 @@ <h3><a href="#add_<%= id %>"><%= key %></a></h3> <input type="hidden" name="<%= name %>[id]" value="<%= task[:id] %>"> -<%= class_render('config.erb', task[:class], :locals => { - :id => id, +<%= class_render('task.erb', task[:class], :locals => { + :id => "#{id}_task_#{key}", :name => name, :values => task[:config]}) %> <a href="<%= help_uri(:task, task) %>">help</a> @@ -104,8 +104,8 @@ <input type="hidden" name="<%= name %>[1][]" value="<%= output %>"> <% end %> <input type="hidden" name="<%= name %>[2][id]" value="<%= join[:id] || 'join' %>"> -<%= class_render('config.erb', join[:class], :locals => { - :id => id, +<%= class_render('join.erb', join[:class], :locals => { + :id => "#{id}_join_#{index}", :name => "#{name}[2]", :values => join[:config]}) %> <a href="<%= help_uri(:join, join) %>">help</a> tap-server/views/tap/controllers/schema/schema.erb tap-server/views/configurable/delegate/regexp.erb tap-server/views/tap/controllers/schema/config.erb tap-server/views/tap/controllers/schema/configurations.erb 5172c13225d098624e28a0aff972e6525565bd1f Simon Chiang simon.a.chiang@gmail.com http://github.com/bahuvrihi/tap/commit/9847133027118f99452e7a80ccafe98026169c36 9847133027118f99452e7a80ccafe98026169c36 2009-05-14T13:41:39-07:00 2009-05-14T13:41:39-07:00 work cleaning up configuration rendering 706eecb2903a6851df306627392d1a72248b4882 Simon Chiang simon.a.chiang@gmail.com