fiscalizer 0.0.12 → 1.0.0

data/fiscalizer.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fiscalizer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fiscalizer"
+  spec.name          = 'fiscalizer'
   spec.version       = Fiscalizer::VERSION
-  spec.authors       = ["Stanko Krtalić Rusendić"]
-  spec.email         = ["stanko.krtalic-rusendic@infinum.hr"]
-  spec.description   = %q{Automatic fiscalization}
-  spec.summary       = %q{A gem that automatically handles fiscalization}
-  spec.homepage      = "https://github.com/infinum/fiscalizer"
-  spec.license       = "MIT"
-
+  spec.authors       = ['Stanko Krtalić Rusendić', 'Vladimir Rosančić']
+  spec.email         = ['stanko.krtalic@gmail.com', 'vladimir.rosancic@infinum.hr']
+  spec.description   = 'Automatic fiscalization'
+  spec.summary       = 'A gem that automatically handles fiscalization'
+  spec.homepage      = 'https://github.com/infinum/fiscalizer'
+  spec.license       = 'MIT'
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency             "nokogiri", "~> 1.6"
-  spec.add_dependency             "xmldsig-fiscalizer", "~> 0.2"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", '~> 10.3'
+  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency 'xmldsig-fiscalizer', '~> 0.2'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rspec'
 end

data/lib/fiscalizer.rb

@@ -1,8 +1,37 @@
-require "bundler/setup"
-require "fiscalizer/version"
-require "fiscalizer/fiscalizer"
+require 'bundler/setup'
 require 'uri'
 require 'net/http'
 require 'openssl'
 require 'nokogiri'
-require 'xmldsig_fiscalizer'
+require 'xmldsig_fiscalizer'
+
+require 'fiscalizer/version'
+require 'fiscalizer/fiscalizer'
+
+require 'fiscalizer/constants'
+
+require 'fiscalizer/data_objects/echo'
+require 'fiscalizer/data_objects/invoice'
+require 'fiscalizer/data_objects/office'
+require 'fiscalizer/data_objects/tax'
+require 'fiscalizer/data_objects/fee'
+
+require 'fiscalizer/fiscalizers/base'
+require 'fiscalizer/fiscalizers/echo'
+require 'fiscalizer/fiscalizers/invoice'
+require 'fiscalizer/fiscalizers/office'
+
+require 'fiscalizer/serializers/base'
+require 'fiscalizer/serializers/echo'
+require 'fiscalizer/serializers/invoice'
+require 'fiscalizer/serializers/office'
+require 'fiscalizer/serializers/signature'
+require 'fiscalizer/serializers/tax'
+
+require 'fiscalizer/deserializers/base'
+require 'fiscalizer/deserializers/echo'
+require 'fiscalizer/deserializers/invoice'
+require 'fiscalizer/deserializers/office'
+
+require 'fiscalizer/services/request_sender'
+require 'fiscalizer/services/security_code_generator'

data/lib/fiscalizer/constants.rb

@@ -0,0 +1,11 @@
+class Fiscalizer
+  module Constants
+    DEMO_URL = 'https://cistest.apis-it.hr:8449/FiskalizacijaServiceTest'
+    PROD_URL = 'https://cis.porezna-uprava.hr:8449/FiskalizacijaService'
+    TNS = 'http://www.apis-it.hr/fin/2012/types/f73'
+    XSI = 'http://www.w3.org/2001/XMLSchema-instance'
+    SCHEMA_LOCATION = 'http://www.apis-it.hr/fin/2012/types/f73 FiskalizacijaSchema.xsd'
+    DEMO_CERT_ISSUER = 'OU=DEMO,O=FINA,C=HR'
+    PROD_CERT_ISSUER = 'OU=RDC,O=FINA,C=HR'
+  end
+end

data/lib/fiscalizer/data_objects/echo.rb

@@ -0,0 +1,10 @@
+class Fiscalizer
+  class Echo
+    def initialize(message:)
+      @message = message
+    end
+
+    attr_reader :message
+    attr_accessor :generated_xml
+  end
+end

data/lib/fiscalizer/data_objects/fee.rb

@@ -0,0 +1,18 @@
+class Fiscalizer
+  class Fee
+    def initialize(name:, value:)
+      @name = name
+      @value = value
+    end
+
+    attr_accessor :name, :value
+
+    def value
+      @value.to_f.round(2)
+    end
+
+    def value_str
+      format('%15.2f', value).strip
+    end
+  end
+end

data/lib/fiscalizer/data_objects/invoice.rb

@@ -0,0 +1,79 @@
+class Fiscalizer
+  class Invoice
+    # rubocop:disable Metrics/ParameterLists, Metrics/AbcSize, Metrics/MethodLength
+    def initialize(uuid:, time_sent:, pin:, in_vat_system:, time_issued:, consistance_mark:,
+                   issued_number:, issued_office:, issued_machine:, summed_total:,
+                   payment_method:, operator_pin:, subsequent_delivery:,
+                   tax_vat: [], tax_spending: [], tax_other: [],
+                   value_tax_liberation: nil, value_tax_margin: nil, value_non_taxable: nil,
+                   fees: [], paragon_label: nil, specific_purpose: nil)
+
+      @uuid = uuid
+      @time_sent = time_sent
+      @pin = pin
+      @in_vat_system = in_vat_system
+      @time_issued = time_issued
+      @consistance_mark = consistance_mark
+      @issued_number = issued_number
+      @issued_office = issued_office
+      @issued_machine = issued_machine
+      @tax_vat = tax_vat
+      @tax_spending = tax_spending
+      @tax_other = tax_other
+      @value_tax_liberation = value_tax_liberation
+      @value_tax_margin = value_tax_margin
+      @value_non_taxable = value_non_taxable
+      @fees = fees
+      @summed_total = summed_total
+      @payment_method = payment_method
+      @operator_pin = operator_pin
+      @subsequent_delivery = subsequent_delivery
+      @paragon_label = paragon_label
+      @specific_purpose = specific_purpose
+    end
+
+    attr_reader :uuid, :time_sent, :pin,
+                :in_vat_system, :time_issued, :consistance_mark,
+                :issued_number, :issued_office, :issued_machine,
+                :tax_vat, :tax_spending, :tax_other,
+                :value_tax_liberation, :value_tax_margin, :value_non_taxable,
+                :fees, :summed_total, :payment_method,
+                :operator_pin, :subsequent_delivery,
+                :paragon_label, :specific_purpose
+
+    attr_accessor :security_code, :generated_xml
+
+    def time_issued_str(separator = 'T')
+      time_issued.strftime("%d.%m.%Y#{separator}%H:%M:%S")
+    end
+
+    def time_sent_str(separator = 'T')
+      time_sent.strftime("%d.%m.%Y#{separator}%H:%M:%S")
+    end
+
+    def summed_total_str
+      format_decimal(summed_total)
+    end
+
+    def value_tax_liberation_str
+      return if value_tax_liberation.nil?
+      format_decimal(value_tax_liberation.round(2))
+    end
+
+    def value_tax_margin_str
+      return if value_tax_margin.nil?
+      format_decimal(value_tax_margin.round(2))
+    end
+
+    def value_non_taxable_str
+      return if value_non_taxable.nil?
+      format_decimal(value_non_taxable.round(2))
+    end
+
+    private
+
+    def format_decimal(value)
+      format('%15.2f', value).strip
+    end
+  end
+end

data/lib/fiscalizer/data_objects/office.rb

@@ -0,0 +1,41 @@
+class Fiscalizer
+  class Office
+    # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+    def initialize(uuid:, time_sent:, pin:, office_label:, office_time:, take_effect_date:,
+                   adress_street_name: nil, adress_house_num: nil, adress_house_num_addendum: nil,
+                   adress_post_num: nil, adress_settlement: nil, adress_township: nil,
+                   adress_other: nil, closure_mark: nil, specific_purpose: nil)
+
+      @uuid = uuid
+      @time_sent = time_sent
+      @pin = pin
+      @office_label = office_label
+      @adress_street_name = adress_street_name
+      @adress_house_num = adress_house_num
+      @adress_house_num_addendum = adress_house_num_addendum
+      @adress_post_num = adress_post_num
+      @adress_settlement = adress_settlement
+      @adress_township = adress_township
+      @adress_other = adress_other
+      @office_time = office_time
+      @take_effect_date = take_effect_date
+      @closure_mark = closure_mark
+      @specific_purpose = specific_purpose
+    end
+
+    attr_reader :uuid, :time_sent, :pin, :office_label, :adress_street_name,
+                :adress_house_num, :adress_house_num_addendum, :adress_post_num,
+                :adress_settlement, :adress_township, :adress_other, :office_time,
+                :take_effect_date, :closure_mark, :specific_purpose
+
+    attr_accessor :generated_xml
+
+    def time_sent_str(separator = 'T')
+      time_sent.strftime("%d.%m.%Y#{separator}%H:%M:%S")
+    end
+
+    def take_effect_date_str
+      take_effect_date.strftime('%d.%m.%Y')
+    end
+  end
+end

data/lib/fiscalizer/{tax.rb → data_objects/tax.rb}

@@ -1,15 +1,13 @@
 class Fiscalizer
   class Tax
-    attr_accessor :base, :rate, :name, :total, :summed
-
-    def initialize(base: 0.0, rate: 0.0, name: '', total: nil, summed: nil)
+    def initialize(base:, rate:, name:)
       @base = base
       @rate = rate
       @name = name
-      @total = total
-      @summed = summed
     end
 
+    attr_accessor :base, :rate, :name, :total, :summed
+
     def total
       @total || (base.to_f * (rate.to_f / 100.0)).round(2)
     end

data/lib/fiscalizer/deserializers/base.rb

@@ -0,0 +1,58 @@
+class Fiscalizer
+  module Deserializers
+    class Base
+      include Constants
+
+      def initialize(raw_response, object)
+        @raw_response = raw_response
+        @object = object
+      end
+
+      attr_reader :raw_response, :object
+
+      def uuid
+        element_value(root, 'IdPoruke')
+      end
+
+      def processed_at
+        element_value(root, 'DatumVrijeme')
+      end
+
+      def errors?
+        error_nodes.any?
+      end
+
+      def errors
+        @errors ||= begin
+          error_nodes.map do |error_node|
+            {
+              code: element_value(error_node, 'SifraGreske'),
+              message: element_value(error_node, 'PorukaGreske')
+            }
+          end
+        end
+      end
+
+      private
+
+      def element_value(root_node, element)
+        element = find(root_node, element).first
+        return if element.nil?
+
+        element.text
+      end
+
+      def find(root_node, element)
+        root_node.xpath("//tns:#{element}", 'tns' => TNS)
+      end
+
+      def root
+        Nokogiri::XML(raw_response).root
+      end
+
+      def error_nodes
+        @error_nodes ||= find(root, 'Greska')
+      end
+    end
+  end
+end

data/lib/fiscalizer/deserializers/echo.rb

@@ -0,0 +1,13 @@
+class Fiscalizer
+  module Deserializers
+    class Echo < Base
+      def echo_response
+        element_value(root, 'EchoResponse')
+      end
+
+      def success?
+        echo_response == object.message
+      end
+    end
+  end
+end

data/lib/fiscalizer/deserializers/invoice.rb

@@ -0,0 +1,9 @@
+class Fiscalizer
+  module Deserializers
+    class Invoice < Base
+      def unique_identifier
+        element_value(root, 'Jir')
+      end
+    end
+  end
+end

data/lib/fiscalizer/deserializers/office.rb

@@ -0,0 +1,6 @@
+class Fiscalizer
+  module Deserializers
+    class Office < Base
+    end
+  end
+end

data/lib/fiscalizer/fiscalizer.rb

@@ -1,153 +1,37 @@
-require 'fiscalizer/communication'
-require 'fiscalizer/echo'
-require 'fiscalizer/office'
-require 'fiscalizer/invoice'
-require 'fiscalizer/response'
-
 class Fiscalizer
-
-		# Accessible attributes
-		attr_accessor 	:url, :key_public_path, :key_private_path, :certificate_path,
-						:key_private, :key_public, :certificate,
-						:tns, :schemaLocation, :certificate_issued_by,
-						:timeout
-
-		# Public methods
-		def initialize(	url: "https://cis.porezna-uprava.hr:8449/FiskalizacijaService", 
-						key_public_path: nil, key_private_path: nil, certificate_path: nil,
-						tns: "http://www.apis-it.hr/fin/2012/types/f73",
-						schemaLocation: "http://www.apis-it.hr/fin/2012/types/f73 FiskalizacijaSchema.xsd",
-						certificate_issued_by: "OU=RDC,O=FINA,C=HR", certificate_p12_path: nil, password: nil, timeout:3)
-			@url = url
-			@key_public_path  = key_public_path
-			@key_private_path = key_private_path
-			@certificate_path = certificate_path
-			@certificate_p12_path = certificate_p12_path
-			@tns = tns
-			@schemaLocation = schemaLocation
-			@timeout = timeout
-
-			# Import certificates
-			export_keys password
-
-			if @key_public_path != nil && File.exists?(@key_public_path)
-				@key_public  = OpenSSL::X509::Certificate.new(File.read(@key_public_path))
-			end
-
-			if @key_private_path != nil && File.exists?(@key_private_path)
-				@key_private = OpenSSL::PKey::RSA.new(File.read(@key_private_path))
-			end
-
-			if @certificate_path != nil && File.exists?(@certificate_path)
-				@certificate = OpenSSL::X509::Certificate.new(File.read(@certificate_path))
-			end
-		end # new
-
-		def echo echo=nil, text: "Hello World!"
-			# Build echo request
-			echo = Fiscalizer::Echo.new text: text if echo == nil
-			# Send it
-			comm = Fiscalizer::Communication.new 	url: @url, tns: @tns, schemaLocation: @schemaLocation, 
-													key_public: @key_public, key_private: @key_private,
-													certificate: @certificate, certificate_issued_by: @certificate_issued_by,
-													timeout:@timeout
-			raw_response = comm.send echo
-			response = Fiscalizer::Response.new object: echo, html_response: raw_response, tns: @tns
-			return response
-		end # echo
-
-		def fiscalize_office(	office=nil, uuid: nil, time_sent: nil, pin: nil, 
-								office_label: nil, adress_street_name: nil, adress_house_num: nil,
-								adress_house_num_addendum: nil, adress_post_num: nil, adress_settlement: nil,
-								adress_township: nil, adress_other: nil, office_time: nil, take_effect_date: nil,
-								closure_mark: nil, specific_purpose: nil, reconnect_attempts: 3 )
-			# Test connection
-			response_alive = echo text: "Is the server alive?"
-			recconect_attempted = 1
-			reconnect_attempts = 0 if reconnect_attempts < 0
-			while recconect_attempted < reconnect_attempts && !response_alive.echo?
-				response_alive = echo text: "Is the server alive?"
-				recconect_attempted += 1
-			end
-			if !response_alive.echo?
-				response_alive.type = 0
-				response_alive.errors['f100'] = "Failed to connect to server"
-				return response_alive
-			end
-			# Build office
-			office = Fiscalizer::Office.new(	uuid: uuid, time_sent: time_sent, pin: pin, 
-												office_label: office_label, adress_street_name: adress_street_name, adress_house_num: adress_house_num,
-												adress_house_num_addendum: adress_house_num_addendum, adress_post_num: adress_post_num, adress_settlement: adress_settlement,
-												adress_township: adress_township, adress_other: adress_other, office_time: office_time, take_effect_date: take_effect_date,
-												closure_mark: closure_mark, specific_purpose: specific_purpose) if office == nil
-			# Send it
-			comm = Fiscalizer::Communication.new 	url: @url, tns: @tns, schemaLocation: @schemaLocation, 
-													key_public: @key_public, key_private: @key_private,
-													certificate: @certificate, certificate_issued_by: @certificate_issued_by,
-													timeout:@timeout
-			raw_response = comm.send office
-			response = Fiscalizer::Response.new object: office, html_response: raw_response, tns: @tns
-			return response
-		end # fiscalize_office
-		alias_method :office, :fiscalize_office
-		alias_method :fiscalize_office_space, :fiscalize_office
-
-		def fiscalize_invoice(	invoice=nil, uuid: nil, time_sent: nil, pin: nil, 
-								in_vat_system: nil, time_issued: nil, consistance_mark: nil, 
-								issued_number: nil, issued_office: nil, issued_machine: nil, 
-								tax_vat: [], tax_spending: [], tax_other: [],
-								value_tax_liberation: nil, value_tax_margin: nil, value_non_taxable: nil,
-								fees: [], summed_total: nil, payment_method: nil, 
-								operator_pin: nil, security_code: nil, subsequent_delivery: nil,
-								paragon_label: nil, specific_purpose: nil, unique_identifier: nil,
-								automatic: true, reconnect_attempts: 3)
-			# Test connection
-			response_alive = echo text: "Is the server alive"
-			recconect_attempted = 1
-			reconnect_attempts = 0 if reconnect_attempts < 0
-			while recconect_attempted < reconnect_attempts && !response_alive.echo?
-				response_alive = echo text: "Is the server alive"
-				recconect_attempted += 1
-			end
-			if !response_alive.echo?
-				response_alive.type = 0
-				response_alive.errors['f100'] = "Failed to connect to server"
-				return response_alive
-			end
-			# Build invoice
-			invoice = Fiscalizer::Invoice.new(	uuid: uuid, time_sent: time_sent, pin: pin, 
-												in_vat_system: in_vat_system, time_issued: time_issued, consistance_mark: consistance_mark, 
-												issued_number: issued_number, issued_office: issued_office, issued_machine: issued_machine, 
-												tax_vat: tax_vat, tax_spending: tax_spending, tax_other: tax_other,
-												value_tax_liberation: value_tax_liberation, value_tax_margin: value_tax_margin, value_non_taxable: value_non_taxable,
-												fees: fees, summed_total: summed_total, payment_method: payment_method, 
-												operator_pin: operator_pin, security_code: security_code, subsequent_delivery: subsequent_delivery,
-												paragon_label: paragon_label, specific_purpose: specific_purpose, unique_identifier: unique_identifier,
-												automatic: automatic) if invoice == nil
-			# Send it
-			comm = Fiscalizer::Communication.new 	url: @url, tns: @tns, schemaLocation: @schemaLocation, 
-													key_public: @key_public, key_private: @key_private,
-													certificate: @certificate, certificate_issued_by: @certificate_issued_by,
-													timeout:@timeout
-			raw_response = comm.send invoice
-			response = Fiscalizer::Response.new object: invoice, html_response: raw_response, tns: @tns
-			return response
-		end # fiscalize_invoice
-		alias_method :invoice, :fiscalize_invoice
-
-		def certificate_p12_path= path
-			@certificate_p12_path = path
-			export_keys
-		end # certificate_p12_path
-
-		private
-			def export_keys password
-				if @certificate_p12_path != nil && File.exists?(@certificate_p12_path) && password != nil
-					extracted = OpenSSL::PKCS12.new(File.read(@certificate_p12_path), password)
-					@key_public  = OpenSSL::X509::Certificate.new(extracted.certificate)
-					@key_private = OpenSSL::PKey::RSA.new(extracted.key)
-					@certificate = OpenSSL::X509::Certificate.new(extracted.ca_certs.first.to_s) if extracted.ca_certs != nil && extracted.ca_certs.size != 0
-				end
-			end # export_keys
-
-end # FiscalizerRuby
+  def initialize(app_cert_path:, password:, timeout: 3, demo: false, ca_cert_path: nil)
+    @app_cert_path = app_cert_path
+    @password = password
+    @timeout = timeout
+    @demo = demo
+    @ca_cert_path = ca_cert_path
+  end
+
+  attr_reader :app_cert_path, :password, :timeout, :demo, :ca_cert_path
+
+  def echo(message)
+    echo = Echo.new(message: message)
+    fiscalize(Fiscalizers::Echo, echo)
+  end
+
+  def fiscalize_invoice(invoice)
+    fiscalize(Fiscalizers::Invoice, invoice)
+  end
+
+  def fiscalize_office(office)
+    fiscalize(Fiscalizers::Office, office)
+  end
+
+  private
+
+  def fiscalize(fiscalizer_class, object_to_fiscalize)
+    fiscalizer_class.new(
+      app_cert_path,
+      password,
+      timeout,
+      demo,
+      ca_cert_path,
+      object_to_fiscalize
+    ).call
+  end
+end