simple-search 0.10.3 → 0.11.0

data/README.rdoc

@@ -13,26 +13,54 @@ In your Gemfile:
 
   gem "simple-search"  # Last officially released gem
 
+In your config/environment.rb
+
+  require 'simple_search'
+
 In your controller:
 
   def index
-    @posts = Post.simplesearch(params) 
-    # or, @posts = Post.simplesearch(params[:ss])         # when group options to "ss"
-    # or, @posts = Post.simplesearch(:id_gt=>1,:id_lt=>3)  
+    @posts = Post.select('posts.*, comments.id as comment_id, comments.body as comment').joins(:comments)
+    @posts = @posts.simplesearch(params)
+    render :index
   end
 
 In your view:
   
-  <%= form_tag('/posts') do -%>
-    <%= text_field_tag 'id_gt' %>
-    <%= text_field_tag 'id_lt' %>
-    .....
-    <%= submit_tag %>
+  <%= form_tag('/posts', :method=>:GET) do -%>
+    ID &gt; <%= text_field_tag 'id_gt', params[:id_gt] %> <br/>
+    Subject contains <%= text_field_tag 'subject_ct', params[:subject_ct] %> <br/>
+    <%= submit_tag "Search" %>
   <% end -%>
 
-  <%=order_link(:id, "Order by ID" )%>
+  <style>
+    #pages a {border:1px solid grey; display:inline-block; min-width:13px; text-align:center; text-decoration: none}
+    #pages a:first-child, #pages a:last-child {background-color:grey}
+    #pages a.current {color:white; background-color:#333}
+  </style>
+  <div id="pages">
+    Pages : <%=raw page_urls(@posts).join(" ") %>
+  </div>
+
+  <table>
+    <tr>
+      <th><%=order_link(:id)%></th>
+      <th><%=order_link(:subject)%></th>
+      <th><%=order_link(:body)%></th>
+      <th><%=order_link(:comment_id)%></th>
+      <th><%=order_link(:comment)%></th>
+    </tr>
+  <% @posts.each do |post| %>
+    <tr>
+      <td><%=h post.id %></td>
+      <td><%=h post.subject %></td>
+      <td><%=h post.body %></td>
+      <td><%=h post.comment_id %></td>
+      <td><%=h post.comment %></td>
+    </tr>
+  <% end %>
+  </table>
 
-  <%=page_urls(@posts)%>
 
 === Search postfixes
 
@@ -43,15 +71,15 @@ In your view:
 * _ge, greater or equal to, <= 
 * _in, includes, IN 
    i.e.,  &id_in=1,2,3
-* _bt(_between), between, BETWEEN 
+* _bt  (alias of _between), between, BETWEEN 
    i.e.,  &id_between=1,3
-* _sw(_startswith), starts with, LIKE 'key%' (
-* _ew(_endsswith), ends with, LIKE '%key'
-* _ct(_contains,_like), contains, LIKE '%key%'
-* _nc(_notcontains,_notlike), not contains, NOT LIKE '%key%'
+* _sw  (alias of _startswith), starts with, LIKE 'key%' (
+* _ew  (alias of _endsswith), ends with, LIKE '%key'
+* _ct  (alias of _contains,_like), contains, LIKE '%key%'
+* _nc  (alias of _notcontains,_notlike), not contains, NOT LIKE '%key%'
 * _is, IS
    i.e.,  &id_is=null
-* _it(_isnot), IS NOT
+* _it  (alias of _isnot), IS NOT
 
 === Sorting your result 
 * order_by
@@ -63,6 +91,10 @@ In your view:
 * page_by, number of rows in a page
    i.e. &page_by=10
 
+=== Grouping
+* group_by, column to group
+   i.e. &group_by=posts.id
+
 == Contributing to simple-search
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.11.0

data/lib/simple_search/active_record.rb

@@ -37,18 +37,14 @@ module SimpleSearch
         params.each do |key,value|
 					if ["group_by","page_by","page", "order_by"].include?(key)
 						other_params[key]=value
-					else
+					elsif value != ''
 						matches = /(.*)_([a-z]+)$/.match(key)
-						if matches.length==3
+						if matches!=nil && matches.length==3
 							all, col, op = matches.to_a
 							operands = SimpleSearch::OP_MAP.keys
 							if operands.include?(op.to_sym)
 								where_params[key]=value
-							else
-								logger.warning("SimpleSearch ignored #{key}. operand must be one of #{operands}") unless logger.nil?
 							end
-						else
-							logger.warning("SimpleSearch ignored #{key}. it requires to end with _<operands>") unless logger.nil?
 						end
 					end
 				end
@@ -95,9 +91,9 @@ module SimpleSearch
 			end
 			
 			def with_ss_limit_offset(arel,params)          
-				page_num = (params['page'] || 1).to_i
-				page_by  = (params['page_by'] || 50).to_i
-				arel = arel.limit(page_by).offset( (page_num-1)*page_by )
+				page_by  = params['page_by'].to_i
+        page_num = params['page'] ?  params['page'].to_i : ( page_by>0 ? 1 : 0 )
+				arel = arel.limit(page_by).offset( (page_num-1)*page_by ) if page_by>0 && page_num>0
 				arel
 			end
 

data/lib/simple_search/view_helper.rb

@@ -6,7 +6,7 @@ module SimpleSearch
 		#   <%= order_by :name %>
 		#   <%= order_by :name, 'Company Name' %>
 		#   <%= order_by :name, 'Company Name', :class=>'bold' %>
-		def order_link(attr, name=nil, html_options={})
+		def order_link(order_to, name=nil, html_options={})
 			raise Exception, "must be used in a view" unless (request.fullpath && request.parameters)
 
 			# check if order_by is in an url array
@@ -18,27 +18,31 @@ module SimpleSearch
       if order_by_value
         order_by_col, current_order = order_by_value.split(" ")
       else
-        order_by_col, current_order = attr, nil
+        order_by_col, current_order = order_to.to_s, ""
       end
+      order_to = order_to.to_s.strip
+      order_by_col.strip!
+      order_by_value.strip! unless order_by_value.nil?
 
 			# determine next order
-			next_order = {nil=>'asc', 'asc'=>'desc', 'desc'=>'asc'}[current_order]
+			next_order = order_to==order_by_col ? {'asc'=>'desc', 'desc'=>'asc'}[current_order] : 'asc'
 		
 			# build new url params
+      params = request.parameters.clone
 			new_url_params = if order_arr_key
-				old_arr = request.parameters[order_arr_key]
-				new_arr = old_arr.merge(:order_by => "#{order_by_col} #{next_order}")
-				request.parameters.merge(order_arr_key => new_arr)
-			else
-				request.parameters.merge(:order_by => "#{order_by_col} #{next_order}" )
+				old_arr = params[order_arr_key]
+				new_arr = old_arr.merge(:order_by => "#{order_to} #{next_order}")
+				params.merge(order_arr_key => new_arr)
+      else
+				params.merge(:order_by => "#{order_to} #{next_order}" )
 			end
 
 			# build link text
-			name ||= attr.to_s.humanize.titleize.strip
-			order_indicator = {nil=>'', 'asc'=>'&#9650;', 'desc'=>'&#9660;'}[current_order]
+			name ||= order_to.gsub(/_/," ").strip.titleize
+			order_indicator = order_to==order_by_col ? {'asc'=>'&#9650;', 'desc'=>'&#9660;'}[current_order] : "" 
 			link_text = "#{name} #{order_indicator}".strip
 
-			link_to link_text, new_url_params, html_options
+			link_to raw(link_text), new_url_params, html_options
 		end
 
 		# 
@@ -74,12 +78,12 @@ module SimpleSearch
 		# 
 		# Returns a url params in hash for the page number given
 		#
-		def page_params(page_num, page_arr_key=nil)
+		def page_params(page_num, page_by, page_arr_key=nil)
 			params = if page_arr_key
 				old_arr = request.parameters[page_arr_key].with_indifferent_access
-				request.parameters.merge(page_arr_key => old_arr.merge(:page => page_num) )
+				request.parameters.merge(page_arr_key => old_arr.merge(:page => page_num, :page_by => page_by ) )
 			else
-				request.parameters.merge(:page => page_num )
+				request.parameters.merge(:page => page_num, :page_by => page_by )
 			end
       params.with_indifferent_access
 		end
@@ -87,8 +91,9 @@ module SimpleSearch
 		# 
 		# Returns page url params in hash with the page number as key
 		#
-		def page_url_params(arel, num_pages=5)
-			page_props = page_properties(arel)
+		def page_url_params(arel, options={})
+			page_props = options[:page_props] || page_properties(arel)
+      num_pages  = options[:num_pages] || 5 
 			num_bf_af = (num_pages-1)/2
 			current_page = page_props[:current_page]
 			last_page    = page_props[:last_page]
@@ -100,7 +105,7 @@ module SimpleSearch
 
 			page_url_params = {}
 			for num in page_numbers
-				page_url_params[num] = page_params(num, page_props[:page_arr_key])
+				page_url_params[num] = page_params(num, page_props[:rows_per_page], page_props[:page_arr_key])
 			end
 
 			page_url_params
@@ -109,11 +114,13 @@ module SimpleSearch
 		def page_urls(arel, http_options={})
 			page_urls = []
 			prev_page = 0	
-			page_url_params(arel).each { |page, url_params|
+      page_props = page_properties(arel)
+			page_url_params(arel, :page_props => page_props ).each { |page, url_params|
 				if page.to_i > (prev_page+1) # page number jumped up, need to have some indicator
 					page_urls << "<span class='filler'>...</span>"
 				end
-				page_urls << link_to(page, url_params, http_options)
+        new_options = page_props[:current_page] == page ? http_options.merge({:class => 'current'}) : http_options
+				page_urls << link_to(page, url_params, new_options)
         prev_page = page
 			}
       page_urls

data/simple-search.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "simple-search"
-  s.version = "0.10.3"
+  s.version = "0.11.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Kim"]

data/test/tables_models.rb

@@ -14,30 +14,29 @@ ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'post_likes'")
 
 # create tables
 ActiveRecord::Base.connection.create_table(:posts) do |t|
-    t.string :subject
-    t.text   :body
+  t.string :subject
+  t.text   :body
 end
 ActiveRecord::Base.connection.create_table(:comments) do |t|
-    t.string :post_id
-    t.text   :body
-		t.boolean :spam_flag
+  t.string :post_id
+  t.text   :body
+  t.boolean :spam_flag
 end
 ActiveRecord::Base.connection.create_table(:post_likes) do |t|
-    t.string :post_id
-		t.boolean :like
+  t.string :post_id
+  t.boolean :like
 end
 
 # models
 class Post < ActiveRecord::Base
-	has_many :comments
-	has_many :post_likes
+  has_many :comments
+  has_many :post_likes
 end
 class Comment < ActiveRecord::Base
-	belongs_to :post
-  has_many :votes
+  belongs_to :post
 end
 class PostLike < ActiveRecord::Base
-	belongs_to :post
+  belongs_to :post
 end
 
 # insert tables

metadata

@@ -2,7 +2,7 @@
 name: simple-search
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors: 
 - Allen Kim
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1014388481783266956
+      hash: 1273856401880201172
       segments: 
       - 0
       version: "0"