scaffolding_extensions 1.4.3 → 1.4.4

data/README

@@ -21,19 +21,19 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 2.3.8 (with or without RailsXss plugin)
+  * Rails 3.0.0
   * Ramaze 2010.06.18
   * Camping 2.1
   * Sinatra 1.0
   * Merb 1.0.4
   * Rack 1.1.0
 * Object Relational Mappers
-  * ActiveRecord 2.3.8
-  * Sequel 3.14.0
+  * ActiveRecord 3.0.0
+  * Sequel 3.16.0
   * DataMapper 1.0 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.3
-  * JQuery 1.2.3
+  * JQuery 1.4.2 (with JQuery-Autocomplete 1.1) 
   
 There are differing levels of support for the web frameworks, mostly related
 to whether or not you can use custom views and layouts.  Custom views mean

data/contrib/scaffold_jquery_autocomplete/README

@@ -1,8 +1,7 @@
 If you are using JQuery javascript library with the plugin, you need to use this
-plugin for autocomplete functionality.  It's a modification of jq-autocomplete
-[1].  It also requires the Dimensions JQuery plugin [2].  To use this plugin,
-add the include the css file as a stylesheet and the js file as a script (in
-addition to JQuery and the Dimensions plugin).
+plugin for autocomplete functionality.  It's a modification of jquery-Autocomplete
+[1].  To use this plugin, include the css file as a stylesheet, the gif in the
+same directory as the stylesheet, and the js file as a script (in addition to
+JQuery itself).
 
-[1] http://plugins.jquery.com/project/jq-autocomplete
-[2] http://plugins.jquery.com/project/dimensions
+[1] http://docs.jquery.com/Plugins/autocomplete

data/contrib/scaffold_jquery_autocomplete/jquery.autocomplete.css

@@ -0,0 +1,48 @@
+.ac_results {
+	padding: 0px;
+	border: 1px solid black;
+	background-color: white;
+	overflow: hidden;
+	z-index: 99999;
+}
+
+.ac_results ul {
+	width: 100%;
+	list-style-position: outside;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.ac_results li {
+	margin: 0px;
+	padding: 2px 5px;
+	cursor: default;
+	display: block;
+	/* 
+	if width will be 100% horizontal scrollbar will apear 
+	when scroll mode will be used
+	*/
+	/*width: 100%;*/
+	font: menu;
+	font-size: 12px;
+	/* 
+	it is very important, if line-height not setted or setted 
+	in relative units scroll will be broken in firefox
+	*/
+	line-height: 16px;
+	overflow: hidden;
+}
+
+.ac_loading {
+	background: white url('indicator.gif') right center no-repeat;
+}
+
+.ac_odd {
+	background-color: #eee;
+}
+
+.ac_over {
+	background-color: #0A246A;
+	color: white;
+}

data/contrib/scaffold_jquery_autocomplete/jquery.autocomplete.js

@@ -0,0 +1,13 @@
+/*
+ * jQuery Autocomplete plugin 1.1
+ *
+ * Copyright (c) 2009 Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
+ */;(function($){$.fn.extend({autocomplete:function(urlOrData,options){var isUrl=typeof urlOrData=="string";options=$.extend({},$.Autocompleter.defaults,{url:isUrl?urlOrData:null,data:isUrl?null:urlOrData,delay:isUrl?$.Autocompleter.defaults.delay:10,max:options&&!options.scroll?10:150},options);options.highlight=options.highlight||function(value){return value;};options.formatMatch=options.formatMatch||options.formatItem;return this.each(function(){new $.Autocompleter(this,options);});},result:function(handler){return this.bind("result",handler);},search:function(handler){return this.trigger("search",[handler]);},flushCache:function(){return this.trigger("flushCache");},setOptions:function(options){return this.trigger("setOptions",[options]);},unautocomplete:function(){return this.trigger("unautocomplete");}});$.Autocompleter=function(input,options){var KEY={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8};var $input=$(input).attr("autocomplete","off").addClass(options.inputClass);var timeout;var previousValue="";var cache=$.Autocompleter.Cache(options);var hasFocus=0;var lastKeyPressCode;var config={mouseDownOnSelect:false};var select=$.Autocompleter.Select(options,input,selectCurrent,config);var blockSubmit;$.browser.opera&&$(input.form).bind("submit.autocomplete",function(){if(blockSubmit){blockSubmit=false;return false;}});$input.bind(($.browser.opera?"keypress":"keydown")+".autocomplete",function(event){hasFocus=1;lastKeyPressCode=event.keyCode;switch(event.keyCode){case KEY.UP:event.preventDefault();if(select.visible()){select.prev();}else{onChange(0,true);}break;case KEY.DOWN:event.preventDefault();if(select.visible()){select.next();}else{onChange(0,true);}break;case KEY.PAGEUP:event.preventDefault();if(select.visible()){select.pageUp();}else{onChange(0,true);}break;case KEY.PAGEDOWN:event.preventDefault();if(select.visible()){select.pageDown();}else{onChange(0,true);}break;case options.multiple&&$.trim(options.multipleSeparator)==","&&KEY.COMMA:case KEY.TAB:case KEY.RETURN:if(selectCurrent()){event.preventDefault();blockSubmit=true;return false;}break;case KEY.ESC:select.hide();break;default:clearTimeout(timeout);timeout=setTimeout(onChange,options.delay);break;}}).focus(function(){hasFocus++;}).blur(function(){hasFocus=0;if(!config.mouseDownOnSelect){hideResults();}}).click(function(){if(hasFocus++>1&&!select.visible()){onChange(0,true);}}).bind("search",function(){var fn=(arguments.length>1)?arguments[1]:null;function findValueCallback(q,data){var result;if(data&&data.length){for(var i=0;i<data.length;i++){if(data[i].result.toLowerCase()==q.toLowerCase()){result=data[i];break;}}}if(typeof fn=="function")fn(result);else $input.trigger("result",result&&[result.data,result.value]);}$.each(trimWords($input.val()),function(i,value){request(value,findValueCallback,findValueCallback);});}).bind("flushCache",function(){cache.flush();}).bind("setOptions",function(){$.extend(options,arguments[1]);if("data"in arguments[1])cache.populate();}).bind("unautocomplete",function(){select.unbind();$input.unbind();$(input.form).unbind(".autocomplete");});function selectCurrent(){var selected=select.selected();if(!selected)return false;var v=selected.result;previousValue=v;if(options.multiple){var words=trimWords($input.val());if(words.length>1){var seperator=options.multipleSeparator.length;var cursorAt=$(input).selection().start;var wordAt,progress=0;$.each(words,function(i,word){progress+=word.length;if(cursorAt<=progress){wordAt=i;return false;}progress+=seperator;});words[wordAt]=v;v=words.join(options.multipleSeparator);}v+=options.multipleSeparator;}$input.val(v);hideResultsNow();$input.trigger("result",[selected.data,selected.value]);return true;}function onChange(crap,skipPrevCheck){if(lastKeyPressCode==KEY.DEL){select.hide();return;}var currentValue=$input.val();if(!skipPrevCheck&&currentValue==previousValue)return;previousValue=currentValue;currentValue=lastWord(currentValue);if(currentValue.length>=options.minChars){$input.addClass(options.loadingClass);if(!options.matchCase)currentValue=currentValue.toLowerCase();request(currentValue,receiveData,hideResultsNow);}else{stopLoading();select.hide();}};function trimWords(value){if(!value)return[""];if(!options.multiple)return[$.trim(value)];return $.map(value.split(options.multipleSeparator),function(word){return $.trim(value).length?$.trim(word):null;});}function lastWord(value){if(!options.multiple)return value;var words=trimWords(value);if(words.length==1)return words[0];var cursorAt=$(input).selection().start;if(cursorAt==value.length){words=trimWords(value)}else{words=trimWords(value.replace(value.substring(cursorAt),""));}return words[words.length-1];}function autoFill(q,sValue){if(options.autoFill&&(lastWord($input.val()).toLowerCase()==q.toLowerCase())&&lastKeyPressCode!=KEY.BACKSPACE){$input.val($input.val()+sValue.substring(lastWord(previousValue).length));$(input).selection(previousValue.length,previousValue.length+sValue.length);}};function hideResults(){clearTimeout(timeout);timeout=setTimeout(hideResultsNow,200);};function hideResultsNow(){var wasVisible=select.visible();select.hide();clearTimeout(timeout);stopLoading();if(options.mustMatch){$input.search(function(result){if(!result){if(options.multiple){var words=trimWords($input.val()).slice(0,-1);$input.val(words.join(options.multipleSeparator)+(words.length?options.multipleSeparator:""));}else{$input.val("");$input.trigger("result",null);}}});}};function receiveData(q,data){if(data&&data.length&&hasFocus){stopLoading();select.display(data,q);autoFill(q,data[0].value);select.show();}else{hideResultsNow();}};function request(term,success,failure){if(!options.matchCase)term=term.toLowerCase();var data=cache.load(term);if(data&&data.length){success(term,data);}else if((typeof options.url=="string")&&(options.url.length>0)){var extraParams={timestamp:+new Date()};$.each(options.extraParams,function(key,param){extraParams[key]=typeof param=="function"?param():param;});$.ajax({mode:"abort",port:"autocomplete"+input.name,dataType:options.dataType,url:options.url,data:$.extend({q:lastWord(term),limit:options.max},extraParams),success:function(data){var parsed=options.parse&&options.parse(data)||parse(data);cache.add(term,parsed);success(term,parsed);}});}else{select.emptyList();failure(term);}};function parse(data){var parsed=[];var rows=data.split("\n");for(var i=0;i<rows.length;i++){var row=$.trim(rows[i]);if(row){row=row.split("|");parsed[parsed.length]={data:row,value:row[0],result:options.formatResult&&options.formatResult(row,row[0])||row[0]};}}return parsed;};function stopLoading(){$input.removeClass(options.loadingClass);};};$.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:100,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(row){return row[0];},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(value,term){return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>");},scroll:true,scrollHeight:180};$.Autocompleter.Cache=function(options){var data={};var length=0;function matchSubset(s,sub){if(!options.matchCase)s=s.toLowerCase();var i=s.indexOf(sub);if(options.matchContains=="word"){i=s.toLowerCase().search("\\b"+sub.toLowerCase());}if(i==-1)return false;return i==0||options.matchContains;};function add(q,value){if(length>options.cacheLength){flush();}if(!data[q]){length++;}data[q]=value;}function populate(){if(!options.data)return false;var stMatchSets={},nullData=0;if(!options.url)options.cacheLength=1;stMatchSets[""]=[];for(var i=0,ol=options.data.length;i<ol;i++){var rawValue=options.data[i];rawValue=(typeof rawValue=="string")?[rawValue]:rawValue;var value=options.formatMatch(rawValue,i+1,options.data.length);if(value===false)continue;var firstChar=value.charAt(0).toLowerCase();if(!stMatchSets[firstChar])stMatchSets[firstChar]=[];var row={value:value,data:rawValue,result:options.formatResult&&options.formatResult(rawValue)||value};stMatchSets[firstChar].push(row);if(nullData++<options.max){stMatchSets[""].push(row);}};$.each(stMatchSets,function(i,value){options.cacheLength++;add(i,value);});}setTimeout(populate,25);function flush(){data={};length=0;}return{flush:flush,add:add,populate:populate,load:function(q){if(!options.cacheLength||!length)return null;if(!options.url&&options.matchContains){var csub=[];for(var k in data){if(k.length>0){var c=data[k];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub.push(x);}});}}return csub;}else
+if(data[q]){return data[q];}else
+if(options.matchSubset){for(var i=q.length-1;i>=options.minChars;i--){var c=data[q.substr(0,i)];if(c){var csub=[];$.each(c,function(i,x){if(matchSubset(x.value,q)){csub[csub.length]=x;}});return csub;}}}return null;}};};$.Autocompleter.Select=function(options,input,select,config){var CLASSES={ACTIVE:"ac_over"};var listItems,active=-1,data,term="",needsInit=true,element,list;function init(){if(!needsInit)return;element=$("<div/>").hide().addClass(options.resultsClass).css("position","absolute").appendTo(document.body);list=$("<ul/>").appendTo(element).mouseover(function(event){if(target(event).nodeName&&target(event).nodeName.toUpperCase()=='LI'){active=$("li",list).removeClass(CLASSES.ACTIVE).index(target(event));$(target(event)).addClass(CLASSES.ACTIVE);}}).click(function(event){$(target(event)).addClass(CLASSES.ACTIVE);select();input.focus();return false;}).mousedown(function(){config.mouseDownOnSelect=true;}).mouseup(function(){config.mouseDownOnSelect=false;});if(options.width>0)element.css("width",options.width);needsInit=false;}function target(event){var element=event.target;while(element&&element.tagName!="LI")element=element.parentNode;if(!element)return[];return element;}function moveSelect(step){listItems.slice(active,active+1).removeClass(CLASSES.ACTIVE);movePosition(step);var activeItem=listItems.slice(active,active+1).addClass(CLASSES.ACTIVE);if(options.scroll){var offset=0;listItems.slice(0,active).each(function(){offset+=this.offsetHeight;});if((offset+activeItem[0].offsetHeight-list.scrollTop())>list[0].clientHeight){list.scrollTop(offset+activeItem[0].offsetHeight-list.innerHeight());}else if(offset<list.scrollTop()){list.scrollTop(offset);}}};function movePosition(step){active+=step;if(active<0){active=listItems.size()-1;}else if(active>=listItems.size()){active=0;}}function limitNumberOfItems(available){return options.max&&options.max<available?options.max:available;}function fillList(){list.empty();var max=limitNumberOfItems(data.length);for(var i=0;i<max;i++){if(!data[i])continue;var formatted=options.formatItem(data[i].data,i+1,max,data[i].value,term);if(formatted===false)continue;var li=$("<li/>").html(options.highlight(formatted,term)).addClass(i%2==0?"ac_even":"ac_odd").appendTo(list)[0];$.data(li,"ac_data",data[i]);}listItems=list.find("li");if(options.selectFirst){listItems.slice(0,1).addClass(CLASSES.ACTIVE);active=0;}if($.fn.bgiframe)list.bgiframe();}return{display:function(d,q){init();data=d;term=q;fillList();},next:function(){moveSelect(1);},prev:function(){moveSelect(-1);},pageUp:function(){if(active!=0&&active-8<0){moveSelect(-active);}else{moveSelect(-8);}},pageDown:function(){if(active!=listItems.size()-1&&active+8>listItems.size()){moveSelect(listItems.size()-1-active);}else{moveSelect(8);}},hide:function(){element&&element.hide();listItems&&listItems.removeClass(CLASSES.ACTIVE);active=-1;},visible:function(){return element&&element.is(":visible");},current:function(){return this.visible()&&(listItems.filter("."+CLASSES.ACTIVE)[0]||options.selectFirst&&listItems[0]);},show:function(){var offset=$(input).offset();element.css({width:typeof options.width=="string"||options.width>0?options.width:$(input).width(),top:offset.top+input.offsetHeight,left:offset.left}).show();if(options.scroll){list.scrollTop(0);list.css({maxHeight:options.scrollHeight,overflow:'auto'});if($.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var listHeight=0;listItems.each(function(){listHeight+=this.offsetHeight;});var scrollbarsVisible=listHeight>options.scrollHeight;list.css('height',scrollbarsVisible?options.scrollHeight:listHeight);if(!scrollbarsVisible){listItems.width(list.width()-parseInt(listItems.css("padding-left"))-parseInt(listItems.css("padding-right")));}}}},selected:function(){var selected=listItems&&listItems.filter("."+CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);return selected&&selected.length&&$.data(selected[0],"ac_data");},emptyList:function(){list&&list.empty();},unbind:function(){element&&element.remove();}};};$.fn.selection=function(start,end){if(start!==undefined){return this.each(function(){if(this.createTextRange){var selRange=this.createTextRange();if(end===undefined||start==end){selRange.move("character",start);selRange.select();}else{selRange.collapse(true);selRange.moveStart("character",start);selRange.moveEnd("character",end);selRange.select();}}else if(this.setSelectionRange){this.setSelectionRange(start,end);}else if(this.selectionStart){this.selectionStart=start;this.selectionEnd=end;}});}var field=this[0];if(field.createTextRange){var range=document.selection.createRange(),orig=field.value,teststring="<->",textLength=range.text.length;range.text=teststring;var caretAt=field.value.indexOf(teststring);field.value=orig;this.selection(caretAt,caretAt+textLength);return{start:caretAt,end:caretAt+textLength}}else if(field.selectionStart!==undefined){return{start:field.selectionStart,end:field.selectionEnd}}};})(jQuery);

data/lib/scaffolding_extensions/controller/action_controller.rb

@@ -15,6 +15,11 @@ module ScaffoldingExtensions
       def scaffold_token_tag
         token_tag
       end
+
+      # Mark the output as safe for raw display
+      def scaffold_raw(s)
+        raw(s)
+      end
   end
   
   # Instance methods for ActionController::Base necessary for Scaffolding Extensions
@@ -49,10 +54,15 @@ module ScaffoldingExtensions
         begin
           render({:action=>suffix_action}.merge(render_options))
         rescue ActionView::MissingTemplate
-          if active_layout || render_options.include?(:layout)
-            render({:file=>scaffold_path(action), :layout=>active_layout}.merge(render_options))
+          if render_options.include?(:layout) || _default_layout
+            render({:file=>scaffold_path(action)}.merge(render_options))
           else
-            @content = render_to_string({:file=>scaffold_path(action)}.merge(render_options))
+            options = _normalize_args({:file=>scaffold_path(action)}.merge(render_options))
+            _normalize_options(options)
+            _process_options(options)
+            vc = view_context
+            @content = vc.render(options)
+            vc.instance_variables.each{|iv| instance_variable_set(iv, vc.instance_variable_get(iv))}
             render({:file=>scaffold_path("layout")})
           end
         end
@@ -92,21 +102,7 @@ module ScaffoldingExtensions
     private
       # Adds a before filter for checking nonidempotent requests use method POST
       def scaffold_setup_helper
-        mod = ScaffoldingExtensions::Helper.clone
-        helper mod
-        if mod.respond_to?(:safe_helper, true)
-          mod.send(:safe_helper, :scaffold_association_links, :scaffold_auto_complete_result,
-            :scaffold_button_to, :scaffold_button_to_remote, :scaffold_field_tag,
-            :scaffold_form, :scaffold_habtm_ajax_associations,
-            :scaffold_habtm_association_line_item, :scaffold_javascript_tag,
-            :scaffold_label, :scaffold_link, :scaffold_manage_link,
-            :scaffold_model_error_messages, :scaffold_model_field_tags,
-            :scaffold_model_form, :scaffold_select_tag,
-            :scaffold_add_habtm_element, :scaffold_remove_existing_habtm_element,
-            :scaffold_text_field_tag_with_auto_complete,
-            :scaffold_form_remote_tag, :scaffold_javascript_autocompleter,
-            :scaffold_load_associations_with_ajax_link)
-        end
+        helper ScaffoldingExtensions::Helper
         helper ScaffoldingExtensions::ActionControllerHelper
         include ScaffoldingExtensions::Controller
         include ScaffoldingExtensions::ActionController

data/lib/scaffolding_extensions/helper.rb

@@ -47,17 +47,6 @@ module ScaffoldingExtensions
         content << "</ul>\n"
       end
       
-      # Formats the records returned by scaffold autocompleting to be displayed,
-      # should be an unordered list.  By default uses the scaffold_name and id of
-      # the entries as the value.
-      def scaffold_auto_complete_result(entries)
-        return unless entries
-        content = '<ul>'
-        entries.collect{|entry| content << "<li>#{h(entry.scaffold_name_with_id)}</li>"}
-        content << '</ul>'
-        content
-      end
-      
       # Simple button with label text that submits a form to the given url, options are
       # passed to scaffold_form.
       def scaffold_button_to(text, url, options={})
@@ -294,6 +283,11 @@ module ScaffoldingExtensions
       def scaffold_param_list_suffix
         '[]'
       end
+
+      # Empty method, used in certain frameworks for marking strings as raw
+      def scaffold_raw(s)
+        s
+      end
       
       # A select tag with the provided name for the given collection of items. The options
       # will have the value of scaffold_id and the content of scaffold_name.  If multiple is

data/lib/scaffolding_extensions/jquery_helper.rb

@@ -18,11 +18,17 @@ module ScaffoldingExtensions
         end
         content
       end
+
+      # JQuery-Autocomplete expects the autocomplete result to be plain text
+      # with a single line per row.
+      def scaffold_auto_complete_result(entries)
+        scaffold_raw(entries.map{|e| h(e.scaffold_name_with_id)}.join("\n")) if entries
+      end
       
       # A form tag with an onsubmit attribute that submits the form to the given url via Ajax
       def scaffold_form_remote_tag(url, options)
         u = scaffold_url(url, options)
-        "<form method='post' action='#{u}' onsubmit=\"$.post('#{u}', $(this).serialize(), function(data, textStatus){eval(data);}); return false;\">\n#{scaffold_token_tag}\n"
+        "<form method='post' action='#{u}' onsubmit=\"$.post('#{u}', $(this).serialize(), function(data, textStatus){}); return false;\">\n#{scaffold_token_tag}\n"
       end
       
       # Javascript that takes the given id as the text box to autocomplete for, 
@@ -30,7 +36,7 @@ module ScaffoldingExtensions
       # (with the association if one is given), using the get method, and displaying values
       # in #{id}_scaffold_auto_complete.
       def scaffold_javascript_autocompleter(id, model_name, association)
-        scaffold_javascript_tag("$('##{id}').autocomplete({ajax:'#{scaffold_url("scaffold_auto_complete_for_#{model_name}")}'#{", association:'#{association}'" if association}});")
+        scaffold_javascript_tag("$('##{id}').autocomplete('#{scaffold_url("scaffold_auto_complete_for_#{model_name}")}'#{", {extraParams: {association: '#{association}'}}" if association});")
       end
       
       # Filters some html entities and replaces them with their javascript equivalents

data/lib/scaffolding_extensions/meta_controller.rb

@@ -124,7 +124,7 @@ module ScaffoldingExtensions
           if klass.scaffold_load_associations_with_ajax
             scaffold_define_method("associations#{suffix}") do
               @scaffold_object ||= klass.scaffold_find_object(:edit, scaffold_request_id, :session=>scaffold_session)
-              scaffold_render_template(:associations, scaffold_options, :inline=>"<%= scaffold_habtm_ajax_associations %>\n<%= scaffold_association_links %>\n")
+              scaffold_render_template(:associations, scaffold_options, :inline=>"<%=scaffold_raw scaffold_habtm_ajax_associations %>\n<%=scaffold_raw scaffold_association_links %>\n")
             end
           end
         end
@@ -224,7 +224,8 @@ module ScaffoldingExtensions
             if scaffold_request_param(:association) && !allowed_associations.include?(association)
               scaffold_method_not_allowed
             else
-              @items = klass.scaffold_auto_complete_find(scaffold_request_id.to_s, :association=>(association.to_sym if scaffold_request_param(:association)), :session=>scaffold_session)
+              # Prototype uses the request id, JQuery-Autocomplete uses the q parameter
+              @items = klass.scaffold_auto_complete_find((scaffold_request_id || scaffold_request_param(:q)).to_s, :association=>(association.to_sym if scaffold_request_param(:association)), :session=>scaffold_session)
               scaffold_render_template(meth, {}, :inline => "<%= scaffold_auto_complete_result(@items) %>")
             end
           end
@@ -272,7 +273,7 @@ module ScaffoldingExtensions
               @auto_complete = auto_complete
               @element_id = element_id
               @scaffold_javascript = true
-              scaffold_render_template(add_meth, {}, :inline=>'<%= scaffold_add_habtm_element %>')
+              scaffold_render_template(add_meth, {}, :inline=>'<%=scaffold_raw scaffold_add_habtm_element %>')
             else
               scaffold_redirect_to(scaffold_url("edit#{suffix}", :id=>@record.scaffold_id))
             end
@@ -289,7 +290,7 @@ module ScaffoldingExtensions
               @select_value = @associated_record.scaffold_id
               @select_text = @associated_record.scaffold_name
               @scaffold_javascript = true
-              scaffold_render_template(remove_meth, {}, :inline=>'<%= scaffold_remove_existing_habtm_element %>')
+              scaffold_render_template(remove_meth, {}, :inline=>'<%=scaffold_raw scaffold_remove_existing_habtm_element %>')
             else
               scaffold_redirect_to(scaffold_url("edit#{suffix}", :id=>@record.scaffold_id))
             end

data/lib/scaffolding_extensions/prototype_helper.rb

@@ -19,6 +19,15 @@ module ScaffoldingExtensions
         content
       end
       
+      # Prototype wants the auto_complete result as an unordered list.
+      def scaffold_auto_complete_result(entries)
+        return unless entries
+        content = '<ul>'
+        entries.collect{|entry| content << "<li>#{h(entry.scaffold_name_with_id)}</li>"}
+        content << '</ul>'
+        scaffold_raw content
+      end
+      
       # A form tag with an onsubmit attribute that submits the form to the given url via Ajax
       def scaffold_form_remote_tag(url, options)
         u = scaffold_url(url, options)

data/scaffolds/edit.rhtml

@@ -1,12 +1,12 @@
 <% @scaffold_title = "Editing #{@scaffold_options[:singular_lc_human_name]}" %>
 
-<%= scaffold_model_form('update', @scaffold_class.scaffold_fields(:edit)) %>
+<%=scaffold_raw scaffold_model_form('update', @scaffold_class.scaffold_fields(:edit)) %>
 
 <% if @scaffold_class.scaffold_load_associations_with_ajax && !@scaffold_show_associations %>
-  <%= scaffold_load_associations_with_ajax_link %>
+  <%=scaffold_raw scaffold_load_associations_with_ajax_link %>
 <% else %>
-  <%= scaffold_habtm_ajax_associations %>
-  <%= scaffold_association_links %>
+  <%=scaffold_raw scaffold_habtm_ajax_associations %>
+  <%=scaffold_raw scaffold_association_links %>
 <% end %>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/habtm.rhtml

@@ -1,18 +1,18 @@
 <% @scaffold_title = "Update #{sn = h(@scaffold_object.scaffold_name)}'s #{mpn = (so = @scaffold_options )[:aplch_name]}" %>
 
-<%= scaffold_form(scaffold_url("update#{@scaffold_suffix}", :id=>(soid=@scaffold_object.scaffold_id))) %>
+<%=scaffold_raw scaffold_form(scaffold_url("update#{@scaffold_suffix}", :id=>(soid=@scaffold_object.scaffold_id))) %>
 
 <% if @scaffold_class.scaffold_association_use_auto_complete(assoc = so[:association]) %>
   <h4>Add this <%= so[:aslhc_name] %></h4>
-  <%= scaffold_text_field_tag_with_auto_complete('add', so[:singular_name], assoc) %>
+  <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('add', so[:singular_name], assoc) %>
 <% elsif @items_to_add.length > 0 %>
   <h4>Add these <%= mpn %></h4>
-  <%= scaffold_select_tag('add', @items_to_add, true) %>
+  <%=scaffold_raw scaffold_select_tag('add', @items_to_add, true) %>
 <% end %>
 
 <% if @items_to_remove.length > 0 %> 
   <h4>Remove these <%= mpn %></h4>
-  <%= scaffold_select_tag('remove', @items_to_remove, true) %>
+  <%=scaffold_raw scaffold_select_tag('remove', @items_to_remove, true) %>
 <% end %>
 
 <br /><br />
@@ -20,5 +20,5 @@
 </form>
 
 <% if '' != (edit_link = scaffold_check_link("Edit #{sn}", true, "edit_#{@scaffold_options[:singular_name]}", :id=>soid)) %>
-  <h2><%= edit_link %></h2>
+  <h2><%=scaffold_raw edit_link %></h2>
 <% end %>

data/scaffolds/list.rhtml

@@ -1,13 +1,13 @@
 <% @scaffold_title = "Choose #{hn = @scaffold_options[:singular_lc_human_name]} to #{(haction = (action = @scaffold_action).to_s.humanize).downcase}" %>
 
-<%= scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}"), :method=>scaffold_idempotent_action?(action) ? :get : :post) %>
+<%=scaffold_raw scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}"), :method=>scaffold_idempotent_action?(action) ? :get : :post) %>
 <% if @scaffold_class.scaffold_use_auto_complete %>
-  <%= scaffold_text_field_tag_with_auto_complete('id', @scaffold_options[:singular_name]) %>
+  <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('id', @scaffold_options[:singular_name]) %>
 <% else %>
-  <%= scaffold_select_tag('id', @scaffold_objects) %>
+  <%=scaffold_raw scaffold_select_tag('id', @scaffold_objects) %>
 <% end %>
 <br /><br />
 <input type="submit" value="<%= haction %> <%= hn %>" />
 </form>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/listtable.rhtml

@@ -21,13 +21,13 @@
     <td><%=h entry.scaffold_value(column).to_s %></td>
   <% end %>
   <% if show %>
-    <td><%= scaffold_button_to(s, scaffold_url(ss, :id=>eid), :method=>:get) %></td>
+    <td><%=scaffold_raw scaffold_button_to(s, scaffold_url(ss, :id=>eid), :method=>:get) %></td>
   <% end %>
   <% if edit %>
-    <td><%= scaffold_button_to(e, scaffold_url(es, :id=>eid), :method=>:get) %></td>
+    <td><%=scaffold_raw scaffold_button_to(e, scaffold_url(es, :id=>eid), :method=>:get) %></td>
   <% end %>
   <% if delete %>
-    <td><%= scaffold_button_to(d, scaffold_url(ds, :id=>eid)) %></td>
+    <td><%=scaffold_raw scaffold_button_to(d, scaffold_url(ds, :id=>eid)) %></td>
   <% end %>
   </tr>
 <% end %>
@@ -43,16 +43,16 @@
 <% end %>
 
 <% if @scaffold_listtable_type == :search && @scaffold_search_results_form_params && (@scaffold_search_results_form_params[:page] > 1 || @scaffold_search_results_form_params[:next_page]) %>
-  <%= scaffold_form(scaffold_url("results#{@scaffold_suffix}")) %>
-  <%= scaffold_field_tag(:hidden, :value=>@scaffold_search_results_form_params[:page], :id=>'page') %>
+  <%=scaffold_raw scaffold_form(scaffold_url("results#{@scaffold_suffix}")) %>
+  <%=scaffold_raw scaffold_field_tag(:hidden, :value=>@scaffold_search_results_form_params[:page], :id=>'page') %>
   <% @scaffold_search_results_form_params[:model].each do |key, value| %>
-    <%= scaffold_field_tag(:hidden, :value=>value, :id=>"#{@scaffold_options[:singular_name]}_#{key}", :name=>"#{@scaffold_options[:singular_name]}[#{key}]") %>
+    <%=scaffold_raw scaffold_field_tag(:hidden, :value=>value, :id=>"#{@scaffold_options[:singular_name]}_#{key}", :name=>"#{@scaffold_options[:singular_name]}[#{key}]") %>
   <% end %>
   <% @scaffold_search_results_form_params[:notnull].each do |field| %>
-    <%= scaffold_field_tag(:hidden, :value=>field, :name=>"notnull#{scaffold_param_list_suffix}") %>
+    <%=scaffold_raw scaffold_field_tag(:hidden, :value=>field, :name=>"notnull#{scaffold_param_list_suffix}") %>
   <% end %>
   <% @scaffold_search_results_form_params[:null].each do |field| %>
-    <%= scaffold_field_tag(:hidden, :value=>field, :name=>"null#{scaffold_param_list_suffix}") %>
+    <%=scaffold_raw scaffold_field_tag(:hidden, :value=>field, :name=>"null#{scaffold_param_list_suffix}") %>
   <% end %>
   <% if @scaffold_search_results_form_params[:page] > 1 %>
     <input type="submit" name="page_previous" value="Previous Page" />
@@ -63,4 +63,4 @@
   </form>
 <% end %>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/manage.rhtml

@@ -9,9 +9,9 @@
 ["Show #{singular_name}", :show]].each do |text, action| %>
   <% link = scaffold_check_link(text, true, "#{action}#{@scaffold_suffix}") 
   unless link == '' %>
-    <li><%= link %></li>
+    <li><%=scaffold_raw link %></li>
   <% end %>
 <% end %>
 </ul>
 
-<%= scaffold_check_link('Manage Models', true, 'index') %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/merge.rhtml

@@ -1,23 +1,23 @@
 <% @scaffold_title = "Merge two #{@scaffold_options[:plural_lc_human_name]}" %>
 
-<%= scaffold_form(scaffold_url("merge_update#{@scaffold_suffix}")) %>
+<%=scaffold_raw scaffold_form(scaffold_url("merge_update#{@scaffold_suffix}")) %>
 <p>Merge:
 <% if @scaffold_class.scaffold_use_auto_complete %>
-  <%= scaffold_text_field_tag_with_auto_complete('from', @scaffold_options[:singular_name]) %>
+  <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('from', @scaffold_options[:singular_name]) %>
 <% else %>
-  <%= scaffold_select_tag('from', @scaffold_objects) %>
+  <%=scaffold_raw scaffold_select_tag('from', @scaffold_objects) %>
 <% end %>
 </p>
 
 <p>into: 
 <% if @scaffold_class.scaffold_use_auto_complete %>
-  <%= scaffold_text_field_tag_with_auto_complete('to', @scaffold_options[:singular_name]) %>
+  <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('to', @scaffold_options[:singular_name]) %>
 <% else %>
-  <%= scaffold_select_tag('to', @scaffold_objects) %>
+  <%=scaffold_raw scaffold_select_tag('to', @scaffold_objects) %>
 <% end %>
 </p>
 
 <input type="submit" value="Merge <%= @scaffold_options[:plural_lc_human_name] %>" />
 </form>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/new.rhtml

@@ -1,5 +1,5 @@
 <% @scaffold_title = "Create new #{@scaffold_options[:singular_lc_human_name]}" %>
 
-<%= scaffold_model_form('create', @scaffold_class.scaffold_fields(:new)) %>
+<%=scaffold_raw scaffold_model_form('create', @scaffold_class.scaffold_fields(:new)) %>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/search.rhtml

@@ -1,11 +1,11 @@
 <% @scaffold_title = "Search #{@scaffold_options[:plural_lc_human_name]}" %>
 
-<%= scaffold_model_form('results', @scaffold_class.scaffold_fields(:search)) do |form|
+<%=scaffold_raw(scaffold_model_form('results', @scaffold_class.scaffold_fields(:search)) do |form|
   form << "<table class='#{@scaffold_class.scaffold_table_class(:form)}'><tbody>"
   form << "<tr><td><label for='null'>Null Fields</label>:</td><td><select name='null#{scaffold_param_list_suffix}' id='null' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
   form << "<tr><td><label for='notnull'>Not Null Fields</label>:</td><td><select name='notnull#{scaffold_param_list_suffix}' id='notnull' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
   form << '</tbody></table>'
   @scaffold_submit_value = @scaffold_title
-end %>
+end)%>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

data/scaffolds/show.rhtml

@@ -1,6 +1,6 @@
 <% @scaffold_title = "Showing #{@scaffold_options[:singular_lc_human_name]}" %>
 <% if '' != (edit_link = scaffold_check_link('Edit', true, "edit_#{@scaffold_options[:singular_name]}", :id=>@scaffold_object.scaffold_id)) %>
-  <h2><%= edit_link %></h2>
+  <h2><%=scaffold_raw edit_link %></h2>
 <% end %>
 
 <table id="scaffolded" class="<%= @scaffold_class.scaffold_table_class(:show) %>">
@@ -14,6 +14,6 @@
 <% end %>
 </tbody></table>
 
-<%= scaffold_association_links %>
+<%=scaffold_raw scaffold_association_links %>
 
-<%= scaffold_manage_link %>
+<%=scaffold_raw scaffold_manage_link %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -71,8 +71,9 @@ files:
 - contrib/scaffold_form_focus/README
 - contrib/scaffold_form_focus/scaffold_form_focus.js
 - contrib/scaffold_jquery_autocomplete/README
-- contrib/scaffold_jquery_autocomplete/jquery.ui.se_autocomplete.css
-- contrib/scaffold_jquery_autocomplete/jquery.ui.se_autocomplete.js
+- contrib/scaffold_jquery_autocomplete/indicator.gif
+- contrib/scaffold_jquery_autocomplete/jquery.autocomplete.css
+- contrib/scaffold_jquery_autocomplete/jquery.autocomplete.js
 - scaffolds/show.rhtml
 - scaffolds/habtm.rhtml
 - scaffolds/index.rhtml

data/contrib/scaffold_jquery_autocomplete/jquery.ui.se_autocomplete.css

@@ -1,22 +0,0 @@
-ul.se_autocomplete {
-    position: absolute;
-    overflow: hidden;
-    background-color: #fff;
-    border: 1px solid #aaa;
-    margin: 0px;
-    padding: 0;
-    list-style: none;
-    font: normal .75em/.75em Verdana, Arial, sans-serif;
-    color: #333;
-}
-ul.se_autocomplete li {
-    display: block;
-    padding: .3em .5em .3em .3em;
-    overflow: hidden;
-    width: 100%;
-}
-
-ul.se_autocomplete li.active {
-    background-color: #3875d7;
-    color: #fff;
-}

data/contrib/scaffold_jquery_autocomplete/jquery.ui.se_autocomplete.js

@@ -1,121 +0,0 @@
-/* Copyright 2007 Yehuda Katz, Rein Henrichs
- * Copyright 2008 Jeremy Evans
- */
- 
-(function($) {
-  
-  $.ui = $.ui || {}; $.ui.autocomplete = $.ui.autocomplete || {}; var active;
-    
-  $.fn.autocompleteMode = function(container, input, size, opt) {
-    var original = input.val(); var selected = -1; var self = this;
-    
-    $.data(document.body, "autocompleteMode", true);
-
-    $("body").one("cancel.autocomplete", function() { 
-      input.trigger("cancel.autocomplete"); $("body").trigger("off.autocomplete"); input.val(original); 
-    });
-    
-    $("body").one("activate.autocomplete", function() {
-      input.trigger("activate.autocomplete", [$(active[0]).html()]); $("body").trigger("off.autocomplete");
-    });
-    
-    $("body").one("off.autocomplete", function(e, reset) {
-      container.remove();
-      $.data(document.body, "autocompleteMode", false);
-      input.unbind("keydown.autocomplete");
-      $("body").add(window).unbind("click.autocomplete").unbind("cancel.autocomplete").unbind("activate.autocomplete");
-    });
-    
-    // If a click bubbles all the way up to the window, close the autocomplete
-    $(window).bind("click.autocomplete", function() { $("body").trigger("cancel.autocomplete"); });
-
-    var select = function() {
-      active = $("> *", container).removeClass("active").slice(selected, selected + 1).addClass("active");
-      input.trigger("itemSelected.autocomplete", [$(active[0]).html()]);     
-      input.val($(active[0]).html());
-    };
-    
-    container.mouseover(function(e) {
-      // If you hover over the container, but not its children, return
-      if(e.target == container[0]) return;
-      // Set the selected item to the item hovered over and make it active
-      selected = $("> *", container).index($(e.target).is('li') ? $(e.target)[0] : $(e.target).parents('li')[0]); select();
-    }).bind("click.autocomplete", function(e) {
-      $("body").trigger("activate.autocomplete"); $.data(document.body, "suppressKey", false); 
-    });
-    
-    input
-      .bind("keydown.autocomplete", function(e) {
-        if(e.which == 27) { $("body").trigger("cancel.autocomplete"); }
-        else if(e.which == 13) { $("body").trigger("activate.autocomplete"); }
-        else if(e.which == 40 || e.which == 9 || e.which == 38) {
-          switch(e.which) {
-            case 40: 
-            case 9:
-              selected = selected >= size - 1 ? 0 : selected + 1; break;
-            case 38:
-              selected = selected <= 0 ? size - 1 : selected - 1; break;
-            default: break;
-          }
-          select();
-        } else { return true; }
-        $.data(document.body, "suppressKey", true);
-      });
-  };
-  
-  $.fn.autocomplete = function(opt) {
-    var ajax = opt.ajax;
-    var association = opt.association
-    opt = $.extend({}, {
-      timeout: 1000,
-      getList: function(input) { 
-        params = "id=" + input.val()
-        if(association) {
-          params += '&association=' + association
-        }
-        $.get(ajax, params, function(html) { input.trigger("updateList", [html]); }); 
-      }
-    }, opt);
-
-    return this.each(function() {
-  
-      $(this)
-        .keypress(function(e) {
-          var typingTimeout = $.data(this, "typingTimeout");
-          if(typingTimeout) window.clearInterval(typingTimeout);
-                    
-          if($.data(document.body, "suppressKey"))
-            return $.data(document.body, "suppressKey", false);
-          else if($.data(document.body, "autocompleteMode") && e.charCode < 32 && e.keyCode != 8 && e.keyCode != 46) return false;          
-          else {
-            $.data(this, "typingTimeout", window.setTimeout(function() { 
-              $(e.target).trigger("autocomplete"); 
-            }, opt.timeout));
-          }
-        })
-        .bind("autocomplete", function() {
-          var self = $(this);
-
-          self.one("updateList", function(e, list) {
-            $("body").trigger("off.autocomplete");
-            
-            list = $(list);
-            var length = list.children().length;
-            if(!length) return false;
-            
-            list.addClass('se_autocomplete');
-            
-            var offset = self.offset();
-          
-            list.css({top: offset.top + self.outerHeight(), left: offset.left, width: self.width()}).appendTo("body");
-          
-            $("body").autocompleteMode(list, self, length, opt);
-          });
-
-          opt.getList(self);
-        });
-
-    });
-  };
-  
-})(jQuery);