sunspot_matchers 1.3.0.2 → 2.0.0.0

data/spec/sunspot_matchers_spec.rb

@@ -2,9 +2,12 @@ require 'sunspot'
 require 'sunspot_matchers'
 require 'rspec'
 
-class Post; end
-class Blog; end
-class Person; end
+class Post;
+end
+class Blog;
+end
+class Person;
+end
 
 Sunspot.setup(Post) do
   text :body
@@ -24,7 +27,7 @@ end
 
 describe "Sunspot Matchers" do
   include SunspotMatchers
-  
+
   before do
     Sunspot.session = SunspotMatchers::SunspotSessionSpy.new(Sunspot.session)
   end
@@ -75,10 +78,10 @@ describe "Sunspot Matchers" do
           keywords 'great pizza'
           keywords 'terrible pizza'
         end
-        Sunspot.session.should have_search_params(:keywords, Proc.new {
+        Sunspot.session.should have_search_params(:keywords) {
           keywords 'great pizza'
           keywords 'terrible pizza'
-        })
+        }
       end
 
       it "should work with any_param match" do
@@ -116,46 +119,46 @@ describe "Sunspot Matchers" do
           with :author_name, 'Mark Twain'
           with :author_name, 'John Twain'
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           with :author_name, 'Mark Twain'
           with :author_name, 'John Twain'
-        })
+        }
       end
 
       it "should match for greater_than" do
         Sunspot.search(Post) do
           with(:category_ids).greater_than(1)
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           with(:category_ids).greater_than(1)
-        })
+        }
       end
 
       it "should match for less_than" do
         Sunspot.search(Post) do
           with(:category_ids).less_than(1)
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           with(:category_ids).less_than(1)
-        })
+        }
       end
 
       it "should match for range" do
         Sunspot.search(Post) do
           with :category_ids, 1..3
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           with :category_ids, 1..3
-        })
+        }
       end
 
       it "should match any_of" do
         Sunspot.search(Post) do
-          with(:category_ids).any_of [1,2]
+          with(:category_ids).any_of [1, 2]
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
-          with(:category_ids).any_of [1,2]
-        })
+        Sunspot.session.should have_search_params(:with) {
+          with(:category_ids).any_of [1, 2]
+        }
       end
 
       it "should match any_of multiline" do
@@ -165,12 +168,12 @@ describe "Sunspot Matchers" do
             with :category_ids, 2
           end
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           any_of do
             with :category_ids, 1
             with :category_ids, 2
           end
-        })
+        }
       end
 
       it "should match any_of and all_of" do
@@ -183,7 +186,7 @@ describe "Sunspot Matchers" do
             end
           end
         end
-        Sunspot.session.should have_search_params(:with, Proc.new {
+        Sunspot.session.should have_search_params(:with) {
           any_of do
             with :category_ids, 1
             all_of do
@@ -191,7 +194,7 @@ describe "Sunspot Matchers" do
               with :category_ids, 3
             end
           end
-        })
+        }
       end
 
       it "should work with any_param match" do
@@ -243,46 +246,46 @@ describe "Sunspot Matchers" do
           without :author_name, 'Mark Twain'
           without :author_name, 'John Twain'
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           without :author_name, 'Mark Twain'
           without :author_name, 'John Twain'
-        })
+        }
       end
 
       it "should match for greater_than" do
         Sunspot.search(Post) do
           without(:category_ids).greater_than(1)
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           without(:category_ids).greater_than(1)
-        })
+        }
       end
 
       it "should match for less_than" do
         Sunspot.search(Post) do
           without(:category_ids).less_than(1)
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           without(:category_ids).less_than(1)
-        })
+        }
       end
 
       it "should match for range" do
         Sunspot.search(Post) do
           without :category_ids, 1..3
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           without :category_ids, 1..3
-        })
+        }
       end
 
       it "should match any_of" do
         Sunspot.search(Post) do
-          without(:category_ids).any_of [1,2]
+          without(:category_ids).any_of [1, 2]
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
-          without(:category_ids).any_of [1,2]
-        })
+        Sunspot.session.should have_search_params(:without) {
+          without(:category_ids).any_of [1, 2]
+        }
       end
 
       it "should match any_of multiline" do
@@ -292,12 +295,12 @@ describe "Sunspot Matchers" do
             without :category_ids, 2
           end
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           any_of do
             without :category_ids, 1
             without :category_ids, 2
           end
-        })
+        }
       end
 
       it "should match any_of and all_of" do
@@ -310,7 +313,7 @@ describe "Sunspot Matchers" do
             end
           end
         end
-        Sunspot.session.should have_search_params(:without, Proc.new {
+        Sunspot.session.should have_search_params(:without) {
           any_of do
             without :category_ids, 1
             all_of do
@@ -318,7 +321,7 @@ describe "Sunspot Matchers" do
               without :category_ids, 3
             end
           end
-        })
+        }
       end
 
       it "should work with any_param match" do
@@ -400,10 +403,10 @@ describe "Sunspot Matchers" do
           order_by :published_at, :asc
           order_by :average_rating, :asc
         end
-        Sunspot.session.should have_search_params(:order_by, Proc.new {
+        Sunspot.session.should have_search_params(:order_by) {
           order_by :published_at, :asc
           order_by :average_rating, :asc
-        })
+        }
       end
 
       it "should not match if multiple orderings are reversed" do
@@ -411,10 +414,10 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
           order_by :published_at, :asc
         end
-        Sunspot.session.should_not have_search_params(:order_by, Proc.new {
+        Sunspot.session.should_not have_search_params(:order_by) {
           order_by :published_at, :asc
           order_by :average_rating, :asc
-        })
+        }
       end
 
       it "should match when using random" do
@@ -422,10 +425,10 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
           order_by :random
         end
-        Sunspot.session.should have_search_params(:order_by, Proc.new {
+        Sunspot.session.should have_search_params(:order_by) {
           order_by :average_rating, :asc
           order_by :random
-        })
+        }
       end
 
       it "should not match when random is missing" do
@@ -433,9 +436,9 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
           order_by :random
         end
-        Sunspot.session.should_not have_search_params(:order_by, Proc.new {
+        Sunspot.session.should_not have_search_params(:order_by) {
           order_by :average_rating, :asc
-        })
+        }
       end
 
       it "should match when using score" do
@@ -443,10 +446,10 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
           order_by :score
         end
-        Sunspot.session.should have_search_params(:order_by, Proc.new {
+        Sunspot.session.should have_search_params(:order_by) {
           order_by :average_rating, :asc
           order_by :score
-        })
+        }
       end
 
       it "should not match when score is missing" do
@@ -454,9 +457,9 @@ describe "Sunspot Matchers" do
           order_by :average_rating, :asc
           order_by :score
         end
-        Sunspot.session.should_not have_search_params(:order_by, Proc.new {
+        Sunspot.session.should_not have_search_params(:order_by) {
           order_by :average_rating, :asc
-        })
+        }
       end
 
       it "should work with any_param match on direction" do
@@ -523,10 +526,10 @@ describe "Sunspot Matchers" do
             category_filter = with(:category_ids, 2)
             facet(:category_ids, :exclude => category_filter)
           end
-          Sunspot.session.should have_search_params(:facet, Proc.new {
+          Sunspot.session.should have_search_params(:facet) {
             category_filter = with(:category_ids, 2)
             facet(:category_ids, :exclude => category_filter)
-          })
+          }
         end
       end
 
@@ -542,7 +545,7 @@ describe "Sunspot Matchers" do
               end
             end
           end
-          Sunspot.session.should have_search_params(:facet, Proc.new {
+          Sunspot.session.should have_search_params(:facet) {
             facet(:average_rating) do
               row(1.0..2.0) do
                 with(:average_rating, 1.0..2.0)
@@ -551,7 +554,7 @@ describe "Sunspot Matchers" do
                 with(:average_rating, 2.0..3.0)
               end
             end
-          })
+          }
         end
 
         it "should not match if actual search is missing a facet" do
@@ -562,7 +565,7 @@ describe "Sunspot Matchers" do
               end
             end
           end
-          Sunspot.session.should_not have_search_params(:facet, Proc.new {
+          Sunspot.session.should_not have_search_params(:facet) {
             facet(:average_rating) do
               row(1.0..2.0) do
                 with(:average_rating, 1.0..2.0)
@@ -571,7 +574,7 @@ describe "Sunspot Matchers" do
                 with(:average_rating, 2.0..3.0)
               end
             end
-          })
+          }
         end
 
         it "should not match if facet query is different" do
@@ -585,7 +588,7 @@ describe "Sunspot Matchers" do
               end
             end
           end
-          Sunspot.session.should_not have_search_params(:facet, Proc.new {
+          Sunspot.session.should_not have_search_params(:facet) {
             facet(:average_rating) do
               row(1.0..2.0) do
                 with(:average_rating, 1.0..2.0)
@@ -594,7 +597,7 @@ describe "Sunspot Matchers" do
                 with(:average_rating, 2.0..4.0)
               end
             end
-          })
+          }
         end
       end
     end
@@ -606,11 +609,11 @@ describe "Sunspot Matchers" do
             boost_fields :body => 2.0
           end
         end
-        Sunspot.session.should have_search_params(:boost, Proc.new {
+        Sunspot.session.should have_search_params(:boost) {
           keywords 'great pizza' do
             boost_fields :body => 2.0
           end
-        })
+        }
       end
 
       it "should not match if field boost does not match" do
@@ -619,11 +622,11 @@ describe "Sunspot Matchers" do
             boost_fields :body => 2.0
           end
         end
-        Sunspot.session.should_not have_search_params(:boost, Proc.new {
+        Sunspot.session.should_not have_search_params(:boost) {
           keywords 'great pizza' do
             boost_fields :body => 3.0
           end
-        })
+        }
       end
 
       it "should match if boost query matches" do
@@ -634,13 +637,13 @@ describe "Sunspot Matchers" do
             end
           end
         end
-        Sunspot.session.should have_search_params(:boost, Proc.new {
+        Sunspot.session.should have_search_params(:boost) {
           keywords 'great pizza' do
             boost(2.0) do
               with :blog_id, 4
             end
           end
-        })
+        }
       end
 
       it "should not match if boost query does not match" do
@@ -651,13 +654,13 @@ describe "Sunspot Matchers" do
             end
           end
         end
-        Sunspot.session.should_not have_search_params(:boost, Proc.new {
+        Sunspot.session.should_not have_search_params(:boost) {
           keywords 'great pizza' do
             boost(2.0) do
               with :blog_id, 5
             end
           end
-        })
+        }
       end
 
       it "should match if boost function matches" do
@@ -666,11 +669,11 @@ describe "Sunspot Matchers" do
             boost(function { sum(:average_rating, product(:popularity, 10)) })
           end
         end
-        Sunspot.session.should have_search_params(:boost, Proc.new {
+        Sunspot.session.should have_search_params(:boost) {
           keywords 'great pizza' do
             boost(function { sum(:average_rating, product(:popularity, 10)) })
           end
-        })
+        }
       end
 
       it "should not match if boost function does not match" do
@@ -679,11 +682,28 @@ describe "Sunspot Matchers" do
             boost(function { sum(:average_rating, product(:popularity, 10)) })
           end
         end
-        Sunspot.session.should_not have_search_params(:boost, Proc.new {
+        Sunspot.session.should_not have_search_params(:boost) {
           keywords 'great pizza' do
             boost(function { sum(:average_rating, product(:popularity, 42)) })
           end
-        })
+        }
+      end
+    end
+
+    describe "group matcher" do
+      it "should match if grouping a field" do
+        Sunspot.search(Post) do
+          keywords 'great pizza'
+          group :author_name
+        end
+        Sunspot.session.should have_search_params(:group, :author_name)
+      end
+
+      it "should match if grouping a field" do
+        Sunspot.search(Post) do
+          keywords 'great pizza'
+        end
+        Sunspot.session.should_not have_search_params(:group, :author_name)
       end
     end
 
@@ -728,8 +748,16 @@ describe "Sunspot Matchers" do
   end
 
   describe "have_searchable_field" do
+    context "it works with instances as well as classes" do
+      describe Post do
+        it { should have_searchable_field(:body) }
+      end
+    end
+
     it "should succeed if the model has the given field" do
       Post.should have_searchable_field(:body)
+      Post.should have_searchable_field(:author_name)
+      Post.should have_searchable_field(:blog_id)
     end
 
     it "should fail if the model does not have the given field" do

data/sunspot_matchers.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_development_dependency "sunspot", "~> 1.3.0"
+  s.add_development_dependency "sunspot", "~> 2.0.0"
   s.add_development_dependency "rake"
 
   s.files        = `git ls-files`.split("\n")