einvoice 1.3 → 1.5.0

data/lib/einvoice/provider.rb

@@ -1,7 +1,6 @@
 module Einvoice
   class Provider
-    attr_accessor *Configuration::VALID_OPTIONS_KEYS
-    attr_accessor :provider
+    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
 
     def initialize(options={})
       options = Einvoice.options.merge(options)

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

@@ -52,7 +52,7 @@ module Einvoice
           :itemList
         ].freeze
 
-        attr_accessor *VALID_OPTIONS_KEYS
+        attr_accessor(*VALID_OPTIONS_KEYS)
 
         validates :companyUn, presence: true, length: { is: 8 }
         validates :orgId, presence: true, length: { is: 5 }
@@ -121,7 +121,7 @@ module Einvoice
         validates :invoiceType, allow_blank: true, length: { is: 2 }, inclusion: { in: %w(07 08) }, if: proc { self.type == 'G' }
 
         def payload
-          serializable_hash(except: [:errors, :validation_context], include: [:itemList])
+          serializable_hash(except: [:errors, :validation_context, :context_for_validation], include: [:itemList])
         end
       end
     end

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

@@ -19,13 +19,13 @@ module Einvoice
           :description
         ]
 
-        attr_accessor *VALID_OPTIONS_KEYS
+        attr_accessor(*VALID_OPTIONS_KEYS)
 
         validates :saleIdentifier, presence: true, length: { maximum: 100 }
         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/model/void_data.rb

@@ -12,7 +12,7 @@ module Einvoice
           :companyUn
         ].freeze
 
-        attr_accessor *VALID_OPTIONS_KEYS
+        attr_accessor(*VALID_OPTIONS_KEYS)
 
         validates :type, presence: true, length: { is: 1 }, inclusion: { in: %w(C I A) }
 
@@ -27,7 +27,7 @@ module Einvoice
         validates :allowancePaperReturned, presence: true, length: { is: 1 }, inclusion: { in: %w(Y N) }, if: proc { self.type == 'A' }
 
         def payload
-          serializable_hash(except: [:errors, :validation_context, :itemList])
+          serializable_hash(except: [:errors, :validation_context, :context_for_validation, :itemList])
         end
       end
     end

data/lib/einvoice/tradevan/provider.rb

@@ -1,7 +1,6 @@
 require 'base64'
 require 'openssl'
 
-require "einvoice/utils"
 
 require "einvoice/tradevan/model/base"
 require "einvoice/tradevan/model/issue_data"
@@ -18,11 +17,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 +33,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 +45,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 +54,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 +63,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 +72,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 +81,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 +90,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 +99,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.3"
+  VERSION = "1.5.0"
 end

data/lib/einvoice.rb

@@ -5,7 +5,6 @@ require "einvoice/configuration"
 require "einvoice/connection"
 require "einvoice/provider"
 require "einvoice/result"
-require "einvoice/utils"
 require "einvoice/version"
 
 require "einvoice/tradevan/provider"

data/lib/faraday/response/decode_tradevan.rb

@@ -1,12 +1,11 @@
+require 'base64'
+require 'json'
+require 'openssl'
+
 require 'faraday'
 
 module Faraday
   class Response::DecodeTradevan < Faraday::Middleware
-    dependency do
-      require 'base64' unless defined?(::Base64)
-      require 'openssl' unless defined?(::OpenSSL)
-    end
-
     def initialize(app, key)
       super(app)
       @key = key
@@ -30,7 +29,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

data/lib/faraday/response/parse_xml.rb

@@ -0,0 +1,14 @@
+require 'faraday'
+require 'multi_xml'
+
+module Faraday
+  class Response::ParseXml < Faraday::Middleware
+    def on_complete(env)
+      return unless env[:body].is_a?(String) && !env[:body].strip.empty?
+
+      env[:body] = ::MultiXml.parse(env[:body])
+    end
+  end
+end
+
+Faraday::Response.register_middleware xml: Faraday::Response::ParseXml

metadata

@@ -1,43 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: einvoice
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: 1.5.0
 platform: ruby
 authors:
 - David Yun
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gyoku
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -206,17 +177,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - abookyun@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coderabbit.yaml"
 - ".github/workflows/build.yml"
 - ".github/workflows/cron.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -240,14 +212,17 @@ files:
 - lib/einvoice/tradevan/provider.rb
 - lib/einvoice/tradevan/result.rb
 - lib/einvoice/tradevan/validator/issue_data_validator.rb
-- lib/einvoice/utils.rb
 - lib/einvoice/version.rb
 - lib/faraday/response/decode_tradevan.rb
+- lib/faraday/response/parse_xml.rb
 homepage: https://github.com/abookyun/einvoice
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  source_code_uri: https://github.com/abookyun/einvoice
+  changelog_uri: https://github.com/abookyun/einvoice/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/abookyun/einvoice/issues
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -255,15 +230,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
-summary: A API wrapper for Taiwan e-invoice services.
+summary: An API wrapper for Taiwan e-invoice services.
 test_files: []

data/lib/einvoice/utils.rb

@@ -1,13 +0,0 @@
-require "gyoku"
-
-module Einvoice
-  module Utils
-    def camelize(hash)
-      hash.deep_transform_keys { |k| k.to_s.camelize }
-    end
-
-    def encode_xml(hash)
-      ::Gyoku.xml(hash, key_converter: :none)
-    end
-  end
-end