quintype 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0287b1b423facb37184a57dba69a5d6d55ab51cf'
-  data.tar.gz: ecab515fafee3dd23ba15b0b24cc36acc8efbabd
+  metadata.gz: 24fc217ce09f1cb4bdefb0799585ef30f769c9ba
+  data.tar.gz: 5c3941c16e5b841dd1571a75511d6b237b74c299
 SHA512:
-  metadata.gz: 17e34a6cd0641bef5cbb90ba1c8922400dcc1c0ecfed3d375daec1c050384e7c036bedd0e56610f9fcfdbb8943ad2018724c41ce42b21bde11b480e5ee53106e
-  data.tar.gz: be0da5cc89a320bc48cf11b2d72804a797c3370552ca289125da5bb5408f395f3dafa1dc23efb7b6da13907daf04eae04f12e175a97aabee02bf92d448f09be7
+  metadata.gz: c1ea1563227cf39ba704d99b17fa0d7ae852fab8f76c38782d29f69a290f5bfcbeed217000aeb11c59c116570cc220dba3b36b1ceab6451e6b18b1204529526b
+  data.tar.gz: 824c94d1f7eb35547e84f235d5a5e3529b6e55aa1ece322ebc6d2fb5540e55faebb0ae05cf79eced3e7ed7a01ddac9e1e1716fd239e187e63d7ba4f0ec89137b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quintype (0.0.10)
+    quintype (0.0.11)
       activesupport (~> 4.2)
       faraday (~> 0.9)
 

data/lib/quintype/api.rb

@@ -25,18 +25,26 @@ class API
     end
 
     def bulk_cached(params)
+      response_body = nil # Used in case of manticore auto following redirect. Ugly side effect
+
       location = @@bulk_cache.fetch(params) do |params|
         response = @@conn.post(@@api_base + "bulk-request", params) do |request|
           request.headers['Content-Type'] = 'application/json'
           request.body = params.to_json
         end
+
         if response.status == 303 && response.headers["Location"]
           response.headers["Location"]
+        elsif response.status == 200 && response.headers["Content-Location"]
+          response_body = keywordize(JSON.parse(response.body))
+          log_warning("The faraday adapter is configured to follow redirects by default. Using the Content-Location header")
+          response.headers["Content-Location"]
         else
           raise "Did not recieve a location header, status #{response.status}"
         end
       end
-      _get(location.sub(/^\/api\//, ""))
+
+      response_body || _get(location.sub(/^\/api\//, ""))
     end
 
     def config
@@ -265,5 +273,10 @@ class API
     def make_fields(arr)
       arr.join(',') if arr.present?
     end
+
+    def log_warning(*args)
+      return unless defined?(Rails)
+      Rails.logger.warn(*args)
+    end
   end
 end

data/quintype.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'quintype'
-  s.version     = '0.0.10'
+  s.version     = '0.0.11'
   s.date        = '2016-02-19'
   s.summary     = "quintype!"
   s.platform    = Gem::Platform::RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quintype
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - ''