tangocard 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac03de16035232e603b426c59ccd6224e782122
-  data.tar.gz: de61de3f8a4a361274a3a7689382b69f28972a94
+  metadata.gz: 7f7d4ed6be48184c160a1fdba063b0a4927dce67
+  data.tar.gz: eab7f8d2e7558c42e1fc45f5a110eb2f52fe6457
 SHA512:
-  metadata.gz: d736487bb1c755343ba712a77eccc2db7de51036dc5eb73f40b8a913827a811db4baba37fa3c516e1b90ecc224eb89087cb9810e3cff7e63756b1cb977d74143
-  data.tar.gz: 6dde06d834effdbe683bdcbcb32d52a98175388e7a0b710a743bd57bcfdb9bbc6ef374cd8e0ee28887a501da5296909006ae8b21a73618e96b5e2b945cc050dc
+  metadata.gz: 232120b85c5a52108958f0534abda04c4069cb07c7d489a7cfb227eb81071207b0767528c481c1da34b7a265fe081daf7aa265ec67faf36c3119926254c2bfec
+  data.tar.gz: 1a7d9eecaf0a0ca4b0d39a08169061c31f5dc7ebe42accd322f66cc7e25dff1dcbe3498df486eff127bce04ce7aa1a0d44d872c6023f72981884b13c9b8e28da

data/lib/tangocard.rb

@@ -20,7 +20,7 @@ module Tangocard
   end
 
   def self.configuration
-    @configuration ||=  Configuration.new
+    @configuration ||= Configuration.new
   end
 
   def self.configure
@@ -40,5 +40,7 @@ require 'tangocard/brand'
 require 'tangocard/order'
 require 'tangocard/order_create_failed_exception'
 require 'tangocard/order_not_found_exception'
+require 'tangocard/raas_exception'
 require 'tangocard/reward'
 require 'tangocard/exchange_rate'
+

data/lib/tangocard/brand.rb

@@ -22,7 +22,9 @@ class Tangocard::Brand
   # Arguments:
   #   none
   def self.all
-    Tangocard::Raas.rewards_index.parsed_response['brands'].map{|p| Tangocard::Brand.new(p)}
+    rewards_index = Tangocard::Raas.rewards_index
+    raise Tangocard::RaasException.new("Tangocard error with response code #{rewards_index.code}") unless rewards_index.success?
+    rewards_index.parsed_response['brands'].map{|p| Tangocard::Brand.new(p)}
   end
 
   # Find a brand by its :description field.

data/lib/tangocard/raas.rb

@@ -12,7 +12,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#create-account for details)
   def self.create_account(params)
-    Tangocard::Response.new(post(endpoint + '/accounts', {:body => params.to_json}.merge(basic_auth_param)))
+    Tangocard::Response.new(post_request('/accounts', { body: params.to_json }))
   end
 
   # Gets account details. Returns Tangocard::Response object.
@@ -24,7 +24,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#get-account for details)
   def self.show_account(params)
-    Tangocard::Response.new(get(endpoint + "/accounts/#{params['customer']}/#{params['identifier']}", basic_auth_param))
+    Tangocard::Response.new(get_request("/accounts/#{params['customer']}/#{params['identifier']}"))
   end
 
   # Funds an account. Returns Tangocard::Response object.
@@ -36,7 +36,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#create-cc-fund for details)
   def self.cc_fund_account(params)
-    Tangocard::Response.new(post(endpoint + '/cc_fund', {:body => params.to_json}.merge(basic_auth_param)))
+    Tangocard::Response.new(post_request('/cc_fund', { body: params.to_json }))
   end
 
   # Registers a credit card to an account. Returns Tangocard::Response object.
@@ -48,7 +48,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#create-cc-registration for details)
   def self.register_credit_card(params)
-    Tangocard::Response.new(post(endpoint + '/cc_register', {:body => params.to_json}.merge(basic_auth_param)))
+    Tangocard::Response.new(post_request('/cc_register', { body: params.to_json }))
   end
 
   # Deletes a credit card from an account. Returns Tangocard::Response object.
@@ -60,7 +60,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#create-cc-un-registration for details)
   def self.delete_credit_card(params)
-    Tangocard::Response.new(post(endpoint + '/cc_unregister', {:body => params.to_json}.merge(basic_auth_param)))
+    Tangocard::Response.new(post_request('/cc_unregister', { body: params.to_json }))
   end
 
   # Retrieve all rewards. Returns Tangocard::Response object.
@@ -75,11 +75,11 @@ class Tangocard::Raas
     if Tangocard.configuration.use_cache
       clear_cache! if cache_expired?
 
-      @@rewards_response ||= Tangocard::Response.new(get(endpoint + '/rewards', basic_auth_param))
+      @@rewards_response ||= Tangocard::Response.new(get_request('/rewards'))
       @@rewards_response_expires_at = (Time.now.to_i + Tangocard.configuration.cache_ttl) if cache_expired?
       @@rewards_response
     else
-      Tangocard::Response.new(get(endpoint + '/rewards', basic_auth_param))
+      Tangocard::Response.new(get_request('/rewards'))
     end
   end
 
@@ -92,7 +92,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#create-order for details)
   def self.create_order(params)
-    Tangocard::Response.new(post(endpoint + '/orders', {:body => params.to_json}.merge(basic_auth_param)))
+    Tangocard::Response.new(post_request('/orders', { body: params.to_json }))
   end
 
   # Get order details. Returns Tangocard::Response object.
@@ -104,7 +104,7 @@ class Tangocard::Raas
   # Arguments:
   #   params: (Hash - see https://www.tangocard.com/docs/raas-api/#get-order for details)
   def self.show_order(params)
-    Tangocard::Response.new(get(endpoint + "/orders/#{params['order_id']}", basic_auth_param))
+    Tangocard::Response.new(get_request("/orders/#{params['order_id']}"))
   end
 
   # Retrieve a list of historical orders. Returns Tangocard::Response object.
@@ -119,12 +119,12 @@ class Tangocard::Raas
     query_string = ""
     if params.any?
       query_string = "?"
-      params.keys.each_with_index do |k,i|
+      params.keys.each_with_index do |k, i|
         query_string += "&" unless i == 0
         query_string += "#{k}=#{params[k]}"
       end
     end
-    Tangocard::Response.new(get(endpoint + "/orders#{query_string}", basic_auth_param))
+    Tangocard::Response.new(get_request("/orders#{query_string}"))
   end
 
   def self.clear_cache!
@@ -135,7 +135,7 @@ class Tangocard::Raas
   private
 
   def self.basic_auth_param
-    {:basic_auth => {:username => Tangocard.configuration.name, :password => Tangocard.configuration.key}}
+    { basic_auth: { username: Tangocard.configuration.name, password: Tangocard.configuration.key } }
   end
 
   def self.use_cache_ttl?
@@ -147,6 +147,14 @@ class Tangocard::Raas
   end
 
   def self.endpoint
-    Tangocard.configuration.base_uri + '/raas/v1.1'
+    "#{Tangocard.configuration.base_uri}/raas/v1.1"
+  end
+
+  def self.get_request(path)
+    get("#{endpoint}#{path}", basic_auth_param)
+  end
+
+  def self.post_request(path, params)
+    post("#{endpoint}#{path}", basic_auth_param.merge(params))
   end
 end

data/lib/tangocard/raas_exception.rb

@@ -0,0 +1,2 @@
+class Tangocard::RaasException < StandardError
+end

data/lib/tangocard/response.rb

@@ -7,22 +7,28 @@ class Tangocard::Response
   end
 
   def success?
-    parsed_response['success'] rescue false
+    safe_response['success'] || false
   end
 
   def error_message
-    parsed_response['error_message'] rescue 'UNKNOWN ERROR MESSAGE'
+    safe_response['error_message']
   end
 
   def denial_message
-    parsed_response['denial_message'] rescue 'UNKNOWN DENIAL MESSSAGE'
+    safe_response['denial_message']
   end
 
   def denial_code
-    parsed_response['denial_code'] rescue 'UNKNOWN DENIAL CODE'
+    safe_response['denial_code']
   end
 
   def invalid_inputs
-    parsed_response['invalid_inputs'] rescue 'UNKNOWN INVALID INPUTS'
+    safe_response['invalid_inputs']
+  end
+
+  private
+
+  def safe_response
+    parsed_response || {}
   end
 end

data/lib/tangocard/version.rb

@@ -1,3 +1,3 @@
 module Tangocard
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tangocard
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Raphael Crawford-Marks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -56,28 +56,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: rr
-  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: |-
@@ -105,6 +91,7 @@ files:
 - lib/tangocard/order_create_failed_exception.rb
 - lib/tangocard/order_not_found_exception.rb
 - lib/tangocard/raas.rb
+- lib/tangocard/raas_exception.rb
 - lib/tangocard/response.rb
 - lib/tangocard/reward.rb
 - lib/tangocard/version.rb
@@ -132,3 +119,4 @@ signing_key:
 specification_version: 4
 summary: Ruby Wrapper for Tango Card RaaS API.
 test_files: []
+has_rdoc: