app/controllers/taxons_controller.rb app/helpers/application_helper.rb app/helpers/taxons_helper.rb app/views/products/index.html.erb app/views/shared/_login_bar.html.erb app/views/taxons/show.html.erb @@ -1,82 +1,33 @@ class ProductsController < Spree::BaseController -# Uncomment those methods to make the simple search work for products and inside taxons - private - - def collection - products_per_page = 20 - - search = Search.new({ - :taxon_id => params[:taxon], - :min_price => params[:min_price], - :max_price => params[:max_price], - :keywords => params[:search] - }) - # Verify if theres any ondition. - conditions = search.conditions - if conditions == [""] - conditions = "" - end - - # Define what is allowed. - sort_params = { - "price_asc" => "master_price ASC", - "price_desc" => "master_price DESC", - "date_asc" => "available_on ASC", - "date_desc" => "available_on DESC", - "name_asc" => "name ASC", - "name_desc" => "name DESC" - } - # Set it to what is allowed or default. - @sort_by = sort_params[params[:sort]] || "available_on DESC" - - @search_param = "- #{t('ext.search.searching_by', :search_term => params[:search])}" if params[:search] - - @collection ||= Product.active.by_name(params[:search]).find( - :all, - :conditions => conditions, - :order => @sort_by, - :page => {:start => 1, :size => products_per_page, :current => params[:p]}, - :include => :images) - end - end - - TaxonsController.class_eval do - private - - def load_data - products_per_page = 20 - - search = Search.new({ - :taxon_id => params[:taxon], - :min_price => params[:min_price], - :max_price => params[:max_price], - :keywords => params[:search] - }) - # Verify if theres any ondition. - conditions = search.conditions - if conditions == [""] - conditions = "" - end - - # Define what is allowed. - sort_params = { - "price_asc" => "master_price ASC", - "price_desc" => "master_price DESC", - "date_asc" => "available_on ASC", - "date_desc" => "available_on DESC", - "name_asc" => "name ASC", - "name_desc" => "name DESC" - } - # Set it to what is allowed or default. - @sort_by = sort_params[params[:sort]] || "available_on DESC" - - @search_param = "- #{t('ext.search.searching_by', :search_term => params[:search])}" if params[:search] - - @products ||= object.products.active.by_name(params[:search]).find( - :all, - :conditions => conditions, - :order => @sort_by, - :page => {:start => 1, :size => products_per_page, :current => params[:p]}, - :include => :images) - end +# Uncomment this method to make the simple search work for products. + private + + def collection + # Define what is allowed. + sort_params = { + "price_asc" => ["master_price", "ASC"], + "price_desc" => ["master_price", "DESC"], + "date_asc" => ["available_on", "ASC"], + "date_desc" => ["available_on", "DESC"], + "name_asc" => ["name", "ASC"], + "name_desc" => ["name", "DESC"] + } + # Set it to what is allowed or default. + @sort_by_and_as = sort_params[params[:sort]] || ["available_on", "DESC"] + # If setted to default, clean the param it doesn't need to clutter the url. + params[:sort] = nil if @sort_by_and_as == ["available_on", "DESC"] + +# @search_param = "- #{t('ext.search.searching_by', :search_term => params[:keywords])}" if params[:keywords] + + @search = Product.active.new_search(params[:search]) + @search.order_by = @sort_by_and_as[0] + @search.order_as = @sort_by_and_as[1] + @search.conditions.name_contains = params[:keywords] + + @search.per_page = Spree::Config[:products_per_page] + @search.include = :images + + @product_cols = 3 + @products ||= @search.all + end end app/controllers/products_controller.rb @@ -5,14 +5,16 @@ class SearchesController < Spree::BaseController def test end + # Create a search object to receive parameters of the form to validate. def new @search = Search.new end + # Validates the search object and redirect to show action renaming the parameters to not clash with searchlogic. def create @search = Search.new(params[:search]) if @search.valid? - + # Build the custom parameters hash and don't clutter the url with empty params. temp = {} temp.merge!(:taxon => params["search"]["taxon_id"]) if !params["search"]["taxon_id"].empty? @@ -20,7 +22,7 @@ class SearchesController < Spree::BaseController temp.merge!(:min_price => params["search"]["min_price"]) if !params["search"]["min_price"].empty? temp.merge!(:max_price => params["search"]["max_price"]) if !params["search"]["max_price"].empty? temp.merge!(:keywords => params["search"]["keywords"]) if !params["search"]["keywords"].empty? - + redirect_to temp.merge(:action => 'show') else render :action => 'new' @@ -28,76 +30,50 @@ class SearchesController < Spree::BaseController end def show - products_per_page = 4 - - @search = Search.new({ - :taxon_id => params[:taxon], - :subtaxons => params[:subtaxons], - :min_price => params[:min_price], - :max_price => params[:max_price], - :keywords => params[:keywords] - }) - # Verify if theres any ondition. - conditions = @search.conditions - if conditions == [""] - conditions = "" - end - - # Define what is allowed. sort_params = { - "price_asc" => "master_price ASC", - "price_desc" => "master_price DESC", - "date_asc" => "available_on ASC", - "date_desc" => "available_on DESC", - "name_asc" => "name ASC", - "name_desc" => "name DESC" + "price_asc" => ["master_price", "ASC"], + "price_desc" => ["master_price", "DESC"], + "date_asc" => ["available_on", "ASC"], + "date_desc" => ["available_on", "DESC"], + "name_asc" => ["name", "ASC"], + "name_desc" => ["name", "DESC"] } # Set it to what is allowed or default. - @sort_by = sort_params[params[:sort]] || "available_on DESC" - - @search_param = "- #{t('ext.search.searching_by', :search_term => params[:search])}" if params[:search] + @sort_by_and_as = sort_params[params[:sort]] || ["available_on", "DESC"] + # If setted to default, clean the param it doesn't need to clutter the url. + params[:sort] = nil if @sort_by_and_as == ["available_on", "DESC"] + +# @search_param = "- #{t('ext.search.searching_by', :search_term => params[:keywords])}" if params[:keywords] + + + @search = Product.active.new_search(params[:search]) - an_array = [] - add_subtaxons(an_array, Taxon.find(@search.taxon_id)) if @search.taxon_id - - count_query = " - SELECT count(products.id) FROM products - INNER JOIN products_taxons ON (products.id = products_taxons.product_id) - INNER JOIN taxons ON (products_taxons.taxon_id = taxons.id) - WHERE taxons.id IN (#{an_array.join(',').to_s}) - #{(conditions.empty? ? "" : " AND ")} #{conditions}" - - query = " - SELECT products.* FROM products - INNER JOIN products_taxons ON (products.id = products_taxons.product_id) - INNER JOIN taxons ON (products_taxons.taxon_id = taxons.id) - WHERE taxons.id IN (#{an_array.join(',').to_s}) - #{(conditions.empty? ? "" : " AND ")} #{conditions} ORDER BY #{@sort_by}" - - - if @search.taxon_id - if @search.subtaxons - @products ||= Product.paginating_sql_find( - count_query, query, {:page_size => products_per_page, :current => params[:p]} - ) + if params[:taxon] + if params[:subtaxons] + an_array = [] + + a_taxon = Taxon.first(:conditions => {:id_is => params[:taxon]}) + add_subtaxons(an_array, a_taxon) if a_taxon + + @search.conditions.taxons.id_equals = an_array else - @products ||= Taxon.find(@search.taxon_id).products.available.find( - :all, - :conditions => conditions, - :order => @sort_by, - :page => {:start => 1, :size => products_per_page, :current => params[:p]}, - :include => :images) + @search.conditions.taxons.id_equals = params[:taxon] end - else - @products ||= Product.available.by_name(params[:search]).find( - :all, - :conditions => conditions, - :order => @sort_by, - :page => {:start => 1, :size => products_per_page, :current => params[:p]}, - :include => :images) end - end + + + @search.order_by = @sort_by_and_as[0] + @search.order_as = @sort_by_and_as[1] + @search.conditions.name_contains = params[:keywords] + @search.conditions.master_price_greater_than_or_equal_to = params[:min_price] + @search.conditions.master_price_less_than_or_equal_to = params[:max_price] + @search.per_page = Spree::Config[:products_per_page] + @search.include = :images + + @product_cols = 3 + @products ||= @search.all +end private app/controllers/searches_controller.rb @@ -2,16 +2,32 @@ module SearchesHelper # Redefined here to not escape html characters inside the select options, we need to add &nbsp; tags # there to change indentation of subitems. - def options_for_select(container, selected = nil) +# def options_for_select(container, selected = nil) +# container = container.to_a if Hash === container +# +# options_for_select = container.inject([]) do |options, element| +# text, value = option_text_and_value(element) +# selected_attribute = ' selected="selected"' if option_value_selected?(value, selected) +# options << %(<option value="#{html_escape(value.to_s)}"#{selected_attribute}>#{text.to_s}</option>) +# end +# +# options_for_select.join("\n") +# end + + # Redefined here to not escape html characters inside the select options, we need to add &nbsp; tags + # there to change indentation of subitems. Changed version to fit option_tags_with_disable plugin. + def options_for_select(container, selected = nil, disabled = nil) container = container.to_a if Hash === container - + options_for_select = container.inject([]) do |options, element| text, value = option_text_and_value(element) selected_attribute = ' selected="selected"' if option_value_selected?(value, selected) - options << %(<option value="#{html_escape(value.to_s)}"#{selected_attribute}>#{text.to_s}</option>) + disabled_attribute = ' disabled="disabled"' if option_value_selected?(value, disabled) && disabled != nil + options << %(<option value="#{html_escape(value.to_s)}"#{selected_attribute}#{disabled_attribute}>#{text.to_s}</option>) end - + options_for_select.join("\n") end + end app/helpers/searches_helper.rb @@ -9,35 +9,4 @@ class Search < ActiveRecord::Base validates_numericality_of :min_price, :unless => Proc.new { |search| search.min_price.nil? } validates_numericality_of :max_price, :unless => Proc.new { |search| search.max_price.nil? } - - def conditions - [conditions_clauses.join(' AND '), *conditions_options] - end - - private - - def keyword_conditions - ["products.name LIKE ?", "%#{keywords}%"] unless keywords.blank? - end - - def min_price_conditions - ["products.master_price >= ?", min_price] unless min_price.blank? - end - - def max_price_conditions - ["products.master_price <= ?", max_price] unless max_price.blank? - end - - def conditions_clauses - conditions_parts.map { |condition| condition.first } - end - - def conditions_options - conditions_parts.map { |condition| condition[1..-1] }.flatten - end - - def conditions_parts - private_methods(false).grep(/_conditions$/).map { |m| send(m) }.compact - end - end app/models/search.rb @@ -4,6 +4,8 @@ </td> <% end %> +<%= error_messages_for :search %> + <% form_for @search do |f| %> <p> <%= t('ext.search.keywords') %>:<br/> app/views/searches/new.html.erb @@ -1,13 +1,8 @@ -<div id="product-listing"> - <%= t('ext.search.advanced_product_search') %> - <br/><br/> - <%= render :partial => 'shared/advanced_search_sort_bar' %> - <br/> - <%= render :partial => "shared/products.html.erb", :locals => {:products => @products, :taxon => @taxon } %> -</div> <% content_for :sidebar do %> - <td id="shop-by-col" valign="top"> - <%= render :partial => "shared/taxonomies" %> - </td> + <%= render :partial => "shared/taxonomies" %> <% end %> -<%= render :partial => 'shared/advanced_search_paginate', :locals => {:collection => @products, :options => {}} unless @products.empty? %> + +<%= render :partial => "shared/products.html.erb", :locals => {:products => @products, :taxon => @taxon } %> + +<%= render :partial => "shared/advanced_search_sort_bar" %> +<%= page_links(maintain_search_params.merge(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;")) if @search.page_count > 1 %> app/views/searches/show.html.erb @@ -1,14 +1,3 @@ -<% - # Build the custom parameters hash and don't clutter the url with empty params. - temp = {} - temp.merge!(:taxon => params[:taxon]) if !params[:taxon].nil? && !params[:taxon].empty? - temp.merge!(:subtaxons => params[:subtaxons]) if params[:subtaxons] != "0" - temp.merge!(:min_price => params[:min_price]) if !params[:min_price].nil? && !params[:min_price].empty? - temp.merge!(:max_price => params[:max_price]) if !params[:max_price].nil? && !params[:max_price].empty? - temp.merge!(:keywords => params[:keywords]) if !params[:keywords].nil? && !params[:keywords].empty? - temp.merge!(:p => params[:p]) if !params[:p].nil? && !params[:p].empty? -%> - <table> <tr> @@ -20,12 +9,12 @@ <td> <%= link_to t('name'), - temp.merge(:sort => "name_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}") + maintain_search_params.merge(:sort => "name_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") -%> </td> <td> - <% if @sort_by.include?('name') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('name') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> @@ -33,25 +22,25 @@ <td> <%= link_to t('price'), - temp.merge(:sort => "price_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}") + maintain_search_params.merge(:sort => "price_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") -%> </td> <td> - <% if @sort_by.include?('master_price') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('master_price') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> <td>&nbsp;</td> <td class="sort_item"> - <%= link_to t('date'), - temp.merge(:sort => "date_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}") + <%= link_to t('ext.search.date'), + maintain_search_params.merge(:sort => "date_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") -%> </td> <td> - <% if @sort_by.include?('available_on') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('available_on') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> app/views/shared/_advanced_search_sort_bar.html.erb @@ -5,12 +5,10 @@ else search_path_local = products_path end -%> -<br/> <div style="text-align: center;"> <% form_tag search_path_local, :id => 'search_form', :method => 'get' do %> - <%= text_field_tag :search, params[:search] %> + <%= text_field_tag :keywords, params[:keywords] %> <%= submit_tag t('ext.search.search'), :name => nil %> <% end %> <%= link_to(t('ext.search.advanced'), new_search_path) %> -</div> -<br/> \ No newline at end of file +</div> \ No newline at end of file app/views/shared/_search_box.html.erb @@ -8,45 +8,39 @@ <td>&nbsp;</td> <td> - <%= link_to t('name'), { - :search => params[:search], - :sort => "name_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}", - :p => params[:p] - } -%> + <%= link_to t('name'), + maintain_search_params.merge(:sort => "name_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") + -%> </td> <td> - <% if @sort_by.include?('name') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('name') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> <td>&nbsp;</td> <td> - <%= link_to t('price'), { - :search => params[:search], - :sort => "price_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}", - :p => params[:p] - } -%> + <%= link_to t('price'), + maintain_search_params.merge(:sort => "price_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") + -%> </td> <td> - <% if @sort_by.include?('master_price') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('master_price') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> <td>&nbsp;</td> <td class="sort_item"> - <%= link_to t('date'), { - :search => params[:search], - :sort => "name_#{@sort_by.include?('ASC') ? 'desc' : 'asc'}", - :p => params[:p] - } -%> + <%= link_to t('ext.search.date'), + maintain_search_params.merge(:sort => "date_#{@sort_by_and_as[1].include?('ASC') ? 'desc' : 'asc'}") + -%> </td> <td> - <% if @sort_by.include?('available_on') -%> - <%= @sort_by.include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> + <% if @sort_by_and_as[0].include?('available_on') -%> + <%= @sort_by_and_as[1].include?('ASC') ? t('ext.search.asc') : t('ext.search.desc') %> <% end -%> </td> app/views/shared/_sort_bar.html.erb @@ -18,3 +18,4 @@ en-US: searching_by: Searching for '{{search_term}}' send: Send sort_by: Sort by + date: Date config/locales/en-US.yml @@ -18,4 +18,4 @@ pt-BR: searching_by: Procurando por '{{search_term}}' send: Enviar sort_by: Ordenar por - + date: Data config/locales/pt-BR.yml @@ -8,29 +8,29 @@ class SearchExtension < Spree::Extension def activate - # Add pagination support for the find_by_sql method inside paginating_find plugin. - PaginatingFind::ClassMethods.class_eval do - def paginating_sql_find(count_query, query, options) - - # The current page defaults to 1 when not passed. - options[:current] ||= "1" - - count_query = sanitize_sql(count_query) - query = sanitize_sql(query) - - # execute the count query - need to know how many records we're looking at - count = count_by_sql(count_query) - - PagingEnumerator.new(options[:page_size], count, false, options[:current], 1) do |page| - # calculate the right offset values for current page and page_size - offset = (options[:current].to_i - 1) * options[:page_size] - limit = options[:page_size] - - # run the actual query - Note: do not include LIMIT statement in your query - find_by_sql(query + " LIMIT #{offset},#{limit}") - end - end - end +# # Add pagination support for the find_by_sql method inside paginating_find plugin. +# PaginatingFind::ClassMethods.class_eval do +# def paginating_sql_find(count_query, query, options) +# +# # The current page defaults to 1 when not passed. +# options[:current] ||= "1" +# +# count_query = sanitize_sql(count_query) +# query = sanitize_sql(query) +# +# # execute the count query - need to know how many records we're looking at +# count = count_by_sql(count_query) +# +# PagingEnumerator.new(options[:page_size], count, false, options[:current], 1) do |page| +# # calculate the right offset values for current page and page_size +# offset = (options[:current].to_i - 1) * options[:page_size] +# limit = options[:page_size] +# +# # run the actual query - Note: do not include LIMIT statement in your query +# find_by_sql(query + " LIMIT #{offset},#{limit}") +# end +# end +# end end def self.require_gems(config) search_extension.rb 0bc99d24b78f20546119300d3b22c188cce614a5 Edmundo Valle Neto edmundo.vn@gmail.com http://github.com/edmundo/spree-search/commit/07186759b799148f40992379fe5c12f888a3491f 07186759b799148f40992379fe5c12f888a3491f 2009-06-01T11:38:29-07:00 2009-06-01T11:38:29-07:00 Updated to work with searchlogic. 8c172abeab3cf0e2247e80d49584740f0a05b56b Edmundo Valle Neto edmundo.vn@gmail.com