geonames_api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50c12c8caf88cb16c72e51b02e0899f9f6f76df
-  data.tar.gz: 31bf711659f22e768a31827e15d1577e1d138362
+  metadata.gz: b04085ba81b7f7d468df252648f0b343e510a422
+  data.tar.gz: c9d634bfbdf444b769f43abd67bc2a5b2238ef56
 SHA512:
-  metadata.gz: b09f7294b7b01b99732866b17fb59ae7b96a3065ed06c344a5219cd2737e2f1a6b133ca07d792c05b2b05fcafe63a56d2065bc97697a7df4246b5db7c63f463e
-  data.tar.gz: c6bc4c9b9326f9837f473231280a2f59a57169a46f453d4c21eee6c39d2635daccc15013746f7a777a63789f5d8c68a047c13d28f3d0ff963af9a22b98aee79c
+  metadata.gz: d083c2f06f3b1a5f4d2d624206f586e652df601caea5ec3d78b3be993bac3252fc3b7ff93782dbbc1896573f1f00112bb73843ff5e11550adc274bb1490cc11c
+  data.tar.gz: 1cdc8e7ee3166aec78f9e4c41b3023410c3e0a173e8900a5fb6e8210a2a1f7d63d9dfe1d44449660d4c8d3a7fc8d11b284199fb822da7c5d4777318aa3e2c7a0

data/lib/geonames_api/version.rb

@@ -1,3 +1,3 @@
 module GeoNamesAPI
-  VERSION = Gem::Version.new('0.1.3')
+  VERSION = Gem::Version.new('0.1.4')
 end

data/spec/geonames_api/place_search_spec.rb

@@ -28,24 +28,35 @@ describe GeoNamesAPI::PlaceSearch do
 
   describe "#next_page" do
     it "should grab the next page of results from the same search" do
-      # the paging with 'columbus' sometimes doesn't match across the 3 pages.
-      big_search = GeoNamesAPI::PlaceSearch.where(name: 'goleta', maxRows: 9)
-      search_pg1 = GeoNamesAPI::PlaceSearch.where(name: 'goleta', maxRows: 3)
+      page_size = 3
+      big_search = GeoNamesAPI::PlaceSearch.where(name: 'goleta', maxRows: page_size * 4)
+      search_pg1 = GeoNamesAPI::PlaceSearch.where(name: 'goleta', maxRows: page_size)
+      search_pg1.size.should == page_size
+
       search_pg2 = search_pg1.next_page
+      search_pg2.size.should == page_size
+      search_pg2.request_params[:startRow].should == page_size
+
       search_pg3 = search_pg2.next_page
-      search_pg1.size.should == 3
-      search_pg2.size.should == 3
-      search_pg3.size.should == 3
-      search_pg3.request_params[:startRow].should == 6
-      (search_pg1.results + search_pg2.results + search_pg3.results).map{|ea|ea.geoname_id}.should == big_search.results.map{|ea|ea.geoname_id}
+      search_pg3.request_params[:startRow].should == page_size * 2
+      search_pg3.size.should == page_size
+
+      # Ordering isn't always deterministic, so we're just looking for an overlap bigger than 1 page size:
+      expected_ids = big_search.results.map { |ea| ea.geoname_id }
+      paged_ids = (search_pg1.results + search_pg2.results + search_pg3.results).map { |ea| ea.geoname_id }
+      matching_ids = paged_ids & expected_ids
+      if matching_ids.size <= page_size
+        # use .should just to render a nice error message:
+        paged_ids.should =~ matching_ids
+      end
     end
   end
 
   describe "#to_page" do
-    it "should grab the specified page of results from the same search" do
-      search10 = GeoNamesAPI::PlaceSearch.all("columbus", 10)
+    it "should set startRow appropriately" do
       search2 = GeoNamesAPI::PlaceSearch.all("columbus", 2)
-      search2.to_page(4).first.geoname_id.should == search10.results[8].geoname_id
+      page4 = search2.to_page(4)
+      page4.request_params[:startRow].should == 8
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sean Devine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport