scoped_search 2.7.1 → 3.0.0

data/spec/integration/auto_complete_spec.rb

@@ -131,7 +131,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     context 'value auto complete' do
       it "should complete values list of values " do
-        Foo.complete_for('explicit = ').should have(1).item
+        Foo.complete_for('explicit = ').length.should == 1
       end
 
       it "should complete values should contain baz" do
@@ -179,7 +179,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     context 'exceptional search strings' do
 
       it "query that starts with 'or'" do
-        Foo.complete_for('or ').should have(9).items
+        Foo.complete_for('or ').length.should == 9
       end
 
       it "value completion with quotes" do
@@ -201,15 +201,15 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     # the string.
     context 'dotted options in the completion list' do
       it "query that starts with space should not include the dotted options" do
-        Foo.complete_for(' ').should have(9).items
+        Foo.complete_for(' ').length.should == 9
       end
 
       it "query that starts with the dotted string should include the dotted options" do
-        Foo.complete_for('bars.').should have(4).items
+        Foo.complete_for('bars.').length.should == 4
       end
 
       it "query that starts with part of the dotted string should include the dotted options" do
-        Foo.complete_for('b').should have(4).items
+        Foo.complete_for('b').length.should == 4
       end
 
     end

data/spec/integration/key_value_querying_spec.rb

@@ -31,7 +31,7 @@ require "spec_helper"
           class ::Item < ActiveRecord::Base
             has_many :facts
             has_many :keys, :through => :facts
-            
+
             scoped_search :in => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
           end
           class ::MyItem < ::Item
@@ -60,7 +60,7 @@ require "spec_helper"
         end
 
         it "should find all bars with a fact name color and fact value green" do
-          Item.search_for('facts.color = green').should have(1).items
+          Item.search_for('facts.color = green').length.should == 1
         end
 
         it "should find all bars with a fact name color and fact value gold" do
@@ -68,31 +68,31 @@ require "spec_helper"
         end
 
         it "should find all bars with a fact name size and fact value 5" do
-          Item.search_for('facts.size = 5').should have(1).items
+          Item.search_for('facts.size = 5').length.should == 1
         end
 
         it "should find all bars with a fact color green and fact size 5" do
-          Item.search_for('facts.color = green and facts.size = 5').should have(1).items
+          Item.search_for('facts.color = green and facts.size = 5').length.should == 1
         end
 
         it "should find all bars with a fact color gold or green" do
-          Item.search_for('facts.color = gold or facts.color = green').should have(2).items
+          Item.search_for('facts.color = gold or facts.color = green').length.should == 2
         end
 
         it "should find all bars that has size value" do
-          Item.search_for('has facts.size').should have(1).items
+          Item.search_for('has facts.size').length.should == 1
         end
 
         it "should find all bars that has color value" do
-          Item.search_for('has facts.color').should have(2).items
+          Item.search_for('has facts.color').length.should == 2
         end
 
         it "should complete facts names" do
-          Item.complete_for('facts.').should have(2).items
+          Item.complete_for('facts.').length.should == 2
         end
 
         it "should complete values for fact name = color" do
-          Item.complete_for('facts.color = ').should have(2).items
+          Item.complete_for('facts.color = ').length.should == 2
         end
 
         it "should find all bars with a fact name color and fact value gold of descendant class" do

data/spec/integration/ordinal_querying_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.
 ScopedSearch::RSpec::Database.test_databases.each do |db|
-  
+
   describe ScopedSearch, "using a #{db} database" do
 
     before(:all) do
@@ -31,39 +31,39 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the record with an exact integer match" do
-        @class.search_for('9').should have(1).item
+        @class.search_for('9').length.should == 1
       end
 
       it "should find the record with an exact decimal match" do
-        @class.search_for('1.23').should have(1).item
+        @class.search_for('1.23').length.should == 1
       end
 
       it "should find the record with an exact integer match with an explicit operator" do
-        @class.search_for('= 9').should have(1).item
+        @class.search_for('= 9').length.should == 1
       end
 
       it "should find the record with an exact integer match with an explicit field name" do
-        @class.search_for('int = 9').should have(1).item
+        @class.search_for('int = 9').length.should == 1
       end
 
       it "should find the record with an exact integer match with an explicit field name" do
-        @class.search_for('int > 8').should have(1).item
+        @class.search_for('int > 8').length.should == 1
       end
 
       it "should find the record with a grater than operator and explicit field" do
-        @class.search_for('int > 9').should have(0).item
+        @class.search_for('int > 9').length.should == 0
       end
 
       it "should find the record with an >= operator with an implicit field name" do
-        @class.search_for('>= 9').should have(1).item
+        @class.search_for('>= 9').length.should == 1
       end
 
       it "should not return the record if only one predicate is true and AND is used (by default)" do
-        @class.search_for('int <= 8, int > 8').should have(0).item
+        @class.search_for('int <= 8, int > 8').length.should == 0
       end
 
       it "should return the record in only one predicate is true and OR is used as operator" do
-        @class.search_for('int <= 8 || int > 8').should have(1).item
+        @class.search_for('int <= 8 || int > 8').length.should == 1
       end
     end
 
@@ -81,18 +81,16 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         lambda { @class.search_for('unindexed = 10') }.should raise_error(ScopedSearch::Exception)
       end
 
-      # Before Ruby 2.0 if a string had forced encoding and a nil was extracted from it during 
+      # Before Ruby 2.0 if a string had forced encoding and a nil was extracted from it during
       # any implicit type conversions to a string (+ or << operators) a TypeError would be raised.
       # https://github.com/wvanbergen/scoped_search/issues/33 for more details
       it "encoded string should not raise TypeError when querying non-indexed column without a value" do
-        if defined? Encoding
-          query = 'unindexed ='.force_encoding(Encoding::UTF_8).encode
-          lambda { @class.search_for(query) }.should_not raise_error
-        end
+        query = 'unindexed ='.force_encoding(Encoding::UTF_8).encode
+        lambda { @class.search_for(query) }.should_not raise_error
       end
 
       it "should not return records for which the query matches unindex records" do
-        @class.search_for('= 10').should have(0).item
+        @class.search_for('= 10').length.should == 0
       end
     end
 
@@ -109,65 +107,65 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should accept YYYY-MM-DD as date format" do
-        @class.search_for('date = 2009-01-02').should have(1).item
+        @class.search_for('date = 2009-01-02').length.should == 1
       end
 
       it "should accept YY-MM-DD as date format" do
-        @class.search_for('date = 09-01-02').should have(1).item
+        @class.search_for('date = 09-01-02').length.should == 1
       end
 
       if RUBY_VERSION.to_f == 1.8
         it "should accept MM/DD/YY as date format" do
-          @class.search_for('date = 01/02/09').should have(1).item
+          @class.search_for('date = 01/02/09').length.should == 1
         end
 
         it "should accept MM/DD/YYYY as date format" do
-          @class.search_for('date = 01/02/2009').should have(1).item
+          @class.search_for('date = 01/02/2009').length.should == 1
         end
-      end  
-      
+      end
+
       it "should accept YYYY/MM/DD as date format" do
-        @class.search_for('date = 2009/01/02').should have(1).item
-      end      
+        @class.search_for('date = 2009/01/02').length.should == 1
+      end
 
       it "should ignore an invalid date and thus return all records" do
-        @class.search_for('>= 2009-14-57').should have(2).items
+        @class.search_for('>= 2009-14-57').count.should == 2
       end
 
       it "should find the records with a timestamp set some point on the provided date" do
-        @class.search_for('>= 2009-01-02').should have(1).item
+        @class.search_for('>= 2009-01-02').length.should == 1
       end
 
       it "should support full timestamps" do
-        @class.search_for('> "2009-01-02 02:02:02"').should have(1).item
+        @class.search_for('> "2009-01-02 02:02:02"').length.should == 1
       end
 
       it "should find no record with a timestamp in the past" do
-        @class.search_for('< 2009-01-02').should have(0).item
+        @class.search_for('< 2009-01-02').length.should == 0
       end
 
       it "should find all timestamps on a date if no time is given using the = operator" do
-        @class.search_for('= 2009-01-02').should have(1).item
+        @class.search_for('= 2009-01-02').length.should == 1
       end
 
       it "should find all timestamps on a date if no time is when no operator is given" do
-        @class.search_for('2009-01-02').should have(1).item
+        @class.search_for('2009-01-02').length.should == 1
       end
 
       it "should find all timestamps not on a date if no time is given using the != operator" do
-        @class.search_for('!= 2009-01-02').should have(0).item
+        @class.search_for('!= 2009-01-02').length.should == 0
       end
 
       it "should find the records when the date part of a timestamp matches a date" do
-        @class.search_for('>= 2009-01-02').should have(1).item
+        @class.search_for('>= 2009-01-02').length.should == 1
       end
 
       it "should find the record with the timestamp today or in the past" do
-        @class.search_for('<= 2009-01-02').should have(1).item
+        @class.search_for('<= 2009-01-02').length.should == 1
       end
 
       it "should find no record with a timestamp later than today" do
-        @class.search_for('> 2009-01-02').should have(0).item
+        @class.search_for('> 2009-01-02').length.should == 0
       end
 
     end
@@ -191,35 +189,35 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should accept Today as date format" do
-        @class.search_for('date = Today').should have(2).item
+        @class.search_for('date = Today').length.should == 2
       end
 
       it "should accept Yesterday as date format" do
-        @class.search_for('date = yesterday').should have(1).item
+        @class.search_for('date = yesterday').length.should == 1
       end
 
       it "should find all timestamps and date from today using the = operator" do
-        @class.search_for('= Today').should have(2).item
+        @class.search_for('= Today').length.should == 2
       end
 
       it "should find all timestamps and date from today no operator" do
-        @class.search_for('Today').should have(2).item
+        @class.search_for('Today').length.should == 2
       end
 
       it "should accept 2 days ago as date format" do
-        @class.search_for('date < "2 days ago"').should have(2).item
+        @class.search_for('date < "2 days ago"').length.should == 2
       end
 
        it "should accept 3 hours ago as date format" do
-        @class.search_for('timestamp > "3 hours ago"').should have(2).item
+        @class.search_for('timestamp > "3 hours ago"').length.should == 2
        end
 
        it "should accept 1 month ago as date format" do
-        @class.search_for('date > "1 month ago"').should have(3).item
+        @class.search_for('date > "1 month ago"').length.should == 3
        end
 
       it "should accept 1 year ago as date format" do
-        @class.search_for('date > "1 year ago"').should have(4).item
+        @class.search_for('date > "1 year ago"').length.should == 4
       end
 
     end
@@ -240,27 +238,27 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should not find any record because first equal = 2" do
-        @foo.search_for('first = 4').should have(0).item
+        @foo.search_for('first = 4').length.should == 0
       end
 
       it "should find the record" do
-        @foo.search_for('first = 2').should have(1).item
+        @foo.search_for('first = 2').length.should == 1
       end
 
       it "should not find any record with a grater than operator" do
-        @foo.search_for('first > 9').should have(0).item
+        @foo.search_for('first > 9').length.should == 0
       end
 
       it "should find the record with an >= operator" do
-        @foo.search_for('sec >= 4').should have(1).item
+        @foo.search_for('sec >= 4').length.should == 1
       end
 
       it "should find the record with AND operator is used" do
-        @foo.search_for('sec <= 8 and first = 2').should have(1).item
+        @foo.search_for('sec <= 8 and first = 2').length.should == 1
       end
 
       it "should return the record in if one predicate is true and OR is used as operator" do
-        @foo.search_for('sec <= 8 || first > 8').should have(1).item
+        @foo.search_for('sec <= 8 || first > 8').length.should == 1
       end
     end
   end

data/spec/integration/relation_querying_spec.rb

@@ -30,14 +30,14 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find records when searching the subclass" do
-        Sub.search_for('test').should have(1).item
+        Sub.search_for('test').length.should == 1
       end
     end
 
     context 'querying a :belongs_to relation' do
 
       before do
-        
+
         # The related class
         ActiveRecord::Migration.create_table(:hars) { |t| t.string :related }
         class Har < ActiveRecord::Base; has_many :loos; end
@@ -63,15 +63,15 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find all records with a related bar record containing bar" do
-        Loo.search_for('bar').should have(3).items
+        Loo.search_for('bar').length.should == 3
       end
 
       it "should find all records with a related bar record having an exact value of bar with an explicit field" do
-        Loo.search_for('related = bar').should have(2).items
+        Loo.search_for('related = bar').length.should == 2
       end
 
       it "should find records for which the bar relation is not set using null?" do
-        Loo.search_for('null? related').should have(1).items
+        Loo.search_for('null? related').length.should == 1
       end
 
       it "should find records for which the bar relation is not set using null?" do
@@ -111,35 +111,35 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find all records with at least one bar record containing 'bar'" do
-        ::Goo.search_for('bar').should have(2).items
+        ::Goo.search_for('bar').length.should == 2
       end
 
       it "should find the only record with at least one bar record having the exact value 'bar'" do
-        ::Goo.search_for('= bar').should have(1).item
+        ::Goo.search_for('= bar').length.should == 1
       end
 
       it "should find all records for which at least one related bar record exists" do
-        ::Goo.search_for('set? related').should have(2).items
+        ::Goo.search_for('set? related').length.should == 2
       end
 
       it "should find all records for which none related bar records exist" do
-        ::Goo.search_for('null? related').should have(1).items
+        ::Goo.search_for('null? related').length.should == 1
       end
-      
+
       it "should find all records which has relation with both related values" do
-        ::Goo.search_for('related=bar AND related="another bar"').should have(1).items
+        ::Goo.search_for('related=bar AND related="another bar"').length.should == 1
       end
 
       it "should find all records searching with both parent and child fields" do
-        ::Goo.search_for('foo bar').should have(2).items
+        ::Goo.search_for('foo bar').length.should == 2
       end
 
       it "should find the only record with two Jars" do
-        ::Goo.search_for('foo bar "another bar"').should have(1).item
+        ::Goo.search_for('foo bar "another bar"').length.should == 1
       end
 
       it "shouldn't find any records as there isn't an intersect" do
-        ::Goo.search_for('too another').should have(0).items
+        ::Goo.search_for('too another').length.should == 0
       end
 
     end
@@ -175,19 +175,19 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find all records with a car record containing 'bar" do
-        Hoo.search_for('bar').should have(2).items
+        Hoo.search_for('bar').length.should == 2
       end
 
       it "should find the only record with the bar record has the exact value 'bar" do
-        Hoo.search_for('= bar').should have(1).item
+        Hoo.search_for('= bar').length.should == 1
       end
 
       it "should find all records for which the related bar record exists" do
-        Hoo.search_for('set? related').should have(2).items
+        Hoo.search_for('set? related').length.should == 2
       end
 
       it "should find all records for which the related bar record does not exist" do
-        Hoo.search_for('null? related').should have(1).items
+        Hoo.search_for('null? related').length.should == 1
       end
     end
 
@@ -228,19 +228,19 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find all records with at least one associated bar record containing 'bar'" do
-        Joo.search_for('bar').should have(2).items
+        Joo.search_for('bar').length.should == 2
       end
 
       it "should find record which is related to @bar_1" do
-        Joo.search_for('= bar').should have(1).items
+        Joo.search_for('= bar').length.should == 1
       end
 
       it "should find the only record related to @bar_3" do
-        Joo.search_for('last').should have(1).items
+        Joo.search_for('last').length.should == 1
       end
 
       it "should find all records that are related to @bar_2" do
-        Joo.search_for('other').should have(2).items
+        Joo.search_for('other').length.should == 2
       end
     end
 
@@ -290,11 +290,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the two records that are related to a baz record" do
-        Koo.search_for('baz').should have(2).items
+        Koo.search_for('baz').length.should == 2
       end
 
       it "should find the two records that are related to a baz record" do
-        Koo.search_for('related=baz AND related="baz too!"').should have(1).items
+        Koo.search_for('related=baz AND related="baz too!"').length.should == 1
       end
     end
 
@@ -339,11 +339,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       # This table schema is not supported in activerecord 2, skip the tests
       if ActiveRecord::VERSION::MAJOR > 2
         it "should find the three records that are related to a baz record" do
-          Zoo.search_for('baz').should have(3).items
+          Zoo.search_for('baz').length.should == 3
         end
 
         it "should find no records that are related to a baz record" do
-          Zoo.search_for('related=baz AND related="baz too!"').should have(0).items
+          Zoo.search_for('related=baz AND related="baz too!"').length.should == 0
         end
       end
     end
@@ -406,19 +406,19 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the two records that are related to a tag that contains foo record" do
-        Dog.search_for('foo').should have(2).items
+        Dog.search_for('foo').length.should == 2
       end
 
       it "should find one records that is related to both tags" do
-        Dog.search_for('foo=foo AND foo="foo too"').should have(1).items
+        Dog.search_for('foo=foo AND foo="foo too"').length.should == 1
       end
 
       it "should find the two tags that are related to a dog record" do
-        Tag.search_for('dog=baz').should have(2).items
+        Tag.search_for('dog=baz').length.should == 2
       end
 
       it "should find the 3 tags that are related to dogs record" do
-        Tag.search_for('baz').should have(3).items
+        Tag.search_for('baz').length.should == 3
       end
 
     end