simple_search_filter 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe03419b2b7ff9aae11cb0fb70188bd934685272
-  data.tar.gz: e5de877b2a475227553909293b362a91a13db91e
+  metadata.gz: 9c554aefd2046782485386edc4128def4a52f24a
+  data.tar.gz: fee22489eb7e9b8d24d4de2bf60289d40f135dc1
 SHA512:
-  metadata.gz: 2bbd53ab849f10ce194464c565180b6b4c39bd19dcfae2a15c1c5cccf7e77e37e62d7e2bd509ecd3500276992ec191a4ea2fa1a1f7d9337d4328e0df05bedb0a
-  data.tar.gz: f9ceea179c4f6a02d98bc47873b7b21014836572a2578594cc4325e7dfa981472999eaf3cff21a43cc8eb388d53c3f5498d743eacc66b2b51c12aad16fc4a396
+  metadata.gz: 9cdf9f65db095c8cf790c494ef09bf0b6b3aee6114e43901a3ff604981792a9ae70790dd5a5122145b0764b25ab1d50e2cdc72b742847b36a7b5ddccc14b5f40
+  data.tar.gz: bd0f066c416279a59a8143ad5f610a47ce162a322e209fb3833f179edd7c6863e0fe47424bd5abea6c782f39d36a2b2d6b0652c5419f3f426f5b65c4fa5c93b8

data/app/views/simple_search_filter/_buttons_apply_clear.html.haml

@@ -1,2 +1,2 @@
-<button type="submit" class="btn btn-primary btn-sm">Apply</button>
-<button type="button" class="btn btn-default btn-sm" onclick="$('#formFilter input[id=filter_cmd]').val('clear'); document.getElementById('formFilter').reset(); document.getElementById('formFilter').submit(); return false;">Clear</button>
+<button type="submit" class="btn btn-primary btn-sm">Apply</button>
+<button type="button" class="btn btn-default btn-sm" onclick="$('#formFilter input[id=filter_cmd]').val('clear'); document.getElementById('formFilter').reset(); document.getElementById('formFilter').submit(); return false;">Clear</button>

data/app/views/simple_search_filter/_field.html.haml

@@ -1,12 +1,12 @@
-- field = filter.fields[name]
-- formtype = field.formtype.to_s
-- name ||= field.name.to_s
-- v = filter.v(name)
-
-
-- tpl = 'simple_search_filter/fields/'+formtype.to_s
-
-= render tpl, filter: filter, field: field
-
-
-
+- field = filter.fields[name]
+- formtype = field.formtype.to_s
+- name ||= field.name.to_s
+- v = filter.v(name)
+
+
+- tpl = 'simple_search_filter/fields/'+formtype.to_s
+
+= render tpl, filter: filter, field: field
+
+
+

data/app/views/simple_search_filter/_fields.html.haml

@@ -1,3 +1,3 @@
-- filter.fields.each do |name, field|
-  = render :partial=>'simple_search_filter/field_simple_form', :locals => {name: name, f: f, filter: filter}
-
+- filter.fields.each do |name, field|
+  = render :partial=>'simple_search_filter/field_simple_form', :locals => {name: name, f: f, filter: filter}
+

data/lib/simple_search_filter/controller.rb

@@ -60,17 +60,32 @@ module SimpleSearchFilter
         @filter.set_order params[:orderby], params[:orderdir]
         #(redirect_to action: name.to_sym and return) if @filter.search_method_post_and_redirect?
         if @filter.search_method_post_and_redirect?
-          redirect_to main_app.send(@filter.options[:url])
+          u = url_search_filter(@filter)
+          raise 'Bad url' if u.nil?
+          redirect_to u
+
+          #redirect_to main_app.send(@filter.options[:url])
+          #redirect_to send(@filter.options[:url])
         end
       end
 
     end
 
+    def url_search_filter(filter)
+      opt_url = filter.options[:url]
+      u = nil
+      u = send(opt_url) if u.nil? && respond_to?(opt_url)
+      u = main_app.send(opt_url) if u.nil? && main_app.respond_to?(opt_url)
+
+      u
+    end
+
     module ClassMethods
       def search_filter(name, options = {}, &block)
         # raise "You need a block to build!" unless block_given?
 
         init_method = "init_search_filter_#{name.to_s}"
+        search_action_name = (options[:search_action] || 'search')
 
         define_method(init_method) do
           prefix = options[:prefix] || "filter_#{params[:controller]}_#{name}"
@@ -87,13 +102,19 @@ module SimpleSearchFilter
         end
 
         # before_action callback
-        self.before_action :"#{init_method}", only: [name.to_sym, options[:search_action]]
+        self.before_action :"#{init_method}", only: [name.to_sym, search_action_name]
 
 
         #
-        define_method("#{options[:search_action]}") do
+        define_method("#{search_action_name}") do
+          u = url_search_filter(@filter)
+          raise 'Bad url' if u.nil?
+          redirect_to u
+
           #redirect_to action: name.to_sym
-          redirect_to main_app.send(options[:url])
+          #redirect_to main_app.send(options[:url])
+          #redirect_to send(options[:url])
+          #redirect_to '/'
         end
       end
 

data/lib/simple_search_filter/filter.rb

@@ -1,452 +1,452 @@
-require 'simple_search_filter/filter_field'
-require 'simple_search_filter/filter_data'
-
-module SimpleSearchFilter
-  class Filter
-    CMD_PARAM_NAME = :filter_cmd
-    CMD_ORDER = 'order'
-
-    #
-    SEARCH_METHOD_GET = :get
-    SEARCH_METHOD_POST_AND_REDIRECT = :post_and_redirect
-
-    DEFAULT_SEARCH_METHOD = SEARCH_METHOD_GET
-
-    #
-    attr_accessor :prefix # session prefix
-    attr_accessor :fields # array of FilterField
-    attr_accessor :data # values
-
-
-
-    def initialize(_session, _prefix, opt={})
-      @prefix = _prefix
-      @session = _session
-
-      @fields ||={}
-
-      @options = opt
-      @options||={}
-
-      # init data
-      data()
-    end
-
-
-    def field(name, type, formtype, opt={})
-      if formtype.to_s==FilterField::FORM_TYPE_AUTOCOMPLETE
-        add_field_autocomplete(name, type, formtype, opt)
-      else
-        add_field FilterField.new(name,type, formtype, opt)
-      end
-
-    end
-
-
-
-
-    ############
-    # fields
-    ############
-
-    def add_field(f)
-      #@fields[f[:name]] = f
-      @fields[f.name] = f
-
-    end
-
-    def add_fields_from_array(a)
-      a.each{|fa| add_field fa}
-    end
-
-    def add_field_autocomplete(name, type, formtype, opt={})
-      search_by = opt[:search_by] || :text
-
-      if search_by==:id
-        # filter by id
-
-        # id field
-        opt_id = opt.clone
-        opt_id[:default_value] = 0
-        opt_id[:ignore_value] = 0
-        opt_id[:condition] = opt[:condition] || FilterField::QUERY_CONDITION_EQUAL
-        opt_id[:condition_scope] = opt[:condition_scope]
-
-        id_name = field_name_for_id_autocomplete(name).to_sym
-        add_field FilterField.new(id_name, FilterField::TYPE_INT, FilterField::FORM_TYPE_EMPTY, opt_id)
-
-        # text field
-        opt_text = opt.clone
-        opt_text[:default_value] = ''
-        opt_text[:ignore_value] = ''
-        opt_text[:condition] = FilterField::QUERY_CONDITION_EMPTY
-
-        add_field FilterField.new(name,type, formtype, opt_text)
-
-      else
-        # filter by text
-        add_field FilterField.new(name,type, formtype, opt)
-      end
-
-    end
-
-
-    def field_name_for_id_autocomplete(name)
-      "#{name}_id"
-    end
-
-    def field_def_value(name)
-      name = name.to_sym
-
-      return nil if @fields[name].nil?
-
-      @fields[name].default_value
-    end
-
-
-    ############
-    # options
-    ############
-
-    def options
-      @options || {}
-    end
-
-    def search_method
-      options[:search_method] ||= DEFAULT_SEARCH_METHOD
-
-      options[:search_method]
-    end
-
-    def search_method_get?
-      search_method == SEARCH_METHOD_GET
-    end
-
-    def search_method_post_and_redirect?
-      search_method == SEARCH_METHOD_POST_AND_REDIRECT
-    end
-
-
-    def url
-      options[:url] || options[:search_url]
-    end
-
-    def search_url
-      options[:search_url]
-    end
-
-
-    def form_method
-      search_method_get? ? :get : :post
-    end
-
-    def page_param_name
-      options[:page_param_name] || SimpleSearchFilter.page_default_param_name
-    end
-
-
-
-    ############
-    # sessions
-    ############
-
-    def session_get(name, def_value)
-      @session[prefix+name] || def_value
-    end
-
-    def session_save(name, v)
-      @session[prefix+name] = v
-    end
-
-
-    ############
-    # data
-    ############
-
-
-    def data
-      return @data unless @data.nil?
-
-      # from session
-      data_sess = session_get 'data', nil
-      unless data_sess.nil?
-        if data_sess.is_a?(FilterData)
-          @data = data_sess
-        elsif data_sess.is_a?(Hash)
-          @data = FilterData.new
-          @data.set_values(data_sess)
-        else
-          #y=0
-        end
-      end
-
-      #
-      @data ||= FilterData.new
-
-      data_save_to_session
-
-      #
-      @data
-    end
-
-    def data_save_to_session
-      session_save('data', @data.values)
-    end
-
-    def v(name, v_def=nil)
-      name = name.to_s
-
-      res = data.v(name, field_def_value(name))
-      return res unless res.nil?
-
-      v_def
-    end
-
-
-    def v_empty?(name)
-      data.v_empty?(name)
-    end
-
-    def set(field_name,v)
-      field = @fields[field_name]
-      vv = field.nil? ? v : field.fix_value(v)
-
-      data.set(field_name, vv)
-    end
-
-
-    def clear_all
-      self.page=1
-      clear_order
-      clear_data
-    end
-
-    def clear_data
-      data.clear
-
-      data_save_to_session
-    end
-
-    def set_data_from_form(params)
-      # search for fields like filter[XXX]
-      params.each do |k, v|
-        name = k.to_sym
-
-        #if f =~ /^filter\[([^\]]+)\]$/
-        #name = Regexp.last_match(1)
-
-        next unless @fields.has_key? name
-
-        t = @fields[name].type
-        if t==FilterField::TYPE_INT
-          set name, (v.to_i rescue 0)
-        elsif t==FilterField::TYPE_BOOLEAN
-          set name, FilterField.fix_value_boolean(v)
-        else
-          set name, v
-        end
-
-        #end
-      end
-
-      # default values from fields
-      @fields.each do |k, f|
-        name = k.to_s
-        next if data.v_exist? name
-
-        set name, field_def_value(name)
-      end
-
-    end
-
-
-
-    ####
-    # page
-    ####
-
-    def page
-      return @page unless @page.nil?
-
-      # from session
-      @v_sess = session_get 'page', nil
-      @page = @v_sess unless @v_sess.nil?
-
-      #
-      @page ||= 1
-
-      session_save 'page', @page
-
-      #
-      @page
-    end
-
-    def page=(value)
-      @page = value.to_i
-
-      session_save 'page', @page
-    end
-
-
-    ####
-    # order
-    ####
-
-    def default_order(order_by, order_dir)
-      set_default_order order_by, order_dir
-    end
-
-    def order
-      return @order unless @order.nil?
-
-      # from session
-      @v_sess = session_get 'order', nil
-      @order = @v_sess unless @v_sess.nil?
-
-      #
-      @order ||= []
-
-      session_save 'order', @order
-
-      #
-      @order
-    end
-
-    def order= (value)
-      @order = value
-
-      session_save 'order', @order
-    end
-
-    def set_default_order(order_by, order_dir)
-      @order_default = [[order_by, order_dir]]
-
-      #
-      return false if !order.nil? && !order.empty?
-
-      set_order(order_by, order_dir)
-
-    end
-
-
-    def set_order(order_by, order_dir)
-      self.order = [[order_by, order_dir]]
-    end
-
-    def get_order
-      order[0] if order.count>0
-      order[0]
-    end
-
-    def clear_order
-      self.order = @order_default
-    end
-
-
-    # return nil if not sorted by this column
-    # return order dir if sorted by this column
-    def get_order_dir_for_column(name)
-      name = name.to_s
-      current_column = get_order_column
-
-      return nil unless current_column==name
-
-      dir = get_order_dir
-      return nil if dir.nil?
-
-      dir
-    end
-
-    def get_order_column
-      ord = order
-      return nil if ord.empty?
-
-      ord[0][0].to_s
-    end
-
-    def get_order_dir
-      ord = order
-      return nil if ord.empty?
-
-      ord[0][1].to_s
-    end
-
-
-    def get_opposite_order_dir_for_column(name)
-      name = name.to_s
-
-      ord_column = get_order_column
-      return 'asc' if ord_column.nil?
-
-      if ord_column == name
-        return opposite_order_dir(order[0][1])
-      end
-
-      return 'asc'
-    end
-
-    def opposite_order_dir(order_dir)
-      order_dir = order_dir.to_s
-      return 'asc' if order_dir=='desc'
-      return 'desc' if order_dir=='asc'
-      'asc'
-    end
-
-
-
-
-
-    def url_params_for_sortable_column(name)
-      p = {}
-      p[CMD_PARAM_NAME] = CMD_ORDER
-      p[:orderby] = name.to_s
-      p[:orderdir] = get_opposite_order_dir_for_column(name)
-
-      p
-    end
-
-
-
-    ########
-    # where
-    ########
-
-    def order_string
-      o = order
-      if o.empty?
-        orderby = 'id'
-        orderdir = 'asc'
-      else
-        orderby, orderdir = order[0]
-      end
-
-      "#{orderby} #{orderdir}"
-    end
-
-
-
-    def where_conditions
-      w_string = '1=1 '
-      w_values = []
-
-      @fields.each do |name, f|
-        val = v(name)
-
-        next if val.nil?
-
-        w_field = f.make_where(val)
-        next if w_field.nil?
-
-        w_cond, w_value = w_field
-
-        w_string << " AND #{w_cond} "
-        w_values << w_value
-      end
-
-      [w_string, *w_values]
-    end
-
-
-  end
-
+require 'simple_search_filter/filter_field'
+require 'simple_search_filter/filter_data'
+
+module SimpleSearchFilter
+  class Filter
+    CMD_PARAM_NAME = :filter_cmd
+    CMD_ORDER = 'order'
+
+    #
+    SEARCH_METHOD_GET = :get
+    SEARCH_METHOD_POST_AND_REDIRECT = :post_and_redirect
+
+    DEFAULT_SEARCH_METHOD = SEARCH_METHOD_GET
+
+    #
+    attr_accessor :prefix # session prefix
+    attr_accessor :fields # array of FilterField
+    attr_accessor :data # values
+
+
+
+    def initialize(_session, _prefix, opt={})
+      @prefix = _prefix
+      @session = _session
+
+      @fields ||={}
+
+      @options = opt
+      @options||={}
+
+      # init data
+      data()
+    end
+
+
+    def field(name, type, formtype, opt={})
+      if formtype.to_s==FilterField::FORM_TYPE_AUTOCOMPLETE
+        add_field_autocomplete(name, type, formtype, opt)
+      else
+        add_field FilterField.new(name,type, formtype, opt)
+      end
+
+    end
+
+
+
+
+    ############
+    # fields
+    ############
+
+    def add_field(f)
+      #@fields[f[:name]] = f
+      @fields[f.name] = f
+
+    end
+
+    def add_fields_from_array(a)
+      a.each{|fa| add_field fa}
+    end
+
+    def add_field_autocomplete(name, type, formtype, opt={})
+      search_by = opt[:search_by] || :text
+
+      if search_by==:id
+        # filter by id
+
+        # id field
+        opt_id = opt.clone
+        opt_id[:default_value] = 0
+        opt_id[:ignore_value] = 0
+        opt_id[:condition] = opt[:condition] || FilterField::QUERY_CONDITION_EQUAL
+        opt_id[:condition_scope] = opt[:condition_scope]
+
+        id_name = field_name_for_id_autocomplete(name).to_sym
+        add_field FilterField.new(id_name, FilterField::TYPE_INT, FilterField::FORM_TYPE_EMPTY, opt_id)
+
+        # text field
+        opt_text = opt.clone
+        opt_text[:default_value] = ''
+        opt_text[:ignore_value] = ''
+        opt_text[:condition] = FilterField::QUERY_CONDITION_EMPTY
+
+        add_field FilterField.new(name,type, formtype, opt_text)
+
+      else
+        # filter by text
+        add_field FilterField.new(name,type, formtype, opt)
+      end
+
+    end
+
+
+    def field_name_for_id_autocomplete(name)
+      "#{name}_id"
+    end
+
+    def field_def_value(name)
+      name = name.to_sym
+
+      return nil if @fields[name].nil?
+
+      @fields[name].default_value
+    end
+
+
+    ############
+    # options
+    ############
+
+    def options
+      @options || {}
+    end
+
+    def search_method
+      options[:search_method] ||= DEFAULT_SEARCH_METHOD
+
+      options[:search_method]
+    end
+
+    def search_method_get?
+      search_method == SEARCH_METHOD_GET
+    end
+
+    def search_method_post_and_redirect?
+      search_method == SEARCH_METHOD_POST_AND_REDIRECT
+    end
+
+
+    def url
+      options[:url] || options[:search_url]
+    end
+
+    def search_url
+      options[:search_url]
+    end
+
+
+    def form_method
+      search_method_get? ? :get : :post
+    end
+
+    def page_param_name
+      options[:page_param_name] || SimpleSearchFilter.page_default_param_name
+    end
+
+
+
+    ############
+    # sessions
+    ############
+
+    def session_get(name, def_value)
+      @session[prefix+name] || def_value
+    end
+
+    def session_save(name, v)
+      @session[prefix+name] = v
+    end
+
+
+    ############
+    # data
+    ############
+
+
+    def data
+      return @data unless @data.nil?
+
+      # from session
+      data_sess = session_get 'data', nil
+      unless data_sess.nil?
+        if data_sess.is_a?(FilterData)
+          @data = data_sess
+        elsif data_sess.is_a?(Hash)
+          @data = FilterData.new
+          @data.set_values(data_sess)
+        else
+          #y=0
+        end
+      end
+
+      #
+      @data ||= FilterData.new
+
+      data_save_to_session
+
+      #
+      @data
+    end
+
+    def data_save_to_session
+      session_save('data', @data.values)
+    end
+
+    def v(name, v_def=nil)
+      name = name.to_s
+
+      res = data.v(name, field_def_value(name))
+      return res unless res.nil?
+
+      v_def
+    end
+
+
+    def v_empty?(name)
+      data.v_empty?(name)
+    end
+
+    def set(field_name,v)
+      field = @fields[field_name]
+      vv = field.nil? ? v : field.fix_value(v)
+
+      data.set(field_name, vv)
+    end
+
+
+    def clear_all
+      self.page=1
+      clear_order
+      clear_data
+    end
+
+    def clear_data
+      data.clear
+
+      data_save_to_session
+    end
+
+    def set_data_from_form(params)
+      # search for fields like filter[XXX]
+      params.each do |k, v|
+        name = k.to_sym
+
+        #if f =~ /^filter\[([^\]]+)\]$/
+        #name = Regexp.last_match(1)
+
+        next unless @fields.has_key? name
+
+        t = @fields[name].type
+        if t==FilterField::TYPE_INT
+          set name, (v.to_i rescue 0)
+        elsif t==FilterField::TYPE_BOOLEAN
+          set name, FilterField.fix_value_boolean(v)
+        else
+          set name, v
+        end
+
+        #end
+      end
+
+      # default values from fields
+      @fields.each do |k, f|
+        name = k.to_s
+        next if data.v_exist? name
+
+        set name, field_def_value(name)
+      end
+
+    end
+
+
+
+    ####
+    # page
+    ####
+
+    def page
+      return @page unless @page.nil?
+
+      # from session
+      @v_sess = session_get 'page', nil
+      @page = @v_sess unless @v_sess.nil?
+
+      #
+      @page ||= 1
+
+      session_save 'page', @page
+
+      #
+      @page
+    end
+
+    def page=(value)
+      @page = value.to_i
+
+      session_save 'page', @page
+    end
+
+
+    ####
+    # order
+    ####
+
+    def default_order(order_by, order_dir)
+      set_default_order order_by, order_dir
+    end
+
+    def order
+      return @order unless @order.nil?
+
+      # from session
+      @v_sess = session_get 'order', nil
+      @order = @v_sess unless @v_sess.nil?
+
+      #
+      @order ||= []
+
+      session_save 'order', @order
+
+      #
+      @order
+    end
+
+    def order= (value)
+      @order = value
+
+      session_save 'order', @order
+    end
+
+    def set_default_order(order_by, order_dir)
+      @order_default = [[order_by, order_dir]]
+
+      #
+      return false if !order.nil? && !order.empty?
+
+      set_order(order_by, order_dir)
+
+    end
+
+
+    def set_order(order_by, order_dir)
+      self.order = [[order_by, order_dir]]
+    end
+
+    def get_order
+      order[0] if order.count>0
+      order[0]
+    end
+
+    def clear_order
+      self.order = @order_default
+    end
+
+
+    # return nil if not sorted by this column
+    # return order dir if sorted by this column
+    def get_order_dir_for_column(name)
+      name = name.to_s
+      current_column = get_order_column
+
+      return nil unless current_column==name
+
+      dir = get_order_dir
+      return nil if dir.nil?
+
+      dir
+    end
+
+    def get_order_column
+      ord = order
+      return nil if ord.empty?
+
+      ord[0][0].to_s
+    end
+
+    def get_order_dir
+      ord = order
+      return nil if ord.empty?
+
+      ord[0][1].to_s
+    end
+
+
+    def get_opposite_order_dir_for_column(name)
+      name = name.to_s
+
+      ord_column = get_order_column
+      return 'asc' if ord_column.nil?
+
+      if ord_column == name
+        return opposite_order_dir(order[0][1])
+      end
+
+      return 'asc'
+    end
+
+    def opposite_order_dir(order_dir)
+      order_dir = order_dir.to_s
+      return 'asc' if order_dir=='desc'
+      return 'desc' if order_dir=='asc'
+      'asc'
+    end
+
+
+
+
+
+    def url_params_for_sortable_column(name)
+      p = {}
+      p[CMD_PARAM_NAME] = CMD_ORDER
+      p[:orderby] = name.to_s
+      p[:orderdir] = get_opposite_order_dir_for_column(name)
+
+      p
+    end
+
+
+
+    ########
+    # where
+    ########
+
+    def order_string
+      o = order
+      if o.empty?
+        orderby = 'id'
+        orderdir = 'asc'
+      else
+        orderby, orderdir = order[0]
+      end
+
+      "#{orderby} #{orderdir}"
+    end
+
+
+
+    def where_conditions
+      w_string = '1=1 '
+      w_values = []
+
+      @fields.each do |name, f|
+        val = v(name)
+
+        next if val.nil?
+
+        w_field = f.make_where(val)
+        next if w_field.nil?
+
+        w_cond, w_value = w_field
+
+        w_string << " AND #{w_cond} "
+        w_values << w_value
+      end
+
+      [w_string, *w_values]
+    end
+
+
+  end
+
 end