glebtv-robokassa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d92d7be6df70c58ac056421fe43885b81c2aa0db2e1e772e758259931ad5b929
-  data.tar.gz: e86a7dccef0f9f13ccbb54107e5b71870673a8b7e3cc97995cba7b7f19925ac5
+  metadata.gz: f9789611e089b962f3ea1f3afd11508557cf27416c5f8dde57463bbd8f26e39f
+  data.tar.gz: f9fbf2ba3d5f2d5e1154764d80ad4cc51d6420bd7c85f40ddb27e9406b92ad3f
 SHA512:
-  metadata.gz: 5fc48515bc38b9b7084b6d5d03f0e10ebef0d465f8c7ead438c0347de9dec27a7d120e861dffdb051947e1231420ae56d339e68b09fdd5d99ad01ba55f90f65b
-  data.tar.gz: ecf7ab364e6769950c7b80ee701512d17a49f934e57ce38f8c47e6c5bcbfa56b6eeb6983273aac84f11add52d1e7b0b7636c0286055e1aafaec44021097d0874
+  metadata.gz: 07ce56e2beaff6179bc0bdb320d950da81286a41ee22f659cfd5896c4a542a99e122b1c539e66090ce4cdf1d31f1a35814d66f259d4feb0f53f62f1e42c295ef
+  data.tar.gz: c94a54eddc0060adc874bb41c7a43bcaea23e2f41e5aafcfcf05409fab148e72f09ed99b27d7f9d4c63cceca42fa8af00ddc3f1cfb55567dd4553155bab3514f

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in glebtv-robokassa.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'combustion'
+  gem 'rspec-rails'
+  gem 'factory_bot_rails'
+  gem 'shoulda'
+  gem 'faker'
+  gem 'pg'
+end

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/glebtv-robokassa.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
+
   spec.add_dependency "rails", ">= 3.2.0"
-  
-  spec.add_development_dependency "bundler", "~> 1.3"
+
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

data/lib/robokassa/controller.rb

@@ -1,14 +1,16 @@
 module Robokassa::Controller
   extend ActiveSupport::Concern
-  included do
-    skip_before_action :verify_authenticity_token
-  end
+  # included do
+  #   if protect_against_forgery?
+  #     skip_before_action :verify_authenticity_token, only: [:notify]
+  #   end
+  # end
 
   def notify
     if params[:token] != Robokassa.interface.token
         raise Robokassa::InvalidToken.new
     end
-    render :text => Robokassa.interface.notify(params, self)
+    render plain: Robokassa.interface.notify(params, self)
   end
 
   def success

data/lib/robokassa/interface.rb

@@ -135,6 +135,7 @@ module Robokassa
 
     # Maps gem parameter names, to robokassa names
     def map_params(params, map)
+      params = params.is_a?(Hash) ? params : params.permit!.to_hash
       parsed_params = Hash[params.map do|key, value| [(map[key] || map[key.to_sym] || key), value] end]
       parsed_params[:custom_options] = Hash[params.select{ |k,v| k.respond_to?(:starts_with?) && k.starts_with?('shp') }.sort.map{|k, v| [k[3, k.size].to_sym, v]}]
       parsed_params
@@ -152,6 +153,9 @@ module Robokassa
         :email       => email,
         :language    => language
       }.merge(Hash[custom_options.sort.map{|x| ["shp#{x[0]}", x[1]]}])
+      if @options[:test_mode]
+        options[:isTest] = 1
+      end
       map_params(options, @@params_map)
     end
 
@@ -166,9 +170,9 @@ module Robokassa
       "#{@options[:login]}:#{amount}:#{invoice_id}:#{@options[:password1]}#{custom_options_fmt.blank? ? "" : ":" + custom_options_fmt}"
     end
 
-    # returns http://test.robokassa.ru or https://merchant.roboxchange.com in order to current mode
+    # returns http://auth.robokassa.ru or https://merchant.roboxchange.com in order to current mode
     def base_url
-      test_mode? ? 'http://test.robokassa.ru' : 'https://merchant.roboxchange.com'
+      test_mode? ? 'http://auth.robokassa.ru/Merchant' : 'https://merchant.roboxchange.com'
     end
 
     # returns url to redirect user to payment page

data/lib/robokassa/version.rb

@@ -1,3 +1,3 @@
 module Robokassa
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/internal/app/controllers/robokassa_controller.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+class RobokassaController < ActionController::Base
+  include Robokassa::Controller
+
+  def success
+    super
+  end
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,9 @@
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: robokassa_test
+  pool: 5
+  host: localhost
+  username: postgres
+  password: 123
+  template: template0

data/spec/internal/config/routes.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  # Add your own routes here, or remove this file if you don't have need for it.
+  mount Robokassa::Engine => '/robokassa'
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+ActiveRecord::Schema.define do
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/lib/interface_spec.rb

@@ -5,11 +5,11 @@ require 'robokassa/interface'
 describe "Interface should work correct" do
   before :each do
   end
-  
+
   it "Should correctly use test server" do
     i = Robokassa::Interface.new :test_mode => true
     i.should be_test_mode
-    i.base_url.should == "http://test.robokassa.ru"
+    i.base_url.should == "http://auth.robokassa.ru/Merchant"
   end
 
   it "should compute correct signature string" do
@@ -18,13 +18,20 @@ describe "Interface should work correct" do
     i.init_payment_signature_string(15, 185.0, "Order #125", {:a => 15, :c => 30, :b => 20}).should == "demo:185.0:15:12345:shpa=15:shpb=20:shpc=30"
   end
 
-  it "should create correct init payment url" do
+  it "should create correct init payment url for test_mode" do
     i = Robokassa::Interface.new :test_mode => true, :login => 'demo', :password1 => '12345'
-    i = Robokassa::Interface.new :test_mode => true, :login => 'shaggyone239', :password1 => '12345asdf' 
+    expected_url = "http://auth.robokassa.ru/Merchant/Index.aspx?MrchLogin=demo&OutSum=185.11&InvId=15&Desc=Order+125&SignatureValue=8e32c6ad194a540fe14fb97367360170&IncCurrLabel=&Email=demo%40robokassa.ru&Culture=ru&isTest=1&custom_options=%7B%7D"
+    generated_url = i.init_payment_url(15, 185.11, "Order 125", '', 'ru', 'demo@robokassa.ru', {})
+    puts generated_url
+    generated_url.should == expected_url
+  end
+
+  it "should create correct init payment url for production" do
+    i = Robokassa::Interface.new :login => 'shaggyone239', :password1 => '12345asdf'
     i.init_payment_signature_string(15, 185.11, "Order #125").should == "shaggyone239:185.11:15:12345asdf"
     i.init_payment_signature(15, 185.11, "Order #125").should == "55f2aee20767cde28e7fc49919cec969"
-    i.init_payment_url(15, 185.11, "Order 125", '', 'ru', 'demo@robokassa.ru', {}).should == 
-      "http://test.robokassa.ru/Index.aspx?MrchLogin=shaggyone239&OutSum=185.11&InvId=15&Desc=Order+125&SignatureValue=55f2aee20767cde28e7fc49919cec969&IncCurrLabel=&Email=demo%40robokassa.ru&Culture=ru"
+    i.init_payment_url(15, 185.11, "Order 125", '', 'ru', 'demo@robokassa.ru', {}).should ==
+      "ttps://merchant.roboxchange.com/Index.aspx?MrchLogin=shaggyone239&OutSum=185.11&InvId=15&Desc=Order+125&SignatureValue=55f2aee20767cde28e7fc49919cec969&IncCurrLabel=&Email=demo%40robokassa.ru&Culture=ru&isTest=1"
     i.init_payment_signature(196, 2180.0, "R602412577").should == "adeedf2afbac5eca09b44898da3ef51a"
   end
 
@@ -52,4 +59,3 @@ describe "Interface should work correct" do
     expect { i.success_validate_signature( params ) }.not_to raise_error
   end
 end
-

data/spec/routing/routes_spec.rb

@@ -1,23 +1,26 @@
 require 'spec_helper'
 
 
-describe 'routes' do
+describe 'routes', type: :routing do
   context "robokassa" do
-    specify { get('/robokassa/notify/some-secure-notification-key').should route_to(
-      controller:       'robokassa',
-      action:           'notify',
-      token:            'some-secure-notification-key'
-    )}
-
-    specify { get('/robokassa/success').should route_to(
-      controller: 'robokassa',
-      action:     'success'
-    )}
-
-    specify { get('/robokassa/fail').should route_to(
-      controller: 'robokassa',
-      action:     'fail'
-    )}
+    it "routes robokassa notify" do
+      expect(:get => '/robokassa/notify/some-secure-notification-key').to route_to(
+        controller:       'robokassa',
+        action:           'notify',
+        token:            'some-secure-notification-key'
+      )
+    end
+    it "routes robokassa success" do
+      expect(:get => '/robokassa/success').to route_to(
+        controller: 'robokassa',
+        action:     'success'
+      )
+    end
+    it "routes robokassa fail" do
+      expect(:get => '/robokassa/fail').to route_to(
+        controller: 'robokassa',
+        action:     'fail'
+      )
+    end
   end
 end
-

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
 require 'bundler'
-
+require 'combustion'
 require 'rails'
 
 Bundler.require :default, :development
 
-Combustion.initialize! :active_record, :action_controller
+#  :active_record,
+Combustion.initialize! :action_controller
 
 require 'rspec/rails'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-robokassa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/robokassa_controller.rb
+- config.ru
 - config/locales/en.yml
 - config/locales/ru.yml
 - config/routes.rb
@@ -75,6 +76,12 @@ files:
 - lib/robokassa/engine.rb
 - lib/robokassa/interface.rb
 - lib/robokassa/version.rb
+- spec/internal/app/controllers/robokassa_controller.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/lib/interface_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
@@ -102,6 +109,12 @@ signing_key:
 specification_version: 4
 summary: This gem adds robokassa support to your app.
 test_files:
+- spec/internal/app/controllers/robokassa_controller.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/lib/interface_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb