rack-test-rest 0.5.1 → 0.6.0

data/lib/rack-test-rest.rb

@@ -56,7 +56,9 @@ module Rack
           assert_content_type_is_json
 
           if @rack_test_rest[:location]
-            assert last_response.original_headers["Location"] =~ @rack_test_rest[:location]
+            assert last_response.original_headers["Location"] =~ @rack_test_rest[:location],
+              "Response location header '%s' does not match RegExp '%s'" %
+              [last_response.original_headers["Location"], @rack_test_rest[:location]]
           end
 
         end
@@ -123,28 +125,30 @@ module Rack
         end
       end
 
-      def paginate_resource(params={})
+      def paginate_resource(opts={})
 
-        count = params[:count] ? params[:count] : 512
-        max = params[:max_length] ? params[:max_length] : 100
+        count = opts[:count] ? opts[:count] : 512
+        max = opts[:max_length] ? opts[:max_length] : 100
+        existing_resource_count = opts[:existing_resource_count] || 0
 
         #populate the DB
         0.upto(count - 1) do |id|
-          if params.has_key?(:do_create) && params[:do_create] == false
+          if opts[:do_create] == false
             yield(id)
           else
             create_resource(yield(id))
           end
         end
 
+        total = count + existing_resource_count
         retrieved = 0
         offset = 0
 
-        while retrieved < count
+        while retrieved < total
           # Get a random number from 1-100
           length = rand(max - 1) + 1
 
-          expected_length = (length > (count - retrieved)) ? (count - retrieved) : length
+          expected_length = (length > (total - retrieved)) ? (total - retrieved) : length
 
           if @rack_test_rest[:debug]
             puts "Requesting offset='#{offset}', length='#{length}'"
@@ -158,9 +162,9 @@ module Rack
             assert_equal(expected_length, pg_resp[@rack_test_rest[:resource]].count)
 
             puts "Found #{pg_resp["query"]["found"]} records" if @rack_test_rest[:debug]
-            assert_equal(count, pg_resp["query"]["found"])
+            assert_equal(total, pg_resp["query"]["found"])
 
-            assert_equal(count, pg_resp["query"]["total"])
+            assert_equal(total, pg_resp["query"]["total"])
             assert_equal(expected_length, pg_resp["query"]["length"])
             assert_equal(offset, pg_resp["query"]["offset"])
 

data/lib/rack-test-rest/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Test
     module Rest
-      VERSION = '0.5.1'
+      VERSION = '0.6.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-test-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1945334664000681698
+      hash: -3995603219145648516
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: