rubykassa 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd92e78dd2880fad505c7e4bcf561a011c0ebabd
-  data.tar.gz: 7075c5b4b5a8b7d5852f2de6e985bba652e23455
+  metadata.gz: 3bb9879d9d2b86beba88015e506782c4bd57fd4d
+  data.tar.gz: b47aa33a7cad9f81ec111b031b911ab2e9ac41d9
 SHA512:
-  metadata.gz: a1800cc9729f3a985d9aabf204b3199c251f5b2bdfc6bbe7425256a5e797fb54c148b16f9f3d71ccbcf81bc6b5cf1606588501690b7863b3f21e7a609994f5c3
-  data.tar.gz: 71a029822a6eaf978bd1cd0b950ca9c1ae3a231f556d177188795bdb823f61b7b8b837873ef3e7169ba065b56f9779906307f8e88e87e8ec5f29b16c243666ed
+  metadata.gz: 3370eb1c5bf9c0923ac17d4795f381d1d2ad120128a5858888ff11c9fc3e8d292addeb77e7cc2362e376ae0141f046dc3aa77e5f7d49d4fb6233518cd5bdf3a5
+  data.tar.gz: 216ff6f6ab2db1479ea5e2108ce7c4a0090a7a4e35d324afc53f770c679733346b736686b0cf143f933127114b71c09f88fedff3881a1653d28ba10aa4fa32e7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Edge (not released)
 
+## 0.4.0
+
+* Simplify callbacks logic: no more necessity to pass `controller` variable to lambda. Thanks @BrainNya for active promotion.
+
 ## 0.3.2
 
 * Add confugurable result callback [#14][]

data/README.md

@@ -48,12 +48,12 @@ To define custom success/fail callbacks you can also use the initializer:
 
     Rubykassa.configure do |config|
       ...
-      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 }
+      config.success_callback = -> (notification) { render text: 'success' }
+      config.fail_callback    = -> (notification) { redirect_to root_path }
+      config.result_callback  = -> (notification) { 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) calling it on the `controller` variable. 
+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).
 
 NOTE: `result_callback` should always return `"OK#{ invoice_id }"` string. So, implement your custom logic above `render text: notification.success` line.
 

data/app/controllers/robokassa_controller.rb

@@ -4,22 +4,22 @@ class RobokassaController < ApplicationController
 
   def paid
     if @notification.valid_result_signature?
-      Rubykassa.result_callback.call(self, @notification)
+      instance_exec @notification, &Rubykassa.result_callback
     else
-      Rubykassa.fail_callback.call(self, @notification)
+      instance_exec @notification, &Rubykassa.fail_callback
     end
   end
 
   def success
     if @notification.valid_success_signature?
-      Rubykassa.success_callback.call(self, @notification)
+      instance_exec @notification, &Rubykassa.success_callback
     else
-      Rubykassa.fail_callback.call(self, @notification)
+      instance_exec @notification, &Rubykassa.fail_callback
     end
   end
 
   def fail
-    Rubykassa.fail_callback.call(self, @notification)
+    instance_exec @notification, &Rubykassa.fail_callback
   end
 
   private

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

@@ -10,12 +10,12 @@ Rubykassa.configure do |config|
 
   # 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
+  # your custom logic above `render text: notification.success` line
 
-  config.result_callback = -> (controller, notification) { controller.render text: notification.success }
+  config.result_callback = -> (notification) { render text: notification.success }
 
   # Define success or failure callbacks here like:
 
-  # config.success_callback = -> (controller, notification) { controller.render text: 'success' }
-  # config.fail_callback = -> (controller, notification) { controller.redirect_to controller.root_path }
+  # config.success_callback = -> (notification) { render text: 'success' }
+  # config.fail_callback = -> (notification) { redirect_to root_path }
 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 result_callback).map do |name|
+  Rubykassa::Configuration::ATTRIBUTES.map do |name|
     define_method name do
       Rubykassa::Client.configuration.send(name)
     end

data/lib/rubykassa/configuration.rb

@@ -1,27 +1,23 @@
 # -*- encoding : utf-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
-    attr_accessor :result_callback
+    ATTRIBUTES = [
+      :login, :first_password, :second_password, :mode, :http_method, :xml_http_method,
+      :success_callback, :fail_callback, :result_callback
+    ]
+
+    attr_accessor *ATTRIBUTES
 
     def initialize
       self.login = "your_login"
-      self.first_password = "first_password"
-      self.second_password = "second_password"
-      self.mode = :test
-      self.http_method = :get
-      self.xml_http_method = :get
-      self.success_callback = Proc.new do |controller, notification|
-        render text: 'success'
-      end
-      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      
+      self.first_password   = "first_password"
+      self.second_password  = "second_password"
+      self.mode             = :test
+      self.http_method      = :get
+      self.xml_http_method  = :get
+      self.success_callback = -> (notification) { render text: 'success' }
+      self.fail_callback    = -> (notification) { render text: 'fail' }
+      self.result_callback  = -> (notification) { render text: notification.success   }
     end
   end
 end

data/lib/rubykassa/version.rb

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

metadata

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