rubykassa 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52a778739e02a0c460779e56ef5aa8f1551a341
-  data.tar.gz: a8c7956dad7f2320f9c53edf8b159348a931b75b
+  metadata.gz: dd92e78dd2880fad505c7e4bcf561a011c0ebabd
+  data.tar.gz: 7075c5b4b5a8b7d5852f2de6e985bba652e23455
 SHA512:
-  metadata.gz: 21cc076fa77de32594bf1e7ee3e13874ff1853a8c14dbc58ef8d3a51fd8c8a4fdb984f22ab17183b0c0746add7a34602319914b4b6bb8eacb168c8d2e8dc40a4
-  data.tar.gz: 4c18a84c4d1153f1a71ed7fc416958f2f1557a5b06868cabd2c23ed447b106f84ce712fee9be7f7a6281d4f2e8ae180d678195ec6e3e85ab6fba48fda2bc5929
+  metadata.gz: a1800cc9729f3a985d9aabf204b3199c251f5b2bdfc6bbe7425256a5e797fb54c148b16f9f3d71ccbcf81bc6b5cf1606588501690b7863b3f21e7a609994f5c3
+  data.tar.gz: 71a029822a6eaf978bd1cd0b950ca9c1ae3a231f556d177188795bdb823f61b7b8b837873ef3e7169ba065b56f9779906307f8e88e87e8ec5f29b16c243666ed

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Edge (not released)
 
+## 0.3.2
+
+* Add confugurable result callback [#14][]
+
+[#14]:https://github.com/ZeroOneStudio/rubykassa/pull/14
+
 ## 0.3.1
 
 * Pass `controller` and `notification` variables to callback block by @1um [#12][]

data/README.md

@@ -5,6 +5,7 @@
 [![Coverage Status](https://coveralls.io/repos/ZeroOneStudio/rubykassa/badge.png)](https://coveralls.io/r/ZeroOneStudio/rubykassa)
 [![Code Climate](https://codeclimate.com/github/ZeroOneStudio/rubykassa.png)](https://codeclimate.com/github/ZeroOneStudio/rubykassa)
 [![Dependency Status](https://gemnasium.com/ZeroOneStudio/rubykassa.png)](https://gemnasium.com/ZeroOneStudio/rubykassa)
+[![Inline docs](http://inch-ci.org/github/ZeroOneStudio/rubykassa.svg?branch=master)](http://inch-ci.org/github/ZeroOneStudio/rubykassa)
 
 by [Zero One][]
 
@@ -47,11 +48,14 @@ To define custom success/fail callbacks you can also use the initializer:
 
     Rubykassa.configure do |config|
       ...
-      config.success_callback = -> (controller, notification){ render text: 'success' }
-      config.fail_callback = -> (controller, notification){ redirect_to root_path }
+      config.success_callback = -> (controller, notification) { controller.render text: 'success' }
+      config.fail_callback = -> (controller, notification) { controller.redirect_to controller.root_path }
+      config.result_callback = -> (controller, notification) { controller.render text: notification.success }
     end
 
-Lambdas are called in RobokassaController so you can respond with [any kind that is supported by Rails](http://guides.rubyonrails.org/layouts_and_rendering.html#creating-responses)    
+Lambdas are called in RobokassaController so you can respond with [any kind that is supported by Rails](http://guides.rubyonrails.org/layouts_and_rendering.html#creating-responses) calling it on the `controller` variable. 
+
+NOTE: `result_callback` should always return `"OK#{ invoice_id }"` string. So, implement your custom logic above `render text: notification.success` line.
 
 Mode is `:test` by default. For production you have to use `:production`.
 `http_method` and `xml_http_method` are `:get` by default but can be configured as `:post`
@@ -103,4 +107,4 @@ Copyright (c) 2013-2014 [Zero One][]
 [ZERO.ONE]: http://www.zeroone.st
 
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ZeroOneStudio/rubykassa/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ZeroOneStudio/rubykassa/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/app/controllers/robokassa_controller.rb

@@ -4,7 +4,7 @@ class RobokassaController < ApplicationController
 
   def paid
     if @notification.valid_result_signature?
-      render text: @notification.success
+      Rubykassa.result_callback.call(self, @notification)
     else
       Rubykassa.fail_callback.call(self, @notification)
     end

data/lib/generators/rubykassa/templates/rubykassa.rb

@@ -1,14 +1,21 @@
 # -*- encoding : utf-8 -*-
-Rubykassa.configure do |c|
-  c.login = ENV["ROBOKASSA_LOGIN"]
-  c.first_password = ENV["ROBOKASSA_FIRST_PASSWORD"]
-  c.second_password = ENV["ROBOKASSA_SECOND_PASSWORD"]
-  c.mode = :test # or :production
-  c.http_method = :get # or :post
-  c.xml_http_method = :get # or :post
+Rubykassa.configure do |config|
+  config.login = ENV["ROBOKASSA_LOGIN"]
+  config.first_password = ENV["ROBOKASSA_FIRST_PASSWORD"]
+  config.second_password = ENV["ROBOKASSA_SECOND_PASSWORD"]
+  config.mode = :test # or :production
+  config.http_method = :get # or :post
+  config.xml_http_method = :get # or :post
+
+
+  # Result callback is called in RobokassaController#paid action if valid signature
+  # was generated. It should always return "OK#{ invoice_id }" string, so implement
+  # your custom logic above `controller.render text: notification.success` line
+
+  config.result_callback = -> (controller, notification) { controller.render text: notification.success }
 
   # Define success or failure callbacks here like:
 
-  # config.success_callback = -> (controller, notification){ render text: 'success' }
-  # config.fail_callback = -> (controller, notification){ redirect_to root_path }
+  # config.success_callback = -> (controller, notification) { controller.render text: 'success' }
+  # config.fail_callback = -> (controller, notification) { controller.redirect_to controller.root_path }
 end

data/lib/rubykassa/configuration.rb

@@ -4,6 +4,7 @@ module Rubykassa
     attr_accessor :login, :first_password, :second_password, :mode, :http_method, :xml_http_method
     attr_accessor :success_callback
     attr_accessor :fail_callback
+    attr_accessor :result_callback
 
     def initialize
       self.login = "your_login"
@@ -18,6 +19,9 @@ module Rubykassa
       self.fail_callback = Proc.new do |controller, notification|
         render text: 'fail'
       end
+      self.result_callback = Proc.new do |controller, notification|
+        render text: notification.success
+      end      
     end
   end
-end
+end

data/lib/rubykassa/version.rb

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

data/lib/rubykassa.rb

@@ -12,7 +12,7 @@ module Rubykassa
     Rubykassa::Client.configure &block
   end
 
-  %w(login first_password second_password mode http_method xml_http_method success_callback fail_callback).map do |name|
+  %w(login first_password second_password mode http_method xml_http_method success_callback fail_callback result_callback).map do |name|
     define_method name do
       Rubykassa::Client.configuration.send(name)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubykassa
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sergey Kishenin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails