mandarin_pay 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6aa66899bf036fe36b6d408f2a7f123ed8036d6
-  data.tar.gz: 13e097421df68143d2c77129e9d697835104dd8e
+  metadata.gz: 621f5679074f8bd32baac048b534b33e7ad0945f
+  data.tar.gz: 8efb0d1d68f75be18023fa6612acd1d7d48642e0
 SHA512:
-  metadata.gz: 782885f15b6a4286a390003e57910a855d00d6250f9d168abd44199395fb29d4269d0f6bb5d788eb57d68f49bf0611b3d36a7c5400f0a505fdabbea6fdf0aa6b
-  data.tar.gz: db5859cb85061582a8dfeba7855ce168dd20c34bbde686c5a45286db883f3ea60668f984d325064f46500bf31c86e3b9bb8e065946a3bf693db5a2549fadb638
+  metadata.gz: 06e57bc17a355b0b0e229273e11efafe326a01f13840d9dc2e9da55f0c39965b878904c4772a7c2360a3ad24aaffe484a66532cfc7332c6228403ce74a07e09c
+  data.tar.gz: 74ae510f75c4edc31afb896a55a7d046466d0111a55a6d3f4b55ec981dd90470040635b711847c9089d08b28b4007d0141c1f678e0e9c556e45cd7a61bb355e0

data/Gemfile

@@ -4,6 +4,7 @@ gem "rails", "~> 4.2.0"
 
 group :test do
   gem "coveralls", require: false
+  gem "pry", require: false
 end
 
 gemspec

data/README.md

@@ -4,7 +4,7 @@ by [Drakmail][]
 
 [Drakmail]: http://drakmail.ru
 
-Ruby wrapper for [Mandarin Pay API][]. Make Mandarin Pay to work with your Rails project without pain. MandarinPay took the best from [rubykassa gem][] and [Active Merchant Robokassa integration] but easier to use and setup.
+Ruby wrapper for [MandarinPay API][]. Make Mandarin Pay to work with your Rails project without pain. MandarinPay took the best from [rubykassa gem][] and [Active Merchant Robokassa integration] but easier to use and setup.
 
 [MandarinPay API]: http://mandarin_pay.com/sites/default/files/protokol_integracii_v0.5.5_0.pdf
 [rubykassa gem]: https://github.com/ZeroOneStudio/rubykassa

data/app/controllers/mandarin_pay_controller.rb

@@ -1,8 +1,9 @@
 class MandarinPayController < ApplicationController
   before_action :create_notification
+  skip_before_action :verify_authenticity_token
 
   def paid
-    if @notification.valid_result_signature?
+    if @notification.valid_transaction_signature?
       instance_exec @notification, &MandarinPay.result_callback
     else
       instance_exec @notification, &MandarinPay.fail_callback
@@ -10,11 +11,7 @@ class MandarinPayController < ApplicationController
   end
 
   def success
-    if @notification.valid_success_signature?
-      instance_exec @notification, &MandarinPay.success_callback
-    else
-      instance_exec @notification, &MandarinPay.fail_callback
-    end
+    instance_exec @notification, &MandarinPay.success_callback
   end
 
   def fail

data/bin/bundler

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/cdiff

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/coderay

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("coderay", "coderay")

data/bin/colortab

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/coveralls

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/decolor

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/erubis

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/htmldiff

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/ldiff

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/nokogiri

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/pry

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

data/bin/rackup

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/rails

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/rake

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/rspec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/sprockets

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/term_display

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/term_mandel

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/bin/thor

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # This file was generated by Bundler.
 #

data/lib/mandarin_pay/signature_generator.rb

@@ -2,7 +2,7 @@ module MandarinPay
   module SignatureGenerator
     def generate_signature_for(kind, extra_params = {})
       unless [:card_binding, :payment, :transaction].include? kind
-        raise ArgumentError, "Available kinds are only :payment, :result or :success"
+        raise ArgumentError, "Available kinds are only :payment, :card_binding or :transaction"
       end
       Digest::SHA256.hexdigest(params_string(kind, extra_params))
     end
@@ -10,11 +10,9 @@ module MandarinPay
     def params_string(kind, extra_params)
       case kind
       when :payment
-        Hash[conformity_params(extra_params).sort].values.join("-") + "-" + MandarinPay.sharedsec
-      when :card_binding
-        Hash[conformity_params(extra_params).sort].values.join("-") + "-" + MandarinPay.sharedsec
-      when :transaction
-        Hash[conformity_params(extra_params).sort].values.join("-") + "-" + MandarinPay.sharedsec
+        Hash[conformity_params(extra_params).sort_by { |(key, _v)| key }].values.join("-") + "-" + MandarinPay.sharedsec
+      else
+        Hash[@params.except("sign").sort_by { |(key, _v)| key }].values.join("-") + "-" + MandarinPay.sharedsec
       end
     end
 

data/lib/mandarin_pay/version.rb

@@ -1,3 +1,3 @@
 module MandarinPay
-  VERSION = "1.0.0"
+  VERSION = "1.1.0".freeze
 end

data/spec/mandarin_pay/notification_spec.rb

@@ -11,7 +11,7 @@ describe MandarinPay::Notification do
     data = {
       "orderId" => "12",
       "price" => "1200",
-      "sign" => "dd00e1d8e77ae1b62e5c05a9023ebda218d94955202ad323563046fc10f19a98"
+      "sign" => "e3daf8ea5021343c455853a27901a2355a5db5d3c29b9c3f0ce9869a040ce593"
     }
     notification = MandarinPay::Notification.new(data)
     expect(notification.valid_card_binding_signature?).to eq true
@@ -31,7 +31,7 @@ describe MandarinPay::Notification do
     data = {
       "orderId" => "12",
       "price" => "1200",
-      "sign" => "dd00e1d8e77ae1b62e5c05a9023ebda218d94955202ad323563046fc10f19a98"
+      "sign" => "e3daf8ea5021343c455853a27901a2355a5db5d3c29b9c3f0ce9869a040ce593"
     }
     notification = MandarinPay::Notification.new(data)
     expect(notification.valid_transaction_signature?).to eq true
@@ -46,6 +46,6 @@ describe MandarinPay::Notification do
     expect do
       notification = MandarinPay::Notification.new({})
       notification.generate_signature_for(:bullshit)
-    end.to raise_error(ArgumentError, "Available kinds are only :payment, :result or :success")
+    end.to raise_error(ArgumentError, "Available kinds are only :payment, :card_binding or :transaction")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandarin_pay
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - app/controllers/mandarin_pay_controller.rb
 - bin/bundler
 - bin/cdiff
+- bin/coderay
 - bin/colortab
 - bin/coveralls
 - bin/decolor
@@ -91,6 +92,7 @@ files:
 - bin/htmldiff
 - bin/ldiff
 - bin/nokogiri
+- bin/pry
 - bin/rackup
 - bin/rails
 - bin/rake