ruby-culqi 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50f07e4c824046a04e48ff3045df7389ff4e0ae31e68293854b4e7d99b21fdc
-  data.tar.gz: 39b18b9941dac0426e7e776e31174754db169905162fd93f5b18c9f897b37058
+  metadata.gz: 3ac525931f7cc5ec8e5aded7335bec54784379ae631b280ddc1adcb7dff1a35c
+  data.tar.gz: 3388c5f6ebb01dc8793dfd7b3d687cab2c0bf113fb52d37cca76fcc9e3afb740
 SHA512:
-  metadata.gz: d212ef408e73a608417999ed44ee29ead9134da7e87a58c727e070bc29d8fe4c6c3d4673a8ef1518689587d870a11f7fe28d8cfa895928712b6318d034a267a1
-  data.tar.gz: 01c1b269bc803109ff8ad8ca40a6624b77122124f7977e9b449f827509526eebef035f7d37a17162b81178d8fb6dc6cbf5b73ed0f778b90dc1a0e0864d09e192
+  metadata.gz: f09d3e6770651e93d732213429f32c8c0fcefdfbf2f4cd0eb03a01dc0f7cd5f017a76d0f93093ea1d215864e2e1a58bfa4171002260ef8fb2502905b74dc379c
+  data.tar.gz: f3768a3aecf710d388d0aec20b0b785528b56b8d718b41f7289e8addfb86b4a5b856a0f2d411058cc581613ee7eebbd293c0016b7403f83a13a9fbed6e395c58

data/lib/culqi/charge.rb

@@ -11,8 +11,8 @@ module Culqi
     @url = URL
 
     def self.capture(id)
-      response = Culqi.connect("#{@url}#{id}/capture/", Culqi.secret_key, nil, "post", Culqi::READ_TIMEOUT)
-      return response.read_body
+      response, statuscode = Culqi.connect("#{@url}#{id}/capture/", Culqi.secret_key, nil, "post", Culqi::READ_TIMEOUT)
+      return response.read_body, statuscode
     end
 
   end

data/lib/culqi/version.rb

@@ -1,3 +1,3 @@
 module Culqi
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/operation/post.rb

@@ -14,12 +14,12 @@ module Culqi::Post
         params = Encrypt.encrypt_with_aes_rsa(params, rsa_key, true)
       end
       key = Culqi.public_key 
-      response = Culqi.connect(@url, key, params, 'post', Culqi::READ_TIMEOUT, true, rsa_id)
-      return response
+      response, statuscode = Culqi.connect(@url, key, params, 'post', Culqi::READ_TIMEOUT, true, rsa_id)
+      return response, statuscode
     else
       key = Culqi.secret_key
-      response = Culqi.connect(@url, key, params, 'post', Culqi::READ_TIMEOUT, false, '')
-      return response
+      response, statuscode = Culqi.connect(@url, key, params, 'post', Culqi::READ_TIMEOUT, false, '')
+      return response, statuscode
     end
     
   end

data/lib/operation/update.rb

@@ -10,8 +10,8 @@ module Culqi::Update
     if(rsa_key != '')
       params = Encrypt.encrypt_with_aes_rsa(params, rsa_key, true)
     end
-    response = Culqi.connect("#{@url}#{id}/", Culqi.secret_key, params, 'patch', Culqi::READ_TIMEOUT, rsa_id)
-    return response
+    response, statusCode = Culqi.connect("#{@url}#{id}/", Culqi.secret_key, params, 'patch', Culqi::READ_TIMEOUT, rsa_id)
+    return response, statusCode
   end
 
 end

data/lib/util/connect.rb

@@ -1,72 +1,41 @@
-require 'uri'
 require 'net/http'
-require 'openssl'
 require 'json'
 require 'culqi-ruby'
-require 'open3'
-
 
 module Culqi
-
   def self.connect(url, api_key, data, type, time_out, secure_url = false, rsa_id='')
-
-    if secure_url == true 
-      url = URI("#{Culqi::API_BASE_SECURE}#{url}")
-    else 
-      url = URI("#{Culqi::API_BASE}#{url}")  
-    end      
-
-    http = Net::HTTP.new(url.host, url.port)
-    http.read_timeout = time_out
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-    request = ''
-    if type.upcase == 'POST'
-
-      url = url.to_s
-      auth_header = "Authorization: Bearer #{api_key}"
-      content_type_header = "Content-Type: application/json"
-      rsa_id_header = "x-culqi-rsa-id: #{rsa_id}"
-      cache_control_header = "cache-control: no-cache"
-      data = data.to_json
-
-      stdout, stderr, status = Open3.capture3(
-        "curl",
-        "-X", "POST",
-        url,
-        "-H", auth_header,
-        "-H", content_type_header,
-        "-H", rsa_id_header,
-        "-H", cache_control_header,
-        "-d", data
-      )
-
+    base_url = secure_url ? Culqi::API_BASE_SECURE : Culqi::API_BASE
+    full_url = "#{base_url}#{url}"
+    uri = URI(full_url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = uri.scheme == 'https'
+
+    headers = {
+      "Authorization" => "Bearer #{api_key}",
+      "Content-Type" => "application/json",
+      "cache-control" => "no-cache"
+    }
+    headers["x-culqi-rsa-id"] = rsa_id if rsa_id && !rsa_id.empty?
+
+    case type.upcase
+    when 'GET'
+      request = Net::HTTP::Get.new(uri.request_uri, headers)
+    when 'POST'
+      request = Net::HTTP::Post.new(uri.request_uri, headers)
+      request.body = data.to_json if data
+    when 'DELETE'
+      request = Net::HTTP::Delete.new(uri.request_uri, headers)
+    when 'PATCH'
+      request = Net::HTTP::Patch.new(uri.request_uri, headers)
+      request.body = data.to_json if data
+    else
+      raise ArgumentError, "Unsupported request type: #{type}"
     end
 
-    if type.upcase == 'GET'
-      if !data.nil?
-        url.query = URI.encode_www_form(data)
-        command = "curl '#{url}' -G -d '#{URI.encode_www_form(data)}'"
-      else
-        command = "curl '#{url}'"
-      end
-
-      stdout, stderr, status = Open3.capture3("#{command} -H 'Authorization: Bearer #{api_key}' -H 'Content-Type: application/json' -H 'cache-control: no-cache'")
-
-    end
-
-    if type.upcase == 'DELETE'
-      command = "curl -X DELETE '#{url}' -H 'Authorization: Bearer #{api_key}' -H 'Content-Type: application/json' -H 'cache-control: no-cache'"
-      stdout, stderr, status = Open3.capture3(command)
-    end
-
-    if type.upcase == 'PATCH'
-      command = "curl -X PATCH '#{url}' -H 'Authorization: Bearer #{api_key}' -H 'Content-Type: application/json' -H 'x-culqi-rsa-id: #{rsa_id}' -H 'cache-control: no-cache' -d '#{data.to_json}'"
-      stdout, stderr, status = Open3.capture3(command)
-    end
-
-    return stdout
+    http.read_timeout = time_out
+    response = http.request(request)
+    puts response.body
 
+    return response.body, response.code.to_i
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-culqi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jordan Diaz Diaz