orangedata 0.0.2 → 0.0.3

data/lib/orange_data/transport.rb

@@ -55,21 +55,31 @@ module OrangeData
       transport.post(method, data)
     end
 
+    def post_request(method, data)
+      raw_post(method, data).tap{|resp|
+        if resp.status == 401
+          # TODO: better exceptions
+          raise 'Unauthorized'
+        end
+      }
+    end
+
     def post_entity(sub_url, data)
-      res = raw_post(sub_url, data)
+      res = post_request(sub_url, data)
 
       case res.status
       when 201
         return true
-      when 401
-        raise 'Unauthorized'
       when 409
         raise "Conflict"
       when 400
-        raise "Invalid doc: #{res.body}"
-      else
-        raise "Unknown code from OD: #{res.status} #{res.reason_phrase} #{res.body}"
+        raise "Invalid doc: #{res.body["errors"] || res.body}"
+      when 503
+        if res.headers['Retry-After']
+          raise "Document queue full, retry in #{res.headers['Retry-After']}"
+        end
       end
+      raise "Unknown code from OD: #{res.status} #{res.reason_phrase} #{res.body}"
     end
 
     def get_entity(sub_url)
@@ -79,7 +89,7 @@ module OrangeData
       when 200
         return res.body
       when 400
-        raise "Cannot get doc: #{res.body}"
+        raise "Cannot get doc: #{res.body["errors"] || res.body}"
       when 401
         raise 'Unauthorized'
       end
@@ -95,15 +105,13 @@ module OrangeData
     end
 
     def post_document_validate(data)
-      res = raw_post 'validateDocument', data
+      res = post_request 'validateDocument', data
 
       case res.status
       when 200
         return true
       when 400
-        return res.body
-      when 401
-        raise 'Unauthorized'
+        return res.body["errors"]
       else
         raise "Unexpected response: #{res.status} #{res.reason_phrase}"
       end
@@ -114,7 +122,7 @@ module OrangeData
     end
 
     def get_document(inn, document_id)
-      get_entity "documents/#{inn}/status/#{document_id}"
+      ReceiptResult.from_hash(get_entity("documents/#{inn}/status/#{document_id}"))
     end
 
     def post_correction(data)

data/lib/orange_data/version.rb

@@ -2,6 +2,6 @@
 
 module OrangeData
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
 end

data/lib/orange_data.rb

@@ -3,19 +3,11 @@
 require "orange_data/version"
 require "orange_data/credentials"
 require "orange_data/transport"
+require "orange_data/receipt"
 
 # top-level namespace
 module OrangeData
 
-  # QR:  t=20180518T220500&s=975.88&fn=8710000101125654&i=99456&fp=1250448795&n=1
-  #
 
-  # - t=<date/time - дата и время осуществления расчета в формате ГГГГММДДТЧЧММ>
-  # - s=<сумма расчета в рублях и копейках, разделенных точкой>
-  # - fn=<заводской номер фискального накопителя>
-  # - i=<порядковый номер фискального документа, нулями не дополняется>
-  # - fp=<фискальный признак документа, нулями не дополняется>
-  # - n=<признак расчета>.
-  # Пример строки QR-кода: t=20150720T1638&s=9999999.00&fn=000110000105&i=12345678&fp=123456&n=2
 
 end

data/orangedata.gemspec

@@ -29,8 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday_middleware"
 
   spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "json-schema", "~> 2.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orangedata
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +158,7 @@ files:
 - lib/orange_data/credentials.rb
 - lib/orange_data/credentials_test.yml
 - lib/orange_data/receipt.rb
+- lib/orange_data/schema_definitions.yml
 - lib/orange_data/transport.rb
 - lib/orange_data/version.rb
 - lib/orangedata.rb