paysto-rails 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146fbeb3db8bf0d6dade99ab49918b88e0adf69a
-  data.tar.gz: 3b495e18d3d3517f56a1fd67f5f8007726864023
+  metadata.gz: 7700a24bc357595d65d5bcf07880a171611f7635
+  data.tar.gz: 8dfd72717eaeae5936ff620c5a76feb3d5d2e190
 SHA512:
-  metadata.gz: dde4877b7b7254f0a52f73759d4697d069b3534acc65bcf079402ef39d2aec1c4a4ee5e814e269d7b17348ad6b6ba024f185079e970219e3f0bba9090107f1b0
-  data.tar.gz: 0c8359665d747d1f9032012019f60a33848187e7d2aafff5aae1c1b54827784be6e2f87a0aa1da3a93dbb2be7ebed216109f5d695decdb6dd5f1a2f9eb579be2
+  metadata.gz: 9716185ddc6a3691b9240eb189750d995f1a7401980422b9061093d2a13024a14421a669a3f8f569290c87a5b03e5f17dbc96eaaf888b2c24b545312663eb3e2
+  data.tar.gz: ff1a47758b4bde9ecdc77276be927191a110810b57b5ee67fa8dd381af3b8d110af4f6d529b32eaf6be316a926375080d8c18310ccf1bcfcf88c77bed085eb1c

data/README.md

@@ -8,7 +8,7 @@
 
 This is quick implementation for passing payments through [Paysto](https://paysto.com) gateway. It works only with «[onlineMerchant](https://paysto.com/ru/products/onlineMerchant)». Your PRs are welcome.
 
-Check demo shop in action: [www.paysto.tk](http://www.paysto.tk/). And source code [here](http://github.com/fbandrey/paysto-demo).
+Check demo shop in action: [ror.paysto.in](https://ror.paysto.in/). And source code [here](https://github.com/fbandrey/paysto-demo).
 
 ## Installation
 
@@ -82,7 +82,7 @@ But you may override methods as you want. For example, if you want to redirect u
 ```
 class PaystoController < ApplicationController
   include Paysto::Controller
-  
+
   def success
     flash[:success] = I18n.t('paysto.success')
     redirect_to any_custom_payments_path

data/lib/generators/templates/config/paysto.rb

@@ -15,14 +15,10 @@ Paysto.setup do |config|
 
   # === Paysto server IPs.
   config.ips = [
-    '66.226.72.66',
-    '66.226.74.225',
-    '66.226.74.226',
-    '66.226.74.227',
-    '66.226.74.228',
     '23.102.21.72',
+    '137.135.207.41',
     '23.102.17.162',
-    '137.135.207.41'
+    '168.61.92.150'
   ]
 
   # === Payments tax of your tariff plan in Paysto. Default onlineMerchant "All inclusive" is 5%.
@@ -39,4 +35,4 @@ Paysto.setup do |config|
   config.invoice_class_name              = 'Invoice'
   config.invoice_notification_class_name = 'InvoiceNotification'
 
-end
+end

data/lib/paysto/base.rb

@@ -14,6 +14,8 @@ module Paysto
                   :invoice_class_name,
                   :invoice_notification_class_name
 
+  RXP = Regexp.new('[^a-zA-Z0-9$&%;:?!\.,\s}(\[){\]"\'`\\/|^_~*+=<>@-]+')
+
   class << self
 
     # Configuring module.
@@ -65,7 +67,7 @@ module Paysto
     def get_payment_type(invoice_id, time = Time.zone.now)
       _payments = get_payments(time.utc - 30.minutes, time.utc + 5.minutes)
       if _payments.present?
-        p = _payments.select{|_p| _p[2].eql?(invoice_id.to_s)}.first
+        p = _payments.select{ |_p| _p[2].eql?(invoice_id.to_s) }.first
         _type = p[7] if p
       end
       _type || 'common'
@@ -83,8 +85,8 @@ module Paysto
 
     # Check whether the MD5 sign is valid.
     def md5_valid?(p)
-      except_keys = ['action', 'controller', 'PAYSTO_MD5']
-      generate_md5(p.reject{|k,v| except_keys.include?(k)}) == p['PAYSTO_MD5']
+      hash = p.except('action', 'controller', 'PAYSTO_MD5')
+      generate_md5(hash) == p['PAYSTO_MD5']
     end
 
     # Timestamp string in Paysto format for payments expiration.
@@ -105,11 +107,17 @@ module Paysto
 
     # Generating MD5 sign according with received params.
     def generate_md5(p = {}, upcase = true)
-      hash_str = p.to_a.sort_by{|pair| pair.first.downcase}.map{|pair| pair.join('=')}.join('&')
-      md5 = Digest::MD5.hexdigest("#{hash_str}&#{@@secret}")
+      md5 = Digest::MD5.hexdigest(md5_string(p))
       upcase ? md5.upcase : md5
     end
 
+    # Final data string to gererane MD5.
+    def md5_string(p = {})
+      str = p.to_a.sort_by{ |pair| pair.first.downcase }.map{ |pair| pair.join('=') }.join('&')
+      str_with_secret = [str, @@secret].join('&')
+      str_with_secret.gsub(RXP, '')
+    end
+
     # Base set of params for requests.
     def base_params
       p = { 'PAYSTO_SHOP_ID' => @@id }

data/lib/paysto/controller.rb

@@ -10,7 +10,7 @@ module Paysto
     # First step of payment workflow: Invoice, IP and MD5 verification.
     # Render invoice ID if everything right or anything else if not.
     def check
-      invoice = Paysto.invoice_class.find_by_id(params['PAYSTO_INVOICE_ID'])
+      invoice = Paysto.invoice_class.find_by(id: params['PAYSTO_INVOICE_ID'])
       if Paysto.invoice_valid?(invoice) && Paysto.ip_valid?(request.remote_ip) && Paysto.md5_valid?(params)
         render text: invoice.id
       else
@@ -21,7 +21,7 @@ module Paysto
     # Second step of payment workflow: Payment creation.
     # Render invoice ID if everything right or anything else if not.
     def callback
-      invoice = Paysto.invoice_class.find_by_id(params['PAYSTO_INVOICE_ID'])
+      invoice = Paysto.invoice_class.find_by(id: params['PAYSTO_INVOICE_ID'])
       if invoice && invoice.need_to_be_paid?(:paysto, params['PAYSTO_REQUEST_MODE'], params['PAYSTO_SUM']) && Paysto.ip_valid?(request.remote_ip) && Paysto.md5_valid?(params)
         invoice.notify(params, :paysto)
         invoice.send("create_#{Paysto.payment_class_name.underscore}", Paysto.get_payment_type(invoice.id), 'paysto', Paysto.real_amount(params['PAYSTO_SUM']))

data/lib/paysto/version.rb

@@ -1,3 +1,3 @@
 module Paysto
-  VERSION = '1.0.4'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: paysto-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Andrey Baiburin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: i18n
   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: Paysto.com implementation for Ruby on Rails applications
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -90,17 +90,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Paysto.com implementation for Ruby on Rails applications