gladepay 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f182537d1f4bf218db78a5dff536ad9b6e2a802e
-  data.tar.gz: df0df3b9c8a7e9584a18e061fa7d3526e2e77dbc
+  metadata.gz: 1ebcc5dec54974f3aa502ec3c2eb8b75261bdf2e
+  data.tar.gz: 27969552954f751bfc52476f99e66e2220001fc1
 SHA512:
-  metadata.gz: 6515231b543d9ce4c89cbc3701653062d2642e2029a800190af60e2f45e8aee0c2dfa8a941b8ffcdf3cba641d27b904b60ce0c1c5654fe31869452f8d3705919
-  data.tar.gz: 0bc806d636c010a6d0cd0eb6d3a22a9b08dc0c61fbeff86390f062e235de07c6b0208d91211085851d05704016f78fb0408b999e6486f0ee89ee5aaa8426bb0c
+  metadata.gz: 3e7c6706a3c725a1c3ab9fab6b2f5284a401ef310b67b2c40263c12963ed9ef540f3c285c9b755ba0b5bef6fa6290b0150e6148123242c44dc3efe69841ed8b0
+  data.tar.gz: a1d95b38e8bbba91d3d2b39f54714bfc48990eaa9b5c0855af8cfe21b0bd2239cbce1ff85fa99ab0b7dc48ffed52b90d61929f854ce447c14adce182ffe93848

data/README.md

@@ -51,17 +51,17 @@ Or install it yourself as:
         'currency' => 'NGN'
       }
 
-	@merchant_key = "GP0000001" #Test Data
-	@merchant_secret = "123456789" 
+	@merchant_id = "GP0000001" #Test Data
+	@merchant_key = "123456789" 
 	live = true #for live server, default false for test server
 
 	# Demp or Test Server Instance
-	gladepay = Gladepay.new(@merchant_key, @merchant_secret) # Or
+	gladepay = Gladepay.new(@merchant_id, @merchant_key) # Or
 
-	# gladepay = Gladepay.new(@merchant_key, @merchant_secret, false)
+	# gladepay = Gladepay.new(@merchant_id, @merchant_key, false)
 
 	#LIVE SERVER Instance
-	# gladepay = Gladepay.new(@merchant_key, @merchant_secret, true) #for live server
+	# gladepay = Gladepay.new(@merchant_id, @merchant_key, true) #for live server
 		
 	#Get Response
 	response = gladepay.card_payment(

data/lib/gladepay.rb

@@ -9,21 +9,21 @@ require 'json'
 class Gladepay
   include Api
 
-  attr_reader :merchant_key, :merchant_secret, :base_url, :live
+  attr_reader :merchant_id, :merchant_key, :base_url, :live
+
+  def initialize(merchant_id = nil, merchant_key = nil, live = false)
+    @merchant_id = if merchant_id.nil?
+                     ENV['merchant_id']
+                   else
+                     merchant_id
+                   end
 
-  def initialize(merchant_key = nil, merchant_secret = nil, live = false)
     @merchant_key = if merchant_key.nil?
-                      ENV['MERCHANT_KEY']
+                      ENV['merchant_key']
                     else
                       merchant_key
                     end
 
-    @merchant_secret = if merchant_secret.nil?
-                         ENV['MERCHANT_SECRET']
-                       else
-                         merchant_secret
-                       end
-
     @live = live
 
     @base_url = if @live
@@ -32,17 +32,17 @@ class Gladepay
                   DEMO_BASE_URL
                 end
 
-    if @merchant_key.nil?
-      raise GladepayBadKeyError, 'No merchant key supplied and couldn\'t find any in environment variables. Make sure to set merchant key as an environment variable MERCHANT_KEY'
+    if @merchant_id.nil?
+      raise GladepayBadKeyError, 'No merchant Id supplied and couldn\'t find any in environment variables. Make sure to set merchant Id as an environment variable merchant_id'
     end
 
-    raise GladepayBadKeyError, "Invalid merchant key #{@merchant_key}" unless @merchant_key[0..1] == 'GP'
+    raise GladepayBadKeyError, "Invalid merchant key #{@merchant_id}" unless @merchant_id[0..1] == 'GP'
 
-    if @merchant_secret.nil?
-      raise GladepayBadKeyError, 'No merchant secret supplied and couldn\'t find any in environment variables. Make sure to set the merchant secret as an environment variable MERCHANT_SECRET'
+    if @merchant_key.nil?
+      raise GladepayBadKeyError, 'No merchant key supplied and couldn\'t find any in environment variables. Make sure to set the merchant key as an environment variable merchant_key'
     end
 
-    raise GladepayBadKeyError, "Invalid merchant secret #{@merchant_secret}" unless @merchant_secret.to_i.to_s == @merchant_secret
+    raise GladepayBadKeyError, "Invalid merchant key #{@merchant_key}" unless @merchant_key.to_i.to_s == @merchant_key
 
     raise GladepayBadKeyError, 'Invalid BaseUrl Must SPECIFY LIVE or DEMO server' if @base_url.nil? && !@base_url.is_a?(TrueClass)
   end
@@ -288,7 +288,7 @@ class Gladepay
     begin
       jdata = JSON.generate(data)
       base_url_with_method = current_base_url + '/' + api_method
-      response = RestClient.put base_url_with_method, jdata, content_type: :json, accept: :json, key: @merchant_secret, mid: @merchant_key
+      response = RestClient.put base_url_with_method, jdata, content_type: :json, accept: :json, key: @merchant_key, mid: @merchant_id
 
       unless response.code == 200 || response.code == 201
         raise GladepayServerError.new(response), 'HTTP Code ' + response.code.to_s + ': ' + response.body.to_s

data/lib/gladepay/version.rb

@@ -1,3 +1,3 @@
 class Gladepay
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gladepay
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chinaka Light
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler