combo_box 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/assets/javascripts/combo_box.js

@@ -1,15 +1,31 @@
 /*
  * jQuery Combo Box
  */
+
 (function ($) {
-    
+
+
+
+    $.setComboBox = function (element, selected) {
+        element.prop("valueField").val(selected.id);
+        element.comboBoxCache = selected.label;
+	element.val(element.comboBoxCache);
+        element.attr("size", (element.comboBoxCache.length < 32 ? 32 : element.comboBoxCache.length > element.maxSize ? element.maxSize : element.comboBoxCache.length));
+        element.prop("valueField").trigger("emulated:change");
+	return true;
+    };
+
+    $.getComboBox = function (element) {
+	return {id: element.prop("valueField").val(), label: element.val()};
+    };
+
     // Initializes combo-box controls
-    $.initializeComboBoxes = function () {
+    $.initializeComboBox = function () {
         var element = $(this);
-        if (this.alreadyBound !== 'true') {
+        if (element.prop("alreadyBound") !== true) {
             element.comboBoxCache = element.val();
-            element.valueField = $('#' + element.attr('data-value-container'))[0];
-            if ($.isEmptyObject(element.valueField)) {
+            element.prop("valueField", $('#' + element.attr('data-value-container')));
+            if ($.isEmptyObject(element.prop("valueField")[0])) {
                 alert('An input ' + element.id + ' with a "data-combo-box" attribute must contain a "data-value-container" attribute (#' + element.attr('data-value-container') + ')');
             }
             element.maxSize = parseInt(element.attr('data-max-size'), 10);
@@ -20,22 +36,36 @@
                 source: element.attr('data-combo-box'),
                 minLength: 1,
                 select: function (event, ui) {
-                    var selected = ui.item;
-                    element.valueField.value = selected.id;
-                    element.comboBoxCache = selected.label;
-                    element.attr("size", (element.comboBoxCache.length < 32 ? 32 : element.comboBoxCache.length > element.maxSize ? element.maxSize : element.comboBoxCache.length));
-                    $(element.valueField).trigger("emulated:change");
-                    return true;
+		    return $.setComboBox(element, ui.item);
                 }
             });
-            this.alreadyBound = 'true';
+            element.prop("alreadyBound", true);
         }
-        return false;
+        return true;
     };
+    $.initializeComboBoxes = function () {
+	$('input[data-combo-box]').each($.initializeComboBox);
+    }
     // Bind elements with the method 
     // $('input[data-combo-box]').ready($.initializeComboBoxes);
-    $(document).ready(function(event) {
-	$('input[data-combo-box]').each($.initializeComboBoxes);
+    $(document).ready($.initializeComboBoxes);
+    $(document).ajaxComplete($.initializeComboBoxes);
+
+    $("a[data-permute-combo-box]").live("click", function () {
+	var elements = $($(this).attr("data-permute-combo-box"));
+	for (var i = 0; i < elements.length; i += 1) {
+	    if ($(elements[i]).attr("data-combo-box") === undefined || $(elements[i]).attr("data-combo-box") === null) {
+		elements[i] = $("input[data-value-container='" + $(elements[i]).attr("id") + "']");
+	    }
+	}
+	if (elements.length > 1) {	    
+	    var vt = $.getComboBox($(elements[0]));
+	    for (var i = 1; i < elements.length; i += 1) {
+		$.setComboBox($(elements[i-1]), $.getComboBox($(elements[i])));
+	    }
+	    $.setComboBox($(elements[elements.length - 1]), vt);
+	}
+	return false;
     });
-    $('input[data-combo-box]').ajaxStop($.initializeComboBoxes);
+    
 })(jQuery);

data/lib/combo_box/generator.rb

@@ -13,12 +13,12 @@ module ComboBox
         @name = name.to_s
         @filter = options.delete(:filter) || "%X%"
         @interpolation_key = options.delete(:interpolation_key) || @name.gsub(/\W/, '_')
-        mdl = @model
+        klass = @model
         @through = (options.delete(:through) || []).collect do |reflection|
-          unless model.reflections[reflection.to_sym]
-            raise Exception.new("Model #{model.name} has no reflections #{reflection.inspect}")
+          unless klass.reflections[reflection.to_sym]
+            raise Exception.new("Model #{klass.name} has no reflections #{reflection.inspect}")
           end
-          model = model.reflections[reflection.to_sym].class_name.constantize
+          klass = klass.reflections[reflection.to_sym].class_name.constantize
           reflection.to_sym
         end
         @column = foreign_model.columns_hash[@name]
@@ -115,26 +115,31 @@ module ComboBox
         
         code  = ""
         code << "search, conditions = params[:term], [#{query.join(' AND ').inspect+parameters}]\n"
-        code << "words = search.to_s.mb_chars.downcase.strip.normalize.split(/[\\s\\,]+/)\n"
-        code << "if words.size > 0\n"
-        code << "  conditions[0] << '#{' AND ' if query.size>0}('\n"
-        code << "  words.each_index do |index|\n"
-        code << "    word = words[index].to_s\n"
-        code << "    conditions[0] << ') AND (' if index > 0\n"
+        code << "if params[:id].to_i > 0\n"
+        code << "  conditions[0] << '#{' AND ' if query.size>0}#{@model.table_name}.id = ?'\n"
+        code << "  conditions << params[:id].to_i\n"
+        code << "else\n"
+        code << "  words = search.to_s.mb_chars.downcase.strip.normalize.split(/[\\s\\,]+/)\n"
+        code << "  if words.size > 0\n"
+        code << "    conditions[0] << '#{' AND ' if query.size>0}('\n"
+        code << "    words.each_index do |index|\n"
+        code << "      word = words[index].to_s\n"
+        code << "      conditions[0] << ') AND (' if index > 0\n"
         if ActiveRecord::Base.connection.adapter_name == "MySQL"
-          code << "    conditions[0] << "+@columns.collect{|column| "LOWER(CAST(#{column.sql_name} AS CHAR)) LIKE ?"}.join(' OR ').inspect+"\n"
+          code << "      conditions[0] << "+@columns.collect{|column| "LOWER(CAST(#{column.sql_name} AS CHAR)) LIKE ?"}.join(' OR ').inspect+"\n"
         else
-          code << "    conditions[0] << "+@columns.collect{|column| "LOWER(CAST(#{column.sql_name} AS VARCHAR)) LIKE ?"}.join(' OR ').inspect+"\n"
+          code << "      conditions[0] << "+@columns.collect{|column| "LOWER(CAST(#{column.sql_name} AS VARCHAR)) LIKE ?"}.join(' OR ').inspect+"\n"
         end
-        code << "    conditions += ["+@columns.collect{|column| column.filter.inspect.gsub('X', '"+word+"').gsub(/(^\"\"\+|\+\"\"\+|\+\"\")/, '')}.join(", ")+"]\n"
+        code << "      conditions += ["+@columns.collect{|column| column.filter.inspect.gsub('X', '"+word+"').gsub(/(^\"\"\+|\+\"\"\+|\+\"\")/, '')}.join(", ")+"]\n"
+        code << "    end\n"
+        code << "    conditions[0] << ')'\n"
         code << "  end\n"
-        code << "  conditions[0] << ')'\n"
         code << "end\n"
 
         # joins = @options[:joins] ? ", :joins=>"+@options[:joins].inspect : ""
         # order = ", :order=>"+@columns.collect{|column| "#{column[0]} ASC"}.join(', ').inspect
         # limit = ", :limit=>"+(@options[:limit]||80).to_s
-        joins = @options[:joins] ? ".joins(#{@options[:joins].inspect}).include(#{@options[:joins].inspect})" : ""
+        joins = @options[:joins] ? ".joins(#{@options[:joins].inspect}).includes(#{@options[:joins].inspect})" : ""
         
         order = @options[:order] ? ".order(#{@options[:order].inspect})" : ".order("+@columns.collect{|c| "#{c.sql_name} ASC"}.join(', ').inspect+")"
         limit = ".limit(#{@options[:limit]||80})"
@@ -179,11 +184,7 @@ module ComboBox
         code << "  if #{record}.is_a? #{@model.name}\n"
         code << "    return #{item_label(record)}\n"
         code << "  else\n"
-        if Rails.env == "development"
-          code << "    return '[UnfoundRecord]'\n"
-        else
-          code << "    return ''\n"
-        end
+        code << "    return ''\n"
         code << "  end\n"
         code << "end\n"
         return code

data/lib/combo_box/helpers/form_tag_helper.rb

@@ -25,15 +25,17 @@ module ComboBox
           action = choices.split(/\#+/)
           choices = {:action=>action[1], :controller=>action[0]}
         end
-        choices[:controller] ||= options[:controller]||controller.controller_name
+        choices[:controller] ||= options.delete(:controller) || controller.controller_name
         unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{choices[:action]}_in_#{choices[:controller]}".to_sym)
-          "#{choices[:controller].to_s.classify.pluralize}Controller".constantize
+          needed_controller = "#{choices[:controller].to_s.classify.pluralize}Controller"
+          needed_controller.constantize
           unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{choices[:action]}_in_#{choices[:controller]}".to_sym)
-            raise Exception.new("It seems there is no search_for declaration corresponding to #{choices[:action]}")
+            raise Exception.new("It seems there is no search_for declaration corresponding to #{choices[:action]} in #{needed_controller}")
           end
         end
+        html_options[:id] ||= "#{object_name}_#{method}"
         html  = ""
-        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>"#{object_name}_#{method}", :value=>ComboBox::CompiledLabels.send("item_label_for_#{choices[:action]}_in_#{choices[:controller]}", object.send(method)), :size=>html_options.delete(:size)||32)
+        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>html_options[:id], :value=>ComboBox::CompiledLabels.send("item_label_for_#{choices[:action]}_in_#{choices[:controller]}", object.send(method.to_s.gsub(/_id$/,''))), :size=>html_options.delete(:size)||32)
         html << hidden_field(object_name, method, html_options)
         return html.html_safe
       end
@@ -52,21 +54,41 @@ module ComboBox
       #
       # @return [String] HTML code of the tags
       def combo_box_tag(name, choices = nil, options={}, html_options = {})
-        if choices.nil? or choices == controller_name.to_sym
+        if choices.nil? or (choices == controller_name.to_sym and not options.has_key?(:controller))
           choices = {:action=>"search_for"}
         elsif choices.is_a?(Symbol)
-          choices = {:action=>"search_for_#{choices}"}
+          choices = {:action=>"search_for_#{choices}", :controller=>(options.delete(:controller) || controller.controller_name)}
+          if object = options.delete(:value)
+            options[:label] = item_label(object, choices[:action], choices[:controller])
+            html_options[:value] = object.id
+          end
         elsif choices.is_a?(String)
           action = choices.split(/\#+/)
           choices = {:action=>action[1], :controller=>action[0]}
         end
-        choices[:controller] ||= controller.controller_name
+        choices[:controller] ||= options.delete(:controller) || controller.controller_name
+        html_options[:id] ||= name.to_s.gsub(/\W+/, '_').gsub(/(^_+|_+$)/, '')
         html  = ""
-        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>name, :size=>html_options.delete(:size)||32, :value=>options.delete(:label))
+        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>html_options[:id], :size=>html_options.delete(:size)||32, :value=>options.delete(:label))
         html << hidden_field_tag(name, html_options.delete(:value), html_options)
         return html.html_safe
       end
 
+
+      private
+
+      def item_label(record, item_action, item_controller=nil)
+        item_controller ||= controller.controller_name
+        unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{item_action}_in_#{item_controller}".to_sym)
+          needed_controller = "#{item_controller.to_s.classify.pluralize}Controller"
+          needed_controller.constantize
+          unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{item_action}_in_#{item_controller}".to_sym)
+            raise Exception.new("It seems there is no search_for declaration corresponding to #{item_action} in #{needed_controller}")
+          end
+        end
+        return ComboBox::CompiledLabels.send("item_label_for_#{item_action}_in_#{item_controller}", record)
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_box
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19675440 !ruby/object:Gem::Requirement
+  requirement: &25950140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *19675440
+  version_requirements: *25950140
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &19674960 !ruby/object:Gem::Requirement
+  requirement: &25949660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19674960
+  version_requirements: *25949660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19674480 !ruby/object:Gem::Requirement
+  requirement: &25949180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19674480
+  version_requirements: *25949180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19674000 !ruby/object:Gem::Requirement
+  requirement: &25948700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19674000
+  version_requirements: *25948700
 description: Adds helpers for Rails views and controller in order to manage 'dynamic
   select'. It uses jQuery UI as support for inobtrusive use in forms. It's not the
   classic Autocompleter, its use is limited to belongs_to reflections.
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1493692048347508204
+      hash: 3818061861584846825
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: