atol 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0571eec0780fb18eafe60b99e4c5786c8a3166
-  data.tar.gz: f1caad94cb03daed307d5c24f96665a157a5e82b
+  metadata.gz: 43777b45ecaae54c9ad99454f9281423d8793cbc
+  data.tar.gz: 867efae667bc6acc6e601e651711eaf8c1ba56e9
 SHA512:
-  metadata.gz: fb3aaa2101bf30f554c8216b439c675c584e91ec6649010544ae450a62dd601abfd1c89009709e542f4220548a297c89416b2ca33a1203a318fdb688e66c15f9
-  data.tar.gz: 8ce89512fa8ffb53d36cd69d32ca1c558a38ae5b7c6fbd3ec04ed3e36a11b7382355adb30f799de549aefab271a2292380836739f4c226830f9a994f934f0b8d
+  metadata.gz: 608913a36f029a07911c48003a7191bfa34de6c37942559605155b3e503add8a6a4113995af0208a9ec7a05943cd1c1a0d0105dd067698aec9fdc2f380357d4d
+  data.tar.gz: 849b133128f46db62b5b1707a5986bd90fe2346d6f017cb5716e1fd478b4df1df34523723a366e7b24613b29ec375943a358618ba611402b322371821ca02ab2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atol (0.3)
+    atol (0.4)
       anyway_config (~> 1.0)
 
 GEM
@@ -80,4 +80,4 @@ DEPENDENCIES
   webmock (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/README.md

@@ -5,11 +5,11 @@
 
 # atol-rb
 
-Пакет содержит набор классов для работы с [KaaS-сервисом АТОЛ-онлайн](https://online.atol.ru/) по [описанному протоколу](https://online.atol.ru/files/%D0%90%D0%A2%D0%9E%D0%9B%20%D0%9E%D0%BD%D0%BB%D0%B0%D0%B8%CC%86%D0%BD._%D0%9E%D0%BF%D0%B8%D1%81%D0%B0%D0%BD%D0%B8%D0%B5%20%D0%BF%D1%80%D0%BE%D1%82%D0%BE%D0%BA%D0%BE%D0%BB%D0%B0.pdf).
+Пакет содержит набор классов для работы с [KaaS-сервисом АТОЛ-онлайн](https://online.atol.ru/) по [описанному протоколу](https://online.atol.ru/files/ffd/API_AO_v4.pdf).
 
 ##### Совместимость
 
-Для корректной работы необходим интерпретатор Руби версии 2.2 и выше. Пакет работает с версией протокола v3.
+Для корректной работы необходим интерпретатор Руби версии 2.2 и выше. Пакет работает с версией протокола v4.
 
 
 ## Использование

data/lib/atol/request/get_document_state.rb

@@ -9,22 +9,17 @@ module Atol
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
         raise(Atol::MissingConfigError, 'group_code missing') if @config.group_code.nil?
-
-        @url = "#{Atol::URL}/#{@config.group_code}/report/#{uuid}?tokenid=#{token}"
-        @http_client = @config.http_client
+        @token = token
+        @uuid = uuid
       end
 
       def call
-        uri = URI(url)
-
-        http = @http_client.new(uri.host, uri.port)
+        http_client = @config.http_client
+        uri = URI("#{Atol::URL}/#{@config.group_code}/report/#{@uuid}")
+        http = http_client.new(uri.host, uri.port)
         http.use_ssl = true
-        http.get(uri.request_uri)
+        http.get(uri.request_uri, 'Token' => @token)
       end
-
-      private
-
-      attr_reader :url
     end
   end
 end

data/lib/atol/request/get_token.rb

@@ -27,16 +27,12 @@ module Atol
 
       def call
         uri = URI(Atol::URL + PATH)
-        uri.query = URI.encode_www_form(login: login, pass: password)
+        uri.query = URI.encode_www_form(login: @login, pass: @password)
 
         http = @http_client.new(uri.host, uri.port)
         http.use_ssl = true
         http.get(uri.request_uri)
       end
-
-      private
-
-      attr_reader :login, :password
     end
   end
 end

data/lib/atol/request/post_document/item/body.rb

@@ -6,20 +6,32 @@ module Atol
       module Item
         class Body
           def initialize(name:, price:, quantity: 1, config: nil)
-            @config = config || Atol.config
-
             raise Atol::ZeroItemQuantityError if quantity.to_i.zero?
 
-            @body = Hash[]
-            @body[:name] = name
-            @body[:price] = price.to_f
-            @body[:quantity] = quantity.to_f
-            @body[:sum] = (@body[:price] * @body[:quantity]).to_f.round(2)
-            @body[:tax] = @config.default_tax
+            @config = config || Atol.config
+            @name = name
+            @price = price.to_f
+            @quantity = quantity.to_f
           end
 
           def to_h
-            @body.clone
+            body.clone
+          end
+
+          def to_json
+            body.to_json
+          end
+
+          private
+
+          def body
+            @body ||= {
+              name: @name,
+              price: @price,
+              quantity: @quantity,
+              sum: (@price * @quantity).round(2),
+              tax: @config.default_tax
+            }
           end
         end
       end

data/lib/atol/request/post_document/sell/body.rb

@@ -8,20 +8,12 @@ module Atol
           def initialize(external_id:, phone: '', email: '', items:, config: nil)
             raise(Atol::EmptyClientContactError) if phone.empty? && email.empty?
             raise(Atol::EmptySellItemsError) if items.empty?
-            @config = config || Atol.config
-
-            @body = body_template
-            @body[:external_id] = external_id
-            @body[:receipt][:attributes][:email] = email unless email.empty?
-            @body[:receipt][:attributes][:phone] = phone unless phone.empty?
-            @body[:service][:callback_url] = @config.callback_url if @config.callback_url
 
-            total = items.inject(0) do |sum, item|
-              sum += item[:sum]
-            end
-
-            @body[:receipt][:total] = @body[:receipt][:payments][0][:sum] = total
-            @body[:receipt][:items] = items
+            @config = config || Atol.config
+            @external_id = external_id
+            @phone = phone
+            @email = email
+            @items = items
           end
 
           def to_h
@@ -34,28 +26,41 @@ module Atol
 
           private
 
-          attr_reader :config, :body
+          def body
+            @body ||= body_template.tap do |result|
+              result[:external_id] = @external_id
+              result[:receipt][:attributes][:email] = @email unless @email.empty?
+              result[:receipt][:attributes][:phone] = @phone unless @phone.empty?
+              result[:service][:callback_url] = @config.callback_url if @config.callback_url
+
+              total = @items.sum(0) { |item| item[:sum] }
+
+              result[:receipt][:total] = total
+              result[:receipt][:payments][0][:sum] = total
+              result[:receipt][:items] = @items
+            end
+          end
 
           def body_template
-            Hash[
+            {
               receipt: {
                 attributes: {
-                  sno: config.default_sno
+                  sno: @config.default_sno
                 },
                 items: [],
                 payments: [
                   {
                     sum: 0,
-                    type: config.default_payment_type
+                    type: @config.default_payment_type
                   }
                 ]
               },
               service: {
-                inn: config.inn.to_s,
-                payment_address: config.payment_address
+                inn: @config.inn.to_s,
+                payment_address: @config.payment_address
               },
               timestamp: Time.now.strftime(Atol::TIMESTAMP_FORMAT)
-            ]
+            }
           end
         end
       end

data/lib/atol/request/post_document.rb

@@ -7,7 +7,7 @@ module Atol
   module Request
     class PostDocument
       OPERATIONS = %i[sell sell_refund sell_correction buy buy_refund buy_correction].freeze
-      HEADERS = { 'Content-Type' => 'application/json' }.freeze
+      HEADERS = { 'Content-Type' => 'application/json; charset=utf-8' }.freeze
 
       def initialize(operation:, token:, body:, config: nil, req_logger: nil, res_logger: nil)
         @config = config || Atol.config
@@ -16,36 +16,30 @@ module Atol
         raise(Atol::MissingConfigError, 'group_code missing') if @config.group_code.empty?
         raise(Atol::UnknownOperationError, operation.to_s) unless OPERATIONS.include?(operation.to_sym)
 
-        @url = "#{Atol::URL}/#{@config.group_code}/#{operation}?tokenid=#{token}"
+        @operation = operation
+        @token = token
         @body = body
         @req_logger = req_logger
         @res_logger = res_logger
-        @http_client = @config.http_client
       end
 
       def call
-        uri = URI(url)
-        req = @http_client::Post.new(uri, HEADERS)
-        req.body = body
+        http_client = @config.http_client
+        uri = URI("#{Atol::URL}/#{@config.group_code}/#{@operation}")
+        req_headers = HEADERS.merge(Token: @token)
+        req = http_client::Post.new(uri, req_headers)
+        req.body = @body
 
-        if req_logger.respond_to?(:call)
-          req_logger.call(req)
-        end
+        @req_logger.call(req) if @req_logger.respond_to?(:call)
 
-        res = @http_client.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        res = http_client.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
-
-        if res_logger.respond_to?(:call)
-          res_logger.call(res)
-        end
+        
+        @res_logger.call(res) if @res_logger.respond_to?(:call)
 
         res
       end
-
-      private
-
-      attr_reader :url, :body, :req_logger, :res_logger
     end
   end
 end

data/lib/atol/transaction/get_document_state.rb

@@ -7,11 +7,11 @@ module Atol
       def initialize(uuid:, token:, config: nil)
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
-        @params = Hash[uuid: uuid, token: token, config: @config]
+        @params = { uuid: uuid, token: token, config: @config }
       end
 
       def call
-        request = Atol::Request::GetDocumentState.new(params)
+        request = Atol::Request::GetDocumentState.new(@params)
         response = request.call
         encoded_body = response.body.force_encoding(Atol::ENCODING)
         json = JSON.parse(encoded_body)
@@ -24,10 +24,6 @@ module Atol
           raise(encoded_body)
         end
       end
-
-      private
-
-      attr_reader :params
     end
   end
 end

data/lib/atol/transaction/get_token.rb

@@ -13,6 +13,7 @@ module Atol
         @config.req_tries_number.times do |i|
           request = Atol::Request::GetToken.new(config: @config)
           response = request.call
+          byebug
           encoded_body = response.body.encode(Atol::ENCODING)
           json = JSON.parse(encoded_body)
 

data/lib/atol/transaction/post_document.rb

@@ -7,18 +7,18 @@ module Atol
       def initialize(operation:, token:, body:, config: nil, req_logger: nil, res_logger: nil)
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
-        @params = Hash[
+        @params = {
           operation: operation,
           token: token,
           body: body,
           config: config,
           req_logger: req_logger,
           res_logger: res_logger
-        ]
+        }
       end
 
       def call
-        request = Atol::Request::PostDocument.new(params)
+        request = Atol::Request::PostDocument.new(@params)
         response = request.call
         encoded_body = response.body.force_encoding(Atol::ENCODING)
         json = JSON.parse(encoded_body)
@@ -31,10 +31,6 @@ module Atol
           raise(encoded_body)
         end
       end
-
-      private
-
-      attr_reader :params
     end
   end
 end

data/lib/atol/version.rb

@@ -1,6 +1,6 @@
 module Atol
   module Version
-    API = 'v3'.freeze
-    LIB = '0.3'.freeze
+    API = 'v4'.freeze
+    LIB = '0.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atol
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - GeorgeGorbanev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config