ransack_ui 0.1.7 → 1.0.0

data/app/assets/javascripts/ransack_ui_bootstrap/button_group_select.js.coffee

@@ -0,0 +1,26 @@
+#
+# Converts a select list into a bootstrap button-group with radio button behaviour
+#
+(($) ->
+  $.widget 'ransack.button_group_select',
+    options: {}
+
+    _create: ->
+      el = @element
+      val = el.val()
+      el.hide()
+
+      html = '<div class="btn-group btn-group-select" data-toggle="buttons-radio">'
+      el.find('option').each (i, o) ->
+        html += "<button class=\"btn#{if o.value == val then ' active' else ''}\" type=\"button\" value=\"#{o.value}\">#{o.text}</button>"
+
+      # Insert HTML after hidden select
+      el.after html
+
+      # Update select val when button is clicked
+      btn_group = el.next()
+      btn_group.on 'click', 'button.btn', (e) =>
+        @element.val $(e.currentTarget).val()
+        true
+
+) jQuery

data/app/assets/javascripts/ransack_ui_bootstrap/index.js.coffee

@@ -0,0 +1,2 @@
+#= require ransack_ui_jquery
+#= require_tree .

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

@@ -1,5 +1,5 @@
 (($) ->
-  $.widget 'ransack.search_form',
+  $.widget 'ransack.ransack_search_form',
     options: {}
 
     _create: ->
@@ -15,6 +15,9 @@
       @init_select2(containers)
       @store_initial_predicates(containers)
 
+      if $.ransack.button_group_select?
+        @init_button_group_select(@element)
+
       # show spinner and disable the form when the search is underway
       el.find("form input:submit").click $.proxy(@form_submit, this)
 
@@ -37,12 +40,7 @@
       # Handle association columns with AJAX autocomplete
       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>')
+        @force_eq_predicate(base_id)
 
         # Set up Select2 for query input
         query_input.val('')
@@ -61,9 +59,18 @@
             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?
+        @force_eq_predicate(base_id)
+        query_input.val('')
+        query_input.select2
+          data: selected.data('select-options')
+          placeholder: "Please select a #{selected.val()}"
+          allowClear: true
+
       # Handle regular columns
       else
-        predicate_select2.show()
+        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
           query_input.select2('destroy')
@@ -139,6 +146,17 @@
           query_input.parent().find('.ui-datepicker-trigger').show()
 
 
+    # Dsiables predicate choices and sets it to 'eq'
+    force_eq_predicate: (base_id) ->
+      predicate_select  = @element.find("select##{base_id}p")
+      predicate_select2 = @element.find("#s2id_#{base_id}p")
+      # Disable predicate Select2
+      predicate_select2.select2('disable')
+      # 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>')
+      predicate_select2.select2('val', 'eq')
+
     # Attempts to find a predicate translation for the specific column type,
     # or returns the default label.
     # For example, 'lt' on an integer column will be translated to 'is less than',
@@ -208,9 +226,7 @@
                          'value="'+value+'" style="display:none;" />')
 
     form_submit: (e) ->
-      $("#loading").show()
       @element.css({ opacity: 0.4 })
-      $('div.list').html('')
       true
 
     add_fields: (e) ->
@@ -222,7 +238,12 @@
       container = target.closest('p')
       container.before content.replace(regexp, new_id)
       prev_container = container.prev()
+
       @init_select2(prev_container)
+
+      if $.ransack.button_group_select?
+        @init_button_group_select(prev_container)
+
       @store_initial_predicates(prev_container)
       # Fire change event on any new selects.
       container.prev().find("select").change()
@@ -239,7 +260,7 @@
 
     store_initial_predicates: (container) ->
       # Store current predicates in data attribute
-      predicate_select = container.find('select.ransack_predicate')
+      predicate_select = container.find('select.ransack_predicate:first')
       unless predicate_select.data['predicates']
         predicates = []
         predicate_select.find('option').each (i, o) ->
@@ -267,8 +288,17 @@
               # Avoid labels like 'Contact: Contact'
               if group_label == object.text
                 object.text
-              else
+              else if group_label?
                 group_label + ': ' + object.text
+              else
+                object.text
+
+        @element.find('select.ransack_sort').select2
+          width: '230px'
+          placeholder: "Select a Field"
+
+    init_button_group_select: (containers) ->
+      containers.find('select.ransack_combinator, select.ransack_sort_order').button_group_select()
 
     init_datetimepicker: (base_id) ->
       if $.ui?.timepicker?

data/app/assets/stylesheets/ransack_ui_bootstrap/index.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+ */

data/app/assets/stylesheets/ransack_ui_bootstrap/search.css.scss

@@ -0,0 +1,32 @@
+#ransack_search {
+  .remove_fields, .ransack_attribute, .ransack_predicate,
+  .ransack_query, .ransack_sort_order, .ransack_sort,
+  .btn-group-select {
+    margin: 0 5px;
+    vertical-align: middle;
+    margin-bottom: 0;
+  }
+
+  .btn-group-select { display: inline-block; }
+
+  .remove_fields {
+    margin-right: 4px;
+    img { margin-bottom: 4px; }
+    &:hover { opacity: 0.6; }
+  }
+  .remove_fields.btn {
+    padding: 0px 3px;
+    &:hover { opacity: 1; }
+  }
+
+  a.btn {
+    i    { margin-bottom: 2px; }
+    span { margin-left: 5px; }
+  }
+
+  .combinator { margin-bottom: 20px; }
+
+  .filters > p {
+    margin-top: 20px;
+  }
+}

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

@@ -1,6 +1,6 @@
 .fields.condition{ "data-object-name" => f.object_name }
   %p
-    = link_to_remove_fields t(:advanced_search_remove_condition), f
+    = link_to_remove_fields t('ransack.remove_condition'), f, options
 
     = f.attribute_fields do |a|
       %span.fields{ "data-object-name" => f.object_name }

data/app/views/ransack_ui/_grouping_fields.html.haml

@@ -1,12 +1,13 @@
-.fields{ 'data-object-name' => f.object_name }
-  %p
-    - key = (f.object_name =~ /[0]/) ? :advanced_search_group_first : :advanced_search_group_rest
-    = t(key, :combinator => f.combinator_select).html_safe
+.fields.well{ 'data-object-name' => f.object_name }
+  .combinator
+    - key = (f.object_name =~ /[0]/) ? :group_first : :group_rest
+    - combinator = f.combinator_select({}, :class => 'ransack_combinator')
+    = t("ransack.#{key}", :combinator => combinator).html_safe
 
   .filters
     - f.object.build_condition unless f.object.conditions.any?
     = f.condition_fields do |c|
-      = render 'ransack_ui/condition_fields', :f => c
+      = render 'ransack_ui/condition_fields', :f => c, :options => options
 
     %p
-      = link_to_add_fields t(:advanced_search_add_condition), f, :condition
+      = link_to_add_fields t('ransack.add_condition'), f, :condition, options

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

@@ -1,16 +1,25 @@
-= search_form_for @ransack_search, :url => url_for(:action => :index), :html => {:method => :get, :class => "ransack_search"}, :remote => true do |f|
+= search_form_for @ransack_search, :url => (options[:url] || url_for(:action => :index)),
+  :html => {:method => :get, :class => "ransack_search"}, :remote => !!options[:remote] do |f|
 
   :javascript
     if (window.Ransack == null) { window.Ransack = {}; }
     Ransack.alt_predicates_i18n = #{I18n.translate(:"ransack.predicates.alt", :default => {}).to_json}
 
-  = f.grouping_fields do |g|
-    = render 'ransack_ui/grouping_fields', :f => g
+  .row
+    .span12.well
+      = f.grouping_fields do |g|
+        = render 'ransack_ui/grouping_fields', :f => g, :options => options
 
-  %p
-    = link_to_add_fields t(:advanced_search_add_group), f, :grouping
+      %p
+        = link_to_add_fields t('ransack.add_group'), f, :grouping, options
 
-  %p
-    = hidden_field_tag :distinct, '1'
-    = hidden_field_tag :page, '1'
-    = f.submit t(:advanced_search_submit)
+      %hr
+
+      .pull-left
+        = f.sort_fields do |s|
+          = render 'ransack_ui/sort_fields', :f => s
+
+      .pull-right
+        = hidden_field_tag :distinct, '1'
+        = hidden_field_tag :page, '1'
+        = f.submit t('ransack.submit'), :class => 'btn btn-primary btn-large'

data/app/views/ransack_ui/_sort_fields.html.haml

@@ -0,0 +1,3 @@
+.fields.sort
+  %span.sort_by Sort by:
+  = f.sort_select

data/config/locales/en.yml

@@ -14,4 +14,11 @@ en:
           gt_all: "is after all"
           gteq: "is after or on"
           gteq_any: "is after or on any"
-          gteq_all: "is after or on all"
+          gteq_all: "is after or on all"
+
+    submit: Search
+    add_group: Add a filter group
+    group_first: "Show results where %{combinator} of the following match:"
+    group_rest: "...and where %{combinator} of the following match:"
+    add_condition: Add a filter
+    remove_condition: Remove filter

data/lib/ransack_ui/controller_helpers.rb

@@ -11,7 +11,7 @@ module RansackUI
     def load_ransack_search(klass = nil)
       klass ||= controller_name.classify.constantize
       @ransack_search = klass.search(params[:q])
-      @ransack_search.build_grouping unless @ransack_search.groupings.any?
+      @ransack_search.build_grouping if @ransack_search.groupings.empty?
       @ransack_search
     end
   end

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

@@ -20,7 +20,29 @@ module Ransack
             objectify_options(options), @default_options.merge(html_options)
           )
         else
-          collection = object.context.searchable_attributes(bases.first).map do |c|
+          @template.select(
+            @object_name, :name, attribute_collection_for_base(bases.first),
+            objectify_options(options), @default_options.merge(html_options)
+          )
+        end
+      end
+
+      def sort_select(options = {}, html_options = {})
+        raise ArgumentError, "sort_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
+        options[:include_blank] = true unless options.has_key?(:include_blank)
+        bases = [''] + association_array(options[:associations])
+        if bases.size > 1
+          @template.select(
+            @object_name, :name,
+            @template.grouped_options_for_select(attribute_collection_for_bases(bases), object.name),
+            objectify_options(options), @default_options.merge({class: 'ransack_sort'}).merge(html_options)
+          ) + @template.collection_select(
+            @object_name, :dir, [['asc', object.translate('asc')], ['desc', object.translate('desc')]], :first, :last,
+            objectify_options(options.except(:include_blank)), @default_options.merge({class: 'ransack_sort_order'}).merge(html_options)
+          )
+        else
+          # searchable_attributes now returns [c, type]
+          collection = object.context.searchable_attributes(bases.first).map do |c, type|
             [
               attr_from_base_and_column(bases.first, c),
               Translate.attribute(attr_from_base_and_column(bases.first, c), :context => object.context)
@@ -28,7 +50,10 @@ module Ransack
           end
           @template.collection_select(
             @object_name, :name, collection, :first, :last,
-            objectify_options(options), @default_options.merge(html_options)
+            objectify_options(options), @default_options.merge({class: 'ransack_sort'}).merge(html_options)
+          ) + @template.collection_select(
+            @object_name, :dir, [['asc', object.translate('asc')], ['desc', object.translate('desc')]], :first, :last,
+            objectify_options(options.except(:include_blank)), @default_options.merge({class: 'ransack_sort_order'}).merge(html_options)
           )
         end
       end
@@ -49,63 +74,84 @@ 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
+          if collection = attribute_collection_for_base(base)
+            [
+              Translate.association(base, :context => object.context),
+              collection
+            ]
           end
+        end.compact
+      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
+      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] || {}
 
-              # Add column type as data attribute
-              html_options = {:'data-type' => type}
-              # Set 'base' attribute if attribute is on base model
-              html_options[:'data-root-model'] = true if base.blank?
-
-              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'
+        # Detect any inclusion validators to build list of options for a column
+        column_select_options = klass.validators.each_with_object({}) do |v, hash|
+          if v.is_a? ActiveModel::Validations::InclusionValidator
+            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)
               end
-              [
-                attribute_label,
-                attribute,
-                html_options
-              ]
-            end.compact
-          ]
-          rescue UntraversableAssociationError => e
-            nil
+            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'
+
+          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}
+          # 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]
+            # 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|
+              {:id => id, :text => text}
+            }.to_json
+          end
+
+          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
+
+          [
+            attribute_label,
+            attribute,
+            html_options
+          ]
         end.compact
+      rescue UntraversableAssociationError => e
+        nil
       end
     end
   end

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.1.7"
+  VERSION = "1.0.0"
 end

data/lib/ransack_ui/view_helpers.rb

@@ -1,19 +1,30 @@
 module RansackUI
   module ViewHelpers
-    def ransack_ui_search
-      render 'ransack_ui/search'
+    def ransack_ui_search(options = {})
+      render 'ransack_ui/search', :options => options
     end
 
-    def link_to_add_fields(name, f, type)
+    def link_to_add_fields(name, f, type, options)
       new_object = f.object.send "build_#{type}"
       fields = f.send("#{type}_fields", new_object, :child_index => "new_#{type}") do |builder|
-        render "ransack_ui/#{type.to_s}_fields", :f => builder
+        render "ransack_ui/#{type.to_s}_fields", :f => builder, :options => options
+      end
+
+      if options[:theme].to_s == 'bootstrap'
+        link_to nil, :class => "add_fields btn btn-small btn-primary", "data-field-type" => type, "data-content" => "#{fields}" do
+          "<i class=\"icon-plus icon-white\"></i><span>#{name}</span>".html_safe
+        end
+      else
+        link_to name, nil, :class => "add_fields", "data-field-type" => type, "data-content" => "#{fields}"
       end
-      link_to name, nil, :class => "add_fields", "data-field-type" => type, "data-content" => "#{fields}"
     end
 
-    def link_to_remove_fields(name, f)
-      link_to image_tag('ransack_ui/delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
+    def link_to_remove_fields(name, f, options)
+      if options[:theme].to_s == 'bootstrap'
+        link_to '<i class="icon-remove icon-white"></i>'.html_safe, nil, :class => "remove_fields btn btn-mini btn-danger"
+      else
+        link_to image_tag('ransack_ui/delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_chronic
@@ -42,11 +42,16 @@ files:
 - app/assets/images/ransack_ui/calendar.png
 - app/assets/images/ransack_ui/delete.png
 - app/assets/javascripts/ransack/predicates.js.coffee
-- app/assets/javascripts/ransack_ui_jquery.js
+- app/assets/javascripts/ransack_ui_bootstrap/button_group_select.js.coffee
+- app/assets/javascripts/ransack_ui_bootstrap/index.js.coffee
+- app/assets/javascripts/ransack_ui_jquery/index.js
 - app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb
+- app/assets/stylesheets/ransack_ui_bootstrap/index.css
+- app/assets/stylesheets/ransack_ui_bootstrap/search.css.scss
 - app/views/ransack_ui/_condition_fields.html.haml
 - app/views/ransack_ui/_grouping_fields.html.haml
 - app/views/ransack_ui/_search.html.haml
+- app/views/ransack_ui/_sort_fields.html.haml
 - config/locales/en.yml
 - lib/core_ext/enumerable.rb
 - lib/ransack_ui.rb
@@ -76,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1445871146542449388
+      hash: -2240639429364373770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1445871146542449388
+      hash: -2240639429364373770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24