elastomer-client 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d22300f2c0a799c8b2253f60928f24d7da61e39
-  data.tar.gz: 19e135b931dece3946b68469ad52f56dcb9b8271
+  metadata.gz: 900eb1195a08a9969b4e7f4565cffecdbe708e48
+  data.tar.gz: a509b8be56e561d48c40e308a5c7886d9ba1ce0e
 SHA512:
-  metadata.gz: cebdfe02683dee2502e7beb39040dc876884d44656b2f0f5a0aa071621cd6c89be23a39c88b2b0185bc1035c76f01dd42748e1b5cdd14a13ecf5fa1c93696b7f
-  data.tar.gz: 06bbcedac35ee8a1a947b3fcb87c6e451d05d03f390971f5de678c3298b1924414e22cc062459ef378d872134a8d36b5f92cbb903d9c35b7aa923f8055b1d977
+  metadata.gz: 03f8c87cf315cd325bebe44e1fc01ed4d887cbbff374be50a6610f79aaffd8ffcbf0c2e7039f00d1c4f9abd6c58ecb0550414c014e3ab0a48e8f773f4d705738
+  data.tar.gz: 46e183c77bb89b5c9dd040f5f3766fd5a8c8a534c31ccb828ed3aa5bab0c984649a3876bde35b3ba1f1f0129d2e336793a6abd6444e570a370dbddcb6c6741c8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.1 (2018-02-24)
+- Output opaque ID information when a conflict is detected
+- Updating the `semantic` gem
+
 ## 3.1.0 (2018-01-19)
 - Added the `strict_params` flag for enforcing params passed to the REST API
 - Added the `RestApiSpec` module and classes for enforcing strict params

data/lib/elastomer/middleware/opaque_id.rb

@@ -32,8 +32,10 @@ module Elastomer
         env[:request_headers][X_OPAQUE_ID] = uuid
 
         @app.call(env).on_complete do |renv|
-          if uuid != renv[:response_headers][X_OPAQUE_ID]
-            raise ::Elastomer::Client::OpaqueIdError, "conflicting 'X-Opaque-Id' headers"
+          response_uuid = renv[:response_headers][X_OPAQUE_ID]
+          if uuid != response_uuid
+            raise ::Elastomer::Client::OpaqueIdError,
+                  "Conflicting 'X-Opaque-Id' headers: request #{uuid.inspect}, response #{response_uuid.inspect}"
           end
         end
       end

data/lib/elastomer/version.rb

@@ -1,5 +1,5 @@
 module Elastomer
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 
   def self.version
     VERSION

data/test/middleware/opaque_id_test.rb

@@ -37,4 +37,31 @@ describe Elastomer::Middleware::OpaqueId do
     assert_raises(Elastomer::Client::OpaqueIdError) { @client.cluster.state }
   end
 
+  it 'generates a UUID per call' do
+    opaque_id = Elastomer::Middleware::OpaqueId.new
+
+    uuid1 = opaque_id.generate_uuid
+    uuid2 = opaque_id.generate_uuid
+
+    assert uuid1 != uuid2, "UUIDs should be unique"
+  end
+
+  it 'generates a UUID per thread' do
+    opaque_id = Elastomer::Middleware::OpaqueId.new
+    uuids = []
+    threads = []
+
+    3.times do
+      threads << Thread.new { uuids << opaque_id.generate_uuid }
+    end
+    threads.each { |t| t.join }
+
+    assert_equal 3, uuids.length, "expecting 3 UUIDs to be generated"
+
+    # each UUID has 16 random characters as the base ID
+    uuids.each { |uuid| assert_match(%r/\A[a-zA-Z0-9_-]{16}0{8}\z/, uuid) }
+
+    bases = uuids.map { |uuid| uuid[0,16] }
+    assert_equal 3, bases.uniq.length, "each thread did not get a unique base ID"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable