simple-search 0.12.0 → 0.13.0

data/README.rdoc

@@ -35,7 +35,7 @@ In your view:
     #pages a.current {color:white; background-color:#333}
   </style>
   <div id="pages">
-    Pages : <%=raw page_urls(@posts).join(" ") %>
+    Pages : <%=raw page_urls(@posts, :num_pages=>5).join(" ") %>
   </div>
 
   <table>

data/Rakefile

@@ -28,23 +28,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -54,3 +37,13 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.13.0

data/lib/simple_search/view_helper.rb

@@ -48,7 +48,7 @@ module SimpleSearch
 		# 
 		# Returns page related properties in hash
 		#
-		def page_properties(arel)
+		def page_properties(arel, page_options={})
 			total_rows = arel.limit(1000000).offset(0).count
 
 			# check if page is in an url array
@@ -72,7 +72,7 @@ module SimpleSearch
 				:current_page => (page || 1).to_i,
 				:rows_per_page => (page_by || 30).to_i,
 				:page_arr_key => page_arr_key
-			}
+			}.merge(page_options)
 		end
 
 		# 
@@ -91,9 +91,9 @@ module SimpleSearch
 		# 
 		# Returns page url params in hash with the page number as key
 		#
-		def page_url_params(arel, options={})
-			page_props = options[:page_props] || page_properties(arel)
-      num_pages  = options[:num_pages] || 5 
+		def page_url_params(arel, page_props=nil)
+			page_props ||= page_properties(arel)
+      num_pages  = page_props[:num_pages] || 5 
 			num_bf_af = (num_pages-1)/2
 			current_page = page_props[:current_page]
 			last_page    = page_props[:last_page]
@@ -111,11 +111,11 @@ module SimpleSearch
 			page_url_params
 		end
 
-		def page_urls(arel, http_options={})
+		def page_urls(arel, page_options={}, http_options={})
 			page_urls = []
 			prev_page = 0	
-      page_props = page_properties(arel)
-			page_url_params(arel, :page_props => page_props ).each { |page, url_params|
+      page_props = page_properties(arel, page_options)
+			page_url_params(arel, 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

data/simple-search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple-search"
-  s.version = "0.12.0"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Kim"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-27"
   s.description = "\n\t\tTranslates url commands for searching, paging, sorting, groupion against ActiveRecord and its associations.\n\t\tProvides view helpers including links for order and urls for search, group, and page.\n\t"
   s.email = "bighostkim@gmail.com"
   s.extra_rdoc_files = [

data/spec/simple_search_view_helper_spec.rb

@@ -88,7 +88,7 @@ describe SimpleSearch::ViewHelper do
   end
 
   describe "#page_urls" do
-    it "generate page urls" do
+    it "generate page urls by given numbers(default 5)" do
       arel = Post.select('posts.*, post_likes.*').joins(:post_likes).simplesearch(:page_by=>30)
       @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
           "QUERY_STRING"=>"controller=tests&page=5&page_by=10"})
@@ -96,7 +96,11 @@ describe SimpleSearch::ViewHelper do
       page_urls.length.should == 9 # 1 ... 3 4 5 6 7 ... 10
       page_urls[1].should eq "<span class='filler'>...</span>"
       page_urls[7].should eq "<span class='filler'>...</span>"
+
+      page_urls = @view.page_urls(arel,:num_pages=>7)
+      page_urls.length.should == 10 # 1 2 3 4 5 6 7 8 ... 10
     end
+
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: simple-search
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Allen Kim
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 557426879898920140
+      hash: -265750120203918884
       segments: 
       - 0
       version: "0"