simple-search 0.11.1 → 0.12.0

data/Gemfile

@@ -13,6 +13,7 @@ gem "activesupport", "~> 3.1"
 gem "actionpack", "~> 3.1"
 
 group :development do
+  gem "rspec"
   gem "shoulda", ">= 2.11"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"

data/README.rdoc

@@ -13,10 +13,6 @@ In your Gemfile:
 
   gem "simple-search"  # Last officially released gem
 
-In your config/environment.rb
-
-  require 'simple_search'
-
 In your controller:
 
   def index

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.12.0

data/simple-search.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "simple-search"
-  s.version = "0.11.1"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Allen Kim"]
@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
     "lib/simple_search/exception.rb",
     "lib/simple_search/view_helper.rb",
     "simple-search.gemspec",
-    "test/helper.rb",
-    "test/tables_models.rb",
-    "test/test_active_record.rb",
-    "test/test_view_helper.rb"
+    "spec/simple_search_active_record_spec.rb",
+    "spec/simple_search_view_helper_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/spec_helper_tables_models.rb"
   ]
   s.homepage = "http://github.com/bighostkim/simple-search"
   s.licenses = ["MIT"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.1"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.1"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 2.11"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -56,6 +57,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, ["~> 3.1"])
       s.add_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_dependency(%q<actionpack>, ["~> 3.1"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 2.11"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord>, ["~> 3.1"])
     s.add_dependency(%q<activesupport>, ["~> 3.1"])
     s.add_dependency(%q<actionpack>, ["~> 3.1"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 2.11"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/{test/test_active_record.rb → spec/simple_search_active_record_spec.rb}

@@ -1,75 +1,77 @@
-require 'helper'
+require 'spec_helper'
 
-class TestActiveRecord < Test::Unit::TestCase
+describe SimpleSearch::ActiveRecord, "#simplesearch" do 
 
-  should "work with arel where conditions" do
+  it "work with arel where conditions" do
 		posts_comments = Post.select('posts.*, comments.body as comment').joins(:comments)
 		result = posts_comments.simplesearch('id_eq'=>1, 'subject_eq'=>'subject foo', 'body_eq'=>'body foo')
-		assert_equal 1, result.first.id
+    result.first.id.should eq(1)
 
 		result = posts_comments.simplesearch('id_gt'=>1, 'id_lt'=>3)
-		assert_equal 2, result.first.id
+		result.first.id.should eq(2)
 
 		result = posts_comments.simplesearch('id_ge'=>1, 'id_le'=>3)
-		assert_equal 6, result.length
+		result.length.should eq(6)
 
 		result = posts_comments.simplesearch('id_ne'=>1)
-		assert_equal 4, result.length
+		result.length.should eq(4)
 
 		result = posts_comments.simplesearch('id_in'=>'1,2')
-		assert_equal 1, result.first.id
-		assert_equal 2, result.last.id
+		result.first.id.should eq(1)
+		result.last.id.should eq(2)
 
 		result = posts_comments.simplesearch('id_bt'=>'1..3')
-		assert_equal 1, result.first.id
-		assert_equal 3, result.last.id
+		result.first.id.should eq(1)
+		result.last.id.should eq(3)
 
 		result = posts_comments.simplesearch('subject_sw'=>'subject')
-		assert_equal 6, result.length
+		result.length.should eq(6)
 
 		result = posts_comments.simplesearch('subject_ew'=>'foo')
-		assert_equal 2, result.length
+		result.length.should eq(2)
 
 		result = posts_comments.simplesearch('body_ct'=>'body')
-		assert_equal 6, result.length
+		result.length.should eq(6)
 		
 		result = posts_comments.simplesearch('body_nc'=>'foo')
-		assert_equal 4, result.length
+		result.length.should eq(4)
 
 		result = posts_comments.simplesearch('comments.spam_flag_is'=>'NULL')
-		assert_equal 4, result.length
+		result.length.should eq(4)
 
 		result = posts_comments.simplesearch('comments.spam_flag_isnot'=>'NULL')
-		assert_equal 2, result.length
+		result.length.should eq(2)
 	end
 
-  should "work with arel group conditions" do
+  it "work with arel group conditions" do
 		posts_comments = Post.select('posts.*, count(comments.id) as num_comment').joins(:comments)
 		result = posts_comments.simplesearch('group_by'=>'posts.id')
-		assert_equal 3, result.length
+		result.length.should eq(3)
   end
 
-  should "work with arel order conditions" do
+  it "work with arel order conditions" do
 		posts_comments = Post.select('posts.*, comments.id as comment_id, comments.body as comment').joins(:comments)
 		result = posts_comments.simplesearch('order_by'=>'comment_id')
-		assert_equal 11, result.first.comment_id
+		result.first.comment_id.should eq(11)
 		result = posts_comments.simplesearch('order_by'=>'comment_id desc')
-		assert_equal 32, result.first.comment_id
+		result.first.comment_id.should eq(32)
   end
 
-  should "work with arel limit and offset conditions" do
+  it "work with arel limit and offset conditions" do
 		posts_comments = Post.select('posts.*, comments.id as comment_id, comments.body as comment').joins(:comments)
 		result = posts_comments.simplesearch('order_by'=>'comment_id', 'page_by'=>2)
-		assert_equal [11,12], result.map {|r| r.comment_id}
+		result.map {|r| r.comment_id}.should eq([11,12])
 
 		result = posts_comments.simplesearch('order_by'=>'comment_id', 'page'=> 1, 'page_by'=>2)
-		assert_equal [11,12], result.map {|r| r.comment_id}
+		result.map {|r| r.comment_id}.should eq([11,12])
 
 		result = posts_comments.simplesearch('order_by'=>'comment_id', 'page'=> 2, 'page_by'=>2)
-		assert_equal [21,22], result.map {|r| r.comment_id}
+		result.map {|r| r.comment_id}.should eq([21,22])
 
 		result = posts_comments.simplesearch('order_by'=>'comment_id', 'page'=> 3, 'page_by'=>2)
-		assert_equal [31,32], result.map {|r| r.comment_id}
+		result.map {|r| r.comment_id}.should eq([31,32])
   end
 
 end
+
+

data/spec/simple_search_view_helper_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+require 'action_view/test_case'
+
+class MyView < ActionView::Base
+  include SimpleSearch::ViewHelper
+end
+
+describe SimpleSearch::ViewHelper do
+  before(:all) do
+    @view = MyView.new 
+    router = ActionDispatch::Routing::RouteSet.new
+    router.draw do
+      match ':controller(/:action(/:id(.:format)))'
+    end
+    @view.instance_variable_set(:@_routes, router)
+  end
+
+  describe "#order_link" do
+    it "generate order by link" do
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&a=1&b=2"})
+      @view.order_link(:foo).should match /order_by=foo/
+      @view.order_link(:foo_bar).should match />Foo Bar</
+      @view.order_link(:foo, "Custom Name").should match />Custom Name</
+      @view.order_link(:foo, "Name", :class=>:bar).should match /class=\"bar\"/
+
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&order_by=foo+asc&a=1&b=2"})
+      @view.order_link(:foo).should match /order_by=foo\+desc/
+      @view.order_link(:foo).should match />Foo &#9650;</
+
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&order_by=foo+desc&a=1&b=2"})
+      @view.order_link(:foo).should match /order_by=foo\+asc/
+      @view.order_link(:foo).should match />Foo &#9660;</
+      
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&ss[order_by]=foo+desc&a=1&b=2"})
+      @view.order_link(:foo).should match /ss%5Border_by%5D=foo\+asc/
+      @view.order_link(:foo).should match />Foo &#9660;</
+    end
+  end
+
+  describe "#page_properties" do
+    it "generate page properties" do
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&page_by=2"})
+      arel = Post.select('posts.*, comments.*').joins(:comments).simplesearch(:page_by=>2)
+
+      @view.page_properties(arel).should == {:total_rows => 6, :last_page => 3, :current_page => 1, :rows_per_page => 2, :page_arr_key => nil}
+
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&ss[page_by]=2"})
+      @view.page_properties(arel).should == {:total_rows => 6, :last_page => 3, :current_page => 1, :rows_per_page => 2, :page_arr_key => "ss"}
+    end
+  end
+
+  describe "#page_params" do
+    it "generate url params for single page" do
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests", "QUERY_STRING"=>"controller=tests&page=3&page_by=30"})
+      params = @view.page_params(3, 30)  #page number, rows per page
+      params[:page_by].to_i.should == 30
+      params[:page].should == 3
+      
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests", "QUERY_STRING"=>"controller=tests&ss[page]=3&ss[page_by]=2"})
+      params = @view.page_params(3, 30, "ss")
+      params[:ss][:page_by].to_i.should == 30
+      params[:ss][:page].should == 3
+    end
+  end
+
+  describe "#page_url_params" do
+    it "generate url params for many pages" 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"})
+      url_params = @view.page_url_params(arel)
+      url_params.keys.should == [1,3,4,5,6,7,30]
+      url_params[5][:page_by].to_i.should == 10 
+      url_params[5][:page].to_i.should == 5 
+
+      @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
+          "QUERY_STRING"=>"controller=tests&ss[page_by]=2"})
+      url_params = @view.page_url_params(arel)
+      url_params[1][:ss][:page_by].to_i.should == 2 
+      url_params[1][:ss][:page].to_i.should == 1
+    end
+  end
+
+  describe "#page_urls" do
+    it "generate page urls" 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"})
+      page_urls = @view.page_urls(arel)
+      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>"
+    end
+  end
+
+end
+
+  
+

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -7,10 +8,13 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
 require 'test/unit'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'simple_search'
-require 'tables_models.rb'
+
+require 'simple-search'
+
+require 'spec_helper_tables_models.rb'

metadata

@@ -2,7 +2,7 @@
 name: simple-search
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors: 
 - Allen Kim
@@ -46,19 +46,30 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rspec
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.11"
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: shoulda
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.11"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,10 +99,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,10 +110,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -110,7 +121,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 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\
@@ -135,10 +146,10 @@ files:
 - lib/simple_search/exception.rb
 - lib/simple_search/view_helper.rb
 - simple-search.gemspec
-- test/helper.rb
-- test/tables_models.rb
-- test/test_active_record.rb
-- test/test_view_helper.rb
+- spec/simple_search_active_record_spec.rb
+- spec/simple_search_view_helper_spec.rb
+- spec/spec_helper.rb
+- spec/spec_helper_tables_models.rb
 homepage: http://github.com/bighostkim/simple-search
 licenses: 
 - MIT
@@ -152,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1662310510599246307
+      hash: 557426879898920140
       segments: 
       - 0
       version: "0"

data/test/test_view_helper.rb

@@ -1,97 +0,0 @@
-require 'helper'
-require 'action_view/test_case'
-
-class TestViewHelper < Test::Unit::TestCase
-  class MyView < ActionView::Base
-    include SimpleSearch::ViewHelper
-  end
-
-  def setup
-    @view = MyView.new 
-    router = ActionDispatch::Routing::RouteSet.new
-    router.draw do
-      match ':controller(/:action(/:id(.:format)))'
-    end
-    @view.instance_variable_set(:@_routes, router)
-  end
-
-  should "generate order by link" do
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&a=1&b=2"})
-    assert_match "order_by=foo+asc", @view.order_link(:foo)
-    assert_match ">Foo Bar<", @view.order_link(:foo_bar)
-    assert_match ">Custom Name<", @view.order_link(:foo, "Custom Name")
-    assert_match "class=\"bar\"", @view.order_link(:foo, "Name", :class=>:bar)
-
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&order_by=foo+asc&a=1&b=2"})
-    assert_match "order_by=foo+desc", @view.order_link(:foo)
-    assert_match ">Foo &amp;#9650;<", @view.order_link(:foo)
-
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&order_by=foo+desc&a=1&b=2"})
-    assert_match "order_by=foo+asc", @view.order_link(:foo)
-    assert_match ">Foo &amp;#9660;<", @view.order_link(:foo)
-    
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&ss[order_by]=foo+desc&a=1&b=2"})
-    assert_match "ss%5Border_by%5D=foo+asc", @view.order_link(:foo)
-    assert_match ">Foo &amp;#9660;<", @view.order_link(:foo)
-  end
-  
-  should "generate page properties" do
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&page_by=2"})
-    arel = Post.select('posts.*, comments.*').joins(:comments).simplesearch(:page_by=>2)
-
-    @view.page_properties(arel)
-    assert_equal ({ :total_rows => 6, :last_page => 3, :current_page => 1,
-				:rows_per_page => 2, :page_arr_key => nil }), @view.page_properties(arel)
-
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&ss[page_by]=2"})
-    assert_equal ({ :total_rows => 6, :last_page => 3, :current_page => 1,
-				:rows_per_page => 2, :page_arr_key => "ss" }), @view.page_properties(arel)
-  end
-
-  should "generate url params for single page" do
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&page_by=2"})
-    params = @view.page_params(3)
-    assert_equal 2, params[:page_by].to_i
-    assert_equal 3, params[:page]
-    
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&ss[page_by]=2"})
-    params = @view.page_params(3, "ss")
-    assert_equal 2, params[:ss][:page_by].to_i
-    assert_equal 3, params[:ss][:page]
-  end
-
-  should "generate url params for many pages" 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"})
-    url_params = @view.page_url_params(arel)
-    assert_equal [1,3,4,5,6,7,30], url_params.keys
-    assert_equal 10, url_params[5][:page_by].to_i 
-    assert_equal 5, url_params[5][:page].to_i 
-
-    @view.request = ActionController::TestRequest.new({"SCRIPT_NAME"=>"/tests",
-        "QUERY_STRING"=>"controller=tests&ss[page_by]=2"})
-    url_params = @view.page_url_params(arel)
-    assert_equal 2, url_params[1][:ss][:page_by].to_i 
-    assert_equal 1, url_params[1][:ss][:page].to_i 
-  end
-
-  should "generate page urls" 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"})
-    page_urls = @view.page_urls(arel)
-    assert_equal 9, page_urls.length # 1 ... 3 4 5 6 7 ... 10
-    assert_equal "<span class='filler'>...</span>", page_urls[1]
-    assert_equal "<span class='filler'>...</span>", page_urls[7]
-  end
-
-end