rspec-solr 0.1.3 → 0.1.4

data/.travis.yml

@@ -3,7 +3,6 @@ script: rake rspec
 rvm:
   - 1.9.3
   - 1.9.2
-  - jruby-18mode
   - jruby-19mode
 notifications:
   email:

data/lib/rspec-solr/include_documents_matcher.rb

@@ -39,7 +39,7 @@ module RSpec
           if @before_expected
             "expected #{@actual.inspect} to #{name_to_sentence} #{doc_label_str(@expected)}#{expected_to_sentence} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}"
           elsif @min_for_last_matching_doc_pos
-            "expected each of the first #{@min_for_last_matching_doc_pos.to_s} documents to #{name_to_sentence}#{expected_to_sentence}: #{@actual.inspect}"
+            "expected each of the first #{@min_for_last_matching_doc_pos.to_s} documents to #{name_to_sentence}#{expected_to_sentence} in response: #{@actual.inspect}"
           elsif @max_doc_position
             "expected #{@actual.inspect} to #{name_to_sentence} #{doc_label_str(@expected)}#{expected_to_sentence} in first #{@max_doc_position.to_s} results"
           else
@@ -53,7 +53,7 @@ module RSpec
           if @before_expected
             "expected #{@actual.inspect} not to #{name_to_sentence} #{doc_label_str(@expected)}#{expected_to_sentence} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}"
           elsif @min_for_last_matching_doc_pos
-            "expected some of the first #{@min_for_last_matching_doc_pos.to_s} documents not to #{name_to_sentence}#{expected_to_sentence}: #{@actual.inspect}"
+            "expected some of the first #{@min_for_last_matching_doc_pos.to_s} documents not to #{name_to_sentence}#{expected_to_sentence} in response: #{@actual.inspect}"
           elsif @max_doc_position
             "expected #{@actual.inspect} not to #{name_to_sentence} #{doc_label_str(@expected)}#{expected_to_sentence} in first #{@max_doc_position.to_s} results"
           else

data/lib/rspec-solr/solr_response_hash.rb

@@ -41,9 +41,8 @@ class RSpecSolr
     def has_document?(expected_doc, max_doc_position = nil, all_must_match = nil)
       if expected_doc.is_a?(Hash)
         if all_must_match
-          first_non_match = docs.find_index { |doc| 
-            !doc_matches_all_criteria(doc, expected_doc)
-          } >= max_doc_position
+          first_non_match = docs.find_index { |doc| !doc_matches_all_criteria(doc, expected_doc) }
+          (first_non_match ? first_non_match >= max_doc_position : true)
         else
           # we are happy if any doc meets all of our expectations
           docs.any? { |doc| 
@@ -75,7 +74,7 @@ class RSpecSolr
             # a doc's fld values can be a String or an Array
             case exp_val
               when Regexp
-                Array(doc[exp_fname]).any? { |val| val =~ exp_val }
+                return true if Array(doc[exp_fname]).any? { |val| val =~ exp_val }
               else
                 Array(doc[exp_fname]).include?(exp_val)
             end

data/lib/rspec-solr/version.rb

@@ -1,3 +1,3 @@
 class RSpecSolr
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/include_document_spec.rb

@@ -364,6 +364,7 @@ describe RSpecSolr do
         it "passes if Solr document in response matches regex in named field" do
           @solr_resp_5_docs.should include("id" => /\d{3}/)
           @solr_resp_5_docs.should include("fld" => /^va/)  # 2 docs match 
+          @solr_resp_5_docs.should include("fld" => /Va/i)  # 2 docs match 
         end
         it "passes if single value expectation is expressed as an Array" do
           @solr_resp_5_docs.should include("id" => [/111/])

data/spec/include_in_each_of_first_n_spec.rb

@@ -12,6 +12,11 @@ describe RSpecSolr do
         @solr_resp.should include("fld" => "val").in_each_of_first(2).documents
         @solr_resp.should include("fld" => "val").in_each_of_first(2).results
       end
+      it "passes when all docs in range meet regex criteria" do
+        @solr_resp.should include("fld" => /val/).in_each_of_first(2)
+        @solr_resp.should include("fld" => /al/).in_each_of_first(2)
+        @solr_resp.should include("fld" => /Val/i).in_each_of_first(2)
+      end
       it "fails when doc in range doesn't meet criteria" do
         lambda {
           @solr_resp.should include("fld2" => "val2").in_each_of_first(2)
@@ -20,6 +25,14 @@ describe RSpecSolr do
           @solr_resp.should include("fld" => "val").in_each_of_first(3)
         }.should fail_matching('expected each of the first 3 documents to include {"fld"=>"val"}')
       end
+      it "fails when doc in range doesn't meet regex criteria" do
+        lambda {
+          @solr_resp.should include("fld2" => /l2/).in_each_of_first(2)
+        }.should fail_matching('expected each of the first 2 documents to include {"fld2"=>/l2/}')
+        lambda {
+          @solr_resp.should include("fld" => /al/).in_each_of_first(3)
+        }.should fail_matching('expected each of the first 3 documents to include {"fld"=>/al/}')
+      end
     end
     context "should_NOT" do
       it "fails when all docs in range meet criteria" do
@@ -33,10 +46,25 @@ describe RSpecSolr do
           @solr_resp.should_not include("fld" => "val").in_each_of_first(2).results
         }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>"val"}')
       end
+      it "fails when all docs in range meet regex criteria" do
+        lambda {
+          @solr_resp.should_not include("fld" => /val/).in_each_of_first(2)
+        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/val/}')
+        lambda {
+          @solr_resp.should_not include("fld" => /al/).in_each_of_first(2)
+        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/al/}')
+        lambda {
+          @solr_resp.should_not include("fld" => /Val/i).in_each_of_first(2)
+        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/Val/i}')
+      end
       it "passes when doc in range doesn't meet criteria" do
         @solr_resp.should_not include("fld" => "val").in_each_of_first(3)
         @solr_resp.should_not include("fld2" => "val2").in_each_of_first(2)
       end
+      it "passes when doc in range doesn't meet regex criteria" do
+        @solr_resp.should_not include("fld2" => /l2/).in_each_of_first(2)
+        @solr_resp.should_not include("fld" => /al/).in_each_of_first(3)
+      end
     end
     it "should expect a Hash for the include" do
       expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-solr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2465877972703506306
+      hash: 3247708301967459464
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2465877972703506306
+      hash: 3247708301967459464
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24