combo_box 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/assets/javascripts/combo_box.js

@@ -34,7 +34,6 @@
     };
     // Bind elements with the method 
     // $('input[data-combo-box]').ready($.initializeComboBoxes);
-    // $('input[data-combo-box]').ready($.initializeComboBoxes);
     $(document).ready(function(event) {
 	$('input[data-combo-box]').each($.initializeComboBoxes);
     });

data/lib/combo_box/action_controller.rb

@@ -11,7 +11,7 @@ module ComboBox
       # Generates a default action which is the resource for a combo_box.
       # It generates an helper which takes in account selected columns for displaying.
       # 
-      # @macro [new] options
+      # @macro [new] options_details
       #   @param [Hash] options Options to build controller action
       #   @option options [Array] :columns The columns which are used for search and display
       #     All the content columns are used by default.
@@ -29,19 +29,19 @@ module ComboBox
       #   of the class +MODEL+.
       #   @param [Symbol] name Name of the datasource
       #   @param [String, Symbol] name Name of the model to use for searching
-      #   @macro options
+      #   @macro options_details
       #
       # @overload search_for(name, options={})
       #   Defines a controller method +search_for_NAME+ which searches for records
       #   of the class +NAME+.
       #   @param [Symbol] name
       #     Name of the datasource. This name is used to find the model name
-      #   @macro options
+      #   @macro options_details
       #
       # @overload search_for(options={})
       #   Defines a controller method +search_for+ which searches for records corresponding to the
       #   resource controller name. +OrdersController#search_for+ searches for orders.
-      #   @macro options
+      #   @macro options_details
       #
       # @example Search clients with Person model
       #   # app/controller/orders_controller.rb
@@ -76,7 +76,8 @@ module ComboBox
         end
         generator = Generator::Base.new(self, action_name, model, options)
         class_eval(generator.controller_action, "#{__FILE__}:#{__LINE__}")
-        ActionView::Base.send(:class_eval, generator.view_code, "#{__FILE__}:#{__LINE__}")
+        # ActionView::Base.send(:class_eval, generator.view_code, "#{__FILE__}:#{__LINE__}")
+        ComboBox::CompiledLabels.send(:class_eval, generator.item_label_code, "#{__FILE__}:#{__LINE__}")
       end
 
     end

data/lib/combo_box/generator.rb

@@ -172,9 +172,9 @@ module ComboBox
       end
 
 
-      def view_code()
+      def item_label_code()
         record = 'record'
-        code  = "def item_label_for_#{@action_name}_in_#{@controller.controller_name}(#{record})\n"
+        code  = "def self.item_label_for_#{@action_name}_in_#{@controller.controller_name}(#{record})\n"
         code << "  if #{record}.is_a? #{@model.name}\n"
         code << "    return #{item_label(record)}\n"
         code << "  else\n"

data/lib/combo_box/helpers/form_tag_helper.rb

@@ -2,22 +2,6 @@ module ComboBox
   module Helpers
     module FormTagHelper
 
-      
-      # Returns the list of columns to use in the combo_box for displaying
-      # the current item
-      # @param [String, Symbol] action_name Name of the 'search_for' action
-      # @param [String, Symbol] controller_name Name of the controller of the 'search_for' action
-      #
-      # @return [Array] Lists of symbols corresponding to the 'search_for' columns's names
-      def search_columns_for(action, controller=nil)
-        method_name = "search_columns_for_#{action}_in_#{controller}"
-        if self.respond_to?(method_name)
-          return self.send(method_name)
-        else
-          return nil
-        end
-      end
-
 
       # Returns a text field which has the same behavior of +select+ but  with a search 
       # action which permits to find easily in very long lists...
@@ -41,9 +25,15 @@ module ComboBox
           action = choices.split(/\#+/)
           choices = {:action=>action[1], :controller=>action[0]}
         end
-        choices[:controller] ||= controller.controller_name
+        choices[:controller] ||= options[: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
+          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]}")
+          end
+        end
         html  = ""
-        html << tag(:input, :type=>:text, "data-combo-box"=>url_for(choices.merge(:format=>:json)), "data-value-container"=>"#{object_name}_#{method}", :value=>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"=>"#{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 << hidden_field(object_name, method, html_options)
         return html.html_safe
       end

data/lib/combo_box.rb

@@ -4,6 +4,10 @@ require 'combo_box/engine' if defined?(::Rails)
 # :include: ../README.rdoc
 module ComboBox
   extend ActiveSupport::Autoload
+
+  # Module used to "stock" labelling methods for items
+  module CompiledLabels
+  end
   
   autoload :Helpers
   autoload :Generator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combo_box
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19442160 !ruby/object:Gem::Requirement
+  requirement: &21071460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *19442160
+  version_requirements: *21071460
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &19441680 !ruby/object:Gem::Requirement
+  requirement: &21070980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19441680
+  version_requirements: *21070980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19441200 !ruby/object:Gem::Requirement
+  requirement: &21070500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19441200
+  version_requirements: *21070500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19440720 !ruby/object:Gem::Requirement
+  requirement: &21070020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19440720
+  version_requirements: *21070020
 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: -1073113084261701318
+      hash: -2484117035189926183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: