scoped_search 2.7.1 → 3.0.0

data/spec/integration/set_query_spec.rb

@@ -35,15 +35,15 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the record status = 1" do
-        @class.search_for('status = up').should have(1).item
+        @class.search_for('status = up').length.should == 1
       end
 
       it "should find the record with status = 0" do
-        @class.search_for('status = unknown').should have(1).item
+        @class.search_for('status = unknown').length.should == 1
       end
 
       it "should find two record with status != 1" do
-        @class.search_for('status != up').should have(2).item
+        @class.search_for('status != up').length.should == 2
       end
     end
     context 'querying boolean fields' do
@@ -61,16 +61,16 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the record bool = true" do
-        @class.search_for('bool = yes').should have(1).item
+        @class.search_for('bool = yes').length.should == 1
       end
 
       it "should find two record with bool = false" do
-        @class.search_for('bool = no').should have(2).item
+        @class.search_for('bool = no').length.should == 2
       end
 
       it "should find two record with bool = false" do
-        @class.search_for('bool != yes').should have(2).item
+        @class.search_for('bool != yes').length.should == 2
       end
     end
   end
-end
+end

data/spec/integration/string_querying_spec.rb

@@ -8,7 +8,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     before(:all) do
       ScopedSearch::RSpec::Database.establish_named_connection(db)
-    
+
       @class = ScopedSearch::RSpec::Database.create_model(
           :string => :string,
           :another => :string,
@@ -33,187 +33,187 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     context 'in an implicit string field' do
       it "should find the record with an exact string match" do
-        @class.search_for('foo').should have(1).item
+        @class.search_for('foo').length.should == 1
       end
 
       it "should find the other two records using NOT with an exact string match" do
-        @class.search_for('-foo').should have(2).item
+        @class.search_for('-foo').length.should == 2
       end
 
       it "should find the record with an exact string match and an explicit field operator" do
-        @class.search_for('string = foo').should have(1).item
+        @class.search_for('string = foo').length.should == 1
       end
 
       it "should find the record with an exact string match and an explicit field operator" do
-        @class.search_for('another = foo').should have(0).items
+        @class.search_for('another = foo').length.should == 0
       end
 
       it "should find the record with an partial string match" do
-        @class.search_for('fo').should have(1).item
+        @class.search_for('fo').length.should == 1
       end
 
       it "should find the other two records using NOT with an partial string match" do
-        @class.search_for('-fo').should have(2).item
+        @class.search_for('-fo').length.should == 2
       end
 
       it "should not find the record with an explicit equals operator and a partial match" do
-        @class.search_for('= fo').should have(0).items
+        @class.search_for('= fo').length.should == 0
       end
 
       it "should find the record with an explicit LIKE operator and a partial match" do
-        @class.search_for('~ fo').should have(1).items
+        @class.search_for('~ fo').length.should == 1
       end
 
       it "should find the all other record with an explicit NOT LIKE operator and a partial match" do
-        @class.search_for('string !~ fo').should have(@class.count - 1).items
+        @class.search_for('string !~ fo').length.should == @class.count - 1
       end
 
       it "should not find a record with a non-match" do
-        @class.search_for('nonsense').should have(0).items
+        @class.search_for('nonsense').length.should == 0
       end
 
       it "should find two records if it partially matches them" do
-        @class.search_for('ba').should have(2).item
+        @class.search_for('ba').length.should == 2
       end
 
       it "should find no records starting with an a" do
-        @class.search_for('a%').should have(0).item
+        @class.search_for('a%').length.should == 0
       end
 
       it "should find one records ending with an oo" do
-        @class.search_for('%oo').should have(1).item
+        @class.search_for('%oo').length.should == 1
       end
 
       it "should find records without case sensitivity when using the LIKE operator" do
-        @class.search_for('string ~ FOO').should have(1).item
+        @class.search_for('string ~ FOO').length.should == 1
       end
 
       it "should not find records without case sensitivity when using the = operator" do
-        @class.search_for('string = FOO').should have(0).items
+        @class.search_for('string = FOO').length.should == 0
       end
 
       it "should find records without case sensitivity when using the != operator" do
-        @class.search_for('string != FOO').should have(3).items
+        @class.search_for('string != FOO').length.should == 3
       end
 
       it "should find records without case sensitivity when using the NOT LIKE operator" do
-        @class.search_for('string !~ FOO').should have(2).items
+        @class.search_for('string !~ FOO').length.should == 2
       end
 
       it "should find the record if one of the query words match using OR" do
-        @class.search_for('foo OR nonsense').should have(1).item
+        @class.search_for('foo OR nonsense').length.should == 1
       end
 
       it "should find no records in one of the AND conditions isn't met" do
-        @class.search_for('foo AND nonsense').should have(0).item
+        @class.search_for('foo AND nonsense').length.should == 0
       end
 
       it "should find two records every single OR conditions matches one single record" do
-        @class.search_for('foo OR baz').should have(2).item
+        @class.search_for('foo OR baz').length.should == 2
       end
 
       it "should find two records every single AND conditions matches one single record" do
-        @class.search_for('foo AND baz').should have(0).item
+        @class.search_for('foo AND baz').length.should == 0
       end
     end
 
     context 'in a field with a different default operator' do
       it "should find an exact match" do
-        @class.search_for('"temp 1"').should have(1).item
+        @class.search_for('"temp 1"').length.should == 1
       end
 
       it "should find the orther records using NOT and an exact match" do
-        @class.search_for('-"temp 1"').should have(2).item
+        @class.search_for('-"temp 1"').length.should == 2
       end
 
       it "should find an explicit match" do
-        @class.search_for('another = "temp 1"').should have(1).item
+        @class.search_for('another = "temp 1"').length.should == 1
       end
 
       it "should not find a partial match" do
-        @class.search_for('temp').should have(0).item
+        @class.search_for('temp').length.should == 0
       end
 
       it "should find all records using a NOT with a partial match on all records" do
-        @class.search_for('-temp"').should have(3).item
+        @class.search_for('-temp"').length.should == 3
       end
 
       it "should find a partial match when the like operator is given" do
-        @class.search_for('~ temp').should have(2).item
+        @class.search_for('~ temp').length.should == 2
       end
-      
+
       it "should find a negation of partial match when the like operator is give with an explicit NOT operator" do
-        @class.search_for('!(~ temp)').should have(1).item
+        @class.search_for('!(~ temp)').length.should == 1
       end
 
       it "should find a partial match when the like operator and the field name is given" do
-        @class.search_for('another ~ temp').should have(2).item
+        @class.search_for('another ~ temp').length.should == 2
       end
     end
 
     context 'using an aliased field' do
       it "should find an explicit match using its alias" do
-        @class.search_for('alias = "temp 1"').should have(1).item
+        @class.search_for('alias = "temp 1"').length.should == 1
       end
     end
 
     context 'in an explicit string field' do
 
       it "should not find the records if the explicit field is not given in the query" do
-        @class.search_for('= baz').should have(1).item
+        @class.search_for('= baz').length.should == 1
       end
 
       it "should find all records when searching on the explicit field" do
-        @class.search_for('explicit = baz').should have(2).items
+        @class.search_for('explicit = baz').length.should == 2
       end
 
       it "should find no records if the value in the explicit field is not an exact match" do
-        @class.search_for('explicit = ba').should have(0).item
+        @class.search_for('explicit = ba').length.should == 0
       end
 
       it "should find all records when searching on the explicit field" do
-        @class.search_for('explicit ~ ba').should have(2).items
+        @class.search_for('explicit ~ ba').length.should == 2
       end
 
       it "should only find the record with string = foo and explicit = baz" do
-        @class.search_for('foo, explicit = baz').should have(1).item
+        @class.search_for('foo, explicit = baz').length.should == 1
       end
     end
 
     context 'using null? and set? queries' do
 
       it "should return all records if the string field is being checked with set?" do
-        @class.search_for('set? string').should have(3).items
+        @class.search_for('set? string').length.should == 3
       end
 
       it "should return no records if the string field is being checked with null?" do
-        @class.search_for('null? string').should have(0).items
+        @class.search_for('null? string').length.should == 0
       end
 
       it "should return all records with a value if the string field is being checked with set?" do
-        @class.search_for('set? explicit').should have(2).items
+        @class.search_for('set? explicit').length.should == 2
       end
 
       it "should return all records without a value if the string field is being checked with null?" do
-        @class.search_for('null? explicit').should have(1).items
+        @class.search_for('null? explicit').length.should == 1
       end
     end
 
     context 'using order' do
       it "sort by string ASC" do
-        @class.search_for('',:order => 'string ASC').first.string.should eql('bar')
+        @class.search_for('', :order => 'string ASC').first.string.should eql('bar')
       end
 
       it "sort by string DESC" do
-        @class.search_for('',:order => 'string DESC').first.string.should eql('foo')
+        @class.search_for('', :order => 'string DESC').first.string.should eql('foo')
       end
 
       it "sort by description ASC" do
-        @class.search_for('',:order => 'description ASC').first.description.should eql('1 - one')
+        @class.search_for('', :order => 'description ASC').first.description.should eql('1 - one')
       end
 
       it "sort by description DESC" do
-        @class.search_for('',:order => 'description DESC').first.description.should eql('3 - three')
+        @class.search_for('', :order => 'description DESC').first.description.should eql('3 - three')
       end
 
       it "default order by another DESC" do
@@ -221,14 +221,12 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "resetting order when selecting distinct values" do
-        distinct_search =
-          @class.search_for('', :order => '').all(:select => 'DISTINCT(explicit)')
-
-        Set.new(distinct_search.map(&:explicit)).should == Set['baz', nil]
+        distinct_search = @class.search_for('', :order => '').select('DISTINCT(explicit)')
+        Set.new(distinct_search.to_a.map(&:explicit)).should == Set['baz', nil]
       end
 
       it 'should order using symbol' do
-        @class.search_for('',:order => :string).first.string.should eql('bar')
+        @class.search_for('', :order => :string).first.string.should eql('bar')
       end
     end
   end

data/spec/lib/matchers.rb

@@ -23,11 +23,11 @@ RSpec::Matchers.define :parse_to do |tree|
 end
 
 RSpec::Matchers.define :contain do |*expected|
-  match_for_should do |actual|
+  match do |actual|
     expected.all? { |e| actual.include?(e) }
   end
 
-  match_for_should_not do |actual|
+  match_when_negated do |actual|
     expected.none? { |e| actual.include?(e) }
   end
 end

data/spec/spec_helper.rb

@@ -13,4 +13,12 @@ require "#{File.dirname(__FILE__)}/lib/mocks"
 
 RSpec.configure do |config|
   config.include ScopedSearch::RSpec::Mocks
+
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+  end
 end

data/spec/unit/ast_spec.rb

@@ -24,7 +24,7 @@ describe ScopedSearch::QueryLanguage::AST do
       end
 
       it "should create a child node for every subsequent array item" do
-        @ast.should have(1).children
+        @ast.children.length.should == 1
       end
 
       it "should create set the RHS the the first child value" do
@@ -42,7 +42,7 @@ describe ScopedSearch::QueryLanguage::AST do
       end
 
       it "should create a child node for every subsequent array item" do
-        @ast.should have(2).children
+        @ast.children.length.should == 2
       end
 
       it "should create set the LHS the the first child value" do
@@ -64,7 +64,7 @@ describe ScopedSearch::QueryLanguage::AST do
       end
 
       it "should create a child node for every subsequent array item" do
-        @ast.should have(2).children
+        @ast.children.length.should == 2
       end
 
       it "should create a nested OR structure for a nested array" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,17 +54,17 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n
-  \   \n    It will create a named scope :search_for that can be called with a query
-  string. It will build an SQL query using\n    the provided query string and a definition
-  that specifies on what fields to search. Because the functionality is\n    built
-  on named_scope, the result of the search_for call can be used like any other named_scope,
-  so it can be\n    chained with another scope or combined with will_paginate.\n    \n
-  \   Because it uses standard SQL, it does not require any setup, indexers or daemons.
-  This makes scoped_search\n    suitable to quickly add basic search functionality
-  to your application with little hassle. On the other hand,\n    it may not be the
-  best choice if it is going to be used on very large datasets or by a large user
-  base.\n"
+description: |2
+      Scoped search makes it easy to search your ActiveRecord-based models.
+
+      It will create a named scope :search_for that can be called with a query string. It will build an SQL query using
+      the provided query string and a definition that specifies on what fields to search. Because the functionality is
+      built on named_scope, the result of the search_for call can be used like any other named_scope, so it can be
+      chained with another scope or combined with will_paginate.
+
+      Because it uses standard SQL, it does not require any setup, indexers or daemons. This makes scoped_search
+      suitable to quickly add basic search functionality to your application with little hassle. On the other hand,
+      it may not be the best choice if it is going to be used on very large datasets or by a large user base.
 email:
 - abenari@redhat.com
 - willem@railsdoctors.com
@@ -73,20 +73,24 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- CHANGELOG.rdoc
+- CONTRIBUTING.rdoc
+- LICENSE
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.rdoc
+- CONTRIBUTING.rdoc
 - Gemfile
-- Gemfile.activerecord2
 - Gemfile.activerecord3
-- Gemfile.activerecord4
+- Gemfile.activerecord40
+- Gemfile.activerecord41
 - LICENSE
 - README.rdoc
 - Rakefile
 - app/assets/images/spinner.gif
 - app/assets/javascripts/scoped_search.js
 - app/assets/stylesheets/scoped_search.scss
-- init.rb
 - lib/scoped_search.rb
 - lib/scoped_search/auto_complete_builder.rb
 - lib/scoped_search/compass.rb
@@ -139,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -147,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using