inquisitio 0.1.7 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjQ5Y2RhNzkxM2MwZmE5OTVmY2FkYjI0NGJmNDFlY2JkM2Q5ZmE5NQ==
-  data.tar.gz: !binary |-
-    NzE0OWNkZjkwZTk5M2VmZjQyOWIxOWYxNGUwMjBlZjhmNjlhZTc4MA==
+SHA1:
+  metadata.gz: fea08d92d3503aaf286abbbfb90603071151987c
+  data.tar.gz: 89b2a9fa0fde1d9315aaa2b78e6f056b94fc865b
 SHA512:
-  metadata.gz: !binary |-
-    ZTM0NWJmMjlmMTNmYjZlZDFkMTdhMzI2OTNmZmUzZDA4OWJkOTljYTk0OTYw
-    Mjk3ODBiNWVjMjZjOTA5ZWZlOGI2MDcwZjE2NWI1M2I3N2ZhMmJlYjY0ZTY2
-    NzZhNjA1MTZlY2Y1NzA2NzAyMDU1OTM0NWNkNGZmZTMxZTZiMGI=
-  data.tar.gz: !binary |-
-    ZWUwMzViZjJhMDQ3MjllY2NiOTc4MzY0MWNkZGI2MmYzN2M0NDNmMjg2MjRk
-    YzMyOTMzYjM5ZTUzNGI2ZDBkYmNiNmQwOWM4ZWY0ZjMyZjJmNTYyZTAwOWMx
-    Y2ZmMWEyNzZjOTZiOTlkNjZlOTk1MDJhZTYwZjdkNTE5MjMzOWU=
+  metadata.gz: acc88c23d6a6149742fd9b9b8d86aa6965bfd3271cab315d555670e04ddfb02d426bdf5515be1b6bf2b32541d032eba26890bb7c083799ba6ea59f73b1e50f38
+  data.tar.gz: 37b197462af739476a09d9058385054dc54f8b27e4cee3e27a9edb229c8ac758c8ae6157e44a15f7117943c3172df9e0f5d85b34ecbb052e394fa23c4d32d97c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.2.0 / 2014-01-14
+
+[FEATURE] Add support for retrying query
+
 0.1.7 / 2013-12-13
 
 [FEATURE] Added dry-run configuration option to prevent data being sent to 

data/lib/inquisitio/configuration.rb

@@ -10,14 +10,16 @@ module Inquisitio
       :document_endpoint,
       :default_search_size,
       :dry_run,
-      :logger
+      :logger,
+      :max_attempts
     ]
-    
+
     attr_writer *SETTINGS
 
     def initialize
       self.logger = Inquisitio::Logger.new
       self.dry_run = false
+      self.max_attempts = 3
     end
 
     SETTINGS.each do |setting|

data/lib/inquisitio/searcher.rb

@@ -18,6 +18,7 @@ module Inquisitio
         returns: [],
         with: {}
       }
+      @failed_attempts = 0
 
       yield(self) if block_given?
     end
@@ -33,7 +34,7 @@ module Inquisitio
     def records
       @records ||= begin
         klasses = {}
-        map do |result|
+        results.map do |result|
           klass = result['data']['med_type'].first
           klasses[klass] ||= []
           klasses[klass] << result['data']['med_id'].first
@@ -102,20 +103,26 @@ module Inquisitio
     private
 
     def results
-      if @results.nil?
-        Inquisitio.config.logger.info("Performing search: #{search_url}")
-        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)
-        @results = Results.new(body["hits"]["hit"],
-                               params[:page],
-                               params[:per],
-                               body["hits"]["found"])
-      end
-      @results
+      return @results unless @results.nil?
+
+      Inquisitio.config.logger.info("Performing search: #{search_url}")
+      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)
+      @results = Results.new(body["hits"]["hit"],
+                             params[:page],
+                             params[:per],
+                             body["hits"]["found"])
     rescue => e
-        Inquisitio.config.logger.error("Exception Performing search: #{search_url} #{e}")
+      @failed_attempts += 1
+      Inquisitio.config.logger.error("Exception Performing search: #{search_url} #{e}")
+
+      if @failed_attempts < Inquisitio.config.max_attempts
+        Inquisitio.config.logger.error("Retrying search #{@failed_attempts}/#{Inquisitio.config.max_attempts}")
+        results
+      else
         raise InquisitioError.new("Exception performing search")
+      end
     end
 
     def search_url

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/test/configuration_test.rb

@@ -19,6 +19,10 @@ module Inquisitio
       assert_equal test_search_endpoint, Inquisitio.config.search_endpoint
     end
 
+    def test_search_endpoint
+      assert_equal 3, Inquisitio.config.max_attempts
+    end
+
     def test_search_endpoint
       search_endpoint = "test-search-endpoint"
       Inquisitio.config.search_endpoint = search_endpoint

data/test/searcher_test.rb

@@ -211,6 +211,7 @@ module Inquisitio
       Excon.stub({}, {:body => 'Bad Happened', :status => 500})
 
       searcher = Searcher.where('Star Wars')
+      searcher.instance_variable_set(:@failed_attempts, 3)
 
       assert_raises(InquisitioError, "Search failed with status code 500") do
         searcher.search
@@ -221,12 +222,22 @@ module Inquisitio
       Excon.stub({}, lambda { |_| raise Excon::Errors::Timeout})
 
       searcher = Searcher.where('Star Wars')
+      searcher.instance_variable_set(:@failed_attempts, 3)
 
       assert_raises(InquisitioError) do
         searcher.search
       end
     end
 
+    def test_search_retries_when_failed_attempts_under_limit
+      Excon.expects(:get).raises(Excon::Errors::Timeout).times(3)
+
+      searcher = Searcher.where('Star Wars')
+      assert_raises(InquisitioError, "Search failed with status code 500") do
+        searcher.search
+      end
+    end
+
     def test_that_iterating_calls_results
       searcher = Searcher.where("star_wars")
       searcher.expects(results: [])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -30,14 +30,14 @@ dependencies:
   name: ruby_deep_clone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -58,42 +58,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -165,12 +165,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []