orangedata 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bbe36bb29c23434cf5617297214c579757bce08fc0612309ae4f9bb6adc344
-  data.tar.gz: 4b1126b0f5d8d555168b370e138a94d0e2ecce7366462008d72a6c02d2fdc841
+  metadata.gz: c9fa958e5956706463a6a2298893886987840b413bcea4cb4f3dc685df565ae9
+  data.tar.gz: '087c9d1118e082e5c0f190d28d7fb585e1c72b5c2cc4e1961af5ec9034316225'
 SHA512:
-  metadata.gz: 6b7064f4f7a8468d2b5b8b3c4feb6f95ae3376aa7c7470b72c834efde0d85bfe192a5952f686af3407a15dc51495f9fee00174530dcb13c01dbadedf1919e8b6
-  data.tar.gz: 12a46945f79c8e0cfb9043f5ae768652060292b1f5088fdf2ec49d3638c1251608abcf2f5e085b10df7c72a17b29b4252f5029a04ff4b4249bdc58c4f149738f
+  metadata.gz: 6039886a4592a56facf40e4a34b1d97b073c2b0f0e6c8325109ec2e8cbc3167ad507fe6aebd09c78bc4b624f07871cad74a7a2f3d305188ad4ce016bf525743a
+  data.tar.gz: 398d24f56636d6f54833c10251e9be3243877cd74a6dc4beea7573aceed0e0ddb9c5984c6b1bb0057d39fb5b1e229be513fc4b757a21944e079120d10abe5e49

data/.rubocop.yml

@@ -1,4 +1,6 @@
 AllCops:
+  NewCops: enable
+  SuggestExtensions: false
   # DefaultFormatter: fuubar
   # TargetRubyVersion: 2.1
   TargetRubyVersion: 2.3
@@ -6,8 +8,7 @@ AllCops:
     - 'spec/fixtures/**/*'
     - 'tmp/**/*'
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false
+Gemspec/RequiredRubyVersion: { Enabled: false }
 
 Metrics/LineLength:
   Max: 130
@@ -26,8 +27,7 @@ Metrics/MethodLength:
   Max: 20
   Enabled: false
 
-Metrics/ClassLength:
-  Enabled: false
+Metrics/ClassLength: { Enabled: false }
 
 Metrics/AbcSize:
   # Max: 50
@@ -46,10 +46,9 @@ Style/StringLiterals:
   Enabled: false
   # EnforcedStyle: double_quotes
 
-Style/RedundantReturn:
-  Enabled: false
+Style/RedundantReturn: { Enabled: false }
 
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/SpaceBeforeBlockBraces:
@@ -58,11 +57,8 @@ Layout/SpaceBeforeBlockBraces:
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
-Layout/SpaceAfterColon:
-  Enabled: false
-
-Layout/SpaceAroundOperators:
-  Enabled: false
+Layout/SpaceAfterColon: { Enabled: false }
+Layout/SpaceAroundOperators: { Enabled: false }
 
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
@@ -85,14 +81,11 @@ Layout/DotPosition:
   # so that code can be copied to console
   EnforcedStyle: trailing
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
-Layout/EmptyLines:
-  Enabled: false
-
-Style/AsciiComments:
-  Enabled: false
+Layout/EmptyLines: { Enabled: false }
+Style/AsciiComments: { Enabled: false }
 
 Style/Documentation:
   # TODO
@@ -104,10 +97,9 @@ Style/BlockDelimiters:
     - 'spec/**/*'
 
 # trailing commas make simpler diffs
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
+Style/TrailingCommaInHashLiteral: { Enabled: false }
+Style/TrailingCommaInArrayLiteral: { Enabled: false }
+Style/KeywordParametersOrder: { Enabled: false }
 
-Naming/AccessorMethodName:
-  Enabled: false
+Naming/AccessorMethodName: { Enabled: false }
+Naming/VariableNumber: { Enabled: false }

data/CHANGELOG.md

@@ -1,20 +1,25 @@
-# 0.0.9
+# Changelog
+
+## 0.0.10
+- Changed cashless print title per law change
+
+## 0.0.9
 
 - Added: Payment method names in schema
 - Added: credentials#certificate_subject
 - Added: `Receipt#as_json` and `.from_hash`
 
-# 0.0.8
+## 0.0.8
 
-- Fixed: return `nil` when document is not ready yet 
+- Fixed: return `nil` when document is not ready yet
 
-# 0.0.7
+## 0.0.7
 
 - data schema update to 2.23.0 (15.06.2019)
 - Added: load credentials from zip file via rubyzip (no dependency, only accept already opened object)
 - Added: Credentials#from_hash now accepts `key_pass` argument
 
-# 0.0.6
+## 0.0.6
 
 - data schema changes:
   - title attribute used for field names instead of description

data/Gemfile.lock

@@ -1,67 +1,95 @@
 PATH
   remote: .
   specs:
-    orangedata (0.0.9)
+    orangedata (0.0.10)
       faraday (>= 0.15)
       faraday_middleware
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.4.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    multipart-post (2.1.1)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    public_suffix (3.1.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    hashdiff (1.0.1)
+    json (2.6.2)
+    json-schema (3.0.0)
+      addressable (>= 2.8)
+    multipart-post (2.2.3)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    public_suffix (5.0.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    rubyzip (1.2.3)
-    safe_yaml (1.0.5)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.6.0)
-    webmock (3.6.0)
-      addressable (>= 2.3.6)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (2.3.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -69,10 +97,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  json-schema (~> 2.8)
+  bundler
+  json-schema (>= 2.8)
   orangedata!
-  rake (~> 10.0)
+  rake (>= 10.0)
   rspec
   rubocop
   rubyzip

data/Rakefile

@@ -28,11 +28,11 @@ namespace :swagger do
     new_definitions = swagger['definitions']
     old_definitions = OrangeData::PAYLOAD_SCHEMA['definitions']
 
-    if new_definitions.keys != old_definitions.keys
+    if new_definitions.keys == old_definitions.keys
+      puts "No top-level definitions changed"
+    else
       puts "New schema definitions: #{new_definitions.keys - old_definitions.keys}"
       puts "Removed schema definitions: #{old_definitions.keys - new_definitions.keys}"
-    else
-      puts "No top-level definitions changed"
     end
 
     new_definitions.each_pair do |key, new_schema|
@@ -40,13 +40,13 @@ namespace :swagger do
       next unless old_schema
 
       if old_schema['properties'].keys != new_schema['properties'].keys
-        if old_schema['properties'].keys.sort != new_schema['properties'].keys.sort
-          puts "\t#{key} added: #{new_schema['properties'].keys - old_schema['properties'].keys}"
-          puts "\t#{key} removed: #{old_schema['properties'].keys - new_schema['properties'].keys}"
-        else
+        if old_schema['properties'].keys.sort == new_schema['properties'].keys.sort
           puts "\t#{key} property order changed:"
           puts "\t\told:#{old_schema['properties'].keys}"
           puts "\t\tnew:#{new_schema['properties'].keys}"
+        else
+          puts "\t#{key} added: #{new_schema['properties'].keys - old_schema['properties'].keys}"
+          puts "\t#{key} removed: #{old_schema['properties'].keys - new_schema['properties'].keys}"
         end
         # else
         # TODO: deep compare

data/lib/orange_data/credentials.rb

@@ -18,11 +18,11 @@ module OrangeData
           h = { 'Modulus' => :n, 'Exponent' => :e }
           h.merge!('P' => :p, 'Q' => :q, 'DP' => :dmp1, 'DQ' => :dmq1, 'InverseQ' => :iqmp, 'D' => :d) if private?
 
-          "<RSAKeyValue>#{h.map{|(k, v)| "<#{k}>#{h_params[v.to_s]}</#{k}>" }.join('')}</RSAKeyValue>"
+          "<RSAKeyValue>#{h.map{|(k, v)| "<#{k}>#{h_params[v.to_s]}</#{k}>" }.join}</RSAKeyValue>"
         end
 
         def to_hash
-          params.map{|k, v| v != 0 && [k, Base64.strict_encode64(v.to_s(2))] || nil }.compact.to_h
+          params.map{|k, v| (v != 0 && [k, Base64.strict_encode64(v.to_s(2))]) || nil }.compact.to_h
         end
       end
 
@@ -78,7 +78,7 @@ module OrangeData
               end
             else
               # ruby 2.3 and may be older
-              key.params.keys.each do |param|
+              key.params.each_key do |param|
                 if (v = hash[param] || hash[param.to_sym])
                   key.send(:"#{param}=", OpenSSL::BN.new(Base64.decode64(v), 2))
                 end
@@ -205,9 +205,9 @@ module OrangeData
     end
 
     def certificate_subject
-      if subj = certificate.subject.to_a.select{|ent| ent.first == 'O' }.first
-        subj[1].force_encoding('UTF-8')
-      end
+      return unless (subj = certificate.subject.to_a.select{|ent| ent.first == 'O' }.first)
+
+      subj[1].force_encoding('UTF-8')
     end
 
     DEFAULT_KEY_LENGTH = 2048
@@ -225,14 +225,14 @@ module OrangeData
 
     def self.read_certs_from_pack(path, signature_key_name:nil, cert_key_pass:nil, title:nil, signature_key:nil)
       path = File.expand_path(path)
-      client_cert = Dir.glob(path + '/*.{crt}').select{|f| File.file?(f.sub(/.crt\z/, '.key')) }
+      client_cert = Dir.glob("#{path}/*.{crt}").select{|f| File.file?(f.sub(/.crt\z/, '.key')) }
       raise 'Expect to find exactly one <num>.crt with corresponding <num>.key file' unless client_cert.size == 1
 
       client_cert = client_cert.first
 
       unless signature_key
         # private_key_test.xml || rsa_\d+_private_key.xml
-        xmls = Dir.glob(path + '/*.{xml}').select{|f| f =~ /private/ }
+        xmls = Dir.glob("#{path}/*.{xml}").grep(/private/)
         signature_key = if xmls.size == 1
           File.read(xmls.first)
         else
@@ -260,7 +260,7 @@ module OrangeData
 
       unless signature_key
         # private_key_test.xml || rsa_\d+_private_key.xml
-        xmls = rubyzip_object.glob('/*.{xml}').select{|f| f =~ /private/ }
+        xmls = rubyzip_object.glob('/*.{xml}').grep(/private/)
         signature_key = if xmls.size == 1
           xmls.first.get_input_stream.read
         else

data/lib/orange_data/generated_attributes.rb

@@ -37,8 +37,8 @@ module OrangeData
         property_name = info["x-name"] || property.underscore
 
         if plain_types.include?(info["type"]) ||
-           info["type"].is_a?(Array) && plain_types.include?(info["type"].first) &&
-           info["type"].last == "null" && info["type"].size == 2
+           (info["type"].is_a?(Array) && plain_types.include?(info["type"].first) &&
+           info["type"].last == "null" && info["type"].size == 2)
           if info["x-enum"]
             inverse_map = info["x-enum"].map{|k, v| [v['val'], k.to_sym] }.to_h
 

data/lib/orange_data/receipt.rb

@@ -30,7 +30,7 @@ module OrangeData
         group: hash[:group] || hash['group'],
         key_name: hash[:key] || hash['key'],
         content: hash[:content] || hash['content'],
-        callback_url: hash[:callbackUrl] || hash['callbackUrl'],
+        callback_url: hash[:callbackUrl] || hash['callbackUrl']
       )
     end
 
@@ -68,7 +68,7 @@ module OrangeData
 
   class ReceiptContent < PayloadContent
     def initialize(payload={})
-      @payload = payload || {}
+      super(payload || {})
       # TODO: import...
       # TODO: taxationSystem default in checkclose
       @check_close = CheckClose.new(@payload['checkClose'])
@@ -118,12 +118,12 @@ module OrangeData
     def set_agent_info(**options)
       # agent info may have some validations/transformations, so
       agent_info = AgentInfo.new.assign_attributes(options)
-      assign_attributes(agent_info.attributes.reject{|_k, v| v.nil? })
+      assign_attributes(agent_info.attributes.compact)
     end
 
     class Position < PayloadContent
       def initialize(payload={})
-        @payload = payload
+        super(payload || {})
         @supplier_info = SupplierInfo.new(@payload['supplierInfo']) if @payload['supplierInfo']
         @agent_info = AgentInfo.new(@payload['agentInfo']) if @payload['agentInfo']
       end
@@ -160,9 +160,8 @@ module OrangeData
 
     class CheckClose < PayloadContent
       def initialize(payload={})
-        payload ||= {}
-        @payload = payload
-        @payments = (payload['payments'] || []).map{|p| Payment.new(p) }
+        super(payload || {})
+        @payments = (@payload['payments'] || []).map{|p| Payment.new(p) }
       end
 
       def to_hash
@@ -192,7 +191,7 @@ module OrangeData
 
   class ReceiptResult < PayloadContent
     def initialize(payload)
-      @payload = payload
+      super(payload)
       @content = ReceiptContent.new(@payload["content"])
     end
 
@@ -204,6 +203,7 @@ module OrangeData
     end
 
     attr_reader :content
+
     GeneratedAttributes.from_schema(self, PAYLOAD_SCHEMA["definitions"]["CheckStatusViewModel[CheckContent]"])
 
     def qr_code_content
@@ -248,7 +248,7 @@ module OrangeData
 
   class CorrectionResult < PayloadContent
     def initialize(payload)
-      @payload = payload || {}
+      super(payload || {})
       @content = CorrectionContent.new(@payload["content"] || {})
     end
 
@@ -260,6 +260,7 @@ module OrangeData
     end
 
     attr_reader :content
+
     GeneratedAttributes.from_schema(self, PAYLOAD_SCHEMA["definitions"]["CheckStatusViewModel[CheckContent]"])
   end
 

data/lib/orange_data/schema_definitions.yml

@@ -2,7 +2,12 @@
 info:
   version: '2.0'
   title: Nebula API v2
-  description: OpenApi-like definition for receipt schema with extensions and additions
+  description: |-
+    OpenApi-like definition for receipt schema with extensions and additions
+    Подробнее про поля имеет смысл смотреть в Приказ ФНС России от 21.03.2017 N ММВ-7-20/229@ (ред. от 22.10.2018)
+    "Об утверждении дополнительных реквизитов фискальных документов и форматов фискальных документов,
+    обязательных к использованию" (Зарегистрировано в Минюсте России 13.04.2017 N 46361)
+    (с изм. и доп., вступ. в силу с 01.01.2019)
 
 anyOf:
   - "$ref": "#definitions/CheckDocumentCreate[CheckContent]"
@@ -587,7 +592,7 @@ definitions:
           card:
             val: 2
             title: сумма по чеку электронными
-            print: Электронными 
+            print: Безналичными
             x-tag-id: 1081
           prepaid:
             val: 14

data/lib/orange_data/transport.rb

@@ -24,11 +24,12 @@ module OrangeData
       def initialize(app, signature_key)
         @app = app
         @signature_key = signature_key
+        super(app)
       end
 
       def call(env)
         if env.body
-          signature = @signature_key.sign(OpenSSL::Digest::SHA256.new, env.body)
+          signature = @signature_key.sign(OpenSSL::Digest.new('SHA256'), env.body)
           env.request_headers['X-Signature'] = Base64.strict_encode64(signature)
         end
         @app.call(env)
@@ -105,8 +106,8 @@ module OrangeData
 
         @transport.send(
           get_method,
-          @data.respond_to?(:inn) && @data.inn || @data[:inn] || @data["inn"],
-          @data.respond_to?(:id) && @data.id || @data[:id] || @data["id"]
+          (@data.respond_to?(:inn) && @data.inn) || @data[:inn] || @data["inn"],
+          (@data.respond_to?(:id) && @data.id) || @data[:id] || @data["id"]
         )
       end
     end

data/lib/orange_data/version.rb

@@ -2,6 +2,6 @@
 
 module OrangeData
 
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 
 end

data/orangedata.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday", ">=0.15"
   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 "bundler"
+  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 "rubyzip"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orangedata
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Vasily Fedoseyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,42 +42,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -184,7 +184,7 @@ homepage: https://github.com/Vasfed/orangedata
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Ruby client for orangedata.ru service
 test_files: []