braspag-rest 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af51da75eacd0111305201619309a0526ef5947c
-  data.tar.gz: c0542dd1d64a09fbb86792b091467f2df2d96888
+  metadata.gz: 3360e6c175e92d74d09f77af1f4b7fc8be1c44cb
+  data.tar.gz: 814fafb264d9ff52d46c9063ce6a5ad29bec8152
 SHA512:
-  metadata.gz: 2bbc186e05f37800f9ee185f668da8b24897ab4a8a16ca1ba5b12eebe0411fba7b59ec17aff7e5c953284696088071751a70c6cf0ab02af84403a17c235bf20f
-  data.tar.gz: 6dc039cb0af98ef161d49ce8e691cceeb8e075ec4e5b81ba307ae32de88799817f2564076a3b788826d2ac2a9f28cd73494ecacf72e5b7cf580df345909a06c1
+  metadata.gz: ca38860114ae15583eae64cde61b80ff1b950dd3f30fa2cae38d7197352d25ff2a55feb7b9473fe160593dcf64cb413297f66eecbe55e43cf5e3238b9b0c128a
+  data.tar.gz: efc6ffb424460d2ad8a26101e9453f69f6c015b93b7671ea0ef7a32a54acc14abf55915f52e763d319770e825066ca23d8af5354ee2d0fd6901d3a07f2155c32

data/README.md

@@ -34,6 +34,7 @@ development:
   query_url: 'https://apiquerysandbox.braspag.com.br'
   merchant_id: 'Your MerchantId here'
   merchant_key: 'Your MerchantKey here'
+  request_timeout: 60
 ```
 
 If you want to use a different file or manually set which environment should be
@@ -59,11 +60,13 @@ development:
   query_url: 'https://apiquerysandbox.braspag.com.br'
   merchant_id: 'Your MerchantId here'
   merchant_key: 'Your MerchantKey here'
+  request_timeout: 60
 production:
   url: <%= ENV['BRASPAG_URL'] %>
   query_url: <%= ENV['BRASPAG_QUERY_URL'] %>
   merchant_id: <%= ENV['BRASPAG_MERCHANT_ID'] %>
   merchant_key: <%= ENV['BRASPAG_MERCHANT_KEY'] %>
+  request_timeout: <%= ENV['BRASPAG_REQUEST_TIMEOUT'] %>
 ```
 
 ### Authorize an order

data/braspag-rest.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rest-client", "~> 1.8"
+  spec.add_dependency "rest-client", "~> 2.0"
   spec.add_dependency "hashie", "~> 3.4"
 
   spec.add_development_dependency "bundler", "~> 1.10"
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "pry-byebug"
 end

data/lib/braspag-rest/configuration.rb

@@ -33,6 +33,10 @@ module BraspagRest
       config['merchant_key']
     end
 
+    def request_timeout
+      config.fetch('request_timeout', 60)
+    end
+
     private
 
     def config

data/lib/braspag-rest/request.rb

@@ -9,7 +9,13 @@ module BraspagRest
         config.logger.info("[BraspagRest][Authorize] endpoint: #{sale_url}, params: #{params.to_json}") if config.log_enabled?
 
         execute_braspag_request do
-          RestClient.post(sale_url, params.to_json, default_headers.merge('RequestId' => request_id))
+          RestClient::Request.execute(
+            method: :post,
+            url: sale_url,
+            payload: params.to_json,
+            headers: default_headers.merge('RequestId' => request_id),
+            timeout: config.request_timeout
+          )
         end
       end
 
@@ -17,7 +23,12 @@ module BraspagRest
         config.logger.info("[BraspagRest][Void] endpoint: #{void_url(payment_id, amount)}") if config.log_enabled?
 
         execute_braspag_request do
-          RestClient.put(void_url(payment_id, amount), nil, default_headers.merge('RequestId' => request_id))
+          RestClient::Request.execute(
+            method: :put,
+            url: void_url(payment_id, amount),
+            headers: default_headers.merge('RequestId' => request_id),
+            timeout: config.request_timeout
+          )
         end
       end
 
@@ -25,7 +36,25 @@ module BraspagRest
         config.logger.info("[BraspagRest][GetSale] endpoint: #{search_sale_url(payment_id)}") if config.log_enabled?
 
         execute_braspag_request do
-          RestClient.get(search_sale_url(payment_id), default_headers.merge('RequestId' => request_id))
+          RestClient::Request.execute(
+            method: :get,
+            url: search_sale_url(payment_id),
+            headers: default_headers.merge('RequestId' => request_id),
+            timeout: config.request_timeout
+          )
+        end
+      end
+
+      def get_sales_for_merchant_order_id(request_id, merchant_order_id)
+        config.logger.info("[BraspagRest][GetSale] endpoint: #{search_sales_for_merchant_order_id_url(merchant_order_id)}") if config.log_enabled?
+
+        execute_braspag_request do
+          RestClient::Request.execute(
+            method: :get,
+            url: search_sales_for_merchant_order_id_url(merchant_order_id),
+            headers: default_headers.merge('RequestId' => request_id),
+            timeout: config.request_timeout
+          )
         end
       end
 
@@ -33,7 +62,13 @@ module BraspagRest
         config.logger.info("[BraspagRest][Capture] endpoint: #{capture_url(payment_id)}, amount: #{amount}") if config.log_enabled?
 
         execute_braspag_request do
-          RestClient.put(capture_url(payment_id), { Amount: amount }.to_json, default_headers.merge('RequestId' => request_id))
+          RestClient::Request.execute(
+            method: :put,
+            url: capture_url(payment_id),
+            payload: { Amount: amount }.to_json,
+            headers: default_headers.merge('RequestId' => request_id),
+            timeout: config.request_timeout
+          )
         end
       end
 
@@ -46,7 +81,12 @@ module BraspagRest
 
         BraspagRest::Response.new(gateway_response)
       rescue RestClient::ResourceNotFound => e
-        config.logger.error("[BraspagRest][Error] message: #{e.message}, status: #{e.http_code}, body: #{e.http_body.inspect}") if config.log_enabled?
+        # Explicitly message due to Rest Client RestClient::NotFound normalization:
+        # https://github.com/rest-client/rest-client/blob/v2.0.0/lib/restclient/exceptions.rb#L90
+        config.logger.error("[BraspagRest][Error] message: Resource Not Found, status: #{e.http_code}, body: #{e.http_body.inspect}") if config.log_enabled?
+        raise
+      rescue RestClient::RequestTimeout => e
+        config.logger.error("[BraspagRest][Timeout] message: #{e.message}") if config.log_enabled?
         raise
       rescue RestClient::ExceptionWithResponse => e
         config.logger.warn("[BraspagRest][Error] message: #{e.message}, status: #{e.http_code}, body: #{e.http_body.inspect}") if config.log_enabled?
@@ -72,6 +112,13 @@ module BraspagRest
         sale_url + payment_id.to_s + CAPTURE_ENDPOINT
       end
 
+      def search_sales_for_merchant_order_id_url(merchant_order_id)
+        url = URI.parse(config.query_url)
+        url.path = SALE_ENDPOINT
+        url.query = "merchantOrderId=#{merchant_order_id}"
+        url.to_s
+      end
+
       def default_headers
         {
           'Accept' => 'application/json',

data/lib/braspag-rest/sale.rb

@@ -18,6 +18,13 @@ module BraspagRest
       new(response.parsed_body.merge('RequestId' => request_id))
     end
 
+    def self.find_by_order_id(request_id, order_id)
+      response = BraspagRest::Request.get_sales_for_merchant_order_id(request_id, order_id)
+      payments = response.parsed_body['Payments']
+
+      payments.map { |payment| BraspagRest::Sale.find(request_id, payment['PaymentId']) }
+    end
+
     def save
       response = BraspagRest::Request.authorize(request_id, inverse_attributes)
 

data/lib/braspag-rest/version.rb

@@ -1,3 +1,3 @@
 module BraspagRest
-  VERSION = "0.5.0"
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braspag-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dinda Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to use Braspag gateway in his REST version
 email:
 - dev@dinda.com.br
@@ -170,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Gem to use Braspag gateway in his REST version