payanyway 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05673b4e12bd38b85b361e9181396ac890c9f735
-  data.tar.gz: 0ddf0a1ee9a5725e94f6559c3f03cf93b4340bd4
+  metadata.gz: 006868d92b32837be741013f78c66cd9416310ea
+  data.tar.gz: 817438c74c5995f52735f6b7232854d01802a4e7
 SHA512:
-  metadata.gz: e5dd2cc9f7616f943f2305cc5489038eb8376a14a015d55a028d9a1e26587afbb92159c68246e0e946c1762462e49d3e25adf8061437802a2b276ecf3da542ee
-  data.tar.gz: 692be96d4980db8a9e213e4f4127d68680570733665ce42655e1a88e9a51b90b0ca17d0057012660ed5a3dd4d1623fee23ed87194fccccaf35c4bfabf3bb26f8
+  metadata.gz: 7590e871af8f338c308a82760625576233d69526410fac95d8ba8cbd20eb9030d7db39462a87c540435c9436e6963945d8fdc642e35a384a077cb6a12bd9b574
+  data.tar.gz: e4e21b77e8e8306b241eef8dd3123b69dcacba812dfc26a3ac13fb46aa147006e5cc797c5e45bd04deb319ed98baaac076c9d7cb58cbbc61da9b29d0c1068757

data/.travis.yml

@@ -3,7 +3,21 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
-  - 2.2
+  - 2.2.2
+  - 2.3.3
+
+env:
+  - RAILS_VERSION=3.2.22.5
+  - RAILS_VERSION=4.2.7.1
+  - RAILS_VERSION=5.0.1
+
+matrix:
+  exclude:
+  - rvm: 2.1
+    env: RAILS_VERSION=5.0.1
+  - rvm: 2.0.0
+    env: RAILS_VERSION=5.0.1
 
 script:
-  - CODECLIMATE_REPO_TOKEN=41f20e51bdd84fed15a9717bd19c4aef62c96cd8be6e8fb61c08a69c840deb7a bundle exec rspec
+  - bundle exec rspec
+  - CODECLIMATE_REPO_TOKEN=41f20e51bdd84fed15a9717bd19c4aef62c96cd8be6e8fb61c08a69c840deb7a bundle exec codeclimate-test-reporter

data/Gemfile

@@ -1,4 +1,18 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in payanyway.gemspec
 gemspec
+
+rails_version = ENV['RAILS_VERSION'] || 'default'
+
+rails = case rails_version
+  when 'default'
+    '>= 3.2.0'
+  else
+    "~> #{ rails_version }"
+end
+
+gem 'rails', rails
+
+if RUBY_VERSION[0] == '2' && RUBY_VERSION[2].to_i >= 2
+  gem 'test-unit', '~> 3.0'
+end

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/payanyway.svg)](http://badge.fury.io/rb/payanyway)
-[![Build Status](https://travis-ci.org/ssnikolay/payanyway.svg?branch=master)](https://travis-ci.org/ssnikolay/payanyway)
+[![Build Status](https://travis-ci.org/RuntimeLLC/payanyway.svg?branch=master)](https://travis-ci.org/RuntimeLLC/payanyway)
 [![Code Climate](https://codeclimate.com/github/ssnikolay/payanyway.svg)](https://codeclimate.com/github/ssnikolay/payanyway)
 [![Test Coverage](https://codeclimate.com/github/ssnikolay/payanyway/badges/coverage.svg)](https://codeclimate.com/github/ssnikolay/payanyway)
 

data/lib/payanyway.rb

@@ -1,6 +1,8 @@
 require 'rails'
 require 'active_support/core_ext'
 
+require 'nokogiri'
+
 require 'payanyway/helpers/settings'
 require 'payanyway/helpers/signature_generator'
 

data/lib/payanyway/controller.rb

@@ -3,44 +3,44 @@ module Payanyway
     extend ActiveSupport::Concern
 
     included do
-      skip_before_filter :verify_authenticity_token
+      protect_from_forgery with: :null_session
     end
 
     def pay
-      request = Payanyway::Request::Pay.new(params)
+      request = Payanyway::Request::Pay.new(permitted_params)
       request.success? ?
         pay_implementation(request.pretty_params) :
         Rails.logger.error(request.error_message)
 
-      render text: request.response
+      render plain: request.response
     end
 
     def success
-      request = Payanyway::Request::Base.new(params)
+      request = Payanyway::Request::Base.new(permitted_params)
 
       success_implementation(request.pretty_params)
     end
 
     def fail
-      request = Payanyway::Request::Base.new(params)
+      request = Payanyway::Request::Base.new(permitted_params)
 
       fail_implementation(request.pretty_params[:transaction_id])
     end
 
     def return
-      request = Payanyway::Request::Base.new(params)
+      request = Payanyway::Request::Base.new(permitted_params)
 
       return_implementation(request.pretty_params[:transaction_id])
     end
 
     def in_progress
-      request = Payanyway::Request::Base.new(params)
+      request = Payanyway::Request::Base.new(permitted_params)
 
       in_progress_implementation(request.pretty_params[:transaction_id])
     end
 
     def check
-      request = Payanyway::Request::Check.new(params)
+      request = Payanyway::Request::Check.new(permitted_params)
       if request.pretty_params.present?
         raise request.error_message unless request.success?
 
@@ -48,12 +48,17 @@ module Payanyway
       else
         # Не выдавать ошибку, если параметры пустые
         # Необходимо для проверки со стороны moneta.ru
-        render nothing: true
+        head :ok
       end
     end
 
     private
 
+    def permitted_params
+      params.permit! if params.respond_to?(:permit!)
+      params.to_h
+    end
+
     def pay_implementation(params)
       # Вызывается после успешного прохождения
       # запроса об оплате от payanyway.ru
@@ -63,30 +68,31 @@ module Payanyway
 
     def success_implementation(params)
       # Вызывается после успешной оплаты
+      puts Rails.logger.object_id
 
       Rails.logger.info("PAYANYWAY: Called success payment url for order '#{ params[:transaction_id] }'")
-      render nothing: true
+      head :ok
     end
 
     def fail_implementation(transaction_id)
       # Вызывается после ошибки при оплате
 
       Rails.logger.error("PAYANYWAY: Fail paid order '#{ transaction_id }'")
-      render nothing: true
+      head :ok
     end
 
     def return_implementation(transaction_id)
       # Вызывается при добровольном отказе пользователем от оплаты
 
       Rails.logger.info("PAYANYWAY: Return from payanyway. Order '#{ transaction_id }'")
-      render nothing: true
+      head :ok
     end
 
     def in_progress_implementation(transaction_id)
       # Вызывается после успешного запроса на авторизацию средств, до подтверждения списания и зачисления средств
 
       Rails.logger.info("PAYANYWAY: Order '#{ transaction_id }' in progress")
-      render nothing: true
+      head :ok
     end
 
     def check_implementation(params)

data/lib/payanyway/helpers/settings.rb

@@ -26,4 +26,4 @@ module Payanyway
       end
     end
   end
-end
+end

data/lib/payanyway/request/check.rb

@@ -79,7 +79,7 @@ module Payanyway
           </MNT_RESPONSE>
         EOXML
 
-        Nokogiri::XML(xml, nil, 'UTF-8')
+        ::Nokogiri::XML(xml, nil, 'UTF-8')
       end
 
       def signature_node(xml)

data/lib/payanyway/version.rb

@@ -1,3 +1,3 @@
 module Payanyway
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/payanyway.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pumper'
   spec.add_development_dependency 'combustion', '~> 0.5.3'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
 end

data/spec/controllers/payanyway_controller_spec.rb

@@ -2,8 +2,8 @@ describe PayanywayController do
   routes { Payanyway::Engine.routes }
 
   describe 'GET #success' do
-    it 'should and message to logger' do
-      expect(Rails.logger).to receive(:info).with("PAYANYWAY: Called success payment url for order '676'")
+    it 'should add message to logger' do
+      expect(Rails.logger).to receive(:info).with("PAYANYWAY: Called success payment url for order '676'").and_call_original
 
       get :success, { 'MNT_TRANSACTION_ID' => 676 }
     end
@@ -18,7 +18,7 @@ describe PayanywayController do
   end
 
   describe 'GET #return' do
-    it 'should and message to logger' do
+    it 'should add message to logger' do
       expect(Rails.logger).to receive(:info).with("PAYANYWAY: Return from payanyway. Order '676'")
 
       get :return, { 'MNT_TRANSACTION_ID' => 676 }
@@ -26,7 +26,7 @@ describe PayanywayController do
   end
 
   describe 'GET #in_progress' do
-    it 'should and message to logger' do
+    it 'should add message to logger' do
       expect(Rails.logger).to receive(:info).with("PAYANYWAY: Order '676' in progress")
 
       get :in_progress, { 'MNT_TRANSACTION_ID' => 676 }
@@ -47,7 +47,7 @@ describe PayanywayController do
     end
 
     context 'when valid signature' do
-      it 'should and message to logger' do
+      it 'should add message to logger' do
         expect(Rails.logger).not_to receive(:info).with(/PAYANYWAY: XML response for check/)
         expect_any_instance_of(Payanyway::Controller).to receive(:check_implementation).and_return(amount: 12, state: :paid)
 

data/spec/spec_helper.rb

@@ -11,10 +11,9 @@ Combustion.initialize! :action_controller, :action_view
 require 'payanyway'
 require 'rspec/rails'
 require 'pry'
-require 'codeclimate-test-reporter'
-
-CodeClimate::TestReporter.start if ENV['CODECLIMATE_REPO_TOKEN']
+require 'simplecov'
 
+SimpleCov.start
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: payanyway
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - ssnikolay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pumper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: simple gem for payanyway payment gateway
 email:
 - ssnikolay@gmail.com
@@ -157,9 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -201,17 +201,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: simple gem for payanyway payment gateway