ransack_ui 0.0.6 → 0.1.0

data/app/assets/javascripts/ransack_ui_jquery.js

@@ -1,3 +1,2 @@
 //= require ransack/predicates
-//= require ransack_ui_jquery/search_form
-//= require ransack_ui_jquery/search_tabs
+//= require ransack_ui_jquery/search_form

data/app/assets/javascripts/ransack_ui_jquery/{search_form.js.coffee → search_form.js.coffee.erb}

@@ -8,7 +8,6 @@
       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'))
@@ -47,8 +46,8 @@
       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')
+      # Initialize datepicker if column is date/datetime/time
+      $.proxy(this.init_datetimepicker, this)(base_id)
 
       if selected.data('ajax-url') and Select2?
         controller = selected.data('controller')
@@ -108,31 +107,6 @@
 
       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',
@@ -195,7 +169,7 @@
         container.find('select.ransack_predicate').select2
           width: '130px'
           formatNoMatches: (term) ->
-            "No predicates found"
+            "Select a field first"
 
         container.find('select.ransack_attribute').select2
           width: '220px'
@@ -212,4 +186,33 @@
                 object.text
               else
                 $(object.element).parent().attr('label') + ': ' + object.text
+
+
+
+    init_datetimepicker: (base_id) ->
+      if $.ui?.timepicker?
+        query_input = this.element.find('input#' + base_id + "v_0_value")
+        selected_attr = this.element.find('select#' + base_id + 'a_0_name option:selected')
+
+        # Clear any datepicker from query input first
+        query_input.datepicker('destroy')
+
+        datepicker_options =
+          changeMonth: true
+          constrainInput: false
+          dateFormat: 'yy-mm-dd'
+          buttonImage: "<%= asset_path('ransack_ui/calendar.png') %>"
+          buttonImageOnly: true
+          showOn: 'button'
+          # Always prefer custom input text over selected date
+          onClose: (date) -> $(this).val(date)
+
+        # Show datepicker button for dates
+        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})
 ) jQuery

data/app/views/{ransack → ransack_ui}/_grouping_fields.html.haml

@@ -6,7 +6,7 @@
   .filters
     - f.object.build_condition unless f.object.conditions.any?
     = f.condition_fields do |c|
-      = render 'ransack/condition_fields', :f => c
+      = render 'ransack_ui/condition_fields', :f => c
 
     %p
       = link_to_add_fields t(:advanced_search_add_condition), f, :condition

data/app/views/{ransack/_advanced_search.html.haml → ransack_ui/_search.html.haml}

@@ -1,11 +1,11 @@
-= search_form_for search, :url => url_for(:action => :index), :html => {:method => :get, :class => "advanced_search"}, :remote => true do |f|
+= search_form_for @ransack_search, :url => url_for(:action => :index), :html => {:method => :get, :class => "ransack_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
+    = render 'ransack_ui/grouping_fields', :f => g
 
   %p
     = link_to_add_fields t(:advanced_search_add_group), f, :grouping

data/lib/ransack_ui/controller_helpers.rb

@@ -0,0 +1,14 @@
+module RansackUI
+  module ControllerHelpers
+    # Builds @ransack_search object from params[:q]
+    # Infers model class from controller name.
+    #
+    # Should be used as a before_filter, e.g.:
+    #    before_filter :load_ransack_search, :only => :index
+    def load_ransack_search
+      klass = controller_name.classify.constantize
+      @ransack_search = klass.search(params[:q])
+      @ransack_search.build_grouping unless @ransack_search.groupings.any?
+    end
+  end
+end

data/lib/ransack_ui/rails/engine.rb

@@ -1,4 +1,5 @@
 require 'ransack_ui/view_helpers'
+require 'ransack_ui/controller_helpers'
 
 module RansackUI
   module Rails
@@ -7,8 +8,13 @@ module RansackUI
         ActionView::Base.send :include, ViewHelpers
       end
 
+      initializer "ransack_ui.controller_helpers" do
+        ActionController::Base.send :include, ControllerHelpers
+      end
+
       initializer :assets do
-        ::Rails.application.config.assets.precompile += %w( delete.png )
+        # Add images to be precompiled
+        ::Rails.application.config.assets.precompile += %w(ransack_ui/delete.png ransack_ui/calendar.png)
       end
     end
   end

data/lib/ransack_ui/version.rb

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

data/lib/ransack_ui/view_helpers.rb

@@ -1,19 +1,19 @@
 module RansackUI
   module ViewHelpers
-    def ransack_search_form
-      render 'ransack/search'
+    def ransack_ui_search
+      render 'ransack_ui/search'
     end
 
     def link_to_add_fields(name, f, type)
       new_object = f.object.send "build_#{type}"
       fields = f.send("#{type}_fields", new_object, :child_index => "new_#{type}") do |builder|
-        render "ransack/#{type.to_s}_fields", :f => builder
+        render "ransack_ui/#{type.to_s}_fields", :f => builder
       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('delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
+      link_to image_tag('ransack_ui/delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -39,20 +39,19 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/images/delete.png
+- 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_jquery/search_form.js.coffee
-- app/assets/javascripts/ransack_ui_jquery/search_tabs.js.coffee
-- app/views/ransack/_advanced_search.html.haml
-- app/views/ransack/_basic_search.html.haml
-- app/views/ransack/_condition_fields.html.haml
-- app/views/ransack/_grouping_fields.html.haml
-- app/views/ransack/_search.html.haml
+- app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb
+- app/views/ransack_ui/_condition_fields.html.haml
+- app/views/ransack_ui/_grouping_fields.html.haml
+- app/views/ransack_ui/_search.html.haml
 - config/locales/en-US.yml
 - config/locales/en.yml
 - lib/core_ext/enumerable.rb
 - lib/ransack_ui.rb
+- lib/ransack_ui/controller_helpers.rb
 - lib/ransack_ui/rails/engine.rb
 - lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb
 - lib/ransack_ui/ransack_overrides/configuration.rb
@@ -77,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4598873639471933372
+      hash: -2183248768965735638
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4598873639471933372
+      hash: -2183248768965735638
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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

@@ -1,31 +0,0 @@
-(($) ->
-  $ ->
-    # Search tabs
-    # -----------------------------------------------------
-    activate_search_form = (search_form) ->
-      # Hide all
-      $('#search .search_form').hide()
-      $('#search .tabs li a').removeClass('active')
-      # Show selected
-      $('#' + search_form).show()
-      $('a[data-search-form=' + search_form + ']').addClass('active')
-      # Run search for current query
-      switch search_form
-        when 'basic_search'
-          query_input = $('#basic_search input#query')
-          if !query_input.is('.defaultTextActive')
-            value = query_input.val()
-          else
-            value = ""
-          crm.search(value, window.controller)
-          $('#filters').enable() # Enable filters panel (if present)
-
-        when 'advanced_search'
-          $("#advanced_search form input:submit").click()
-          $('#filters').disable() # Disable filters panel (if present)
-
-      return
-    $("#search .tabs a").click ->
-      activate_search_form($(this).data('search-form'))
-
-) jQuery

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

@@ -1,2 +0,0 @@
-%div{ :style => "margin: 0px 0px 6px 0px" }
-  = text_field_tag('query', @current_query, :size => 32, :placeholder => "Search #{controller_name}")

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

@@ -1,13 +0,0 @@
-#search
-  .tabs
-    %ul
-      %li
-        = link_to 'Basic Search', '#',    :"data-search-form" => "basic_search",    :class => (params[:q]  ? "" : " active")
-      %li
-        = link_to 'Advanced Search', '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
-
-  .search_form#basic_search{ :style => (params[:q] ? 'display: none;' : '') }
-    = render "ransack/basic_search"
-
-  .search_form#advanced_search{ :style => (!params[:q] ? 'display: none;' : '') }
-    = render "ransack/advanced_search"