paytm-merchant 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a499b9d32a0ae534d4962b1ccbcadab48fa6c0
-  data.tar.gz: 337bd82a94f5989d41ef05ea0a3b6a3f7fb3bb27
+  metadata.gz: a5dc04189ff55f3ba21011dc3fcad44333aaf5c6
+  data.tar.gz: f57806c3333d525337f773e6a2906fd21bc0fd0c
 SHA512:
-  metadata.gz: 7239598b7f787b7523c279e3081d9f9fe8a81ca4f42f40d43464eeba16ae9f6661f57a6cbea9460a02c33accd23daf0cd2d1bfc6dd4c25dc8ed48d61c8f4b086
-  data.tar.gz: 1ad2ab76368be71d21c73c40e3e938ae84ea5fce786d64683e887053e8fb6997d94c9a4a63eb9a49072adcc63f8d96f549676a0460bf17a5f6f2c3d18453ffd9
+  metadata.gz: 0c8a6de3b585236a17cfe6e0dc9fca5d029d439c799dbaf3d2828429c69643d547fcfc309bc91713bc57cec13d412582f23bba1893e3ec63d5d4217d38396005
+  data.tar.gz: 3cd259c6e206fc7d100486559cd304d60d8b9c9528cdfcc855624251f1dad9aba53aa8b2daa1ea687d8ff5f987e819445f4e791db8fedcdec00d09badfe2ff54

data/README.md

@@ -24,7 +24,7 @@ To setup, first initialize the library with credentials.
 
 ```ruby
 Paytm.config do |paytm|
-  # paytm.base_uri = 'Some Base URI' # Default is staging api URI fpr paytm
+  # paytm.api_base_uri = 'Some Base URI' # Default is staging api URI fpr paytm
   paytm.merchant_guid = 'Paytm Merchant Guid'
   paytm.aes_key = 'Paytm AES Key'
   paytm.sales_wallet_id = 'Paytm Sales Wallet Id'

data/lib/{paytm/merchant/generators → generators}/paytm_setup_generator.rb

@@ -1,6 +1,6 @@
 InitializerContent = "# Paytm initializer to setup with configurations
 Paytm.config do |paytm|
-  # paytm.base_uri = 'Some Base URI' # Default is staging api URI fpr paytm
+  # paytm.api_base_uri = 'Some Base URI' # Default is staging api URI fpr paytm
   paytm.merchant_guid = 'Paytm Merchant Guid'
   paytm.aes_key = 'Paytm AES Key'
   paytm.sales_wallet_id = 'Paytm Sales Wallet Id'

data/lib/paytm/merchant.rb

@@ -4,15 +4,12 @@ require 'httparty'
 
 module PayTM
   module Merchant
-    include EncryptionNewPG
-    include HTTParty
-    extend EncryptionNewPG
 
-    # Class Variables
-    @@base_uri = nil
-    @@merchant_guid = nil
-    @@aes_key = nil
-    @@sales_wallet_id = nil
+    def self.included(base)
+      base.send :include, HTTParty
+      base.extend EncryptionNewPG
+      base.extend ClassMethods
+    end
 
     # Constants
     Staging_Base_Uri = 'http://trust-uat.paytm.in'
@@ -25,20 +22,9 @@ module PayTM
     attr_accessor :amount, :recipient, :phone, :email, :metadata
 
     # Class Methods
-    class << self
-
-      def base_uri=(value)
-        @@base_uri = value
-      end
-      def merchant_guid=(value)
-        @@merchant_guid = value
-      end
-      def aes_key=(value)
-        @@aes_key = value
-      end
-      def sales_wallet_id=(value)
-        @@sales_wallet_id = value
-      end
+    module ClassMethods
+      # Class attr_accessors
+      attr_accessor :api_base_uri, :merchant_guid, :aes_key, :sales_wallet_id
 
       def config(&block)
         instance_eval(&block)
@@ -47,7 +33,7 @@ module PayTM
 
       # Base URI for HTTParty requests
       def set_httparty_base_uri
-        base_uri(@@base_uri || Staging_Base_Uri)
+        base_uri(api_base_uri || PayTM::Merchant::Staging_Base_Uri)
       end
 
       def check_transaction_status_for(transaction_id, options = {})
@@ -106,7 +92,7 @@ module PayTM
           requestType: request_type,
           txnType: transaction_type,
           txnId: transaction_id,
-          merchantGuid: @@merchant_guid
+          merchantGuid: self.class.merchant_guid
         },
         platformName: 'PayTM',
         operationType: 'CHECK_TXN_STATUS'
@@ -121,10 +107,10 @@ module PayTM
       {
         request: {
           requestType: options[:request_type],
-          merchantGuid: @@merchant_guid,
-          merchantOrderId: options[:merchant_order_id] || "#{ @phone }-#{ Time.current.to_i }",
+          merchantGuid: self.class.merchant_guid,
+          merchantOrderId: options[:merchant_order_id] || "#{ @phone }-#{ Time.now.to_i }",
           salesWalletName: options[:sales_wallet_name],
-          salesWalletGuid: @@sales_wallet_id,
+          salesWalletGuid: self.class.sales_wallet_id,
           payeeEmailId: @email,
           payeePhoneNumber: @phone,
           payeeSsoId: options[:payee_sso_id] || '',
@@ -143,8 +129,8 @@ module PayTM
       {
         'Content-Type' => 'application/json',
         'Accept' => 'application/json',
-        'mid' => @@merchant_guid,
-        'checksumhash' => generate_hash(@@aes_key, request_body)
+        'mid' => self.class.merchant_guid,
+        'checksumhash' => generate_hash(self.class.aes_key, request_body)
       }
     end
 

data/lib/paytm/merchant/version.rb

@@ -1,5 +1,5 @@
 module PayTM
   module Merchant
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paytm-merchant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sachin
@@ -53,9 +53,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/generators/paytm_setup_generator.rb
 - lib/paytm/merchant.rb
 - lib/paytm/merchant/encryption_new_p_g.rb
-- lib/paytm/merchant/generators/paytm_setup_generator.rb
 - lib/paytm/merchant/version.rb
 - paytm-merchant.gemspec
 homepage: https://github.com/schnmudgal/paytm-merchant.git