ransack_ui 0.0.3 → 0.0.4

data/app/assets/javascripts/ransack/predicates.js.coffee

@@ -17,7 +17,7 @@ Ransack.predicates =
 Ransack.type_predicates = {}
 ((o, f) -> f.call o) Ransack.type_predicates, ->
   @text = @string = ['eq', 'cont', 'matches', 'start', 'end', 'present', 'in']
-  @boolean = ['true']
+  @boolean = ['true', 'null']
   @integer = @float = @decimal = ['eq', 'null', 'lt', 'gt', 'in']
   @date = @datetime = @time = ['eq', 'null', 'lt', 'gt']
 

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

@@ -26,37 +26,76 @@
 
     predicate_changed: (e) ->
       target   = $(e.currentTarget)
-      value_el = $('input#' + target.attr('id').slice(0, -1) + "v_0_value")
+      query_input = $('input#' + target.attr('id').slice(0, -1) + "v_0_value")
       if target.val() in ["true", "false", "blank", "present", "null", "not_null"]
-        value_el.val("true")
-        value_el.hide()
+        query_input.val("true")
+        query_input.hide()
       else
-        unless value_el.is(":visible")
-          value_el.val("")
-          value_el.show()
+        unless query_input.is(":visible")
+          query_input.val("")
+          query_input.show()
 
     attribute_changed: (e) ->
       target = $(e.currentTarget)
-      predicate_select = this.element.find('select#' + target.attr('id').slice(0, -8) + "p")
-      previous_val = predicate_select.val()
-      type = target.find('option:selected').data('type')
-
-      # Build array of supported predicates
-      available = predicate_select.data['predicates']
-
-      predicates = Ransack.type_predicates[type] || []
-      predicates = $.map predicates, (p) -> [p, Ransack.predicates[p]]
-
-      # Remove all predicates, and add any supported predicates
-      predicate_select.find('option').each (i, o) -> $(o).remove()
-
-      $.each available, (i, p) ->
-        [val, label] = [p[0], p[1]]
-        if val in predicates
-          predicate_select.append $('<option value='+val+'>'+label+'</option>')
-
-      # Select first predicate if current selection is invalid
-      predicate_select.select2('val', previous_val)
+      selected = target.find('option:selected')
+
+      base_id = target.attr('id').slice(0, -8)
+      predicate_select  = this.element.find('select#' + base_id + 'p')
+      predicate_select2 = this.element.find('#s2id_' + base_id + 'p')
+      query_input = $('input#' + base_id + "v_0_value")
+
+      if selected.data('ajax-url') and Select2?
+        controller = selected.data('controller')
+
+        # Hide predicate Select2
+        predicate_select2.hide()
+        # Clear predicates, and set 'eq' predicate
+        predicate_select.find('option').each (i, o) -> $(o).remove()
+        predicate_select.append $('<option selected="selected" value="eq">is</option>')
+
+        # Set up Select2 for query input
+        query_input.val('')
+        query_input.select2
+          placeholder: "Search #{selected.data('ajax-entity')}"
+          minimumInputLength: 1
+          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}) }
+      else
+        predicate_select2.show()
+        # If Select2 is on query input, remove and set defaults
+        if query_select2 = this.element.find('#s2id_' + base_id + 'v_0_value')
+          query_input.select2('destroy')
+          query_input.val('')
+          previous_val = ''
+        else
+          previous_val = predicate_select.val()
+
+        # Build array of supported predicates
+        available = predicate_select.data['predicates']
+        predicates = Ransack.type_predicates[selected.data('type')] || []
+        predicates = $.map predicates, (p) -> [p, Ransack.predicates[p]]
+
+        # Remove all predicates, and add any supported predicates
+        predicate_select.find('option').each (i, o) -> $(o).remove()
+
+        $.each available, (i, p) ->
+          [val, label] = [p[0], p[1]]
+          if val in predicates
+            predicate_select.append $('<option value='+val+'>'+label+'</option>')
+
+        # Select first predicate if current selection is invalid
+        predicate_select.select2('val', previous_val)
+
+        # Run predicate_changed callback
+        predicate_select.change()
 
       return true
 
@@ -109,5 +148,10 @@
           placeholder: "Select a Field"
           allowClear: true
           formatSelection: (object, container) ->
-            $(object.element).parent().attr('label') + ': ' + object.text
+            # Return model name if column is AJAX auto-completed association
+            if $(object.element).data('ajax-url')
+              object.text
+            # Return 'Model: field' if regular column
+            else
+              $(object.element).parent().attr('label') + ': ' + object.text
 ) jQuery

data/app/views/ransack/_condition_fields.html.haml

@@ -10,4 +10,4 @@
 
     = f.value_fields do |v|
       %span.fields.value{ 'data-object-name' => f.object_name }
-      = v.text_field :value
+      = v.text_field :value, :style => "width: 200px;"

data/lib/core_ext/enumerable.rb

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

data/lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb

@@ -16,8 +16,10 @@ module Ransack
           base.class_eval do
             class_attribute :_ransackers
             class_attribute :_ransackable_associations
+            class_attribute :_ransack_can_autocomplete
             self._ransackers ||= {}
             self._ransackable_associations ||= []
+            self._ransack_can_autocomplete = false
           end
         end
 
@@ -25,6 +27,10 @@ module Ransack
           self._ransackable_associations = associations
         end
 
+        def ransack_can_autocomplete
+          self._ransack_can_autocomplete = true
+        end
+
         def ransackable_associations(auth_object = nil)
           all_associations = reflect_on_all_associations.map {|a| a.name.to_s}
           if self._ransackable_associations.any?

data/lib/ransack_ui/ransack_overrides/configuration.rb

@@ -7,5 +7,9 @@ module Ransack
     def default_predicates=(options)
       self.options[:default_predicates] = options
     end
+
+    def ajax_options=(options)
+      self.options[:ajax_options] = options
+    end
   end
 end

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

@@ -1,4 +1,4 @@
-require 'ransack/helpers/form_builder'
+  require 'ransack/helpers/form_builder'
 
 module Ransack
   module Helpers
@@ -49,17 +49,56 @@ module Ransack
 
       def attribute_collection_for_bases(bases)
         bases.map do |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] || {}
+
+          if base.present?
+            model = object.context.traverse(base).model_name
+          end
+
           begin
           [
             Translate.association(base, :context => object.context),
             object.context.searchable_attributes(base).map do |c, type|
+              # Don't show 'id' column for base model
+              next nil if base.blank? && c == 'id'
+
               attribute = attr_from_base_and_column(base, c)
+              attribute_label = Translate.attribute(attribute, :context => object.context)
+
+              # 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
+
+              # Add column type as data attribute
+              html_options = {:'data-type' => type}
+
+              if foreign_klass
+                # If field is a foreign key, set up 'data-ajax-*' attributes for auto-complete
+                controller = foreign_klass.tableize
+                html_options[:'data-ajax-entity'] = I18n.translate(controller, :default => controller)
+                if ajax_options[:url]
+                  html_options[:'data-ajax-url'] = ajax_options[:url].sub(':controller', controller)
+                else
+                  html_options[:'data-ajax-url'] = "/#{controller}.json"
+                end
+                html_options[:'data-ajax-type'] = ajax_options[:type] || 'GET'
+                html_options[:'data-ajax-key']  = ajax_options[:key]  || 'query'
+              end
               [
-                Translate.attribute(attribute, :context => object.context),
+                attribute_label,
                 attribute,
-                {:'data-type' => type}
+                html_options
               ]
-            end
+            end.compact
           ]
           rescue UntraversableAssociationError => e
             nil

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ransack_ui.rb

@@ -1,5 +1,6 @@
 require "ransack_ui/version"
 require "ransack_ui/rails/engine"
+require "core_ext/enumerable"
 
 # Require ransack overrides
 Dir.glob(File.expand_path('../ransack_ui/ransack_overrides/**/*.rb', __FILE__)) {|f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Framework for building a search UI with Ransack
 email:
@@ -33,6 +33,7 @@ files:
 - app/views/ransack/_condition_fields.html.haml
 - app/views/ransack/_grouping_fields.html.haml
 - app/views/ransack/_search.html.haml
+- lib/core_ext/enumerable.rb
 - lib/ransack_ui.rb
 - lib/ransack_ui/rails/engine.rb
 - lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb
@@ -57,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2955605175423395892
+      hash: 739364888355864408
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2955605175423395892
+      hash: 739364888355864408
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24