loquor 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699e2b00b4ee1162574675896d215c952652901d
-  data.tar.gz: 89dc1db3265fd242b06562ace2eb27f8e2cb4af3
+  metadata.gz: 632149903ddd90cf5dc6edaede05ac490317090c
+  data.tar.gz: a523cf47111b39b1086a8f378316bac2fbf78a6d
 SHA512:
-  metadata.gz: 8911399fba9e05bdce37fa853a55f93a743c2ed31ab7741f93c292179ffe8da2d4c43dc95944e82311d85716d0dba46a16688033588cfb420fc1c64645010a3a
-  data.tar.gz: 02668ec5bdc32239fc620dca4160dfc6eafcc47c8eb372edab5ea769f45289a743e749f14d00cf038fd445b85a768159c432c86a4b7270e8e14923e06a0434dd
+  metadata.gz: ddd8547f47aab0d704b909488c4a59cf569ad7b9bccefb8fb95f313b2aeb7adb1b6b774fe6153c523cecf81d5fdace2dfa7a873f260623ceac00658fced90192
+  data.tar.gz: 43e207ddc2425f44db2a8bc6138b67bff3853b7d6155c61a343d3ab8a4ab41fd22fa59fe87511abcbdade03a5d60a8e1b4658d195903438072fa5265e2bdafba

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.5.0 / 2014-02-27
+* [FEATURE] Add retry support for 404s
+
 # 1.4.0 / 2014-02-22
 * [FEATURE] Use Filum v2.
 

data/lib/loquor/api_calls/show.rb

@@ -7,12 +7,22 @@ module Loquor
     end
 
     def execute
-      obj = if (klass.cache)
-        Loquor.get("#{klass.path}/#{@id}", cache=klass.cache)
-      else
-        Loquor.get("#{klass.path}/#{@id}")
+      begin
+        get_data
+      rescue RestClient::ResourceNotFound
+        if Loquor.config.retry_404s
+          sleep(1)
+          get_data
+        else
+          raise
+        end
       end
-      @klass.new(obj)
+    end
+
+    private
+    def get_data
+      options = {cache: klass.cache}
+      klass.new Loquor.get("#{klass.path}/#{@id}", options)
     end
   end
 end

data/lib/loquor/client.rb

@@ -6,9 +6,9 @@ module Loquor
       @config = Configuration.new
     end
 
-    def get(url, cache=nil)
+    def get(url, options = {})
       deps = {config: @config}
-      deps[:should_cache] = cache if cache
+      deps[:should_cache] = options[:cache] if options[:cache]
       HttpAction::Get.get(url, deps)
     end
 

data/lib/loquor/configuration.rb

@@ -7,7 +7,7 @@ module Loquor
   class Configuration
 
     SETTINGS = [
-      :logger, :access_id, :secret_key, :endpoint, :substitute_values
+      :logger, :access_id, :secret_key, :endpoint, :substitute_values, :retry_404s
     ]
 
     attr_writer *SETTINGS
@@ -16,6 +16,7 @@ module Loquor
     def initialize
       self.logger = Filum.logger
       self.substitute_values = {}
+      self.retry_404s = false
     end
 
     SETTINGS.each do |setting|
@@ -27,8 +28,9 @@ module Loquor
     private
 
     def get_or_raise(setting)
-      instance_variable_get("@#{setting.to_s}") ||
-        raise(LoquorConfigurationError.new("Configuration for #{setting} is not set"))
+      val = instance_variable_get("@#{setting.to_s}")
+      raise(LoquorConfigurationError.new("Configuration for #{setting} is not set")) if val.nil?
+      val
     end
   end
 end

data/lib/loquor/version.rb

@@ -1,3 +1,3 @@
 module Loquor
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/api_calls/show_test.rb

@@ -9,21 +9,41 @@ module Loquor
 
     class CachedResource < Resource
       self.path = '/cached'
-      self.cache = true      
+      self.cache = true
     end
 
     def test_request_correct_path
       show = ApiCall::Show.new(NormalResource, 42)
-      Loquor.expects(:get).with('/normal/42').returns({}.to_json)
+      Loquor.expects(:get).with('/normal/42', {cache: nil}).returns({}.to_json)
       show.execute
     end
-    
+
     def test_request_correct_path_for_cachable_resources
       show = ApiCall::Show.new(CachedResource, 42)
-      Loquor.expects(:get).with('/cached/42', cache=true).returns({}.to_json)
+      Loquor.expects(:get).with('/cached/42', {cache: true}).returns({}.to_json)
       show.execute
     end
 
+    def test_should_retry_for_404_if_configured
+      Loquor.config.retry_404s = true
+      Loquor.expects(:get).twice.raises(RestClient::ResourceNotFound)
+
+      show = ApiCall::Show.new(CachedResource, 42)
+      assert_raises(RestClient::ResourceNotFound) do
+        show.execute
+      end
+    end
+
+    def test_should_not_retry_for_404_if_configured
+      Loquor.config.retry_404s = false
+      Loquor.expects(:get).once.raises(RestClient::ResourceNotFound)
+
+      show = ApiCall::Show.new(CachedResource, 42)
+      assert_raises(RestClient::ResourceNotFound) do
+        show.execute
+      end
+    end
+
     def test_response_is_a_representation
       show = ApiCall::Show.new(Resource, 1)
       Loquor.stubs(get: {foo: 'bar'}.to_json)

data/test/client_test.rb

@@ -35,7 +35,7 @@ module Loquor
       HttpAction::Post.expects(:post).with(url, payload, deps)
       client.post(url, payload)
     end
-    
+
 
     def test_get_calls_gets_with_cache_flag
       url = "foobar"
@@ -43,7 +43,7 @@ module Loquor
       client = Client.new
       deps = {config: client.config, should_cache: true}
       HttpAction::Get.expects(:get).with(url, deps)
-      client.get(url, cache=true)
+      client.get(url, cache: true)
     end
   end
 end

data/test/configuration_test.rb

@@ -37,6 +37,22 @@ module Loquor
       assert_equal endpoint, Loquor.config.endpoint
     end
 
+    def test_retry_404s_should_be_false_by_default
+      assert_equal false, Loquor.config.retry_404s
+    end
+
+    def test_retry_404s_should_set_to_false
+      retry_404s = false
+      Loquor.config.retry_404s = retry_404s
+      assert_equal retry_404s, Loquor.config.retry_404s
+    end
+
+    def test_retry_404s_should_set_to_false
+      retry_404s = true
+      Loquor.config.retry_404s = retry_404s
+      assert_equal retry_404s, Loquor.config.retry_404s
+    end
+
     def test_substitute_values
       substitute_values = {foo: 'bar'}
       Loquor.config.substitute_values = substitute_values

data/test/http_actions/get_test.rb

@@ -47,7 +47,7 @@ module Loquor
       gets.expects(execute_against_cache: json)
       assert_equal output, gets.get
     end
-    
+
     def test_cache_hit
       url = "/resource"
       full_url = "#{@endpoint}#{url}"
@@ -58,10 +58,10 @@ module Loquor
     end
 
     def test_execute_http_call_on_cache_miss
-      url = "/resource" 
+      url = "/resource"
       full_url = "#{@endpoint}#{url}"
       json_response = "{}"
-      
+
       @cache.expects(:get).with(full_url).returns(nil)
       @cache.expects(:set).with(full_url, json_response)
 
@@ -72,7 +72,7 @@ module Loquor
 
     def test_does_not_cache_when_no_cache_configured
       json_response = "{}"
-      
+
       @cache = nil
       gets = HttpAction::Get.new("", deps.merge({should_cache: true}))
       gets.expects(execute: json_response)

data/test/resource_test.rb

@@ -23,7 +23,7 @@ module Loquor
 
     def test_find_should_get_correct_path_with_simple_path
       id = 8
-      Loquor.expects(:get).with("/foobar/#{id}")
+      Loquor.expects(:get).with("/foobar/#{id}", {cache: nil})
       Foobar.find(id)
     end
 

data/test/test_helper.rb

@@ -12,6 +12,7 @@ require "loquor"
 class Minitest::Test
   def setup
     Filum.setup("./log/test.log")
+    Loquor.instance_variable_set :@config, nil
     Loquor.config do |config|
       config.access_id = "Sermo"
       config.secret_key = "foobar"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loquor
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filum