einvoice 1.2.22 → 1.4.0

data/lib/einvoice/tradevan/model/issue_data.rb

@@ -102,7 +102,7 @@ module Einvoice
 
         # Type I R G A
         validates :receiverName, allow_blank: true, length: { maximum: 30 }, if: proc { %w(I R G A).include?(self.type) }
-        validates :receiverAddrZip, allow_blank: true, length: { maximum: 5 }, if: proc { %w(I R G A).include?(self.type) }
+        validates :receiverAddrZip, allow_blank: true, length: { maximum: 6 }, if: proc { %w(I R G A).include?(self.type) }
         validates :receiverAddrRoad, allow_blank: true, length: { maximum: 100 }, if: proc { %w(I R G A).include?(self.type) }
         validates :receiverEmail, allow_blank: true, length: { maximum: 80 }, if: proc { %w(I R G A).include?(self.type) }
         validates :receiverMobile, allow_blank: true, length: { maximum: 15 }, if: proc { %w(I R G A).include?(self.type) }

data/lib/einvoice/tradevan/model/issue_item.rb

@@ -25,7 +25,7 @@ module Einvoice
         validates :serialNumber, presence: true, length: { is: 4 }, numericality: true
         validates :invoiceNumber, allow_blank: true, length: { is: 10 }
         validates :invoiceDate, allow_blank: true, length: { is: 8 }, numericality: true
-        validates :invoiceTime, allow_blank: true, length: { is: 8 }, format: { with: /\Ad{2}\:\d{2}\:\d{2}\Z/ }
+        validates :invoiceTime, allow_blank: true, length: { is: 8 }, format: { with: /\A\d{2}\:\d{2}\:\d{2}\Z/ }
         validates :productCode, allow_blank: true, length: { maximum: 30 }
         validates :productName, presence: true, length: { maximum: 300 }
         validates :qty, presence: true, length: { maximum: 20 }

data/lib/einvoice/tradevan/provider.rb

@@ -18,11 +18,7 @@ module Einvoice
         issue_data.from_json(payload.to_json)
 
         if issue_data.valid?
-          response = connection(
-            ssl: {
-              verify: false
-            }
-          ).post do |request|
+          response = connection.post do |request|
             request.url endpoint_url || endpoint + "/DEFAULTAPI/post/issue"
             request.params[:v] = encrypted_params(issueData: issue_data.payload)
           end.body
@@ -38,11 +34,7 @@ module Einvoice
         void_data.from_json(payload.to_json)
 
         if void_data.valid?
-          response = connection(
-            ssl: {
-              verify: false
-            }
-          ).post do |request|
+          response = connection.post do |request|
             request.url endpoint_url || endpoint + "/DEFAULTAPI/post/cancel"
             request.params[:v] = encrypted_params(voidData: void_data.payload)
           end.body
@@ -54,11 +46,7 @@ module Einvoice
       end
 
       def search_invoice_by_member_id(payload, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/searchInvoiceByMemberId"
           request.params[:v] = encrypted_params(payload)
         end.body
@@ -67,11 +55,7 @@ module Einvoice
       end
 
       def search_invoice_detail(invoice_number)
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/searchInvoiceDetail"
           request.params[:v] = encrypted_params(invoiceNumber: invoice_number)
         end.body
@@ -80,11 +64,7 @@ module Einvoice
       end
 
       def search_invoice_by_transaction_number(payload, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/searchInvoiceInfoByTransactionnumber"
           request.params[:v] = encrypted_params(payload.slice(:companyUn, :orgId, :transactionNumber))
         end.body
@@ -93,11 +73,7 @@ module Einvoice
       end
 
       def send_card_info_to_cust(payload, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/sendCardInfotoCust"
           request.params[:v] = encrypted_params(payload)
         end.body
@@ -106,11 +82,7 @@ module Einvoice
       end
 
       def get_invoice_mark_info(payload, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/getInvoiceMarkInfo"
           request.params[:v] = encrypted_params(payload)
         end.body
@@ -119,11 +91,7 @@ module Einvoice
       end
 
       def get_donate_unit_list(companyUn, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/getDonateUnitList"
           request.params[:v] = encrypted_params(companyUn: companyUn)
         end.body
@@ -132,11 +100,7 @@ module Einvoice
       end
 
       def get_invoice_content(payload, options = {})
-        response = connection(
-          ssl: {
-            verify: false
-          }
-        ).get do |request|
+        response = connection.get do |request|
           request.url endpoint_url || endpoint + "/DEFAULTAPI/get/getInvoiceContent"
           request.params[:v] = encrypted_params(payload)
         end.body

data/lib/einvoice/tradevan/validator/issue_data_validator.rb

@@ -19,7 +19,7 @@ module Einvoice
 
       class TotalValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          unless value != record.itemList.map(&:itemTotal).map(&:to_i).inject(&:+)
+          if value.to_i != record.itemList.map(&:itemTotal).map(&:to_i).sum
             record.errors.add attribute, options[:message] || :invalid
           end
         end
@@ -27,7 +27,7 @@ module Einvoice
 
       class AllowanceNumberValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          unless record.allowanceNumber =~ Regexp.new("\A#{record.orgId}")
+          unless record.allowanceNumber =~ Regexp.new("\\A#{record.orgId}")
             record.errors.add attribute, options[:message] || :invalid
           end
         end
@@ -55,20 +55,20 @@ module Einvoice
       class ItemListValidator < ActiveModel::EachValidator
         def validate_each(record, attribtue, value)
           if record.itemList.map(&:itemTotal).map(&:blank?).reduce(&:|)
-            record.errors[:itemList] << options[:message] || :invalid
+            record.errors.add :itemList, options[:message] || :invalid
           elsif record.itemList.map(&:taxType).map(&:blank?).reduce(&:|)
-            record.errors[:itemList] << options[:message] || :invalid
+            record.errors.add :itemList, options[:message] || :invalid
           else
             # none
           end
 
           if %w(A H).include?(record.type)
             if record.itemList.map(&:invoiceNumber).map(&:blank?).reduce(&:|)
-              record.errors[:itemList] << options[:message] || :invalid
+              record.errors.add :itemList, options[:message] || :invalid
             elsif record.itemList.map(&:invoiceDate).map(&:blank?).reduce(&:|)
-              record.errors[:itemList] << options[:message] || :invalid
+              record.errors.add :itemList, options[:message] || :invalid
             elsif record.itemList.map(&:itemExclude).map(&:blank?).reduce(&:|)
-              record.errors[:itemList] << options[:message] || :invalid
+              record.errors.add :itemList, options[:message] || :invalid
             else
               # none
             end

data/lib/einvoice/version.rb

@@ -1,3 +1,3 @@
 module Einvoice
-  VERSION = "1.2.22"
+  VERSION = "1.4.0"
 end

data/lib/faraday/response/decode_tradevan.rb

@@ -30,7 +30,7 @@ module Faraday
       cipher.padding = 0
 
       decrypted = cipher.update(Base64.decode64(content)) + cipher.final
-      JSON.load(decrypted.strip)
+      JSON.parse(decrypted.strip)
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: einvoice
 version: !ruby/object:Gem::Version
-  version: 1.2.22
+  version: 1.4.0
 platform: ruby
 authors:
 - David Yun
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -154,16 +153,16 @@ dependencies:
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -206,17 +205,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - abookyun@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".github/workflows/cron.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -247,7 +246,6 @@ homepage: https://github.com/abookyun/einvoice
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 4.0.17
 specification_version: 4
 summary: A API wrapper for Taiwan e-invoice services.
 test_files: []

data/.travis.yml

@@ -1,18 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=134e1f1cc8b60db4f2a491152c9227a6dbbfbeba5c1d05ee8b44cd78a1069f28
-language: ruby
-rvm:
-  - 2.5.5
-  - 2.6.3
-  - 2.7.0
-  - 3.0.0
-before_script:
-  - gem install bundler
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT