idempotent-request 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25467dbc0ee42d2648e2dd267edb23be7972a6af0ba2d233e21d455c663fc643
-  data.tar.gz: 4dc4e7373dce6370eb850134d25c164fd67ef5c54dc12c3585267d4774d1f58f
+  metadata.gz: d52f16d55268a056fc1a8239d3112fcc4ef621442e78f5f4100a6093d3279711
+  data.tar.gz: fd9bd7e9290369d1ec2e583eea23bd3ac41d2b1b143cff1faebcc3c65ab17565
 SHA512:
-  metadata.gz: 9af0cf3e406cbea6807cdfedc32110984ac63225dbe9ffe671cfcd8b842dd639db8e80ead393b1bbb7a14d6977f4edbe02aec913f4a5b2e41093a8cf12577c23
-  data.tar.gz: b54740669825c315a164fb42a4a58e54fd1ac1cc6e2802d3c40f4c8e5123bbfb9742e93f53f42667c392982e68784ff3721cb6123e7ea77b41cd4ca3ae762dca
+  metadata.gz: 55daca8c55cc835f24a72c94e72636c3935e27d223238c34fec6d5795fd7b1ec5e6bda6da277783ba3f97af68451356583cbffc02b65791cd6bee2518f4f5ce3
+  data.tar.gz: 04cf35af5be08d455d9aca35f5a41c7924b8d3934b47dec10fb8c0eb5a89555279d5e3d601b02d7ceb835781ef3598c0c442668862bae16c43418290fce81158

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Idempotent Request Changelog #
 
+## v0.1.3 ##
+
+* Fix an issue, when concurrent requests sent to an endpoint won't be protected by idempotency until the 1st request is finished
+
 ## v0.1.2 ##
 
 * Fix rack response

data/lib/idempotent-request/middleware.rb

@@ -14,12 +14,30 @@ module IdempotentRequest
     def process(env)
       set_request(env)
       return app.call(request.env) unless process?
-      storage = RequestManager.new(request, config)
-      storage.read || storage.write(*app.call(request.env))
+      read_idempotent_request ||
+        write_idempotent_request ||
+        concurrent_request_response
     end
 
     private
 
+    def storage
+      @storage ||= RequestManager.new(request, config)
+    end
+
+    def read_idempotent_request
+      storage.read
+    end
+
+    def write_idempotent_request
+      return unless storage.lock
+      storage.write(*app.call(request.env))
+    end
+
+    def concurrent_request_response
+      [429, {}, []]
+    end
+
     attr_reader :app, :env, :config, :request, :policy
 
     def process?

data/lib/idempotent-request/redis_storage.rb

@@ -8,14 +8,24 @@ module IdempotentRequest
       @expire_time = config[:expire_time]
     end
 
+    def lock(key)
+      setnx_with_expiration(lock_key(key), true)
+    end
+
     def read(key)
       redis.get(namespaced_key(key))
     end
 
     def write(key, payload)
+      setnx_with_expiration(namespaced_key(key), payload)
+    end
+
+    private
+
+    def setnx_with_expiration(key, data)
       redis.set(
-        namespaced_key(key),
-        payload,
+        key,
+        data,
         {}.tap do |options|
           options[:nx] = true
           options[:ex] = expire_time.to_i if expire_time.to_i > 0
@@ -23,10 +33,12 @@ module IdempotentRequest
       )
     end
 
-    private
+    def lock_key(key)
+      namespaced_key("lock:#{key}")
+    end
 
-    def namespaced_key(idempotency_key)
-      [namespace, idempotency_key.strip]
+    def namespaced_key(key)
+      [namespace, key.strip]
         .compact
         .join(':')
         .downcase

data/lib/idempotent-request/request_manager.rb

@@ -8,6 +8,10 @@ module IdempotentRequest
       @callback = config[:callback]
     end
 
+    def lock
+      storage.lock(key)
+    end
+
     def read
       status, headers, response = parse_data(storage.read(key)).values
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IdempotentRequest
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idempotent-request
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dmytro Zakharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rack middleware ensuring at most once requests for mutating endpoints.