privat24_api 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a56e4dd019db0597d3f7d57968e8c87ddaf8c8cc09369bcbd4382e2e8d3b0d88
-  data.tar.gz: fad096935ce7dd9922dc01cad036da1652f3a3258fa3acfdb9aa8ffdff094760
+  metadata.gz: abce1d097e78c5a39fa4debf7542fb92c5cfe8ec262b2c6d12a055d0d87fafdc
+  data.tar.gz: 760c0df0ce188e4f47a82e594112ac74adca14754669c14e93b9a1ed662158f7
 SHA512:
-  metadata.gz: 49d41341a5a4d278bd7a7023db4c65c79f78c2d1494d7fd4cdb7e25d618684f6bddea523e230d9dc823fd52e8cbfbb0042bc1701457bc6dc0f282322a643f597
-  data.tar.gz: 4f38a9bb2e1273a5722c77a9b87276278ca3a79becf93ba8ac98e55a9364b27e65d3a68b763fe925d42d1dff4362d56f71bb0acce45a386bfdfef7199f283462
+  metadata.gz: 4d43174dcae07822e85e437689222a3348c45e467623b47dfb16b5f06d19f0edce67e031e53c0611755552dd15cd4447fc0afab909e909667e90f2b19cfacec0
+  data.tar.gz: 12e37e4e370a93bdbe4c72eff28d791931d3c865f332fec9a3eda5c206bd44b676b66c99e0799ba96bf3d52febbd8cf2480f9b57b3173d216dd9739431e19f19

data/lib/privat24_api/card/card.rb

@@ -17,9 +17,5 @@ module Privat24Api
     def payment
       Privat24Api::PaymentRequest.new(args)
     end
-
-    def public
-      Privat24Api::PublicRequest.new(args)
-    end
   end
 end

data/lib/privat24_api/configure.rb

@@ -35,13 +35,13 @@ module Privat24Api
       'send_sms'               => 'sendsms'
     },
     'public' => {
-      'exchange_cash'       => 'pubinfo?exchange&coursid=5',
-      'exchange_non_cash'   => 'pubinfo?exchange&coursid=11',
-      'exchange'            => 'pubinfo?exchange&coursid=3',
+      'exchange_cash'       => 'pubinfo',
+      'exchange_non_cash'   => 'pubinfo',
+      'exchange'            => 'pubinfo',
       'exchange_archive'    => 'exchange_rates',
       'list_privat_offices' => 'pboffice',
-      'atm'                 => 'https://api.privatbank.ua/p24api/infrastructure?atm',
-      'tso'                 => 'https://api.privatbank.ua/p24api/infrastructure?tso'
+      'atm'                 => 'infrastructure',
+      'tso'                 => 'infrastructure'
     }
   }
 end

data/lib/privat24_api/request/info/info_request.rb

@@ -12,7 +12,7 @@ module Privat24Api
     end
 
     def balance
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.payment(id: '')
@@ -22,7 +22,7 @@ module Privat24Api
     end
 
     def transaction_details(date_from, date_to)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')

data/lib/privat24_api/request/payment/payment_request.rb

@@ -13,7 +13,7 @@ module Privat24Api
 
     # payment_id - order id of your shop
     def pay_on_privat_card(payment_id, card, amount, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -28,7 +28,7 @@ module Privat24Api
 
     # payment_id - order id of your shop
     def pay_on_ua_card(payment_id, card, amount, b_name, b_crf, b_bic, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -46,7 +46,7 @@ module Privat24Api
 
     # payment_id - order id of your shop
     def pay_on_visa_card(payment_id, card, amount, b_name, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('30')
         data.test('0')
@@ -61,7 +61,7 @@ module Privat24Api
     end
 
     def check_status_pay(id, ref)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -73,7 +73,7 @@ module Privat24Api
     end
 
     def pay_on_mobile(phone, amount)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -85,7 +85,7 @@ module Privat24Api
     end
 
     def pay_on_mobile_multiple(phones)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -99,7 +99,7 @@ module Privat24Api
     end
 
     def check_status_mobile(id)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')
@@ -110,7 +110,7 @@ module Privat24Api
     end
 
     def send_sms(phone_from, phone_to, message)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
+      Request.new(card_args).send_data_for(MOD, __method__.to_s) do |data|
         data.oper('cmt')
         data.wait('0')
         data.test('0')

data/lib/privat24_api/request/public/public_request.rb

@@ -5,121 +5,38 @@ module Privat24Api
 
     MOD = 'public'
 
-    attr_reader :card_args
-
-    def initialize(**card_args)
-      @card_args = card_args
+    def exchange_cash(url_attr='?exchange&coursid=5')
+      request(__method__.to_s, url_attr)
     end
 
-    # payment_id - order id of your shop
-    def pay_on_privat_card(payment_id, card, amount, details, currency='UAH')
-      Request.new(card_args).send_data_for(:get, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment(id: payment_id) do
-          data.prop(name: 'b_card_or_acc', value: card)
-          data.prop(name: 'amt',           value: amount)
-          data.prop(name: 'ccy',           value: currency)
-          data.prop(name: 'details',       value: details)
-        end
-      end
+    def exchange_non_cash(url_attr='?exchange&coursid=11')
+      request(__method__.to_s, url_attr)
     end
 
-    # payment_id - order id of your shop
-    def pay_on_ua_card(payment_id, card, amount, b_name, b_crf, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment(id: payment_id) do
-          data.prop(name: 'b_card_or_acc', value: card)
-          data.prop(name: 'amt',           value: amount)
-          data.prop(name: 'ccy',           value: currency)
-          data.prop(name: 'b_name',        value: b_name)
-          data.prop(name: 'b_crf',         value: b_crf)
-          data.prop(name: 'b_bic',         value: b_bic)
-          data.prop(name: 'details',       value: details)
-        end
-      end
+    def exchange(url_attr='?exchange&coursid=3')
+      request(__method__.to_s, url_attr)
     end
 
-    # payment_id - order id of your shop
-    def pay_on_visa_card(payment_id, card, amount, b_name, b_crf, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('30')
-        data.test('0')
-        data.payment(id: payment_id) do
-          data.prop(name: 'b_card_or_acc', value: card)
-          data.prop(name: 'amt',           value: amount)
-          data.prop(name: 'ccy',           value: currency)
-          data.prop(name: 'b_name',        value: b_name)
-          data.prop(name: 'details',       value: details)
-        end
-      end
+    def exchange_archive(url_attr)
+      request(__method__.to_s, url_attr)
     end
 
-    def check_status_pay(payment_id, card, amount, b_name, b_crf, details, currency='UAH')
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment do
-          data.prop(name: 'id',  value: card)
-          data.prop(name: 'ref', value: amount)
-        end
-      end
+    def list_privat_offices(url_attr=nil)
+      request(__method__.to_s, url_attr)
     end
 
-    def pay_on_mobile(phone, amount)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment(id: '') do
-          data.prop(name: 'phone', value: phone)
-          data.prop(name: 'amt',   value: amount)
-        end
-      end
+    def atm(url_attr='?atm')
+      request(__method__.to_s, url_attr)
     end
 
-    def pay_on_mobile(*phones)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        phones.each_with_index do |phone, index|
-          data.payment(id: index) do
-            data.prop(name: 'phone', value: phone[:number])
-            data.prop(name: 'amt',   value: phone[:amount])
-          end
-        end
-      end
+    def tso(url_attr='?tso')
+      request(__method__.to_s, url_attr)
     end
 
-    def check_status_mobile(id)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment do
-          data.prop(name: 'id', value: id)
-        end
-      end
-    end
+    private
 
-    def send_sms(phone_from, phone_to, message)
-      Request.new(card_args).send_data_for(:post, MOD, __method__.to_s) do |data|
-        data.oper('cmt')
-        data.wait('0')
-        data.test('0')
-        data.payment(id: '') do
-          data.prop(name: 'phone',   value: phone_from)
-          data.prop(name: 'phoneto', value: phone_to)
-          data.prop(name: 'text',    value: message)
-        end
-      end
+    def request(met, url_attr)
+      Request.new.get_public_data_for(MOD, met, url_attr)
     end
   end
 end

data/lib/privat24_api/request/request.rb

@@ -12,7 +12,7 @@ module Privat24Api
       @merchant_password = card_args[:merchant_password]
     end
 
-    def send_data_for(type, mod, met, url_attr=nil)
+    def send_data_for(mod, met)
       builder = Nokogiri::XML::DocumentFragment.parse ""
       Nokogiri::XML::Builder.with(builder) do |xml|
         yield xml
@@ -20,22 +20,25 @@ module Privat24Api
 
       @data_value = builder.to_xml
 
-      Response.new( send(type, mod, met, url_attr) )
+      Response.new( 
+        RestClient.post(default_url(mod, met), unescape_xml(make_xml), {content_type: 'text/xml'}).body
+      )
     end
 
-    private
-
-    def send(type, mod, met, url_attr)
-      url  = url_attr ? make_url(url_attr) : default_url(mod, met)
-      RestClient.method(type).call(url, unescape_xml(make_xml), {content_type: 'text/xml'}).body
+    def get_public_data_for(mod, met, url_attr=nil)
+      Response.new(
+        RestClient.get(make_url(mod, met, url_attr), {content_type: 'application/x-www-form-urlencoded'}).body
+      )
     end
 
+    private
+
     def default_url(mod, met)
-      "#{Privat24Api.base_url}#{Privat24Api.end_points[mod][met]}"
+      URI::encode("#{Privat24Api.base_url}#{Privat24Api.end_points[mod][met]}")
     end
 
-    def make_url(url_attr)
-      "#{Privat24Api.base_url}#{Privat24Api.end_points[mod][met] << url_attr}"
+    def make_url(mod, met, url_attr)
+      URI::encode(default_url(mod, met) << url_attr.to_s)
     end
 
     def unescape_xml(xml)

data/lib/privat24_api/version.rb

@@ -1,3 +1,3 @@
 module Privat24Api
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: privat24_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - woodcrust