fiscalizer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5439e82bdd0f32d49e0074f573d9128e4eced208
-  data.tar.gz: 931cf25940e68ea5bcd81ebfc78ac2e27eca42ca
+  metadata.gz: b454d2d045c0dacee3673dc33b7ba9ef313a467c
+  data.tar.gz: 0404c3903032076ba7f10ddf1e0a5ecfa519e54b
 SHA512:
-  metadata.gz: 21acba55748c02761bab6d55d71b469bae68f36a3995c7af211fba3b0cf51988407c083c62ae497c8b0e02e8e624ae981e55b15d626d2db369f7311ceacfae8a
-  data.tar.gz: ce83a88e9d79a4a0984436308ff67284be71d5f4b37961641104bc07c7922788c5778f7a09637c9902316b8d4c7ad779621502889dd591be39c6e03294755845
+  metadata.gz: ec7e6577ab49d8b0dadc8155da38f9c686e5a21cf4af435e3d8780d04aafe9955fc0fc8e998fbe095964a49fac63f5e00eaf6ecc86605da6e9c0ca5274767024
+  data.tar.gz: 800e3560a62ef699841e25e69a8bdeedc66a5635f6161468158aff16868e298ce04e3c362cd05fb40ba485b8908b7bad583ddb019b749d3d70224d97e415a7ac

data/lib/fiscalizer/communication.rb

@@ -2,13 +2,13 @@ class Fiscalizer
 	class Communication
 		attr_accessor 	:url, :tns, :schemaLocation,
 						:key_public, :key_private, :certificate,
-						:certificate_issued_by
+						:certificate_issued_by, :timeout
 
 		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,
-						certificate_issued_by: "OU=RDC,O=FINA,C=HR" )
+						certificate_issued_by: "OU=RDC,O=FINA,C=HR", timeout:3 )
 			@tns = tns
 			@url = url
 			@schemaLocation = schemaLocation
@@ -16,6 +16,7 @@ class Fiscalizer
 			@key_private = key_private
 			@certificate = certificate
 			@certificate_issued_by = certificate_issued_by
+			@timeout = timeout
 		end # initialize
 
 		def send object
@@ -27,8 +28,9 @@ class Fiscalizer
 			# Prepare data
 			uri  = URI.parse(@url)
 			http = Net::HTTP.new(uri.host, uri.port)
-			http.use_ssl = true
-			http.cert_store = OpenSSL::X509::Store.new
+			http.read_timeout 	= @timeout
+			http.use_ssl 		= true
+			http.cert_store 	= OpenSSL::X509::Store.new
 			http.cert_store.set_default_paths
 			http.cert_store.add_cert(@certificate)
 			http.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -38,8 +40,8 @@ class Fiscalizer
 			return false if encoded_object.nil?
 
 			# Send it
-			request				  = Net::HTTP::Post.new(uri.request_uri)
-			request.content_type	 = 'application/xml'
+			request					= Net::HTTP::Post.new(uri.request_uri)
+			request.content_type	= 'application/xml'
 			request.body 			= encoded_object
 			response 				= http.request(request)
 
@@ -89,7 +91,7 @@ class Fiscalizer
 				xml = soap_envelope(echo_xml).to_xml
 				object.generated_xml = soap_envelope(echo_xml).to_xml
 				return xml
-			end # send_echo
+			end # encode_echo
 
 			def encode_office object
 				office_request_xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
@@ -162,7 +164,7 @@ class Fiscalizer
 				object.generated_xml = signed_xml
 
 				return signed_xml
-			end # send_office
+			end # encode_office
 
 			def encode_invoice object
 				generate_security_code object

data/lib/fiscalizer/fiscalizer.rb

@@ -9,14 +9,15 @@ 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
+						: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)
+						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
@@ -24,6 +25,7 @@ class Fiscalizer
 			@certificate_p12_path = certificate_p12_path
 			@tns = tns
 			@schemaLocation = schemaLocation
+			@timeout = timeout
 
 			# Import certificates
 			export_keys password
@@ -47,7 +49,8 @@ class Fiscalizer
 			# 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
+													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
@@ -80,7 +83,8 @@ class Fiscalizer
 			# 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
+													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
@@ -123,7 +127,8 @@ class Fiscalizer
 			# 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
+													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

data/lib/fiscalizer/version.rb

@@ -1,3 +1,3 @@
 class Fiscalizer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

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