einvoice 1.1.1 → 1.2.0

data/lib/einvoice/result.rb

@@ -10,7 +10,7 @@ module Einvoice
       raise NotImplementedError, 'You must initialize one of Einvoice::Response subclasses then use it.'
     end
 
-    def success?
+    def successful?
       raise NotImplementedError, 'You must initialize one of Einvoice::Response subclasses then use it.'
     end
 

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

@@ -84,7 +84,7 @@ module Einvoice
 
         # Type I R G
         validates :donate, presence: true, length: { is: 1 }, if: proc { %w(I R G).include?(self.type) && self.buyerUn.blank? && self.paperPrintMode.to_i == 0 }
-        validates :donationUnit, presence: true, length: { maximum: 10 }, if: proc { %w(I R G).include?(self.type) && self.donate == 'Y' }
+        validates :donationUnit, presence: true, length: { maximum: 10 }, donationUnit: true, if: proc { %w(I R G).include?(self.type) && self.donate == 'Y' }
         validates :carrierId, presence: true, length: { maximum: 64 }, if: proc { %w(I R G).include?(self.type) && self.paperPrintMode.to_i == 0 && self.donate == 'N' }
         validates :carrierIdHidden, presence: true, length: { maximum: 64 }, if: proc { %w(I R G).include?(self.type) && self.paperPrintMode.to_i == 0 && self.donate == 'N' }
         validates :receiverName, allow_blank: true, length: { maximum: 30 }, if: proc { %w(I R G).include?(self.type) }

data/lib/einvoice/tradevan/provider.rb

@@ -125,7 +125,6 @@ module Einvoice
           }
         ).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

@@ -33,6 +33,16 @@ module Einvoice
         end
       end
 
+      class DonationUnitValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          units = JSON.parse(File.read("lib/einvoice/donation_unit_list.json"))
+
+          unless units[value]
+            record.errors.add attribute, options[:message] || :invalid
+          end
+        end
+      end
+
       class ItemListValidator < ActiveModel::EachValidator
         def validate_each(record, attribtue, value)
           if %w(A G H).include?(record.type) && record.itemList.map(&:itemExclude).map(&:blank?).reduce(&:|)

data/lib/einvoice/version.rb

@@ -1,3 +1,3 @@
 module Einvoice
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: einvoice
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Yun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -229,18 +229,7 @@ files:
 - lib/einvoice/client.rb
 - lib/einvoice/configuration.rb
 - lib/einvoice/connection.rb
-- lib/einvoice/neweb/model/base.rb
-- lib/einvoice/neweb/model/contact.rb
-- lib/einvoice/neweb/model/customer_defined.rb
-- lib/einvoice/neweb/model/invoice.rb
-- lib/einvoice/neweb/model/invoice_item.rb
-- lib/einvoice/neweb/model/pre_invoice.rb
-- lib/einvoice/neweb/model/query.rb
-- lib/einvoice/neweb/model/seller_invoice.rb
-- lib/einvoice/neweb/provider.rb
-- lib/einvoice/neweb/result.rb
-- lib/einvoice/neweb/validator/invoice_item_validator.rb
-- lib/einvoice/neweb/validator/invoice_validator.rb
+- lib/einvoice/donation_unit_list.json
 - lib/einvoice/provider.rb
 - lib/einvoice/result.rb
 - lib/einvoice/tradevan/model/base.rb
@@ -252,7 +241,6 @@ files:
 - lib/einvoice/tradevan/validator/issue_data_validator.rb
 - lib/einvoice/utils.rb
 - lib/einvoice/version.rb
-- lib/faraday/request/digest_neweb.rb
 - lib/faraday/response/decode_tradevan.rb
 homepage: https://github.com/abookyun/einvoice
 licenses:

data/lib/einvoice/neweb/model/base.rb

@@ -1,39 +0,0 @@
-require "active_model"
-
-require "einvoice/neweb/validator/invoice_validator"
-require "einvoice/neweb/validator/invoice_item_validator"
-
-module Einvoice
-  module Neweb
-    module Model
-      class Base
-        include ActiveModel::Model
-        include ActiveModel::Validations
-        include ActiveModel::Serialization
-        include ActiveModel::Serializers::JSON
-
-        include Einvoice::Neweb::Validator
-
-        def attributes=(hash)
-          @invoice_item ||= []
-          hash.each do |key, value|
-            case key.to_sym
-            when :invoice_item
-              value.each { |v| @invoice_item << InvoiceItem.new(v) }
-            when :contact
-              @contact = Contact.new(value)
-            when :customer_defined
-              @customer_defined = CustomerDefined.new(value)
-            else
-              send("#{key}=", value)
-            end
-          end
-        end
-
-        def attributes
-          instance_values
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/contact.rb

@@ -1,21 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class Contact < Base
-        VALID_OPTIONS_KEYS = [
-          :name,
-          :address,
-          :t_e_l,
-          :email
-        ].freeze
-
-        attr_accessor *VALID_OPTIONS_KEYS
-
-        validates :name, presence: true, length: { maximum: 64 }
-        validates :address, presence: true, length: { maximum: 128 }
-        validates :t_e_l, length: { maximum: 64 }
-        validates :email, length: { maximum: 512 }
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/customer_defined.rb

@@ -1,19 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class CustomerDefined < Base
-        VALID_OPTIONS_KEYS = [
-          :project_no,
-          :purchase_no,
-          :stamp_duty_flag
-        ].freeze
-
-        attr_accessor *VALID_OPTIONS_KEYS
-
-        validates :project_no, length: { maximum: 64 }
-        validates :purchase_no, length: { maximum: 64 }
-        validates :stamp_duty_flag, length: { is: 1 }
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/invoice.rb

@@ -1,70 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class Invoice < Base
-        VALID_OPTIONS_KEYS = [
-          :seller_id,
-          :buyer_name,
-          :buyer_id,
-          :customs_clearance_mark,
-          :invoice_type,
-          :donate_mark,
-          :carrier_type,
-          :carrier_id1,
-          :carrier_id2,
-          :print_mark,
-          :n_p_o_b_a_n,
-          :random_number,
-          :invoice_item,
-          :sales_amount,
-          :free_tax_sales_amount,
-          :zero_tax_sales_amount,
-          :tax_type,
-          :tax_rate,
-          :tax_amount,
-          :total_amount,
-          :contact,
-          :customer_defined
-        ].freeze
-
-        attr_accessor *VALID_OPTIONS_KEYS
-
-        validates :seller_id, presence: true, length: { maximum: 10 }
-        validates :buyer_name, presence: true, length: { maximum: 60 }, buyer_name: true
-        validates :buyer_id, presence: true, length: { maximum: 10 }
-        validates :customs_clearance_mark, length: { maximum: 1 }, inclusion: { in: %w(1 2) }, allow_blank: true
-        validates :invoice_type, presence: true, length: { is: 2 }, inclusion: { in: %w(07 08) }
-        validates :donate_mark, presence: true, length: { is: 1 }, inclusion: { in: %w(0 1) }, donate_mark: true
-        validates :carrier_type, length: { maximum: 6 }, format: { with: /[a-zA-Z]{2}\d{4}/ }, allow_blank: true
-        validates :carrier_id1, length: { maximum: 64 }, carrier_id1: true, allow_blank: true
-        validates :carrier_id2, length: { maximum: 64 }, carrier_id2: true, allow_blank: true
-        validates :print_mark, presence: true, length: { is: 1 }, inclusion: { in: %w(Y N) }, print_mark: true
-        validates :n_p_o_b_a_n, length: { maximum: 10 }
-        validates :random_number, length: { is: 4 }, allow_blank: true
-        validates :invoice_item, presence: true
-        validates :sales_amount, presence: true, length: { maximum: 12 }, numericality: { greater_than_or_equal_to: 0 }
-        validates :free_tax_sales_amount, presence: true, length: { maximum: 12 }, numericality: { greater_than_or_equal_to: 0 }
-        validates :zero_tax_sales_amount, presence: true, length: { maximum: 12 }, numericality: { greater_than_or_equal_to: 0 }
-        validates :tax_type, presence: true, length: { is: 1 }, inclusion: { in: %w(1 2 3 4 9) }
-        validates :tax_rate, presence: true, length: { maximum: 6 }
-        validates :tax_amount, presence: true, length: { maximum: 12 }, numericality: { greater_than_or_equal_to: 0 }
-        validates :total_amount, presence: true, length: { maximum: 12 }, numericality: { greater_than_or_equal_to: 0 }, total_amount: true
-        validates :contact, presence: true
-
-        def initialize
-          raise NotImplementedError, "You should initialize with subclasses"
-        end
-
-        def payload
-          serializable_hash(except: [:errors, :validation_context], include: [:invoice_item, :contact, :customer_defined])
-        end
-
-        def wrapped_payload
-          { invoice_root:
-            { invoice: payload }
-          }
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/invoice_item.rb

@@ -1,27 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class InvoiceItem < Base
-        VALID_OPTIONS_KEYS = [
-          :description,
-          :quantity,
-          :unit,
-          :unit_price,
-          :amount,
-          :sequence_number,
-          :remark
-        ].freeze
-
-        attr_accessor *VALID_OPTIONS_KEYS
-
-        validates :description, presence: true, length: { maximum: 256 }
-        validates :quantity, presence: true, length: { maximum: 17 }, quantity: true
-        validates :unit, length: { maximum: 6 }
-        validates :unit_price, presence: true, length: { maximum: 17 }, unit_price: true
-        validates :amount, presence: true, length: { maximum: 17 }, amount: true
-        validates :sequence_number, presence: true, length: { maximum: 3 }, format: { with: /\A[1-9]|[1-9][0-9]|[1-9][0-9][0-9]\Z/ }
-        validates :remark, length: { maximum: 40 }
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/pre_invoice.rb

@@ -1,18 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class PreInvoice < Invoice
-        TYPE_SPECIFIC_KEYS = [:data_number, :data_date]
-
-        attr_accessor *TYPE_SPECIFIC_KEYS
-
-        validates :data_number, presence: true, length: { maximum: 20 }
-        validates :data_date, presence: true, length: { maximum: 10 }, format: { with: /\A\d{4}\/\d{2}\/\d{2}\Z/ }
-
-        def initialize
-          # overwritten
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/query.rb

@@ -1,43 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class Query < Base
-        VALID_OPTIONS_KEYS = [
-          :invoice_date_time_s,
-          :invoice_date_time_e,
-          :data_number_s,
-          :data_number_e,
-          :sync_status_update
-        ].freeze
-
-        attr_accessor *VALID_OPTIONS_KEYS
-
-        validates :invoice_date_time_s, presence: true, length: { maximum: 14 }, format: { with: /\A\d{4}\d{2}\d{2}\d{2}\d{2}\Z/ }
-        validates :invoice_date_time_e, presence: true, length: { maximum: 14 }, format: { with: /\A\d{4}\d{2}\d{2}\d{2}\d{2}\Z/ }
-        validates :data_number_s, presence: true, length: { maximum: 20 }
-        validates :data_number_e, presence: true, length: { maximum: 20 }
-        validates :sync_status_update, presence: true, length: { maximum: 1 }
-
-        def initialize
-          # overwritten
-        end
-
-        def attributes=(hash)
-          hash.each do |key, value|
-            send("#{key}=", value)
-          end
-        end
-
-        def payload
-          serializable_hash(except: [:errors, :validation_context])
-        end
-
-        def wrapped_payload
-          { invoice_map_root:
-            { invoice_map: payload }
-          }
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/model/seller_invoice.rb

@@ -1,18 +0,0 @@
-module Einvoice
-  module Neweb
-    module Model
-      class SellerInvoice < Invoice
-        TYPE_SPECIFIC_KEYS = [:invoice_number, :invoice_date]
-
-        attr_accessor *TYPE_SPECIFIC_KEYS
-
-        validates :invoice_number, presence: true, length: { maximum: 20 }
-        validates :invoice_date, presence: true, length: { maximum: 10 }, format: { with: /\A\d{4}\/\d{2}\/\d{2}\Z/ }
-
-        def initialize
-          # overwritten
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/provider.rb

@@ -1,67 +0,0 @@
-require "einvoice/utils"
-
-require "einvoice/neweb/model/base"
-require "einvoice/neweb/model/contact"
-require "einvoice/neweb/model/customer_defined"
-require "einvoice/neweb/model/invoice_item"
-require "einvoice/neweb/model/invoice"
-require "einvoice/neweb/model/pre_invoice"
-require "einvoice/neweb/model/seller_invoice"
-require "einvoice/neweb/model/query"
-
-require "einvoice/neweb/result"
-
-module Einvoice
-  module Neweb
-    class Provider < Einvoice::Provider
-      include Einvoice::Utils
-
-      def issue(payload, options = {})
-        case options[:type]
-        when :seller_invoice
-          action = "IN_SellerInvoiceS.action"
-          invoice = Einvoice::Neweb::Model::SellerInvoice.new
-        else
-          action = "IN_PreInvoiceS.action"
-          invoice = Einvoice::Neweb::Model::PreInvoice.new
-        end
-
-        invoice.from_json(payload.to_json)
-
-        if invoice.valid?
-          response = connection.post do |request|
-            request.url endpoint_url || endpoint + action
-            request.body = {
-              storecode: client_id,
-              xmldata: encode_xml(camelize(invoice.wrapped_payload))
-            }
-          end.body
-
-          Einvoice::Neweb::Result.new(response)
-        else
-          Einvoice::Neweb::Result.new(invoice.errors)
-        end
-      end
-
-      def query(payload, options = {})
-        action = "IN_InvoiceMapS.action"
-        query = Einvoice::Neweb::Model::Query.new
-        query.from_json(payload.to_json)
-
-        if query.valid?
-          response = connection.post do |request|
-            request.url endpoint_url || endpoint + action
-            request.body = {
-              storecode: client_id,
-              xmldata: encode_xml(camelize(query.wrapped_payload))
-            }
-          end.body
-
-          Einvoice::Neweb::Result.new(response)
-        else
-          Einvoice::Neweb::Result.new(query.errors)
-        end
-      end
-    end
-  end
-end

data/lib/einvoice/neweb/result.rb

@@ -1,32 +0,0 @@
-module Einvoice
-  module Neweb
-    class Result < Einvoice::Result
-      def errors
-        if response.is_a? ActiveModel::Errors
-          response.full_messages.join('; ')
-        else
-          data = response && (response["Result"]["Invoice"] || response["Result"])
-          data["statcode"] == "0000" ? nil : "#{data["statcode"]}: #{data["statdesc"]}" if data
-        end
-      end
-
-      def success?
-        if response.is_a? ActiveModel::Errors
-          false
-        else
-          data = response && (response["Result"]["Invoice"] || response["Result"])
-          data["statcode"] == "0000" if data
-        end
-      end
-
-      def data
-        if response.is_a? ActiveModel::Errors
-          nil
-        else
-          data = response && (response["Result"]["Invoice"] || response["Result"])
-          data["InvoiceMapRoot"] if data["statcode"] == "0000"
-        end
-      end
-    end
-  end
-end