rubykassa 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32aed2ec5fcba1f0a2da295982531f30bc09639
-  data.tar.gz: 97b7a4036c09d345cd29becd995e259642786e37
+  metadata.gz: 3ade0bc62aef80b744ba0986070c235d5f984bb6
+  data.tar.gz: 04c7e176126113ec11c16cad12b83aee1a95b5ba
 SHA512:
-  metadata.gz: 780f5632372166c33f2eef59a63308a46ac87ad36a1f9db16e764763e42bf8acd7e1efeda195679435e45737cbd2972bad21e6ada74bdceec34114476d8102f2
-  data.tar.gz: 3402f01d6f369a09c850d5514941681367134c172516cf2f776d7c472cb6a99bf63446dcf67c010c80d0118a47e65005ed92bd93604d3b8d3b683dda5bd8ad3a
+  metadata.gz: b3fc71559975f76cd9c406a0a05c8d31cef8633810491c0ea23afc9175ecd1c1171f69226445d01514a823d47d74e5e172069388476c72fbb5636c2aadea7ab6
+  data.tar.gz: 15daf1b2eb84e87fb8538800874dc97d52bedf791c33487e46f440fa4e56cd8a8a40b2ffef0ddacd1c6933c9cfda0e882e742b6872f78dc42886c817edb7ef3b

data/.travis.yml

@@ -4,10 +4,9 @@ rvm:
   - 2.0.0
   - 2.1.0
 env:
-  - "RAILS_VERSION=3.0.0"
-  - "RAILS_VERSION=3.1.0"
-  - "RAILS_VERSION=3.2.0"
+  - "RAILS_VERSION=3.2.18"
   - "RAILS_VERSION=4.0.0"
+  - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=master"  
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Edge (not released)
 
+## 0.3.0
+
+* Add confugurable success and fail callbacks
+
+## 0.2.6
+
 * Fix bug with wrong signature generating with custom user params
 
 ## 0.2.5
@@ -22,4 +28,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

@@ -37,6 +37,22 @@ Run `rails g rubykassa:install`, get an initializer with the following code:
 
 and configure it with your credentials.    
 
+Also, you need to specify Result URL, Success URL and Fail URL at the "Technical Settings" (Технические настройки) in your Robokassa dashboard:
+
+* Result URL: `http://<your_domain>/robokassa/paid`
+* Success URL: `http://<your_domain>/robokassa/success`
+* Fail URL: `http://<your_domain>/robokassa/fail`
+
+To define custom success/fail callbacks you can also use the initializer:
+
+    Rubykassa.configure do |config|
+      ...
+      config.success_callback = -> { render text: 'success' }
+      config.fail_callback = -> { redirect_to root_path }
+    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)    
+
 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`
 
@@ -75,10 +91,9 @@ Rubies:
 * 2.1.0
 
 Rails:
-* ~> 3.0.0
-* ~> 3.1.0
-* ~> 3.2.0
+* ~> 3.2.18
 * ~> 4.0.0
+* ~> 4.1.0
 
 ## License
 
@@ -88,5 +103,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

@@ -6,20 +6,20 @@ class RobokassaController < ApplicationController
     if @notification.valid_result_signature?
       render text: @notification.success
     else
-      render text: "fail"
+      Rubykassa.fail_callback.call
     end
   end
 
   def success
     if @notification.valid_success_signature?
-      render text: "success"
+      Rubykassa.success_callback.call
     else
-      render text: "fail"
+      Rubykassa.fail_callback.call
     end
   end
 
   def fail
-    render text: "fail"
+    Rubykassa.fail_callback.call
   end
 
   private

data/lib/rubykassa/configuration.rb

@@ -2,6 +2,8 @@
 module Rubykassa
   class Configuration
     attr_accessor :login, :first_password, :second_password, :mode, :http_method, :xml_http_method
+    attr_accessor :success_callback
+    attr_accessor :fail_callback
 
     def initialize
       self.login = "your_login"
@@ -9,7 +11,13 @@ module Rubykassa
       self.second_password = "second_password"
       self.mode = :test
       self.http_method = :get
-      self.xml_http_method = :get      
+      self.xml_http_method = :get
+      self.success_callback = -> { 
+        render text: 'success'
+      }
+      self.fail_callback = -> { 
+        render text: 'fail'
+      }
     end
   end
 end

data/lib/rubykassa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Rubykassa
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 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).map do |name|
+  %w(login first_password second_password mode http_method xml_http_method success_callback fail_callback).map do |name|
     define_method name do
       Rubykassa::Client.configuration.send(name)
     end
@@ -20,9 +20,9 @@ module Rubykassa
 
   def pay_url invoice_id, total, custom_params, extra_params = {}
     Rubykassa::PaymentInterface.new do
-      self.total              = total
-      self.invoice_id         = invoice_id
-      self.params = custom_params
+      self.total      = total
+      self.invoice_id = invoice_id
+      self.params     = custom_params
     end.pay_url(extra_params)
   end
 end

data/rubykassa.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- spec/rubykassa/*`.split("\n")
 
-  s.add_dependency "rails", ">= 3.0"
+  s.add_dependency "rails", ">= 3.2.18"
   s.add_dependency "multi_xml"
 
   s.add_development_dependency "sqlite3"

data/spec/rubykassa/client_configuration_spec.rb

@@ -32,6 +32,18 @@ describe Rubykassa::Client do
     Rubykassa.mode.should == :test
     Rubykassa.http_method.should == :get
     Rubykassa.http_method.should == :get
+    expect(Rubykassa.success_callback).to be_instance_of(Proc)
+    expect(Rubykassa.fail_callback).to be_instance_of(Proc)
+  end
+
+  it "should set success_callback" do
+    Rubykassa.configure do |config|
+      config.success_callback = -> {
+        2 + 5
+      }
+    end
+
+    expect(Rubykassa.success_callback.call).to eq(7)
   end
 
   it "should raise error when wrong mode is set" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubykassa
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Sergey Kishenin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -206,3 +206,4 @@ test_files:
 - spec/rubykassa/notification_spec.rb
 - spec/rubykassa/payment_interface_spec.rb
 - spec/rubykassa/xml_interface_spec.rb
+has_rdoc: