ransack_ui 0.0.5 → 0.0.6

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

@@ -8,6 +8,7 @@
       el.on 'click', '.remove_fields',    $.proxy(this.remove_fields, this)
       el.on 'change', 'select.ransack_predicate', $.proxy(this.predicate_changed, this)
       el.on 'change', 'select.ransack_attribute', $.proxy(this.attribute_changed, this)
+      el.on 'click focus', 'input.ransack_query', $.proxy(this.query_focus, this)
 
       # Set up Select2 on select lists in .filters
       this.init_select2(this.element.find('.filters'))
@@ -26,7 +27,8 @@
 
     predicate_changed: (e) ->
       target   = $(e.currentTarget)
-      query_input = $('input#' + target.attr('id').slice(0, -1) + "v_0_value")
+      base_id = target.attr('id').slice(0, -1)
+      query_input = $('input#' + base_id + "v_0_value")
       if target.val() in ["true", "false", "blank", "present", "null", "not_null"]
         query_input.val("true")
         query_input.hide()
@@ -38,12 +40,16 @@
     attribute_changed: (e) ->
       target = $(e.currentTarget)
       selected = target.find('option:selected')
+      column_type = selected.data('type')
 
       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")
 
+      # Clear any datepicker from query input
+      query_input.datepicker('destroy')
+
       if selected.data('ajax-url') and Select2?
         controller = selected.data('controller')
 
@@ -81,15 +87,17 @@
 
         # Build array of supported predicates
         available = predicate_select.data['predicates']
-        predicates = Ransack.type_predicates[selected.data('type')] || []
+        predicates = Ransack.type_predicates[column_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) ->
+        $.each available, (i, p) =>
           [val, label] = [p[0], p[1]]
           if val in predicates
+            # Get alternative predicate label depending on column type
+            label = this.alt_predicate_label_or_default(val, column_type, label)
             predicate_select.append $('<option value='+val+'>'+label+'</option>')
 
         # Select first predicate if current selection is invalid
@@ -100,6 +108,51 @@
 
       return true
 
+    query_focus: (e) ->
+      if $.ui?.timepicker?
+        target = $(e.currentTarget)
+        base_id = target.attr('id').slice(0, -9)
+        query_input = $('input#' + base_id + "v_0_value")
+
+        # Only set up new datepicker if not already initialized
+        if query_input.not('.hasDatePicker')
+          selected_attr = this.element.find('select#' + base_id + 'a_0_name option:selected')
+
+          datepicker_options =
+            changeMonth: true
+            constrainInput: false
+            dateFormat: 'yy-mm-dd'
+            # Always prefer custom input text over selected date
+            onClose: (date) -> $(this).val(date)
+
+          switch selected_attr.data('type')
+            when "date"
+              query_input.datepicker(datepicker_options)
+            when "datetime"
+              query_input.datetimepicker(datepicker_options)
+            when "time"
+              query_input.datetimepicker $.extend(datepicker_options, {timeOnly: true})
+
+    # 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',
+    # while a date column will have it translated as 'is before'.
+    # This is mainly to avoid confusion when building conditions using Chronic strings.
+    # 'created_at is less than 2 weeks ago' is misleading, and
+    # 'created_at is before 2 weeks ago' is much easier to understand.
+    alt_predicate_label_or_default: (p, type, default_label) ->
+      return default_label unless Ransack?.alt_predicates_i18n?
+
+      alt_labels = {}
+      switch type
+        when "date", "datetime", "time"
+          alt_labels = Ransack.alt_predicates_i18n["date"] || {}
+        else
+          alt_labels = Ransack.alt_predicates_i18n[type] || {}
+
+      alt_labels[p] || default_label
+
+
     form_submit: (e) ->
       $("#loading").show()
       this.element.css({ opacity: 0.4 })
@@ -149,8 +202,8 @@
           placeholder: "Select a Field"
           allowClear: true
           formatSelection: (object, container) ->
-            # Return 'Model: field' if column is not on base model
-            if $(object.element).data('base')
+            # Return 'Model: field' unless column is on root model
+            if $(object.element).data('root-model')
               object.text
             else
               group_label = $(object.element).parent().attr('label')

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

@@ -1,5 +1,9 @@
 = search_form_for search, :url => url_for(:action => :index), :html => {:method => :get, :class => "advanced_search"}, :remote => true 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/grouping_fields', :f => g
 

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, :style => "width: 200px;"
+      = v.text_field :value, :style => "width: 200px;", :class => "ransack_query"

data/config/locales/en-US.yml

@@ -0,0 +1,17 @@
+en-US:
+  ransack:
+    predicates:
+      alt:
+        date:
+          lt: "is before"
+          lt_any: "is before any"
+          lt_all: "is before all"
+          lteq: "is before or on"
+          lteq_any: "is before or on any"
+          lteq_all: "is before or on all"
+          gt: "is after"
+          gt_any: "ais fter any"
+          gt_all: "is after all"
+          gteq: "is after or on"
+          gteq_any: "is after or on any"
+          gteq_all: "is after or on all"

data/config/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  ransack:
+    predicates:
+      alt:
+        date:
+          lt: "is before"
+          lt_any: "is before any"
+          lt_all: "is before all"
+          lteq: "is before or on"
+          lteq_any: "is before or on any"
+          lteq_all: "is before or on all"
+          gt: "is after"
+          gt_any: "ais fter any"
+          gt_all: "is after all"
+          gteq: "is after or on"
+          gteq_any: "is after or on any"
+          gteq_all: "is after or on all"

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

@@ -81,7 +81,7 @@ module Ransack
               # Add column type as data attribute
               html_options = {:'data-type' => type}
               # Set 'base' attribute if attribute is on base model
-              html_options[:'data-base'] = true if base.blank?
+              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

data/lib/ransack_ui/ransack_overrides/nodes/value.rb

@@ -0,0 +1,32 @@
+require 'ransack/nodes'
+
+# Add Chronic parsing to date and time casting
+module Ransack
+  module Nodes
+    Value.class_eval do
+      def cast_to_date(val)
+        if val.is_a?(String)
+          Chronic.parse(val).in_time_zone.to_date rescue nil
+        elsif val.respond_to?(:to_date)
+          val.to_date rescue nil
+        else
+          y, m, d = *[val].flatten
+          m ||= 1
+          d ||= 1
+          Date.new(y,m,d) rescue nil
+        end
+      end
+
+      def cast_to_time(val)
+        if val.is_a?(Array)
+          Time.zone.local(*val) rescue nil
+        else
+          unless val.acts_like?(:time)
+            val = val.is_a?(String) ? Chronic.parse(val) : val.to_time rescue nil
+          end
+          val.in_time_zone rescue nil
+        end
+      end
+    end
+  end
+end

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/ransack_ui.rb

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

data/ransack_ui.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_dependency 'chronic', '>= 0.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-11-12 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.7
 description: Framework for building a search UI with Ransack
 email:
 - nathan.f77@gmail.com
@@ -33,6 +49,8 @@ files:
 - app/views/ransack/_condition_fields.html.haml
 - app/views/ransack/_grouping_fields.html.haml
 - app/views/ransack/_search.html.haml
+- config/locales/en-US.yml
+- config/locales/en.yml
 - lib/core_ext/enumerable.rb
 - lib/ransack_ui.rb
 - lib/ransack_ui/rails/engine.rb
@@ -40,6 +58,7 @@ files:
 - lib/ransack_ui/ransack_overrides/configuration.rb
 - lib/ransack_ui/ransack_overrides/context.rb
 - lib/ransack_ui/ransack_overrides/helpers/form_builder.rb
+- lib/ransack_ui/ransack_overrides/nodes/value.rb
 - lib/ransack_ui/version.rb
 - lib/ransack_ui/view_helpers.rb
 - ransack_ui.gemspec
@@ -58,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -11773573269345332
+      hash: 4598873639471933372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -11773573269345332
+      hash: 4598873639471933372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24