rails3-jquery-autocomplete 0.6.1 → 0.6.2

data/integration/public/javascripts/rails.js

@@ -1,163 +1,137 @@
-/*
- * jquery-ujs
- *
- * http://github.com/rails/jquery-ujs/blob/master/src/rails.js
- *
- * This rails.js file supports jQuery 1.4.3 and 1.4.4 .
- *
- */
-
-jQuery(function ($) {
-    var csrf_token = $('meta[name=csrf-token]').attr('content'),
-        csrf_param = $('meta[name=csrf-param]').attr('content');
-
-    $.fn.extend({
-        /**
-         * Triggers a custom event on an element and returns the event result
-         * this is used to get around not being able to ensure callbacks are placed
-         * at the end of the chain.
-         *
-         * TODO: deprecate with jQuery 1.4.2 release, in favor of subscribing to our
-         *       own events and placing ourselves at the end of the chain.
-         */
-        triggerAndReturn: function (name, data) {
-            var event = new $.Event(name);
-            this.trigger(event, data);
-
-            return event.result !== false;
-        },
-
-        /**
-         * Handles execution of remote calls. Provides following callbacks:
-         *
-         * - ajax:before   - is execute before the whole thing begings
-         * - ajax:loading  - is executed before firing ajax call
-         * - ajax:success  - is executed when status is success
-         * - ajax:complete - is execute when status is complete
-         * - ajax:failure  - is execute in case of error
-         * - ajax:after    - is execute every single time at the end of ajax call
-         */
-        callRemote: function () {
-            var el      = this,
-                method  = el.attr('method') || el.attr('data-method') || 'GET',
-                url     = el.attr('action') || el.attr('href'),
-                dataType  = el.attr('data-type')  || ($.ajaxSettings && $.ajaxSettings.dataType);
-
-            if (url === undefined) {
-                throw "No URL specified for remote call (action or href must be present).";
-            } else {
-                if (el.triggerAndReturn('ajax:before')) {
-                    var data = el.is('form') ? el.serializeArray() : [];
-                    $.ajax({
-                        url: url,
-                        data: data,
-                        dataType: dataType,
-                        type: method.toUpperCase(),
-                        beforeSend: function (xhr) {
-                            xhr.setRequestHeader("Accept", "text/javascript");
-                            el.trigger('ajax:loading', xhr);
-                        },
-                        success: function (data, status, xhr) {
-                            el.trigger('ajax:success', [data, status, xhr]);
-                        },
-                        complete: function (xhr) {
-                            el.trigger('ajax:complete', xhr);
-                        },
-                        error: function (xhr, status, error) {
-                            el.trigger('ajax:failure', [xhr, status, error]);
-                        }
-                    });
-                }
-
-                el.trigger('ajax:after');
-            }
-        }
-    });
-
-    /**
-     *  confirmation handler
-     */
-
-    $('body').delegate('a[data-confirm], button[data-confirm], input[data-confirm]', 'click.rails', function () {
-        var el = $(this);
-        if (el.triggerAndReturn('confirm')) {
-            if (!confirm(el.attr('data-confirm'))) {
-                return false;
-            }
-        }
-    });
-
-
-
-    /**
-     * remote handlers
-     */
-    $('form[data-remote]').live('submit.rails', function (e) {
-        $(this).callRemote();
-        e.preventDefault();
-    });
-
-    $('a[data-remote],input[data-remote]').live('click.rails', function (e) {
-        $(this).callRemote();
-        e.preventDefault();
-    });
-
-    /**
-     * <%= link_to "Delete", user_path(@user), :method => :delete, :confirm => "Are you sure?" %>
-     *
-     * <a href="/users/5" data-confirm="Are you sure?" data-method="delete" rel="nofollow">Delete</a>
-     */
-    $('a[data-method]:not([data-remote])').live('click.rails', function (e){
-        var link = $(this),
-            href = link.attr('href'),
-            method = link.attr('data-method'),
-            form = $('<form method="post" action="'+href+'"></form>'),
-            metadata_input = '<input name="_method" value="'+method+'" type="hidden" />';
-
-        if (csrf_param !== undefined && csrf_token !== undefined) {
-            metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
-        }
-
-        form.hide()
-            .append(metadata_input)
-            .appendTo('body');
-
-        e.preventDefault();
-        form.submit();
-    });
-
-    /**
-     * disable-with handlers
-     */
-    var disable_with_input_selector           = 'input[data-disable-with]',
-        disable_with_form_remote_selector     = 'form[data-remote]:has('       + disable_with_input_selector + ')',
-        disable_with_form_not_remote_selector = 'form:not([data-remote]):has(' + disable_with_input_selector + ')';
-
-    var disable_with_input_function = function () {
-        $(this).find(disable_with_input_selector).each(function () {
-            var input = $(this);
-            input.data('enable-with', input.val())
-                .attr('value', input.attr('data-disable-with'))
-                .attr('disabled', 'disabled');
-        });
-    };
-
-    $(disable_with_form_remote_selector).live('ajax:before.rails', disable_with_input_function);
-    $(disable_with_form_not_remote_selector).live('submit.rails', disable_with_input_function);
-
-    $(disable_with_form_remote_selector).live('ajax:complete.rails', function () {
-        $(this).find(disable_with_input_selector).each(function () {
-            var input = $(this);
-            input.removeAttr('disabled')
-                 .val(input.data('enable-with'));
-        });
-    });
-
-    var jqueryVersion = $().jquery;
-
-	if (!( (jqueryVersion === '1.4.3') || (jqueryVersion === '1.4.4'))){
-		alert('This rails.js does not support the jQuery version you are using. Please read documentation.');
-	}
-
-
-});
+/**
+ * Unobtrusive scripting adapter for jQuery
+ *
+ * Requires jQuery 1.4.3 or later.
+ * https://github.com/rails/jquery-ujs
+ */
+
+(function($) {
+	// Triggers an event on an element and returns the event result
+	function fire(obj, name, data) {
+		var event = new $.Event(name);
+		obj.trigger(event, data);
+		return event.result !== false;
+	}
+
+	// Submits "remote" forms and links with ajax
+	function handleRemote(element) {
+		var method, url, data,
+			dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType);
+
+		if (element.is('form')) {
+			method = element.attr('method');
+			url = element.attr('action');
+			data = element.serializeArray();
+			// memoized value from clicked submit button
+			var button = element.data('ujs:submit-button');
+			if (button) {
+				data.push(button);
+				element.data('ujs:submit-button', null);
+			}
+		} else {
+			method = element.attr('data-method');
+			url = element.attr('href');
+			data = null;
+		}
+
+		$.ajax({
+			url: url, type: method || 'GET', data: data, dataType: dataType,
+			// stopping the "ajax:beforeSend" event will cancel the ajax request
+			beforeSend: function(xhr, settings) {
+				if (settings.dataType === undefined) {
+					xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+				}
+				return fire(element, 'ajax:beforeSend', [xhr, settings]);
+			},
+			success: function(data, status, xhr) {
+				element.trigger('ajax:success', [data, status, xhr]);
+			},
+			complete: function(xhr, status) {
+				element.trigger('ajax:complete', [xhr, status]);
+			},
+			error: function(xhr, status, error) {
+				element.trigger('ajax:error', [xhr, status, error]);
+			}
+		});
+	}
+
+	// Handles "data-method" on links such as:
+	// <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
+	function handleMethod(link) {
+		var href = link.attr('href'),
+			method = link.attr('data-method'),
+			csrf_token = $('meta[name=csrf-token]').attr('content'),
+			csrf_param = $('meta[name=csrf-param]').attr('content'),
+			form = $('<form method="post" action="' + href + '"></form>'),
+			metadata_input = '<input name="_method" value="' + method + '" type="hidden" />';
+
+		if (csrf_param !== undefined && csrf_token !== undefined) {
+			metadata_input += '<input name="' + csrf_param + '" value="' + csrf_token + '" type="hidden" />';
+		}
+
+		form.hide().append(metadata_input).appendTo('body');
+		form.submit();
+	}
+
+	function disableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.data('ujs:enable-with', input.val())
+				.val(input.attr('data-disable-with'))
+				.attr('disabled', 'disabled');
+		});
+	}
+
+	function enableFormElements(form) {
+		form.find('input[data-disable-with]').each(function() {
+			var input = $(this);
+			input.val(input.data('ujs:enable-with')).removeAttr('disabled');
+		});
+	}
+
+	function allowAction(element) {
+		var message = element.attr('data-confirm');
+		return !message || (fire(element, 'confirm') && confirm(message));
+	}
+
+	$('a[data-confirm], a[data-method], a[data-remote]').live('click.rails', function(e) {
+		var link = $(this);
+		if (!allowAction(link)) return false;
+
+		if (link.attr('data-remote')) {
+			handleRemote(link);
+			return false;
+		} else if (link.attr('data-method')) {
+			handleMethod(link);
+			return false;
+		}
+	});
+
+	$('form').live('submit.rails', function(e) {
+		var form = $(this);
+		if (!allowAction(form)) return false;
+
+		if (form.attr('data-remote')) {
+			handleRemote(form);
+			return false;
+		} else {
+			disableFormElements(form);
+		}
+	});
+
+	$('form input[type=submit], form button[type=submit], form button:not([type])').live('click.rails', function() {
+		var button = $(this);
+		if (!allowAction(button)) return false;
+		// register the pressed submit button
+		var name = button.attr('name'), data = name ? {name:name, value:button.val()} : null;
+		button.closest('form').data('ujs:submit-button', data);
+	});
+	
+	$('form').live('ajax:beforeSend.rails', function(event) {
+		if (this == event.target) disableFormElements($(this));
+	});
+
+	$('form').live('ajax:complete.rails', function(event) {
+		if (this == event.target) enableFormElements($(this));
+	});
+})( jQuery );

data/lib/rails3-jquery-autocomplete/autocomplete.rb

@@ -30,7 +30,7 @@ module Rails3JQueryAutocomplete
         if term && !term.empty?
           #allow specifying fully qualified class name for model object
           class_name = options[:class_name] || object
-          items = get_items(:model => get_object(class_name), \
+          items = get_autocomplete_items(:model => get_object(class_name), \
             :options => options, :term => term, :method => method) 
         else
           items = {}

data/lib/rails3-jquery-autocomplete/form_helper.rb

@@ -51,6 +51,6 @@ end
 
 class ActionView::Helpers::FormBuilder #:nodoc:
   def autocomplete_field(method, source, options = {})
-    @template.autocomplete_field(@object_name, method, source, options)
+    @template.autocomplete_field(@object_name, method, source, objectify_options(options))
   end
 end

data/lib/rails3-jquery-autocomplete/helpers.rb

@@ -3,7 +3,10 @@ module Rails3JQueryAutocomplete
   # Contains utility methods used by autocomplete
   module Helpers
 
-    # Returns a three keys hash 
+    #
+    # Returns a three keys hash actually used by the Autocomplete jQuery-ui
+    # Can be overriden to show whatever you like
+    #
     def json_for_autocomplete(items, method)
       items.collect {|item| {"id" => item.id, "label" => item.send(method), "value" => item.send(method)}}
     end
@@ -12,6 +15,7 @@ module Rails3JQueryAutocomplete
     #
     #   get_object(:actor)
     #   # returns a Actor constant supposing it is already defined
+    #
     def get_object(model_sym)
       object = model_sym.to_s.camelize.constantize
     end
@@ -29,14 +33,20 @@ module Rails3JQueryAutocomplete
       end
     end
 
-    # Returns the order parameter to be used in the query created by get_items
+    #DEPRECATED
     def get_order(implementation, method, options)
+      warn 'Rails3JQueryAutocomplete#get_order is has been DEPRECATED, please use #get_autocomplete_order instead'
+      get_autocomplete_order(implementation, method, options)
+    end
+
+    # Returns the order parameter to be used in the query created by get_items
+    def get_autocomplete_order(implementation, method, options)
       order = options[:order]
 
       case implementation
         when :mongoid then
           if order 
-            order.split(',').collect do |fields| 
+            order.split(',').collect do |fields|
               sfields = fields.split
               [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
             end
@@ -48,25 +58,39 @@ module Rails3JQueryAutocomplete
       end
     end
 
-    # Returns a limit that will be used on the query    
+    # DEPRECATED
     def get_limit(options)
+      warn 'Rails3JQueryAutocomplete#get_limit is has been DEPRECATED, please use #get_autocomplete_limit instead'
+      get_autocomplete_limit(options)
+    end
+
+    # Returns a limit that will be used on the query
+    def get_autocomplete_limit(options)
       options[:limit] ||= 10
     end
-  
-    # Queries selected database
-    #
-    #   items = get_items(:model => get_object(object), :options => options, :term => term, :method => method) 
+
+    # DEPRECATED
     def get_items(parameters)
+      warn 'Rails3JQueryAutocomplete#get_items is has been DEPRECATED, you should use #get_autocomplete_items instead'
+      get_autocomplete_items(parameters)
+    end
 
+    #
+    # Can be overriden to return or filter however you like
+    # the objects to be shown by autocomplete
+    #
+    #   items = get_autocomplete_items(:model => get_object(object), :options => options, :term => term, :method => method) 
+    #
+    def get_autocomplete_items(parameters)
       model = parameters[:model]
       method = parameters[:method]
       options = parameters[:options]
       term = parameters[:term]
       is_full_search = options[:full]
 
-      limit = get_limit(options)
+      limit = get_autocomplete_limit(options)
       implementation = get_implementation(model)
-      order = get_order(implementation, method, options)
+      order = get_autocomplete_order(implementation, method, options)
 
       case implementation
         when :mongoid

data/lib/rails3-jquery-autocomplete/version.rb

@@ -1,3 +1,3 @@
 module Rails3JQueryAutocomplete
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David Padilla
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -07:00
+date: 2011-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ files:
 - integration/app/controllers/autocomplete_controller.rb
 - integration/app/controllers/id_elements_controller.rb
 - integration/app/controllers/multiple_selections_controller.rb
+- integration/app/controllers/nested_models_controller.rb
 - integration/app/controllers/sub_classes_controller.rb
 - integration/app/helpers/application_helper.rb
 - integration/app/helpers/autocomplete_helper.rb
@@ -143,12 +144,14 @@ files:
 - integration/app/helpers/layout_helper.rb
 - integration/app/helpers/sub_classes_helper.rb
 - integration/app/models/brand.rb
+- integration/app/models/feature.rb
 - integration/app/models/foreign_brand.rb
 - integration/app/models/product.rb
 - integration/app/views/autocomplete/new.html.haml
 - integration/app/views/id_elements/new.html.haml
 - integration/app/views/layouts/application.html.haml
 - integration/app/views/multiple_selections/new.html.haml
+- integration/app/views/nested_models/new.html.haml
 - integration/app/views/sub_classes/new.html.haml
 - integration/config.ru
 - integration/config/application.rb
@@ -169,6 +172,7 @@ files:
 - integration/db/migrate/20101209014338_create_brands.rb
 - integration/db/migrate/20101209014355_create_products.rb
 - integration/db/migrate/20101209053936_add_type_to_brand.rb
+- integration/db/migrate/20110209020136_create_features.rb
 - integration/db/schema.rb
 - integration/db/seeds.rb
 - integration/doc/README_FOR_APP
@@ -187,7 +191,6 @@ files:
 - integration/public/images/rails.png
 - integration/public/javascripts/application.js
 - integration/public/javascripts/autocomplete-rails.js
-- integration/public/javascripts/jquery-ui.js
 - integration/public/javascripts/jquery-ui.min.js
 - integration/public/javascripts/jquery.js
 - integration/public/javascripts/jquery.min.js
@@ -246,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Use jQuery's autocomplete plugin with Rails 3.