sunspot_matchers 2.2.0.2 → 2.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ef209cdf1b1551de2677ab1aae74fbecc86c79
-  data.tar.gz: c8ea87d0e981d7c657aab10e163049ac72183fcb
+  metadata.gz: 71be1abd82eb01fa8a46f8e653d029a8e0c70bd2
+  data.tar.gz: bacebe7d1bd6355569949a37c785855a7559858e
 SHA512:
-  metadata.gz: 0a37bd7f78bc341cb1ae84d827ff11596d9791610cfbda858dcac5817e6f29a83f6351ac104bb1e18256eb1a595024474dc584a78a8ff7f99e1fe29cc2b1f5da
-  data.tar.gz: 707f51e7b7d17eb74e68589f4ab8efbc3b2d8bcaf6e3a81ebe7de4b17ac27378a3c86772b509093a0331a643e70d9ab24780e6ada855d81845dd4fec43a89a2e
+  metadata.gz: 0c9c890cd0810b7024f63886cc287afae42a61f35bc3d242418ac6df3940674355bb920344728bf726d94ababea5dc5d759a2afd573a3988c1d2e9d09281e912
+  data.tar.gz: 8a58d1766e222075acdf3302cc49f97a78abb5377c2d0cffdf88718e50527c8461b54025a5337bcd7fdb362ba5f57973548ad4e9601e18c80948cdea7e144a94

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sunspot_matchers (2.2.0.2)
+    sunspot_matchers (2.2.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/sunspot_matchers/matchers.rb

@@ -127,7 +127,7 @@ module SunspotMatchers
   class HaveSearchParams
     def initialize(method, *args, &block)
       @method = method
-      @args = [*args, block].compact
+      @args = (block.nil? ? args : [*args, block])
     end
 
     def matches?(actual)

data/lib/sunspot_matchers/test_helper.rb

@@ -9,7 +9,7 @@ module SunspotMatchers
     def initialize(session, method, *args, &block)
       @session = session
       @method = method
-      @args = [*args, block].compact
+      @args = (block.nil? ? args : [*args, block])
     end
 
     def get_matcher
@@ -33,7 +33,7 @@ module SunspotMatchers
     end
   end
 
-  
+
   class BeASearchForSession
     def initialize(session, expected_class)
       @session = session
@@ -74,7 +74,7 @@ module SunspotMatchers
       matcher = HaveSearchParamsForSession.new(session, method, *args, &block).get_matcher
       assert !matcher.match?, matcher.unexpected_match_error_message
     end
-    
+
     def assert_is_search_for(session, expected_class)
       matcher = BeASearchForSession.new(session, expected_class)
       assert matcher.match?, matcher.failure_message_for_should

data/lib/sunspot_matchers/version.rb

@@ -1,3 +1,3 @@
 module SunspotMatchers
-  VERSION = "2.2.0.2"
+  VERSION = "2.2.0.3"
 end

data/spec/sunspot_matchers_spec.rb

@@ -52,6 +52,22 @@ describe "Sunspot Matchers" do
       expect(Sunspot.session.searches.last).to have_search_params(:keywords, 'bad pizza')
     end
 
+    context 'when the search arg is nil' do
+      before do
+        Sunspot.search(Post) { with(:published_at, Time.now) }
+      end
+
+      it 'respects expectations on nil parameters' do
+        expect {
+          expect(Sunspot.session.searches.first).to have_search_params(:with, :published_at, nil)
+        }.to raise_error RSpec::Expectations::ExpectationNotMetError
+      end
+
+      it 'allows negated expectation on nil' do
+        expect(Sunspot.session.searches.last).not_to have_search_params(:with, :published_at, nil)
+      end
+    end
+
     describe "keyword/fulltext matcher" do
       it "matches if search matches" do
         Sunspot.search(Post) do

data/test/sunspot_matchers_test.rb

@@ -47,7 +47,21 @@ class SunspotMatchersTest < MiniTest::Unit::TestCase
     end
     assert_has_search_params Sunspot.session, :keywords, 'great pizza'
   end
-  
+
+  def test_respects_expectation_on_nil
+    Sunspot.search(Post) do
+      with(:published_at, Time.now)
+    end
+    assert_raises(MiniTest::Assertion) { assert_has_search_params(Sunspot.session, :with, :published_at, nil) }
+  end
+
+  def test_respects_negated_expectation_on_nil
+    Sunspot.search(Post) do
+      with(:published_at, Time.now)
+    end
+    assert_has_no_search_params Sunspot.session, :with, :published_at, nil
+  end
+
   def test_match_keywords
     Sunspot.search(Post) do
       keywords 'great pizza'
@@ -699,11 +713,11 @@ class SunspotMatchersTest < MiniTest::Unit::TestCase
     assert_is_search_for Sunspot.session, Blog
     assert_is_not_search_for Sunspot.session, Person
   end
- 
+
   def test_be_a_search_for_multiple_searches
     Sunspot.search(Post) { keywords 'great pizza' }
     Sunspot.search(Blog) { keywords 'bad pizza' }
     assert_is_search_for Sunspot.session.searches.first, Post
     assert_is_search_for Sunspot.session.searches.last, Blog
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_matchers
 version: !ruby/object:Gem::Version
-  version: 2.2.0.2
+  version: 2.2.0.3
 platform: ruby
 authors:
 - Joseph Palermo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler