inquisitio 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e8488ee37d4001d57ec5ed0a318b2532d47f2f
-  data.tar.gz: 1a20339ae3942c0e5ba5c0828b725b5f8039f6e0
+  metadata.gz: ab2d4cf939da96f26e1f9ad688363f9df23ed697
+  data.tar.gz: 865070d56b16d662a21a5ea2ae6deb823757cde6
 SHA512:
-  metadata.gz: 37b7902705751a607286325de49dd77f331e2ce1c7dd4db4115f09ec40553f88c65f66cde534cbec9691982992a7ede7609b1c613761344857e702cadac1a03d
-  data.tar.gz: 034fe6edaa9e2cb468765eec84582e4220b4e2d22d0e37ab686e8efc211aad6ad2086f499c29564811a4896714cece5631c1f3b72d65fc58545f1f6faec7a6ee
+  metadata.gz: e2458344374731f34cfbfa78c9c662dcf285303cd4a9ff004b5af23693d4cbbd8c2a4ea01cacacf27a1e86c591adf917659c548df00a0a93de1ba87ba9c037ab
+  data.tar.gz: e13822c322f83c5d49911505930d4ca05e05c3eddb3f72a4fde1182fc75960d9b83b0df5ec73d19fed22f05deb4753ac6f8a3cd4484f5524355b25851a95ea12

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-1.2.2 / 2014-06-03
+1.2.3 / 2014-06-05
+[FEATURE] Return time taken by queries as time_ms on Searcher for 2013-01-01 api
+
+1.2.2 / 2014-06-05
 [FEATURE] Return time taken by queries as time_ms on Searcher
 
 1.2.1 / 2014-06-03

data/lib/inquisitio/searcher.rb

@@ -125,11 +125,13 @@ module Inquisitio
       response = Excon.get(search_url)
       raise InquisitioError.new("Search failed with status code: #{response.status} Message #{response.body}") unless response.status == 200
       body = JSON.parse(response.body)
+      time_ms = body['info']['time-ms'] if Inquisitio.config.api_version == '2011-02-01'
+      time_ms = body['status']['time-ms'] if Inquisitio.config.api_version == '2013-01-01'
       @results = Results.new(body['hits']['hit'],
         params[:page],
         params[:per],
         body['hits']['found'],
-        body['info']['time-ms'])
+        time_ms)
     rescue => e
       @failed_attempts += 1
       Inquisitio.config.logger.error("Exception Performing search: #{search_url} #{e}")

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/test/results_test.rb

@@ -6,6 +6,7 @@ module Inquisitio
       super
       @search_endpoint = 'http://my.search-endpoint.com'
       Inquisitio.config.search_endpoint = @search_endpoint
+      Inquisitio.config.api_version = nil
       @result_1 = {'data' => {'id' => ['1'], 'title' => ["Foobar"], 'type' => ["Cat"]}}
       @result_2 = {'data' => {'id' => ['2'], 'title' => ["Foobar"], 'type' => ["Cat"]}}
       @result_3 = {'data' => {'id' => ['20'], 'title' => ["Foobar2"], 'type' => ["Module_Dog"]}}
@@ -32,12 +33,23 @@ module Inquisitio
       assert_equal @found, searcher.total_entries
     end
 
-    def test_should_return_time_taken
+    def test_should_return_time_taken_for_2011
       searcher = Searcher.where("star_wars")
       searcher.search
       assert_equal 3, searcher.time_ms
     end
 
+    def test_should_return_time_taken_for_2013
+      Inquisitio.config.api_version = '2013-01-01'
+      body = "{\"status\": {\"rid\" : \"u9aP4eYo8gIK0csK\", \"time-ms\": 4}, \"hits\" : {\"#{@found}\": 33, \"#{@start}\": 0, \"hit\":#{@expected_results.to_json} }}"
+      Excon.stubs.clear
+      Excon.stub({}, {body: body, status: 200})
+
+      searcher = Searcher.where("star_wars")
+      searcher.search
+      assert_equal 4, searcher.time_ms
+    end
+
     def test_total_entries_should_proxy
       searcher = Searcher.where("star_wars")
       searcher.search

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jeremy Walker