fiscalizer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a28f77e9a2a9ab8611c8b9115ec048cf8380bbe2
-  data.tar.gz: ed956c0403bf6066779ec8176f4e1da2944693fe
+  metadata.gz: bf3a0286c80975a48c24f12bacbb56dd52e7bff9
+  data.tar.gz: 665daba6e0e75aeea89a3375a68ec7110e800e3b
 SHA512:
-  metadata.gz: 27c61c79639ff2642f62f91f7781d9d1553f9a78dc1b34ab60ce559e677374d3975c64de3873df32de0bcd446dd3ea914472ae0450ad397aed074dd40c8cb031
-  data.tar.gz: 55369a83446b63c7788ab86b1afb54e85558a3f01a6bb8f016731ec922a7b9d60db5f1f8a3b2b3efa532cc9b38b999f226bd86b3c7bcfb7b8385c3952efcb11b
+  metadata.gz: b1527568363f50c83ea0d7fce1dce5b7581b474a44f534cde2afac59b292e2ddf44e3e96d1adf503f7cf24203bb6370230b08d281075fe915d5cbd607aab4c02
+  data.tar.gz: 6033347fda031491a8200df26d1dbf4d47b8fd374c5c364e2463f72d55072df6e9f77b226f325fb9e6d95f634f7320a8fbe982b53297baafe74a3b88b0a9e893

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Stanko Krtalić
+Copyright (c) 2014 Infinum
 
 MIT License
 

data/README.md

@@ -199,7 +199,7 @@ Direct usage of the `Fiscalizer::Communication` class is not advised!
 
 # Credits
 
-Phrasing is maintained and sponsored by
+Fiscalizer is maintained and sponsored by
 [Infinum](http://www.infinum.co).
 
 ![Infinum](http://www.infinum.co/system/logo.png)

data/lib/fiscalizer/communication.rb

@@ -1,10 +1,10 @@
 class Fiscalizer
 	class Communication
-		attr_accessor 	:url, :tns, :schemaLocation, 
-						:key_public, :key_private, :certificate, 
+		attr_accessor 	:url, :tns, :schemaLocation,
+						:key_public, :key_private, :certificate,
 						:certificate_issued_by
 
-		def initialize(	tns: "http://www.apis-it.hr/fin/2012/types/f73", 
+		def initialize(	tns: "http://www.apis-it.hr/fin/2012/types/f73",
 						url: "https://cis.porezna-uprava.hr:8449/FiskalizacijaService",
 						schemaLocation: "http://www.apis-it.hr/fin/2012/types/f73 FiskalizacijaSchema.xsd",
 						key_public: nil, key_private: nil, certificate: nil,
@@ -34,6 +34,19 @@ class Fiscalizer
 			http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
 			# Encode object
+			encoded_object = encode_object object
+			return false if encoded_object.nil?
+
+			# Send it
+			request				  = Net::HTTP::Post.new(uri.request_uri)
+			request.content_type	 = 'application/xml'
+			request.body 			= encoded_object
+			response 				= http.request(request)
+
+			return response
+		end # send
+
+		def encode_object object
 			encoded_object = nil
 			if object.class == Echo
 				encoded_object = encode_echo object
@@ -41,26 +54,32 @@ class Fiscalizer
 				encoded_object = encode_office object
 			elsif object.class == Invoice
 				encoded_object = encode_invoice object
-			else
-				# Something broke so we return false, 
-				# this enables us to check sucess in an if statement
-				return false
 			end
+			return encoded_object
+		end # encode_object
 
-			# Send it
-			request 				= Net::HTTP::Post.new(uri.request_uri)
-			request.content_type 	= 'application/xml'
-			request.body 			= encoded_object
-			response 				= http.request(request)
-			
-			return response
-		end # send
-
+		def generate_security_code invoice
+			# Build data set to generate security code
+			unsigned_code = ""
+			unsigned_code += invoice.pin
+			unsigned_code += invoice.time_sent_str " "
+			unsigned_code += invoice.issued_number.to_s
+			unsigned_code += invoice.issued_office.to_s
+			unsigned_code += invoice.issued_machine.to_s
+			unsigned_code += invoice.summed_total_str
+			# Sign with my private key
+			signed_code = OpenSSL::PKey::RSA.new(key_private).sign(OpenSSL::Digest::SHA1.new, unsigned_code)
+			# Create a MD5 digest from it
+			md5_digest = Digest::MD5.hexdigest(signed_code)
+			invoice.security_code = md5_digest
+			return md5_digest
+		end # generate_security_code
+		
 		private
 			def encode_echo object
 				echo_xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
 					xml['tns'].EchoRequest(
-						'xmlns:tns' => @tns, 
+						'xmlns:tns' => @tns,
 						'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
 						'xsi:schemaLocation' => @schemaLocation
 					) {
@@ -75,7 +94,7 @@ class Fiscalizer
 			def encode_office object
 				office_request_xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
 					xml['tns'].PoslovniProstorZahtjev(
-						'xmlns:tns' => @tns, 
+						'xmlns:tns' => @tns,
 						'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
 						'xsi:schemaLocation' => schemaLocation,
 						'Id' => 'PoslovniProstorZahtjev'
@@ -149,7 +168,7 @@ class Fiscalizer
 				generate_security_code object
 				invoice_request_xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
 					xml['tns'].RacunZahtjev(
-						'xmlns:tns' => @tns, 
+						'xmlns:tns' => @tns,
 						'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
 						'xsi:schemaLocation' => schemaLocation,
 						'Id' => 'RacunZahtjev'
@@ -275,22 +294,6 @@ class Fiscalizer
 				end
 			end # soap_envelope
 
-			def generate_security_code invoice
-				# Build data set to generate security code
-				unsigned_code = ""
-				unsigned_code += invoice.pin
-				unsigned_code += invoice.time_sent_str " "
-				unsigned_code += invoice.issued_number.to_s
-				unsigned_code += invoice.issued_office.to_s
-				unsigned_code += invoice.issued_machine.to_s
-				unsigned_code += invoice.summed_total_str
-				# Sign with my private key
-				signed_code = OpenSSL::PKey::RSA.new(key_private).sign(OpenSSL::Digest::SHA1.new, unsigned_code)
-				# Create a MD5 digest from it
-				md5_digest = Digest::MD5.hexdigest(signed_code)
-				invoice.security_code = md5_digest
-				return md5_digest
-			end # generate_security_code
 
 	end # Communication
-end # Fiscalizer
+end # Fiscalizer

data/lib/fiscalizer/version.rb

@@ -1,3 +1,3 @@
 class Fiscalizer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiscalizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Stanko Krtalić Rusendić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri