@@ -1 +1 @@ -Subproject commit 08d709f78b8c5b0fbeb7821e37fa53e69afcf433 +Subproject commit d221938a6401d956ac6cfdc892f9b1c11b1fa31a rack @@ -33,21 +33,26 @@ module Tap lines << case value when Hash, Array "#{indent}#{key}:\n#{yamlize(value, indent + ' ')}" + when '#' + next else "#{indent}#{key}: #{value}" end end - lines.join("\n") + lines.empty? ? "#{indent}{}" : lines.join("\n") when Array - lines = obj.collect do |value| - case value + lines = [] + obj.each do |value| + lines << case value when Hash, Array "#{indent}-\n#{yamlize(value, indent + ' ')}" + when '#' + next else "#{indent}- #{value}" end end - lines.join("\n") + lines.empty? ? "#{indent}[]" : lines.join("\n") else obj end tap-server/lib/tap/controller/utils.rb @@ -136,45 +136,24 @@ module Tap # Helpers ######################### - def render_config(name, configurable, values=nil) - module_render "_configs.erb", configurable, + def render_config(resource, name="") + klass = resource[:class] + values = resource[:config] || default_config(klass.configurations) + + module_render "_configs.erb", klass, :locals => { :name => name, - :configs => configurable.configurations, - :values => values || default_config(configurable) + :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] = value - end - end - - def scrub_nils(schema) - resources = schema.tasks.values + - schema.joins.collect {|join| join[2] } + - schema.middleware - - resources.each do |resource| - scrub(resource['config']) - 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) tap-server/lib/tap/controllers/schema.rb @@ -1,14 +1,16 @@ <dl class="configs"> <% configs.each_pair do |key, config| %> <% next if config[:type] == :hidden %> +<% config_name = "#{name}[#{key.inspect}]" %> +<% value = values[key] %> <% if config.is_nest? %> -<% value = values[key.to_s] %> <dt class="name"><%= key %></dt> <dd class="nested-configs"> +<% configurations = config.default(false).delegates %> <%= module_render("_configs.erb", obj, :locals => { - :name => "#{name}[#{key}]", - :configs => config.default(false).delegates, - :values => value + :name => config_name, + :configs => configurations, + :values => value || default_config(configurations) }) %> </dd> <% else %> @@ -19,11 +21,11 @@ :file => config_template, :locals => { :obj => obj, - :name => "#{name}[#{key}]", + :name => config_name, :config => config, :value => value}) %> <% else%> - <input name="<%= name %>" type="text" value="<%= escape_html(value) %>" /> + <input name="<%= config_name %>" type="text" value="<%= format_yaml(value) %>" /> <% end %> </dd> <% end %> tap-server/views/configurable/_configs.erb @@ -1,3 +1,2 @@ -<% value = value == true || value == "true" %> <input name="<%= name %>" type="hidden" value="false" /> <input name="<%= name %>" type="checkbox" value="true" <%= value ? 'checked="true"' : '' %> /> \ No newline at end of file tap-server/views/configurable/_flag.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> \ No newline at end of file tap-server/views/configurable/_list_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> \ No newline at end of file tap-server/views/configurable/_select.erb @@ -1,3 +1,2 @@ -<% value = value == true || value == "true" %> <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 tap-server/views/configurable/_switch.erb @@ -105,19 +105,19 @@ <!-- 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}]" %> +<% 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'] %>"> -<%= render_config("#{name}[config]", task['class'], task['config']) %> + <input type="hidden" name="<%= name %>[:id]" value="<%= task[:id] %>"> +<%= render_config(task, "#{name}[:config]") %> </li> <% end %> </ul> @@ -125,7 +125,7 @@ <h3>Joins</h3> <ul class="joins"> <% schema.joins.each_with_index do |(inputs, outputs, join), index| %> -<% name = "schema[joins][]" %> +<% name = "schema[:joins][]" %> <li id="join_<%= index %>"> <h3><a href="#add_<%= id %>"><%= index %></a></h3> <% inputs.each do |input| %> @@ -134,8 +134,8 @@ <% outputs.each do |output| %> <input type="hidden" name="<%= name %>[1][]" value="<%= output %>"> <% end %> - <input type="hidden" name="<%= name %>[2][id]" value="<%= join['id'] || 'join' %>"> -<%= render_config("#{name}[2][config]", join['class'], join['config']) %> + <input type="hidden" name="<%= name %>[2][:id]" value="<%= join[:id] || 'join' %>"> +<%= render_config(join, "#{name}[2][:config]") %> </li> <% end %> </ul> tap-server/views/tap/controllers/schema/entry.erb f6349573397463fc9e68bbee68fc0c14d8bf183b Simon Chiang simon.a.chiang@gmail.com http://github.com/bahuvrihi/tap/commit/e9f4b75e47b6b9df86f4dc0affd18fb3f17bdf75 e9f4b75e47b6b9df86f4dc0affd18fb3f17bdf75 2009-06-12T00:06:08-07:00 2009-06-12T00:06:08-07:00 updated server for latest schema b948bbf8967009a679b1d99effe49a1b4c4aac9e Simon Chiang simon.a.chiang@gmail.com