rubykassa 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9853afe8fbe86ab00ff98d3dce3400f53ee12174
-  data.tar.gz: 749c93e75d2f6aaf75e8b53d297aebe24cb1980c
+  metadata.gz: e32aed2ec5fcba1f0a2da295982531f30bc09639
+  data.tar.gz: 97b7a4036c09d345cd29becd995e259642786e37
 SHA512:
-  metadata.gz: 1e54ae545570baecfab863f0044f120fe701b5eac77c516545e07d4918095c63703fdc9594fdad9ef1d2ea0161c4b23b57208421a841851b0a09deae0ea17d96
-  data.tar.gz: 6890ca424c90fbe83e3dccedb894c2830a4d3ca2b54af7607691ad5bac78a4ab1926272da1bdce161ea5dbce73368bc31828f1ace981e5ec7cd791f4382f6935
+  metadata.gz: 780f5632372166c33f2eef59a63308a46ac87ad36a1f9db16e764763e42bf8acd7e1efeda195679435e45737cbd2972bad21e6ada74bdceec34114476d8102f2
+  data.tar.gz: 3402f01d6f369a09c850d5514941681367134c172516cf2f776d7c472cb6a99bf63446dcf67c010c80d0118a47e65005ed92bd93604d3b8d3b683dda5bd8ad3a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Edge (not released)
+
+* Fix bug with wrong signature generating with custom user params
+
 ## 0.2.5
 
 * Fix bug with passing custom params

data/app/controllers/robokassa_controller.rb

@@ -25,6 +25,6 @@ class RobokassaController < ApplicationController
   private
 
     def create_notification
-      @notification = Rubykassa::Notification.new params
+      @notification = Rubykassa::Notification.new request.query_parameters
     end
 end

data/lib/rubykassa/payment_interface.rb

@@ -20,6 +20,7 @@ module Rubykassa
 
     def initialize &block
       instance_eval &block if block_given?
+      shpfy_params
     end
 
     def test_mode?
@@ -30,10 +31,10 @@ module Rubykassa
       test_mode? ? "http://test.robokassa.ru/Index.aspx" : "https://merchant.roboxchange.com/Index.aspx"
     end
 
-    def pay_url(options = {})
-      options = options.slice(:currency, :description, :email, :culture)
+    def pay_url(extra_params = {})
+      extra_params = extra_params.slice(:currency, :description, :email, :culture)
 
-      "#{base_url}?" + initial_options.merge(options).map do |key, value| 
+      "#{base_url}?" + initial_options.merge(extra_params).map do |key, value| 
         if key =~ /^shp/
           "#{key}=#{value}"
         else
@@ -48,7 +49,13 @@ module Rubykassa
         total: @total,
         invoice_id: @invoice_id,
         signature: generate_signature_for(:payment)
-      }.merge(Hash[@params.sort.map {|param_name| ["shp#{param_name[0]}".to_sym, param_name[1]]}])
+      }.merge(Hash[@params.sort.map {|param_name| [param_name[0], param_name[1]]}])
     end
+
+    private
+
+      def shpfy_params
+        @params = @params.map {|param_name| ["shp#{param_name[0]}".to_sym, param_name[1]]}
+      end
   end
 end

data/lib/rubykassa/signature_generator.rb

@@ -2,22 +2,26 @@
 module Rubykassa
   module SignatureGenerator
     def generate_signature_for kind
-      raise ArgumentError, "Available kinds are only :payment, :result or :success" unless [:success, :payment, :result].include? kind
-      custom_params = @params.keys.select {|key| key =~ /^shp/ }.sort.map {|key| "#{key}=#{params[key]}"}
-      custom_params_string = custom_params.present? ? ":#{custom_params}" : ""
-      
-      Digest::MD5.hexdigest(params_string(kind, custom_params_string))
+      raise ArgumentError, "Available kinds are only :payment, :result or :success" unless [:success, :payment, :result].include? kind      
+      Digest::MD5.hexdigest(params_string(kind))
     end
 
-    def params_string kind, custom_params_string
+    def params_string kind
       string = case kind
       when :payment
-        [Rubykassa.login, @total, @invoice_id, Rubykassa.first_password].join(":") + custom_params_string
+        [Rubykassa.login, @total, @invoice_id, Rubykassa.first_password, custom_params].flatten.join(":")
       when :result
-        [@total, @invoice_id, Rubykassa.second_password].join(":") + custom_params_string
+        [@total, @invoice_id, Rubykassa.second_password, custom_params].flatten.join(":")
       when :success
-        [@total, @invoice_id, Rubykassa.first_password].join(":") + custom_params_string
+        [@total, @invoice_id, Rubykassa.first_password, custom_params].flatten.join(":")
+      end
+    end
+
+    def custom_params
+      @params.sort.inject([]) do |result, element|
+        result << element.join("=") if element[0] =~ /^shp/
+        result
       end
     end
   end
-end
+end

data/lib/rubykassa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Rubykassa
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/rubykassa.rb

@@ -18,11 +18,11 @@ module Rubykassa
     end
   end
 
-  def pay_url invoice_id, total, params, options = {}
+  def pay_url invoice_id, total, custom_params, extra_params = {}
     Rubykassa::PaymentInterface.new do
-      self.total      = total
-      self.invoice_id = invoice_id
-      self.params     = params
-    end.pay_url(options)
+      self.total              = total
+      self.invoice_id         = invoice_id
+      self.params = custom_params
+    end.pay_url(extra_params)
   end
 end

data/spec/rubykassa/payment_interface_spec.rb

@@ -18,11 +18,11 @@ describe Rubykassa::PaymentInterface do
   end
 
   it "should return correct pay_url" do
-    @payment_interface.pay_url.should == "http://test.robokassa.ru/Index.aspx?MrchLogin=your_login&OutSum=1200&InvId=12&SignatureValue=96c0bbd4fc8f365455e949b1fbf5e3f4&shpfoo=bar"
+    @payment_interface.pay_url.should == "http://test.robokassa.ru/Index.aspx?MrchLogin=your_login&OutSum=1200&InvId=12&SignatureValue=bf0504363d89638669e057932857316c&shpfoo=bar"
   end
 
   it "should return correct pay_url when additional options passed" do
-    @payment_interface.pay_url({description: "desc", culture: "ru", email: "foo@bar.com", currency: ""}).should == "http://test.robokassa.ru/Index.aspx?MrchLogin=your_login&OutSum=1200&InvId=12&SignatureValue=96c0bbd4fc8f365455e949b1fbf5e3f4&shpfoo=bar&IncCurrLabel=&Desc=desc&Email=foo@bar.com&Culture=ru"
+    @payment_interface.pay_url({description: "desc", culture: "ru", email: "foo@bar.com", currency: ""}).should == "http://test.robokassa.ru/Index.aspx?MrchLogin=your_login&OutSum=1200&InvId=12&SignatureValue=bf0504363d89638669e057932857316c&shpfoo=bar&IncCurrLabel=&Desc=desc&Email=foo@bar.com&Culture=ru"
   end
 
   it "should return correct initial_options" do
@@ -30,7 +30,7 @@ describe Rubykassa::PaymentInterface do
       login: "your_login",
       total: 1200,
       invoice_id: 12,
-      signature: "96c0bbd4fc8f365455e949b1fbf5e3f4",
+      signature: "bf0504363d89638669e057932857316c",
       shpfoo: "bar"
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubykassa
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Sergey Kishenin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails