atol 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dadf4b469fa9fa9b1489d00b72d057b28e3db6a8
-  data.tar.gz: 731afecf6097e8767443df85c6c13a919f415b2c
+SHA256:
+  metadata.gz: 6c445ed8e20835270102f2c0207d41b334966bfd854d08a40d6ac89f81ecaf31
+  data.tar.gz: 7965b5a7c98b1cf217473b97394546d7cb816122a96ea7a380c1c67943e8d403
 SHA512:
-  metadata.gz: eb8a892c606a28c653ba0e6bdeede5f9b96b895fe1430f80826dfd91af61126bb0b6a31ec4b261ece202da35ea1c1c0c6f624dd14daa3655192886ac020f6be9
-  data.tar.gz: 73e2c099851188b28784536d1755b49a8aad2cd706f6ece489e3d46d71972cb8d3eb42c3fa4e66fbdcca6533c22ec1e124d7d1244942d41e000c575d78f17e98
+  metadata.gz: 55dca0a0a86b40e5505d63fa15b0a25fe9546fb6cfe777da740e0134104cd829a3feb9311e592d5124f59805e9a1e517ba547cec27a15e2b595834c3017c3d8e
+  data.tar.gz: 37caec984ee3d2c4a1311e898e2ea55aa4a80f76142cff9b53b0b5190f129adc9ad389e77a3c28d911dd294d655ac3aba256b3ff66b212d0a4d08ae73e3739bc

data/.rubocop.yml

@@ -0,0 +1,10 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.5.0
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 125

data/.rubocop_todo.yml

@@ -0,0 +1,202 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-10-10 01:05:05 +0300 using RuboCop version 0.52.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/BlockEndNewline:
+  Exclude:
+    - 'spec/atol/request/post_document/sell/body_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: leading, trailing
+Layout/DotPosition:
+  Exclude:
+    - 'spec/atol/request/get_token_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'spec/atol/transaction/post_document_spec.rb'
+
+# Offense count: 34
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_braces
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/MultilineBlockLayout:
+  Exclude:
+    - 'spec/atol/request/post_document/sell/body_spec.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'spec/atol/request/get_token_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  Exclude:
+    - 'spec/atol/request/get_token_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    - 'lib/atol.rb'
+    - 'lib/atol/request.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/atol/request/post_document.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'lib/atol/transaction/get_token.rb'
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/atol/request/post_document/sell/body.rb'
+    - 'spec/atol/request/post_document_spec.rb'
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 22
+
+# Offense count: 16
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 193
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 125
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 20
+
+# Offense count: 3
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 9
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/BlockComments:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/atol/request/post_document/sell/body_spec.rb'
+
+# Offense count: 13
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'spec/atol/transaction/get_token_spec.rb'
+    - 'spec/atol/transaction/post_document_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'spec/factories/atol/config.rb'
+
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/atol/request/get_token.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'spec/atol/request/post_document_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/atol/request/post_document/item/body.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'spec/atol/request/get_document_state_spec.rb'
+    - 'spec/atol/request/get_token_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize, WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: brackets

data/.travis.yml

@@ -2,7 +2,11 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.0
-before_install: bundle install
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install -v 1.16.4 bundler --no-rdoc --no-ri
+  - bundle install
 cache: bundler
 script:
-  - rspec
+  - rubocop
+  - rspec

data/Gemfile

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
+gem 'rubocop', require: false
+
 group :test do
   gem 'coveralls', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atol (0.5.0)
+    atol (0.5.1)
       anyway_config (~> 1.0)
 
 GEM
@@ -76,7 +76,7 @@ DEPENDENCIES
   coveralls
   rake (~> 10.0)
   rspec (~> 3.0)
-  rubocop (~> 0.52)
+  rubocop
   webmock (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -30,9 +30,11 @@ $ bundle install
 
 Для обращения к сервису необходимы данные учетной записи.
 
-При инициализации приложение попытается найти необходимые параметры в константе ENV.
+При инициализации приложение попытается найти необходимые параметры в константе `ENV`.
 
-Для корректной инициализации потребуются следующие переменные окружения:
+Для корректной работы потребуются следующие переменные окружения.
+
+**Все переменные являются обязательными**.
 
 ```bash
 # .env
@@ -41,21 +43,58 @@ ATOL_LOGIN=example-login
 ATOL_PASSWORD=example-password
 ATOL_PAYMENT_ADDRESS="г. Москва, ул. Ленина, д.1 к.2"
 ATOL_GROUP_CODE=example-group-code
+ATOL_DEFAULT_SNO=esn
+ATOL_DEFAULT_TAX=vat18
+ATOL_CALLBACK_URL=https://www.example.com/callback_path
+ATOL_COMPANY_EMAIL=example@email.com
+ATOL_DEFAULT_PAYMENT_TYPE=1
 ```
 
-Для Rails-приложений так же можно создать файл инициализации и задать параметры непосредственно в коде:
+Значения `ATOL_INN`, `ATOL_LOGIN`, `ATOL_PASSWORD`, `ATOL_PAYMENT_ADDRESS` и `ATOL_GROUP_CODE` вы получаете при регистрации в сервисе.
+
+`ATOL_DEFAULT_SNO` - система налогообложения. Возможные значения:
+1) "osn" – общая СН;
+2) "usn_income" – упрощенная СН (доходы);
+3) "usn_income_outcome" – упрощенная СН (доходы минус расходы);
+4) "envd" – единый налог на вмененный доход;
+5) "esn" – единый сельскохозяйственный налог;
+6) "patent" – патентная СН.
+
+`ATOL_DEFAULT_TAX` - номер налога в ККТ. Возможные значения:
+1) "none" – без НДС;
+2) "vat0" – НДС по ставке 0%;
+3) "vat10" – НДС чека по ставке 10%;
+4) "vat18" – НДС чека по ставке 18%;
+5) "vat110" – НДС чека по расчетной ставке 10/110;
+6) "vat118" – НДС чека по расчетной ставке 18/118.
+
+`ATOL_CALLBACK_URL` - адрес, по которому сервис будет отправлять информацию после создания чека.
 
+`ATOL_DEFAULT_PAYMENT_TYPE` - вид оплаты. Возможные значения:
+1) "1" – электронный;
+2) "2" – "9" – расширенные типы оплаты. Для каждого фискального типа оплаты можно указать расширенный тип оплаты.
+
+`ATOL_COMPANY_EMAIL` - адрес электронной почты вашей компании.
+
+### Конфигурация в инициализаторе
+
+Для Rails-приложений так же можно создать файл инициализации и задать параметры непосредственно в коде:
 
 ```ruby
 # config/initializers/atol.rb
 
 Rails.application.config.after_initialize do
   Atol.config.tap do |config|
-    config.inn             = '123456789010'
-    config.login           = 'example-login'
-    config.password        = 'example-password'
-    config.payment_address = 'г. Москва, ул. Ленина, д.1 к.2'
-    config.group_code      = 'example-group-code'
+    config.inn                  = '123456789010'
+    config.login                = 'example-login'
+    config.password             = 'example-password'
+    config.payment_address      = 'г. Москва, ул. Ленина, д.1 к.2'
+    config.group_code           = 'example-group-code'
+    config.default_sno          = 'esn'
+    config.default_tax          = 'vat18'
+    config.callback_url         = 'https://www.example.com/callback_path'
+    config.company_email        = 'example@email.com'
+    config.default_payment_type = '1'
   end
 end
 ```

data/atol-rb.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'atol/version'

data/lib/atol.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'atol/version'
 require 'atol/config'
 require 'atol/request'
 require 'atol/transaction'
 
 module Atol
-  URL = "https://online.atol.ru/possystem/#{Atol::Version::API}".freeze
-  ENCODING = 'utf-8'.freeze
-  TIMESTAMP_FORMAT = '%d.%m.%Y %H:%M:%S'.freeze
+  URL = "https://online.atol.ru/possystem/#{Atol::Version::API}"
+  ENCODING = 'utf-8'
+  TIMESTAMP_FORMAT = '%d.%m.%Y %H:%M:%S'
 
   class << self
     attr_writer :config
@@ -16,4 +18,3 @@ module Atol
     end
   end
 end
-

data/lib/atol/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'anyway'
 require 'net/http'
 

data/lib/atol/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Atol
   class MissingConfigError < StandardError; end
   class AuthBadRequestError < StandardError; end

data/lib/atol/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/request/get_token'
 require 'atol/request/post_document'
-require 'atol/request/get_document_state'
+require 'atol/request/get_document_state'

data/lib/atol/request/get_document_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol'
 require 'atol/errors'
 require 'net/http'

data/lib/atol/request/get_token.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'atol'
 require 'atol/errors'
 
 module Atol
   module Request
     class GetToken
-      PATH = '/getToken'.freeze
+      PATH = '/getToken'
 
       def initialize(config: nil)
         @config = config || Atol.config

data/lib/atol/request/post_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol'
 require 'atol/errors'
 require 'atol/request/post_document/item/body'
@@ -35,7 +37,7 @@ module Atol
         res = http_client.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
-        
+
         @res_logger.call(res) if @res_logger.respond_to?(:call)
 
         res

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/errors'
 
 module Atol

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/errors'
 
 module Atol

data/lib/atol/transaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/transaction/get_token'
 require 'atol/transaction/post_document'
 require 'atol/transaction/get_document_state'

data/lib/atol/transaction/get_document_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/request/get_document_state'
 require 'atol/errors'
 
@@ -13,7 +15,7 @@ module Atol
       def call
         request = Atol::Request::GetDocumentState.new(@params)
         response = request.call
-        encoded_body = response.body.force_encoding(Atol::ENCODING)
+        encoded_body = response.body.dup.force_encoding(Atol::ENCODING)
         json = JSON.parse(encoded_body)
 
         if response.code == '200' && json['error'].nil?

data/lib/atol/transaction/get_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/request/get_token'
 require 'atol/errors'
 
@@ -10,28 +12,24 @@ module Atol
       end
 
       def call
-        @config.req_tries_number.times do |i|
+        @config.req_tries_number.times do
           request = Atol::Request::GetToken.new(config: @config)
           response = request.call
-          encoded_body = response.body.encode(Atol::ENCODING)
+          encoded_body = response.body.dup.force_encoding(Atol::ENCODING)
           json = JSON.parse(encoded_body)
 
           case response.code
           when '200'
             return json['token']
           when '400'
-            case json['code']
-            when 19
-              raise Atol::AuthUserOrPasswordError
-            when 17
-              raise Atol::AuthBadRequestError
-            end
+            raise Atol::AuthBadRequestError
+          when '401'
+            raise Atol::AuthUserOrPasswordError
           when '500'
             next
           end
+          raise "#{response.code} #{response.body}"
         end
-
-        raise "#{response.code} #{response.body}"
       end
     end
   end

data/lib/atol/transaction/post_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'atol/request/post_document'
 require 'atol/errors'
 
@@ -20,7 +22,7 @@ module Atol
       def call
         request = Atol::Request::PostDocument.new(@params)
         response = request.call
-        encoded_body = response.body.force_encoding(Atol::ENCODING)
+        encoded_body = response.body.dup.force_encoding(Atol::ENCODING)
         json = JSON.parse(encoded_body)
 
         if response.code == '200' && json['error'].nil?

data/lib/atol/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Atol
   module Version
-    API = 'v4'.freeze
-    LIB = '0.5.0'.freeze
+    API = 'v4'
+    LIB = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atol
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - GeorgeGorbanev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -103,6 +103,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ATOL KaaS client for Ruby