proxypay 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc946694f10a39fd9c0ad3abc069a1cbd2dfe86e
-  data.tar.gz: 7cdc43d75e8cf8f4de861d96e9ac4132cf4cbe91
+  metadata.gz: 24b46cc765e5d6400ad538fbc114ccc9c9eb93cb
+  data.tar.gz: 002c820f1ac4d26a81a30f088af008cec97262ce
 SHA512:
-  metadata.gz: f2f78b2ec08c2f79ade238e7e4ee0cd28c26bd0be5f17be2f1edede609e16945615ebc6d6d5852b4be31dd3e9e6835458cd37de28e98520a90829c19dddd9685
-  data.tar.gz: ed13d322202e59943814c5cd3486298f6b72b1f7294e5e04114f606f52a041b581394070da6ce75a1cbb086746e4fc88ffedc4c81e8b88537d666b9cb48b9a9f
+  metadata.gz: aa063b0c31bb1980c35d2de5647f735041790ebd884f9cd5d6a3e39be36a45159bf6916c1d0ca2d2f0521d7baab7e17bb88df238ca61a85256477bbbdc3902ce
+  data.tar.gz: c09bc6cd2a142725db4817df1979deacb1658a616e0d09306cd9599e7aeb91fe6148363ddb1f4ed122d63a90a8c5e1bf44a1ed5311a24e16b1a7764f60c16942

data/README.md

@@ -101,7 +101,7 @@ Proxypay.new_payments(ids)
 
 ## Help and Docs
 - [ProxyPay API](https://developer.proxypay.co.ao)
-- [RDOC](http://www.rubydoc.info/gems/proxypay/0.2.1)
+- [RDOC](http://www.rubydoc.info/gems/proxypay/0.2.2)
 
 ## Development
 - You can fork the project

data/lib/proxypay/version.rb

@@ -1,3 +1,3 @@
 module Proxypay
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/proxypay.rb

@@ -7,117 +7,73 @@ module Proxypay
   base_uri "https://api.proxypay.co.ao"
 
   # Fetch all available references
-  def self.get_references(options={})
+  def self.get_references(options = {})
+    # Proxypay.get_references(query: {limit: 20}, is_test: true, api_key: '0djwano5yth94ihrtw34ot9cehn9emo')
+    set_base_url(options.delete(:is_test))
     # request body and header
     content = {}
-    auth = {:basic_auth => authenticate}
-    body = {:headers => {'Content-Type' => 'application/json'}}
-    content.merge!(auth)
-    content.merge!(body)
-    # request query options
-    options = {limit: 20, offset: 0, status: nil, q: nil}.merge!(options)
-    # query options
-    case options != nil
-    # get refs with provided status w/o specific custom query
-    when options.fetch(:status) != nil && options.fetch(:q) == nil
-      get("/references?limit=#{options[:limit]}&offset=#{options[:offset]}&status=#{options[:status]}", content).parsed_response
-    # get refs with provided custom query with specifc status
-    when options.fetch(:status) != nil && options.fetch(:q) != nil
-      get("/references?q=#{options[:q]}&limit=#{options[:limit]}&offset=#{options[:offset]}&status=#{options[:status]}", content).parsed_response
-    # get refs with provided custom query w/o providing specific status
-    when options.fetch(:status) == nil && options.fetch(:q) != nil
-      get("/references?q=#{options[:q]}&limit=#{options[:limit]}&offset=#{options[:offset]}", content).parsed_response
-    else
-      # just get all the reference as per the api defaults (when there is no args provided)
-      get("/references", content).parsed_response
-    end
+    content[:basic_auth] = authenticate(options.delete(:api_key))
+    content[:headers] = {'Content-Type' => 'application/json'}
+    content[:query] = options.delete(:query) || {}
+    get("/references", content).parsed_response
   end
 
   # Fetch a specific reference by his ID string
-  def self.get_reference(id)
-    options = {:basic_auth => authenticate}
+  def self.get_reference(id, options = {})
+    set_base_url(options.delete(:is_test))
+    options = {:basic_auth => authenticate(options.delete(:api_key))}
     get("/references/#{id}", options).parsed_response
   end
 
   # Submit a request to create a new reference
-  def self.new_reference(amount, expiry_date, other_data={})
-    # request body and header
-    auth = {:basic_auth => authenticate}
-
-    post("/references", 
-      :body =>{ :reference => {:amount => amount, :expiry_date => expiry_date, :custom_fields => other_data } }.to_json, 
-      :basic_auth => authenticate,
-      :headers => { 'Content-Type' => 'application/json'}).parsed_response
-  end
-
-  # Submit a request to create a new reference on behalf of other API_KEY
-  def self.other_new_reference(amount, expiry_date, other_data={}, api_key)
-    auth = {
-      username:"api",
-      password:"#{api_key}"
-    }
-    post("/references",
-      :body =>{ :reference => {:amount => amount, :expiry_date => expiry_date, :custom_fields => other_data } }.to_json,
-      :basic_auth => auth,
-      :headers => { 'Content-Type' => 'application/json'}).parsed_response
-  end
-
-  # Fetch all the payments that have not been acknoledged (by submiting the api key)
-  def self.other_get_payments(api_key)
-    auth = {
-      username:"api",
-      password:"#{api_key}"
-    }
-    options = {:basic_auth => auth}
-    get("/events/payments", options).parsed_response
+  def self.new_reference(amount, expiry_date, options={})
+    # new_reference(78654.90, '12-12-2012', custom_fields: {foo: 'F0000-45', bar: 'MMM'}, api_key: 'ctsrxte56v8bgfyv7fuf676t7o89099y85ce6f', is_test: true)
+    set_base_url(options.delete(:is_test))
+    content = {}
+    content[:basic_auth] = authenticate(options.delete(:api_key))
+    content[:body] = {:reference => {:amount => amount, :expiry_date => expiry_date, custom_fields: (options.delete(:custom_fields) || {})}}.to_json
+    content[:headers] = {'Content-Type' => 'application/json'}
+    post("/references", content).parsed_response
   end
 
   # Fetch all availables payments that have not been acknowledged.
   def self.get_payments(options={})
+    # Proxypay.get_payments(query: {limit: 20}, is_test: true, api_key: '0djwano5yth94ihrtw34ot9cehn9emo')
+    set_base_url(options.delete(:is_test))
     # request body and header
     content = {}
-    auth = {:basic_auth => authenticate}
-    body = {:headers => {'Content-Type' => 'application/json'}}
-    content.merge!(auth)
-    content.merge!(body)
-
-    # request query options
-    options = {n: nil}.merge!(options)
-    if options.fetch(:n) == nil
-      # get payments without providing any number(quantity)
-      get("/events/payments", content).parsed_response
-    else
-      # get payments with based on the number(quantity) provided
-      get("/events/payments?n=#{options[:n]}", content).parsed_response
-    end
+    content[:basic_auth] = authenticate(options.delete(:api_key))
+    content[:headers] = {'Content-Type' => 'application/json'}
+    content[:query] = options.delete(:query) || {}
+    get("/events/payments", content).parsed_response
   end
 
   # Acknowledge a payment by submitting his ID
-  def self.new_payment(id)
-    options = {:basic_auth => authenticate}
-    delete("/events/payments/#{id}", options).parsed_response
+  def self.new_payment(id, options = {})
+    set_base_url(options.delete(:is_test))
+    content = {:basic_auth => authenticate(options.delete(:api_key))}
+    delete("/events/payments/#{id}", content).parsed_response
   end
 
-  # Acknowledge a payment by submitting his ID and the API KEY
-  def self.other_new_payment(id, api_key)
-    auth = {
-      username:"api",
-      password:"#{api_key}"
-    }
-    options = {:basic_auth => auth}
-    delete("/events/payments/#{id}", options).parsed_response
+  # Acknowledge multiple payments by submitting an array of ids
+  def self.new_payments(ids, options = {})
+    set_base_url(options.delete(:is_test))
+    content = {}
+    content[:body] = { :ids => ids }.to_json
+    content[:basic_auth] = authenticate(options.delete(:api_key))
+    content[:headers] = {'Content-Type' => 'application/json'}
+    delete("/events/payments", content).parsed_response
   end
 
-  # Acknowledge multiple payments by submitting an array of ids
-  def self.new_payments(ids)
-    delete("/events/payments", :body => { :ids => ids }.to_json, :basic_auth => authenticate, :headers => { 'Content-Type' => 'application/json'} ).parsed_response
+  def self.set_base_url(is_test = false)
+    self.base_uri is_test == true ? "https://api.proxypay.co.ao/tests" : "https://api.proxypay.co.ao"
   end
 
   private
-  def self.authenticate
+  def self.authenticate(api_key = nil)
     auth = {
-      username:ENV["PROXYPAY_USER"],
-      password:ENV["PROXYPAY_API_KEY"]
+      username: api_key.nil? ? ENV["PROXYPAY_USER"] : 'api',
+      password: api_key.nil? ? ENV["PROXYPAY_API_KEY"] : api_key
     }
     return auth
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxypay
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ files:
 - bin/setup
 - lib/proxypay.rb
 - lib/proxypay/version.rb
-- proxypay-0.2.0.gem
+- proxypay-0.2.1.gem
 - proxypay.gemspec
 homepage: https://github.com/smaziano/proxypay
 licenses:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for ProxyPay API(https://proxypay.co.ao) made by SmartTechys(http://smarttechys.co.ao)