idempotent-request 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5cebd804243368dfc14a6199bd3d51f40ebaa149cf697e1793a63f6559f2de23
-  data.tar.gz: 0a9082b74528e9fb15a5fe8981755d004cc325d9a8fa9373acd94352b62335a6
+SHA1:
+  metadata.gz: 1408d4cc1f8842db0668e7a857a9d0dc461f0d82
+  data.tar.gz: f26a1f4dd85c156717b08bd308df2dcfc1c07706
 SHA512:
-  metadata.gz: f5917e4b4f23d74fa2bfcc4b5a2faef9c140a3b77f8b69c63b8d0cac10dab638bbe3b04d842b0a6a8ec54350251717f72a41004078d30d3c53bf7f229def6188
-  data.tar.gz: 9bb5f2d94fc04a58fcd6118312622eaa7211c189461a4dd28491b0b433b8a90b22a7fcfa9c21a499239e76cf59cea6f8aab4a05198fd2cc808c8d7b441d4e21d
+  metadata.gz: 37d1cb66a774f725ebceb176ec8ac013f8699b87983a8dc64d78beb32a8864fb9dcf93857a6e463f45d75f885c0bf6d4718e54d07dc5403c60e0566333473b52
+  data.tar.gz: 8289a677da35316332fe57eb6167e412aaff6078d1aa4ed2a6813b715bda991c0e41c311f2b890ce8f5e68840959fb23b9fed14ec8f6e8d602fee513bd4e1d5c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Idempotent Request Changelog #
 
+## v0.1.4 ##
+
+* Fix an issue, when http response from backend != 200..226 caused lock to be taken
+
 ## 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

data/idempotent-request.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'fakeredis', '~> 0.6'
-  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'byebug', '~> 10.0'
 end

data/lib/idempotent-request/middleware.rb

@@ -4,6 +4,7 @@ module IdempotentRequest
       @app = app
       @config = config
       @policy = config.fetch(:policy)
+      @notifier = ActiveSupport::Notifications if defined?(ActiveSupport::Notifications)
     end
 
     def call(env)
@@ -13,10 +14,12 @@ module IdempotentRequest
 
     def process(env)
       set_request(env)
+      request.env['idempotent.request'] = {}
       return app.call(request.env) unless process?
-      read_idempotent_request ||
-        write_idempotent_request ||
-        concurrent_request_response
+      request.env['idempotent.request']['key'] = request.key
+      response = read_idempotent_request || write_idempotent_request || concurrent_request_response
+      instrument(request)
+      response
     end
 
     private
@@ -26,19 +29,30 @@ module IdempotentRequest
     end
 
     def read_idempotent_request
-      storage.read
+      request.env['idempotent.request']['read'] = storage.read
     end
 
     def write_idempotent_request
       return unless storage.lock
-      storage.write(*app.call(request.env))
+      begin
+        result = app.call(request.env)
+        request.env['idempotent.request']['write'] = result
+        storage.write(*result)
+      ensure
+        request.env['idempotent.request']['unlocked'] = storage.unlock
+        result
+      end
     end
 
     def concurrent_request_response
-      [429, {}, []]
+      status = 429
+      headers = { 'Content-Type' => 'application/json' }
+      body = [ Oj.dump('error' => 'Concurrent requests detected') ]
+      request.env['idempotent.request']['concurrent_request_response'] = true
+      Rack::Response.new(body, status, headers).finish
     end
 
-    attr_reader :app, :env, :config, :request, :policy
+    attr_reader :app, :env, :config, :request, :policy, :notifier
 
     def process?
       !request.key.to_s.empty? && should_be_idempotent?
@@ -49,6 +63,10 @@ module IdempotentRequest
       policy.new(request).should?
     end
 
+    def instrument(request)
+      notifier.instrument('idempotent.request', request: request) if notifier
+    end
+
     def set_request(env)
       @env = env
       @request ||= Request.new(env, config)

data/lib/idempotent-request/redis_storage.rb

@@ -9,7 +9,7 @@ module IdempotentRequest
     end
 
     def lock(key)
-      setnx_with_expiration(lock_key(key), true)
+      setnx_with_expiration(lock_key(key), Time.now.to_f)
     end
 
     def unlock(key)

data/lib/idempotent-request/request.rb

@@ -22,10 +22,9 @@ module IdempotentRequest
     private
 
     def header_name
-      key = @header_name
-        .to_s
-        .upcase
-        .gsub('-', '_')
+      key = @header_name.to_s
+                        .upcase
+                        .tr('-', '_')
 
       key.start_with?('HTTP_') ? key : "HTTP_#{key}"
     end

data/lib/idempotent-request/request_manager.rb

@@ -30,8 +30,6 @@ module IdempotentRequest
 
       if (200..226).cover?(status)
         storage.write(key, payload(status, headers, response))
-      else
-        unlock
       end
 
       data
@@ -46,11 +44,9 @@ module IdempotentRequest
     end
 
     def payload(status, headers, response)
-      Oj.dump({
-        status: status,
-        headers: headers.to_h,
-        response: Array(response)
-      })
+      Oj.dump(status: status,
+              headers: headers.to_h,
+              response: Array(response))
     end
 
     def run_callback(action, args)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IdempotentRequest
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idempotent-request
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dmytro Zakharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '10.0'
 description: 
 email:
 - dmytro@qonto.eu
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rack middleware ensuring at most once requests for mutating endpoints.