rubykassa 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b7cea85eadf162de776c52022447cb0e016c87
-  data.tar.gz: d3c9b7245e873830712757bbc3a0cf13c2b8136d
+  metadata.gz: 9853afe8fbe86ab00ff98d3dce3400f53ee12174
+  data.tar.gz: 749c93e75d2f6aaf75e8b53d297aebe24cb1980c
 SHA512:
-  metadata.gz: 7981dafb420f6cd6b6f5b775278a4c84e7a12172674698a2ec85ef05f14f853416c29617fb2b54222e35271bb75840f173eacded542f5ae8e856c106e8d8823e
-  data.tar.gz: 9257a3dab1d9471b21b6360a3335ca830174ef5dcc68fc79b50c6bcc22e2211515285d87cd6676cea940593960c2dae7d1e0fe4f5f09e6e523cd6d1ba62e9530
+  metadata.gz: 1e54ae545570baecfab863f0044f120fe701b5eac77c516545e07d4918095c63703fdc9594fdad9ef1d2ea0161c4b23b57208421a841851b0a09deae0ea17d96
+  data.tar.gz: 6890ca424c90fbe83e3dccedb894c2830a4d3ca2b54af7607691ad5bac78a4ab1926272da1bdce161ea5dbce73368bc31828f1ace981e5ec7cd791f4382f6935

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.5
+
+* Fix bug with passing custom params
+
 ## 0.2.4
 
 * Fix naming issue with pay helper: rename 'link_to_pay' to 'pay_url'.
@@ -14,4 +18,4 @@
 
 * Fix description param name from `'InvDesc'` to `'Desc'`. Closes [#2][]
 
-[#2]: https://github.com/ZeroOneStudio/rubykassa/issues/2
+[#2]: https://github.com/ZeroOneStudio/rubykassa/issues/2

data/README.md

@@ -48,6 +48,10 @@ Additionally you may want to pass extra options. There is no problem:
 
     <%= pay_url "Pay with Robokassa", ivoice_id, total_sum, { description: "Invoice description", email: "foo@bar.com", currency: "WMZM", culture: :ru } %>
 
+Or if you would like to pass some custom params use `custom` key in options hash:
+
+    <%= pay_url "Pay with Robokassa", ivoice_id, total_sum, { description: "Invoice description", email: "foo@bar.com", currency: "WMZM", culture: :ru, custom: { param1: "value1", param2: "value2" }} %>        
+
 If you need to implement Robokassa's XML interface functionality you have to the following:
 
     xml_interface = Rubykassa::XmlInterface.new do

data/app/controllers/robokassa_controller.rb

@@ -22,9 +22,9 @@ class RobokassaController < ApplicationController
     render text: "fail"
   end
 
-private
+  private
 
-  def create_notification
-    @notification = Rubykassa::Notification.new params
-  end
+    def create_notification
+      @notification = Rubykassa::Notification.new params
+    end
 end

data/config/routes.rb

@@ -3,7 +3,7 @@ Rails.application.routes.draw do
   if Rubykassa::Client.configuration
     scope '/robokassa' do
       %w(paid success fail).map do |route|
-        method(Rubykassa.http_method).call "/#{route}" => "robokassa##{route}", as: "robokassa_#{route}".to_sym 
+        method(Rubykassa.http_method).call "/#{route}" => "robokassa##{route}", as: "robokassa_#{route}" 
       end
     end
   end

data/lib/rubykassa/action_view_extension.rb

@@ -2,9 +2,10 @@
 module Rubykassa
   module ActionViewExtension
     def pay_url phrase, invoice_id, total, options = {}
-      phrase ||= "Pay"
       total, invoice_id  = total.to_s, invoice_id.to_s
-      link_to phrase, Rubykassa.pay_url(invoice_id, total, params, options)
+      extra_params  = options.except(:custom)
+      custom_params = options[:custom] ||= {}
+      link_to phrase, Rubykassa.pay_url(invoice_id, total, custom_params, extra_params)
     end
   end
 end

data/lib/rubykassa/payment_interface.rb

@@ -34,8 +34,12 @@ module Rubykassa
       options = options.slice(:currency, :description, :email, :culture)
 
       "#{base_url}?" + initial_options.merge(options).map do |key, value| 
-        "#{PARAMS_CONFORMITY[key.to_sym]}=#{value}" unless key =~ /^shp/
-      end.compact!.join("&")
+        if key =~ /^shp/
+          "#{key}=#{value}"
+        else
+          "#{PARAMS_CONFORMITY[key]}=#{value}"
+        end
+      end.compact.join("&")
     end
 
     def initial_options
@@ -47,4 +51,4 @@ module Rubykassa
       }.merge(Hash[@params.sort.map {|param_name| ["shp#{param_name[0]}".to_sym, param_name[1]]}])
     end
   end
-end
+end

data/lib/rubykassa/version.rb

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

data/spec/rubykassa/payment_interface_spec.rb

@@ -6,7 +6,7 @@ describe Rubykassa::PaymentInterface do
     @payment_interface = Rubykassa::PaymentInterface.new do
       self.invoice_id = 12
       self.total = 1200
-      self.params = {foo: "bar"}
+      self.params = { foo: "bar" }
     end
 
     Rubykassa.configure do |config|
@@ -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"
+    @payment_interface.pay_url.should == "http://test.robokassa.ru/Index.aspx?MrchLogin=your_login&OutSum=1200&InvId=12&SignatureValue=96c0bbd4fc8f365455e949b1fbf5e3f4&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&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=96c0bbd4fc8f365455e949b1fbf5e3f4&shpfoo=bar&IncCurrLabel=&Desc=desc&Email=foo@bar.com&Culture=ru"
   end
 
   it "should return correct initial_options" do

metadata

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