ransack_ui 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzUxNDFiZWU1YTllYzkwMTNjZmU2ZTJmZmExOTVlMzI0OWQ4YzQ1Yg==
+  data.tar.gz: !binary |-
+    NWM3YzRiZWVjMGZjZGY3NTQ2ODg2NzlhZmM2NzlhYzYyNDc0M2Y1Ng==
+SHA512:
+  metadata.gz: !binary |-
+    OGVhZGIxMDMxZjc3YWQ3YzYwZDk2MjIyOTJiOTZjZmQ2NWQ3MGI5MTQxNTcy
+    YjMzNDYwM2U4MDE4NDA1ZDU5OGI0NGNkZGMwMGE2NGNiZGZkODdkZTdlZTc4
+    MTEzOGVlOWUzMjc1ODNjZDUzNDFlN2U2NGVkYjI2MzgxMDZiYmQ=
+  data.tar.gz: !binary |-
+    MDgxY2Y0YzllYTQyMDM1ZGM0NTZkNzI5YWExYTVjNGM2NDhmZDA4NmE4ZjVl
+    OTRiMzgzMjEzNjFjYTc1ZWY0MzAzYzIzZjQ0MGZhOGM4NDBjY2NiMGQ2MDVm
+    YjdjOTUzOTYxYTZkY2M4MGI0NjBhMjc4ODJhNjRlYTRhMjM5NGE=

data/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb

@@ -22,61 +22,57 @@
       # show spinner and disable the form when the search is underway
       el.find("form input:submit").click $.proxy(@form_submit, this)
 
-      # Fire change event for any existing selects.
-      el.find(".filters select").change()
+      # Fire change event for any existing attribute selects,
+      # set initialize to true so that existing queries are not cleared.
+      el.find(".filters select.ransack_attribute").each (i, el) =>
+        @attribute_changed({currentTarget: el}, true)
 
-    attribute_changed: (e) ->
+    attribute_changed: (e, initialize = false) ->
       target = $(e.currentTarget)
-      selected = target.find('option:selected')
-      column_type = selected.data('type')
+      selected_attribute = target.find('option:selected')
+      column_type = selected_attribute.data('type')
 
       base_id = target.attr('id').slice(0, -8)
       predicate_select  = @element.find("select##{base_id}p")
       available = predicate_select.data['predicates']
       query_input = $("input##{base_id}v_0_value")
+      multi_id = query_input.attr('id') + '_multi'
+      multi_input = @element.find("##{multi_id}")
+      query_select2_id = "#s2id_#{base_id}v_0_value"
+      query_select2 = @element.find(query_select2_id)
+      predicate_select2_id = "#s2id_#{base_id}p"
+      predicate_select2 = @element.find(predicate_select2_id)
 
       # Initialize datepicker if column is date/datetime/time
       $.proxy(@init_datetimepicker, this)(base_id)
 
+      # Clear input value unless this is the first run
+      unless initialize
+        query_input.val('')
+
+      # Destroy any query select2 inputs on attribute change and clear input
+      if query_select2.length
+        query_input.select2('destroy')
+
+      # Destroy any multi-inputs on attribute change and clear input
+      if multi_input.length
+        @destroy_multi_input(multi_input, selected_attribute.val())
+
       # Handle association columns with AJAX autocomplete
-      if selected.data('ajax-url') and Select2?
-        controller = selected.data('controller')
+      if selected_attribute.data('ajax-url') and Select2?
         @set_option_predicates(base_id, available, column_type)
 
-        # Set up Select2 for query input
-        query_input.val('')
-        query_input.select2
-          placeholder: "Search #{selected.data('ajax-entity')}"
-          minimumInputLength: 1
-          allowClear: true
-          ajax:
-            url: selected.data('ajax-url')
-            dataType: 'json'
-            type: selected.data('ajax-type')
-            data: (query, page) ->
-              obj = {}
-              obj[selected.data('ajax-key')] = query
-              obj
-            results: (data, page) ->
-              {results: $.map(data, (text, id) -> {id: id, text: text}) }
-
       # Handle columns with options detected from validates :inclusion
-      else if selected.data('select-options') and Select2?
-        @set_option_predicates(base_id, available, column_type)
-        query_input.val('')
-        query_input.select2
-          data: selected.data('select-options')
-          placeholder: "Please select a #{selected.val()}"
-          allowClear: true
+      else if selected_attribute.data('select-options') and Select2?
+        @set_option_predicates(base_id, available, column_type, true)
 
       # Handle regular columns
       else
         if Select2?
-          predicate_select2 = @element.find("#s2id_#{base_id}p")
           predicate_select2.select2("enable")
 
           # If Select2 is on query input, remove and set defaults
-          if (query_select2 = @element.find("#s2id_#{base_id}v_0_value")).length > 0
+          if query_select2.length > 0
             query_input.select2('destroy')
             query_input.val('')
             previous_val = ''
@@ -109,8 +105,8 @@
         if Select2?
           predicate_select.select2('val', previous_val)
 
-        # Run predicate_changed callback
-        predicate_select.change()
+      # Run predicate_changed callback
+      predicate_select.change()
 
       return true
 
@@ -124,86 +120,111 @@
       attribute_select  = @element.find("select##{base_id}a_0_name")
       selected_attribute = attribute_select.find('option:selected')
 
+      query_select2_id = "#s2id_#{base_id}v_0_value"
+      query_select2 = @element.find(query_select2_id)
+      query_select2_multi_id = "#s2id_#{base_id}v_0_value_multi"
+      query_select2_multi = @element.find(query_select2_multi_id)
+
+      no_query_predicates = ["true", "false", "blank", "present", "null", "not_null"]
+
       # We need to use a dummy input to handle multiple terms
       multi_id = query_input.attr('id') + '_multi'
       multi_input = @element.find("##{multi_id}")
 
+      # If query was previously hidden, clear query input
+      if query_select2.length == 0 && multi_input.length == 0 && query_input.is(":hidden")
+        query_input.val('')
+
+      # Hide query input when not needed
+      if p in no_query_predicates
+        # If Select2 is on query input, remove and set defaults
+        if Select2? && query_select2.length
+          query_input.select2('destroy')
+
+        query_input.val("true")
+        query_input.hide()
+        query_input.parent().find('.ui-datepicker-trigger').hide()
+
       if Select2?
         # Turn query input into Select2 tag list when query accepts multiple values
         if p in ["in", "not_in"] || p.match(/_(all|any)$/)
-          # If Select2 is on query input, remove and set defaults
-          if @element.find("#s2id_#{base_id}v_0_value").length
-            query_input.select2('destroy')
-
           # Add dummy 'multi' input for select2 if not already added
-          if multi_input.length == 0
+          if multi_input.length == 0 && query_select2_multi.length == 0
             # Set up multi-query input with fixed options, if present
-            query_input.val('')
-            options = selected_attribute.data('select-options')
-            @setup_multi_query_input(target, query_input, multi_id, options)
+            @setup_multi_query_input(target, query_input, multi_id, selected_attribute)
+
+          # If Select2 is on query input, remove and set defaults
+          if query_select2.length
+            query_input.select2('destroy').hide()
 
           return
 
-        else           
+        else
+          # Otherwise, remove Select2 from multi-query input, and remove input.
           if multi_input.length
-            # Otherwise, remove Select2 from multi-query input, and remove input.
-            multi_input.select2('destroy').remove()
-            # Also remove all extra inputs
-            base_name = multi_input.data('base-name')
-            inputs = @element.find("input[name^=\"#{base_name}\"]")
-            inputs = inputs.slice(1)
-            inputs.remove()
-
-            # If no fixed options, show query input
-            query_input.val('').show()
-            
-          # Handle fixed options - set up Select2 for single values if not already present
-          if selected_attribute.data('select-options')
-            if (query_select2 = @element.find("#s2id_#{base_id}v_0_value")).length == 0
-              query_input.select2
-                data: selected_attribute.data('select-options')
-                placeholder: "Please select a #{selected_attribute.val()}"
-                allowClear: true
+            # Save label data from first value
+            if multi_input.select2('data') && multi_input.select2('data').length
+              multi_input_data = multi_input.select2('data').first()
+              Ransack.value_field_labels[selected_attribute.val()] ||= {}
+              Ransack.value_field_labels[selected_attribute.val()][multi_input_data.id] = multi_input_data.text
 
-            return
+            @destroy_multi_input(multi_input, selected_attribute.val())
 
+          if p not in no_query_predicates
+            query_input.show()
 
-      # Hide query input when not needed
-      if p in ["true", "false", "blank", "present", "null", "not_null"]
-        # If Select2 is on query input, remove and set defaults
-        if Select2? && @element.find("#s2id_#{base_id}v_0_value").length
-          query_input.select2('destroy')
-          query_input.val('')
+            # Handle association columns with AJAX autocomplete
+            if selected_attribute.data('ajax-url')
+              if query_select2.length
+                query_input.hide()
+              else
+                @setup_select2_association(query_input, selected_attribute)
+
+            # Handle fixed options - set up Select2 for single values if not already present
+            if selected_attribute.data('select-options')
+              if query_select2.length
+                query_input.hide()
+              else
+                @setup_select2_options(query_input, selected_attribute)
 
-        query_input.val("true")
-        query_input.hide()
-        query_input.parent().find('.ui-datepicker-trigger').hide()
       # Otherwise, reset query input and show datepicker trigger if present
-      else
-        unless query_input.is(":visible")
-          query_input.val("")
-          query_input.show()
-          query_input.parent().find('.ui-datepicker-trigger').show()
+      if p not in no_query_predicates
+        return if selected_attribute.data('select-options')
+
+        # Don't show query input if ajax auto complete is present on selected attribute
+        unless p in ['eq', 'not_eq'] and selected_attribute.data('ajax-url')
+          unless query_input.is(":visible")
+            query_input.val('')
+            query_input.show()
+            query_input.parent().find('.ui-datepicker-trigger').show()
 
 
-    # Dsiables predicate choices and sets it to 'eq'
-    set_option_predicates: (base_id, available, column_type) ->
+    # Disables predicate choices and sets it to 'eq'
+    set_option_predicates: (base_id, available_predicates, column_type, include_number_predicates = false) ->
       predicate_select  = @element.find("select##{base_id}p")
+      previous_val = predicate_select.val()
 
       # Remove all predicates, and add any supported predicates
       predicate_select.find('option').each (i, o) -> $(o).remove()
 
-      $.each available, (i, p) =>
+      allowed_predicates = $.merge([], Ransack.option_predicates)
+
+      # Include number predicates if the option was given.
+      # For example, a integer column will have fixed select options,
+      # but will also allow less than and greater than.
+      if column_type in ['integer', 'float', 'decimal'] && include_number_predicates
+        allowed_predicates = allowed_predicates.concat(Ransack.type_predicates[column_type] || [])
+
+      $.each available_predicates, (i, p) =>
         [predicate, label] = [p[0], p[1]]
 
-        if predicate in Ransack.option_predicates
+        if predicate in allowed_predicates
           # Get alternative predicate label depending on column type
           label = @alt_predicate_label_or_default(predicate, column_type, label)
           predicate_select.append $("<option value=#{predicate}>#{label}</option>")
 
-      if Select2?
-        predicate_select2 = @element.find("#s2id_#{base_id}p")
-        predicate_select2.select2('val', 'eq')
+      # Select first predicate if current selection is invalid
+      predicate_select.select2('val', previous_val)
 
     # Attempts to find a predicate translation for the specific column type,
     # or returns the default label.
@@ -246,17 +267,20 @@
         $.each values, (i, v) =>
           @add_query_input(target, base_name, i + 1, v)
 
-    setup_multi_query_input: (predicate_el, query_el, multi_id, options) ->
+    setup_multi_query_input: (predicate_el, query_input, multi_id, selected_attribute) ->
       base_name = predicate_el.attr('name').slice(0, -3) + '[v]'
-      query_el.after(
+      base_id = predicate_el.attr('id').slice(0, -1)
+      query_input.after(
         $('<input class="ransack_query_multi" id="' + multi_id + '" ' +
-          'style="width:' + (query_el.width() * 2) + 'px;" ' +
+          'style="width:' + (query_input.width() * 2) + 'px;" ' +
           'data-base-name="' + base_name + '" />'))
 
+      query_select2_id = "#s2id_#{base_id}v_0_value"
+      query_select2 = @element.find(query_select2_id)
+
       # Fetch all existing values
       inputs = @element.find("input[name^=\"#{base_name}\"]")
-      values = $.map inputs, (el) ->
-        el.value
+      values = $.map inputs, (el) -> el.value
       # Hide all query inputs
       inputs.hide()
 
@@ -264,37 +288,102 @@
         # Find newly created input and setup Select2
         multi_query = @element.find('#' + multi_id)
 
-        if options?
-          # Setup Select2 with fixed options
-          multi_query.select2
-            data: options
-            multiple: true
-            tokenSeparators: [',']
-            formatNoMatches:
-              if options
-                (t) -> "No matches found."
-              else
-                (t) -> "Add a search term"
-            initSelection: (element, callback) ->
-              data = []
-              unless element.val().trim() == ""
-                $(element.val().split(",")).each ->
-                  data.push {id: this, text: this}
-              callback(data)
+        # Handle association columns with AJAX autocomplete
+        if selected_attribute.data('ajax-url')
+          # Set label to single association label, if anything was selected
+          if query_select2.length && query_input.select2('data')
+            query_input_data = query_input.select2('data')
+            Ransack.value_field_labels[selected_attribute.val()] ||= {}
+            Ransack.value_field_labels[selected_attribute.val()][query_input_data.id] = query_input_data.text
+
+          @setup_select2_association(multi_query, selected_attribute, true)
+
         else
-          # Setup Select2 with tagging support (can create options)
-          multi_query.select2
-            tags: []
-            tokenSeparators: [',']
-            formatNoMatches: (t) ->
-              "Add a search term"
+          if selected_attribute.data('select-options')
+            # Setup Select2 with fixed multiple options
+            @setup_select2_options(multi_query, selected_attribute, true)
+
+          else
+            # Setup Select2 with tagging support (can create options)
+            multi_query.select2
+              tags: []
+              tokenSeparators: [',']
+              formatNoMatches: (t) ->
+                "Add a search term"
 
         multi_query.select2('val', values)
 
+    setup_select2_association: (query_input, selected_attribute, multiple = false) ->
+      selected_attribute_val = selected_attribute.val()
+      # Set up Select2 for query input
+      query_input.select2
+        placeholder: "Search #{selected_attribute.data('ajax-entity')}"
+        minimumInputLength: 1
+        allowClear: true
+        multiple: multiple
+        ajax:
+          url: selected_attribute.data('ajax-url')
+          dataType: 'json'
+          type: selected_attribute.data('ajax-type')
+          data: (query, page) ->
+            obj = {}
+            obj[selected_attribute.data('ajax-key')] = query
+            obj
+          results: (data, page) ->
+            {results: $.map(data, (text, id) -> {id: id, text: text}) }
+        initSelection: (element, callback) ->
+          data = []
+          unless element.val().trim() == ""
+            $(element.val().split(",")).each (i, val) ->
+              label = Ransack.value_field_labels[selected_attribute_val]?[val]
+              if label
+                data.push {id: val, text: label}
+              else
+                data.push {id: val, text: val}
+          if data.length
+            callback(multiple and data or data[0])
+          else
+            # If no label could be found, clear value
+            element.select2('val', '')
+
+    setup_select2_options: (query_input, selected_attribute, multiple = false) ->
+      query_input.select2
+        data: selected_attribute.data('select-options')
+        placeholder: "Please select a #{selected_attribute.text()}"
+        allowClear: true
+        multiple: multiple
+        tokenSeparators: [',']
+        formatNoMatches:
+          if selected_attribute.data('select-options')
+            (t) -> "No matches found."
+          else
+            (t) -> "Add a search term"
+        initSelection: (element, callback) ->
+          data = []
+          unless element.val().trim() == ""
+            $(element.val().split(",")).each (i, val) ->
+              selected_attribute.data('select-options').each (option, i) ->
+                if option.id == val
+                  data.push {id: option.id, text: option.text}
+                  return false  # Break out of inner each loop
+
+          if data.length
+            callback(multiple and data or data[0])
+          else
+            element.select2('val', '')
+
     add_query_input: (base_input, base_name, id, value) ->
       base_input.after $('<input name="'+base_name+'['+id+'][value]" '+
                          'value="'+value+'" style="display:none;" />')
 
+    destroy_multi_input: (multi_input, selected_attribute_val) ->
+      multi_input.select2('destroy').remove()
+      # Also remove all extra inputs
+      base_name = multi_input.data('base-name')
+      inputs = @element.find("input[name^=\"#{base_name}\"]")
+      inputs = inputs.slice(1)
+      inputs.remove()
+
     form_submit: (e) ->
       @element.css({ opacity: 0.4 })
       true
@@ -330,7 +419,7 @@
 
     store_initial_predicates: (container) ->
       # Store current predicates in data attribute
-      predicate_select = container.find('select.ransack_predicate:first')
+      predicate_select = container.find('select.ransack_predicate').first()
       unless predicate_select.data['predicates']
         predicates = []
         predicate_select.find('option').each (i, o) ->
@@ -349,8 +438,16 @@
         placeholder: "Select a Field"
         allowClear: true
         formatSelection: (object, container) ->
+          # If initializing and element is not present,
+          # search for option element in original select tag
+          if !object.element
+            this.element.find('option').each (i, option) ->
+              if option.value == object.id
+                object.element = option
+                return false
+
           # Return 'Model: field' unless column is on root model
-          if !object.element || $(object.element).data('root-model')
+          if $(object.element).data('root-model')
             object.text
           else
             group_label = $(object.element).parent().attr('label')
@@ -372,7 +469,7 @@
     init_datetimepicker: (base_id) ->
       if $.ui?.timepicker?
         query_input = @element.find("input##{base_id}v_0_value")
-        selected_attr = @element.find("select##{base_id}a_0_name option:selected")
+        selected_attribute = @element.find("select##{base_id}a_0_name option:selected")
 
         # Clear any datepicker from query input first
         query_input.datepicker('destroy')
@@ -388,7 +485,7 @@
           onClose: (date) -> $(this).val(date)
 
         # Show datepicker button for dates
-        switch selected_attr.data('type')
+        switch selected_attribute.data('type')
           when "date"
             query_input.datepicker(datepicker_options)
           when "datetime"

data/app/views/ransack_ui/_search.html.erb

@@ -1,9 +1,10 @@
 <%= search_form_for @ransack_search, :url => (options[:url] || url_for(:action => :index)),
   :html => {:method => :get, :class => "ransack_search"}, :remote => !!options[:remote] do |f| %>
 
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     if (window.Ransack == null) { window.Ransack = {}; }
-    Ransack.alt_predicates_i18n = #{I18n.translate(:"ransack.predicates.alt", :default => {}).to_json}
+    Ransack.alt_predicates_i18n = <%= I18n.translate(:"ransack.predicates.alt", :default => {}).to_json.html_safe %>;
+    Ransack.value_field_labels  = <%= f.labels_for_value_fields.to_json.html_safe %>
   <% end %>
 
   <div class="row">
@@ -21,7 +22,7 @@
       <div class="pull-right">
         <%= hidden_field_tag :distinct, '1' %>
         <%= hidden_field_tag :page, '1' %>
-        <%= f.submit t('ransack.submit'), :class => 'btn btn-primary btn-large' %>
+        <%= f.submit t('ransack.submit'), :class => 'btn btn-primary btn-large submit-search' %>
       </div>
     </div>
   </div>

data/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb

@@ -3,6 +3,9 @@ require 'ransack/helpers/form_builder'
 module Ransack
   module Helpers
     FormBuilder.class_eval do
+      cattr_accessor :cached_searchable_attributes_for_base
+      self.cached_searchable_attributes_for_base = {}
+
       def attribute_select(options = {}, html_options = {})
         raise ArgumentError, "attribute_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
         options[:include_blank] = true unless options.has_key?(:include_blank)
@@ -58,6 +61,44 @@ module Ransack
         end
       end
 
+      def labels_for_value_fields
+        labels = {}
+
+        object.groupings.each do |grouping|
+          grouping.conditions.each do |condition|
+            condition.values.each do |value|
+              # If value is present, and the attribute is an association,
+              # load the selected record and include the record name as a data attribute
+              if value.value.present?
+                condition_attributes = condition.attributes
+                if condition_attributes.any?
+                  attribute = condition_attributes.first.name
+                  klass_name = foreign_klass_for_attribute(attribute)
+
+                  if klass_name
+                    klass = klass_name.constantize
+
+                    value_object = klass.find_by_id(value.value)
+                    if value_object
+                      labels[attribute] ||= {}
+
+                      if value_object.respond_to? :full_name
+                        labels[attribute][value.value] = value_object.full_name
+                      elsif value_object.respond_to? :name
+                        labels[attribute][value.value] = value_object.name
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        labels
+      end
+
+
       def predicate_keys(options)
         keys = options[:compounds] ? Predicate.names : Predicate.names.reject {|k| k.match(/_(any|all)$/)}
         if only = options[:only]
@@ -101,9 +142,6 @@ module Ransack
 
       def attribute_collection_for_base(base)
         klass = object.context.traverse(base)
-        foreign_keys = klass.reflect_on_all_associations.select(&:belongs_to?).
-                         map_to({}) {|r, h| h[r.foreign_key.to_sym] = r.class_name }
-
         ajax_options = Ransack.options[:ajax_options] || {}
 
         # Detect any inclusion validators to build list of options for a column
@@ -112,41 +150,36 @@ module Ransack
             v.attributes.each do |a|
               # Try to translate options from activerecord.attribute_options.<model>.<attribute>
               hash[a.to_s] = v.send(:delimiter).each_with_object({}) do |o, options|
-                options[o] = I18n.translate("activerecord.attribute_options.#{klass.to_s.downcase}.#{a}.#{o}", :default => o)
+                options[o.to_s] = I18n.translate("activerecord.attribute_options.#{klass.to_s.downcase}.#{a}.#{o}", :default => o.to_s.titleize)
               end
             end
           end
         end
 
-        object.context.searchable_attributes(base).map do |c, type|
-          # Don't show 'id' column for base model
-          next nil if base.blank? && c == 'id'
+        if klass.respond_to?(:ransack_column_select_options)
+          column_select_options.merge!(klass.ransack_column_select_options)
+        end
 
-          attribute = attr_from_base_and_column(base, c)
-          attribute_label = Translate.attribute(attribute, :context => object.context)
+        searchable_attributes_for_base(base).map do |attribute_data|
+          column = attribute_data[:column]
 
-          # Set model name as label for 'id' column on that model's table.
-          if c == 'id'
-            foreign_klass = object.context.traverse(base).model_name
-            # Check that model can autocomplete. If not, skip this id column.
-            next nil unless foreign_klass.constantize._ransack_can_autocomplete
-            attribute_label = I18n.translate(foreign_klass, :default => foreign_klass)
-          else
-            foreign_klass = foreign_keys[c.to_sym]
-          end
+          html_options = {}
 
           # Add column type as data attribute
-          html_options = {:'data-type' => type}
+          html_options[:'data-type'] = attribute_data[:type]
           # Set 'base' attribute if attribute is on base model
           html_options[:'data-root-model'] = true if base.blank?
+
           # Set column options if detected from inclusion validator
-          if column_select_options[c]
+          if column_select_options[column]
             # Format options as an array of hashes with id and text columns, for Select2
-            html_options[:'data-select-options'] = column_select_options[c].map {|id, text|
+            html_options[:'data-select-options'] = column_select_options[column].map {|id, text|
               {:id => id, :text => text}
             }.to_json
           end
 
+          foreign_klass = attribute_data[:foreign_klass]
+
           if foreign_klass
             # If field is a foreign key, set up 'data-ajax-*' attributes for auto-complete
             controller = foreign_klass.tableize
@@ -161,15 +194,66 @@ module Ransack
           end
 
           [
-            attribute_label,
-            attribute,
+            attribute_data[:label],
+            attribute_data[:attribute],
             html_options
           ]
-        end.compact
+        end
       rescue UntraversableAssociationError => e
         nil
       end
-    end
 
+
+      private
+
+      def searchable_attributes_for_base(base)
+        cache_prefix = object.context.klass.table_name
+        cache_key = base.blank? ? cache_prefix : [cache_prefix, base].join('_')
+
+        self.class.cached_searchable_attributes_for_base[cache_key] ||= object.context.searchable_attributes(base).map do |column, type|
+          klass = object.context.traverse(base)
+          foreign_keys = klass.reflect_on_all_associations.select(&:belongs_to?).
+                           each_with_object({}) {|r, h| h[r.foreign_key.to_sym] = r.class_name }
+
+          # Don't show 'id' column for base model
+          next nil if base.blank? && column == 'id'
+
+          attribute = attr_from_base_and_column(base, column)
+          attribute_label = Translate.attribute(attribute, :context => object.context)
+
+          # Set model name as label for 'id' column on that model's table.
+          if column == 'id'
+            foreign_klass = object.context.traverse(base).model_name
+            # Check that model can autocomplete. If not, skip this id column.
+            next nil unless foreign_klass.constantize._ransack_can_autocomplete
+            attribute_label = I18n.translate(foreign_klass, :default => foreign_klass)
+          else
+            foreign_klass = foreign_keys[column.to_sym]
+          end
+
+          attribute_data = {
+            label: attribute_label,
+            type: type,
+            column: column,
+            attribute: attribute
+          }
+          attribute_data[:foreign_klass] = foreign_klass if foreign_klass
+          attribute_data
+        end.compact
+      end
+
+      def foreign_klass_for_attribute(attribute)
+        associations = object.context.klass.ransackable_associations
+        bases = [''] + association_array(associations)
+
+        bases.each do |base|
+          searchable_attributes_for_base(base).each do |attribute_data|
+            if attribute == attribute_data[:attribute]
+              return attribute_data[:foreign_klass]
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/ransack_ui.rb

@@ -1,6 +1,5 @@
 require "ransack_ui/version"
 require "ransack_ui/rails/engine"
-require "core_ext/enumerable"
 require "ransack_chronic"
 
 # Require ransack overrides

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,7 +64,6 @@ files:
 - app/views/ransack_ui/_search.html.erb
 - app/views/ransack_ui/_sort_fields.html.erb
 - config/locales/en.yml
-- lib/core_ext/enumerable.rb
 - lib/ransack_ui.rb
 - lib/ransack_ui/adapters/active_record.rb
 - lib/ransack_ui/adapters/active_record/base.rb
@@ -87,32 +81,25 @@ files:
 homepage: https://github.com/ndbroadbent/ransack_ui
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3625052068884160403
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3625052068884160403
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: UI Builder for Ransack
 test_files: []

data/lib/core_ext/enumerable.rb

@@ -1,3 +0,0 @@
-module Enumerable
-  alias map_to each_with_object
-end