sitra_client 0.0.5 → 0.0.6

data/lib/sitra_client.rb

@@ -6,6 +6,11 @@ require 'logger'
 
 module SitraClient
 
+  MAX_COUNT = 100
+
+  # Safety net
+  MAX_LOOPS = 5
+
   # Configuration defaults
   @config = {
       :base_url => 'http://api.sitra-tourisme.com/api/v001',
@@ -25,13 +30,35 @@ module SitraClient
     @config
   end
 
-  def self.query(criteria = {})
+  def self.query(criteria, all_results = false)
+    if all_results
+      loops = 0
+      criteria[:first] = 0
+      criteria[:count] = MAX_COUNT
+      response = get_response(criteria)
+      results = response.as_array
+      while response.results_count > results.length && loops < MAX_LOOPS
+        loops += 1
+        criteria[:first] += MAX_COUNT
+        results += get_response(criteria).as_array
+      end
+    else
+      response = get_response(criteria)
+      results = response.as_array
+    end
+    results
+  end
+
+  private
+
+  def self.get_response(criteria)
     response = SitraResponse.new
     query = SitraQuery.new(@config[:api_key], @config[:site_identifier], criteria)
     @logger.info "Search query : #{@config[:base_url]}/recherche/list-objets-touristiques?query=#{query.to_params}"
     open("#{@config[:base_url]}/recherche/list-objets-touristiques?query=#{CGI.escape query.to_params}") { |f|
       f.each_line {|line| response.append_line(line)}
     }
+    @logger.info "Retrieved #{response.returned_count} of #{response.results_count} results"
     response
   end
 

data/lib/sitra_client/sitra_response.rb

@@ -6,14 +6,26 @@ class SitraResponse
 
   def initialize
     @json_response = ''
+    @response_hash = {}
   end
 
   def append_line(line)
     @json_response += line unless line.nil?
   end
 
+  def returned_count
+    [as_hash[:query][:count], results_count - as_hash[:query][:first]].min
+  end
+
+  def results_count
+    as_hash[:numFound]
+  end
+
   def as_hash
-    JSON.parse @json_response, :symbolize_names => true
+    if @response_hash.empty?
+      @response_hash = JSON.parse @json_response, :symbolize_names => true
+    end
+    @response_hash
   end
 
   def as_raw_json
@@ -21,11 +33,10 @@ class SitraResponse
   end
 
   def as_array
-    response = as_hash
-    if response[:objetsTouristiques].nil?
+    if as_hash[:objetsTouristiques].nil?
       results = []
     else
-      results = response[:objetsTouristiques].collect {|obj_hash| TouristicObject.new(obj_hash)}
+      results = as_hash[:objetsTouristiques].collect {|obj_hash| TouristicObject.new(obj_hash)}
     end
     results
   end

data/lib/sitra_client/version.rb

@@ -1,3 +1,3 @@
 module SitraClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/sitra_client/sitra_response_test.rb

@@ -59,6 +59,8 @@ class SitraResponseTest < Test::Unit::TestCase
     sitra_response.append_line(json_response)
 
     touristic_objects = sitra_response.as_array
+
+    assert_equal 2, sitra_response.results_count
     assert_empty touristic_objects
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sitra_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler