combo_box 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/assets/javascripts/combo_box.js

@@ -4,19 +4,19 @@
 
 (function ($) {
 
-
+    "use strict";
 
     $.setComboBox = function (element, selected) {
         element.prop("valueField").val(selected.id);
         element.comboBoxCache = selected.label;
-	element.val(element.comboBoxCache);
+        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;
+        return true;
     };
 
     $.getComboBox = function (element) {
-	return {id: element.prop("valueField").val(), label: element.val()};
+        return {id: element.prop("valueField").val(), label: element.val()};
     };
 
     // Initializes combo-box controls
@@ -31,12 +31,12 @@
             element.maxSize = parseInt(element.attr('data-max-size'), 10);
             if (isNaN(element.maxSize) || element.maxSize === 0) { element.maxSize = 64; }
             element.size = (element.comboBoxCache.length < 32 ? 32 : element.comboBoxCache.length > element.maxSize ? element.maxSize : element.comboBoxCache.length);
-            
+
             element.autocomplete({
                 source: element.attr('data-combo-box'),
                 minLength: 1,
                 select: function (event, ui) {
-		    return $.setComboBox(element, ui.item);
+                    return $.setComboBox(element, ui.item);
                 }
             });
             element.prop("alreadyBound", true);
@@ -44,28 +44,28 @@
         return true;
     };
     $.initializeComboBoxes = function () {
-	$('input[data-combo-box]').each($.initializeComboBox);
-    }
+        $('input[data-combo-box]').each($.initializeComboBox);
+    };
     // Bind elements with the method 
     // $('input[data-combo-box]').ready($.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;
+        var elements = $($(this).attr("data-permute-combo-box")), i;
+        for (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 (i = 1; i < elements.length; i += 1) {
+                $.setComboBox($(elements[i-1]), $.getComboBox($(elements[i])));
+            }
+            $.setComboBox($(elements[elements.length - 1]), vt);
+        }
+        return false;
     });
-    
-})(jQuery);
+
+})(jQuery);

data/lib/combo_box/helpers/form_tag_helper.rb

@@ -26,16 +26,17 @@ module ComboBox
           choices = {:action=>action[1], :controller=>action[0]}
         end
         choices[:controller] ||= options.delete(:controller) || controller.controller_name
-        unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{choices[:action]}_in_#{choices[:controller]}".to_sym)
-          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]} in #{needed_controller}")
-          end
-        end
+        # unless ComboBox::CompiledLabels.methods.include?("item_label_for_#{choices[:action]}_in_#{choices[:controller]}".to_sym)
+        #   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]} 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"=>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)
+        # ComboBox::CompiledLabels.send("item_label_for_#{choices[:action]}_in_#{choices[:controller]}", object.send(method.to_s.gsub(/_id$/,'')))
+        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>html_options[:id], :value=>item_label(object.send(method.to_s.gsub(/_id$/,'')), choices[:action], choices[:controller]), :size=>html_options.delete(:size)||32)
         html << hidden_field(object_name, method, html_options)
         return html.html_safe
       end
@@ -79,14 +80,16 @@ module ComboBox
 
       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)
+        method_name = "item_label_for_#{item_action}_in_#{item_controller}".to_sym
+        unless ComboBox::CompiledLabels.respond_to?(method_name)
           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}")
+          # require "#{item_controller}_controller"
+          unless ComboBox::CompiledLabels.respond_to?(method_name)
+            raise Exception.new("It seems there is no 'search_for' declaration corresponding to #{item_action} in #{needed_controller} (#{ComboBox::CompiledLabels.methods.sort.to_sentence})")
           end
         end
-        return ComboBox::CompiledLabels.send("item_label_for_#{item_action}_in_#{item_controller}", record)
+        return ComboBox::CompiledLabels.send(method_name, record)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_box
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &25950140 !ruby/object:Gem::Requirement
+  requirement: &16367380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *25950140
+  version_requirements: *16367380
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &25949660 !ruby/object:Gem::Requirement
+  requirement: &16366460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25949660
+  version_requirements: *16366460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25949180 !ruby/object:Gem::Requirement
+  requirement: &16365480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *25949180
+  version_requirements: *16365480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &25948700 !ruby/object:Gem::Requirement
+  requirement: &16362580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25948700
+  version_requirements: *16362580
 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: 3818061861584846825
+      hash: 2191780791033431926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Adds the combo_box control in Rails 3 based on jQuery UI