orangedata 0.0.5 → 0.0.6

data/lib/orange_data/transport.rb

@@ -64,22 +64,79 @@ module OrangeData
       }
     end
 
-    def post_entity(sub_url, data)
+    class IntermediateResult
+      def initialize(
+        success:false, sub_url:nil, data:,
+        attempt_retry:false, retry_in:nil, retry_count:0, transport:nil,
+        errors:nil
+      )
+        @success = success
+        @sub_url = sub_url
+        @data = data
+        @attempt_retry = attempt_retry
+        @retry_in = retry_in
+        @retry_count = retry_count
+        @transport = transport
+        @errors = errors
+      end
+
+      attr_reader :retry_in, :errors, :retry_count
+
+      def success?
+        @success == true
+      end
+
+      def should_retry?
+        @attempt_retry || false
+      end
+
+      def retry
+        raise "not-retriable" unless should_retry?
+        @transport.post_entity(@sub_url, @data, raise_errors:false, result_class:self.class, retry_count:(retry_count + 1))
+      end
+
+      protected
+      def get_result_with get_method
+        raise "Non-success" unless success?
+        @transport.send(get_method,
+          @data.respond_to?(:inn) && @data.inn || @data[:inn] || @data["inn"],
+          @data.respond_to?(:id) && @data.id || @data[:id] || @data["id"],
+        )
+      end
+    end
+
+    class ReceiptIntermediateResult < IntermediateResult
+      def get_result
+        get_result_with(:get_document)
+      end
+    end
+
+    class CorrectionIntermediateResult < IntermediateResult
+      def get_result
+        get_result_with(:get_correction)
+      end
+    end
+
+    def post_entity(sub_url, data, raise_errors:true, result_class:IntermediateResult, retry_count:0)
       res = post_request(sub_url, data)
 
       case res.status
       when 201
-        return true
+        return result_class.new(success: true, data:data, sub_url:sub_url, retry_count:0, transport:self)
       when 409
-        raise "Conflict"
+        raise "Conflict" if raise_errors
+        return result_class.new(data:data, sub_url:sub_url, errors:["Duplicate id"], retry_count:0)
       when 400
-        raise "Invalid doc: #{res.body['errors'] || res.body}"
+        raise "Invalid doc: #{res.body['errors'] || res.body}" if raise_errors
+        return result_class.new(data:data, sub_url:sub_url, errors:res.body['errors'], retry_count:0)
       when 503
         if res.headers['Retry-After']
-          raise "Document queue full, retry in #{res.headers['Retry-After']}"
+          raise "Document queue full, retry in #{res.headers['Retry-After']}" if raise_errors
+          return result_class.new(attempt_retry:true, retry_in:res.headers['Retry-After'].to_i, data:data, sub_url:sub_url, retry_count:0, transport:self)
         end
       end
-      raise "Unknown code from OD: #{res.status} #{res.reason_phrase} #{res.body}"
+      raise "Unknown code from OD: #{res.status} #{res.reason_phrase} #{res.body}" if raise_errors
+      result_class.new(attempt_retry:true, data:data, sub_url:sub_url, retry_count:0, transport:self)
     end
 
     def get_entity(sub_url)
@@ -117,16 +174,16 @@ module OrangeData
       end
     end
 
-    def post_document(data)
-      post_entity 'documents', data
+    def post_document(data, raise_errors:true)
+      post_entity 'documents', data, raise_errors:raise_errors, result_class:ReceiptIntermediateResult
     end
 
     def get_document(inn, document_id)
       ReceiptResult.from_hash(get_entity("documents/#{inn}/status/#{document_id}"))
     end
 
-    def post_correction(data)
-      post_entity 'corrections', data
+    def post_correction(data, raise_errors:true)
+      post_entity 'corrections', data, raise_errors:raise_errors, result_class:CorrectionIntermediateResult
     end
 
     def get_correction(inn, document_id)

data/lib/orange_data/version.rb

@@ -2,6 +2,6 @@
 
 module OrangeData
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orangedata
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -147,6 +147,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -164,6 +165,7 @@ files:
 - lib/orange_data/version.rb
 - lib/orangedata.rb
 - orangedata.gemspec
+- tmp/.keep
 homepage: https://github.com/Vasfed/orangedata
 licenses:
 - MIT