orangedata 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3f00247b5383fe2991dc28a4df82a5fa53b04c9606a9fa0d8002f3e95d53b3
-  data.tar.gz: f674045c5658c4b2e72b5e691bd0730e580af2584780ea7b942d4183d223720f
+  metadata.gz: 69bbe36bb29c23434cf5617297214c579757bce08fc0612309ae4f9bb6adc344
+  data.tar.gz: 4b1126b0f5d8d555168b370e138a94d0e2ecce7366462008d72a6c02d2fdc841
 SHA512:
-  metadata.gz: 8d77cf5381bb8c440b7031c50e59c702b59c63e74614c9a45a07e301c7c65d89e24df17ed603b531be25485180fe1690cf9ff63ebb48f52309bb16b9807548cf
-  data.tar.gz: 9b1ebfa297779c6fa80e1fd59b4ad654ff2fd9a73b3e5dfc32121989d15010bb9e4a85963c16f616a0681ac3a9ad99420248a31f32dafc927364b4ada6293679
+  metadata.gz: 6b7064f4f7a8468d2b5b8b3c4feb6f95ae3376aa7c7470b72c834efde0d85bfe192a5952f686af3407a15dc51495f9fee00174530dcb13c01dbadedf1919e8b6
+  data.tar.gz: 12a46945f79c8e0cfb9043f5ae768652060292b1f5088fdf2ec49d3638c1251608abcf2f5e085b10df7c72a17b29b4252f5029a04ff4b4249bdc58c4f149738f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.9
+
+- Added: Payment method names in schema
+- Added: credentials#certificate_subject
+- Added: `Receipt#as_json` and `.from_hash`
+
 # 0.0.8
 
 - Fixed: return `nil` when document is not ready yet 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orangedata (0.0.8)
+    orangedata (0.0.9)
       faraday (>= 0.15)
       faraday_middleware
 

data/Rakefile

@@ -21,6 +21,7 @@ namespace :swagger do
     `curl https://apip.orangedata.ru:2443/swagger/v2/swagger.json > #{swagger_file_name}`
   end
 
+  desc "compare upstream swagger spec"
   task diff: [:environment, swagger_file_name] do
     swagger = JSON.parse(File.read(swagger_file_name))
 

data/lib/orange_data/credentials.rb

@@ -197,13 +197,19 @@ module OrangeData
         key_name: signature_key_name.inspect,
       }
 
-      if certificate && (subject_name = certificate.subject.to_a.select{|ent| ent.first == 'O' }.first)
-        info_fields[:certificate] = %("#{(subject_name[1] || 'unknown').gsub('"', '\"')}")
+      if certificate && (subject_name = certificate_subject)
+        info_fields[:certificate] = %("#{(subject_name || 'unknown').gsub('"', '\"')}")
       end
 
       "#<#{self.class.name}:#{object_id} #{info_fields.map{|(k, v)| "#{k}=#{v}" }.join(' ')}>"
     end
 
+    def certificate_subject
+      if subj = certificate.subject.to_a.select{|ent| ent.first == 'O' }.first
+        subj[1].force_encoding('UTF-8')
+      end
+    end
+
     DEFAULT_KEY_LENGTH = 2048
 
     # deprecated

data/lib/orange_data/generated_attributes.rb

@@ -134,8 +134,12 @@ module OrangeData
       @payload
     end
 
+    def as_json
+      to_hash
+    end
+
     def to_json(*args)
-      to_hash.to_json(*args)
+      as_json.to_json(*args)
     end
   end
 

data/lib/orange_data/receipt.rb

@@ -18,21 +18,36 @@ module OrangeData
       @inn = inn
       @group = group
       @key_name = key_name || inn
-      @content = content if content
+      @content ||= content if content
       @callback_url = callback_url
       yield @content if block_given?
     end
 
-    def to_json(*args)
+    def self.from_hash(hash)
+      new(
+        id: hash[:id] || hash['id'],
+        inn: hash[:inn] || hash['inn'],
+        group: hash[:group] || hash['group'],
+        key_name: hash[:key] || hash['key'],
+        content: hash[:content] || hash['content'],
+        callback_url: hash[:callbackUrl] || hash['callbackUrl'],
+      )
+    end
+
+    def as_json
       {
         id: id,
         inn: inn,
         group: group || 'Main',
-        content: content,
+        content: content.is_a?(Hash) ? content : content.as_json,
         key: key_name
       }.tap{|h|
         h[:callbackUrl] = @callback_url if @callback_url
-      }.to_json(*args)
+      }
+    end
+
+    def to_json(*args)
+      as_json.to_json(*args)
     end
   end
 
@@ -41,6 +56,7 @@ module OrangeData
       @content = ReceiptContent.new(content || {})
       super
     end
+
     PAYLOAD_SCHEMA["definitions"]["CheckContent"]["properties"]["type"]["x-enum"].each_pair do |slug, _info|
       define_singleton_method(slug) do |**args, &block|
         new(**args, &block).tap{|doc|

data/lib/orange_data/schema_definitions.yml

@@ -205,6 +205,18 @@ definitions:
         title: ИНН покупателя (клиента)
         x-tag-id: 1228
         type: string
+      cashier:
+        title: Кассир
+        x-tag-id: 1021
+        type: string
+      cashierINN:
+        title: ИНН кассира
+        x-tag-id: 1203
+        type: string
+      senderEmail:
+        title: Адрес электронной почты отправителя чека
+        x-tag-id: 1117
+        type: string
 
 
   CheckPosition:
@@ -570,22 +582,27 @@ definitions:
           cash:
             val: 1
             title: сумма по чеку наличными
+            print: Наличными
             x-tag-id: 1031
           card:
             val: 2
             title: сумма по чеку электронными
+            print: Электронными 
             x-tag-id: 1081
           prepaid:
             val: 14
             title: сумма по чеку предоплатой(зачетом аванса и (или) предыдущих платежей)
+            print: Предварительная оплата(аванс)
             x-tag-id: 1215
           credit:
             val: 15
             title: сумма по чеку постоплатой(в кредит)
+            print: Последующая оплата(кредит)
             x-tag-id: 1216
           counterclaim:
             val: 16
             title: сумма по чеку(БСО) встречным предоставлением
+            print: Иная форма оплаты
             x-tag-id: 1217
       amount:
         format: double
@@ -780,7 +797,14 @@ definitions:
           patent:
             val: 5
             title: Патентная система налогообложения, Патент
-
+      cashier:
+        title: Кассир
+        x-tag-id: 1021
+        type: string
+      cashierINN:
+        title: ИНН кассира
+        x-tag-id: 1203
+        type: string
 
   CheckStatusViewModel[CheckContent]:
     type: object

data/lib/orange_data/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orangedata
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday