veracross · BrianBorge · Jul 22, 2015 · Jul 27, 2015 · Jul 30, 2015 · Jul 30, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,39 @@
 language: ruby
 script: "bundle exec rake test:units"
 sudo: false
+cache: bundler
 
 rvm:
-- "2.2"
-- "2.1"
-- "2.0"
-- "1.9"
+- 2.4.0
+- 2.3.3
+- 2.2.3
+- 2.1
 
 gemfile:
 - Gemfile.rails32
 - Gemfile.rails40
 - Gemfile.rails41
 - Gemfile.rails42
+- Gemfile.rails50
+- Gemfile.rails51
+
+matrix:
+  exclude:
+    - rvm: 2.1
+      gemfile: Gemfile.rails50
+    - rvm: 2.1
+      gemfile: Gemfile.rails51
+    - rvm: 2.4.0
+      gemfile: Gemfile.rails32
+    - rvm: 2.4.0
+      gemfile: Gemfile.rails40
+    - rvm: 2.4.0
+      gemfile: Gemfile.rails41
+    - rvm: 2.4.0
+      gemfile: Gemfile.rails42
+  include:
+    - rvm: 2.3.3
+      gemfile: Gemfile.shopify
+
+before_install:
+  - gem update bundler
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,47 @@
 # Offsite Payments CHANGELOG
 
+### Version 2.6.4 (Jan 8, 2018)
+- Use multiple address fields for WorldPay instead of concatenating them [joshnuss] #270
+
+### Version 2.6.3 (Nov 7, 2017)
+- Fix nil coercion to BigDecimal zero in PayuIn [aman-dureja] #265
+
+### Version 2.6.2 (Oct 30, 2017)
+- Fix ArgumentError in PayuIn with BigDecimal v1.3.2 [aman-dureja] #264
+- Fix molpay and citrus tests [aman-dureja] #264
+
+### Version 2.6.1 (Sep 7, 2017)
+- Fix PayTM checksum generation [christianblais] #262
+
+### Version 2.6.0 (Aug 29, 2017)
+- Rails 5.1 compatibility [eitoball, patientdev] #245
+- Update paydollar URLs [SimonLeungAPHK] #228
+- Fixed compatibility between RubyMoney/money and Shopify/money gems [elfassy] #246
+- Fixed calling Mollie with extra parameters [edwinv] #247
+- Stop hiding JSON parse errors for Bitpay [bdewater] #251
+- Do not send locale parameter to Sagepay [pi3r] #258
+- Updats Skrill URL [sergey-alekseev ] #259
+- Changed PayTM integration [Mohit-Aggarwal1] #260
+
+### Version 2.5.0 (April 12, 2017)
+- corrected zip parameter to from zip to zipcode
+- [Realex] guard against nil when extracting AVS code
+- only use fields that start with `x_` to generate the signature
+- bump active_utils version 3.3.0
+
+### Version 2.4.0 (March 7, 2017)
+- Fixed use of decimal instead of float
+- Fixed use Money gem
+- Fixed sanitize of the phone field for payu_in
+- Added Paytm
+- Updated dependency on nokogiri 1.6
+
+### Version 2.3.0 (February 8, 2016)
+- Release 2.3.0
+
+### Version 2.2.0 (October 14, 2015)
+- Bump active_utils dependency. [lucasuyezu]
+
 ### Version 2.1.0 (January 16, 2015)
 
 - **Change:** network exceptions now use ActiveUtils instead of ActiveMerchant as namespace,

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
-gem 'money', '~> 5.0'
 
 group :remote_test do
   gem 'mechanize'

diff --git a/Gemfile.rails32 b/Gemfile.rails32
@@ -2,13 +2,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
-gem 'money', '~> 5.0'
 
 group :remote_test do
   gem 'mechanize'
   gem 'launchy'
   gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
 end
 
-
-gem 'rails', '~> 3.2.0'
+gem 'actionpack', '~> 3.2.0'
diff --git a/Gemfile.rails40 b/Gemfile.rails40
@@ -2,13 +2,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
-gem 'money', '~> 5.0'
 
 group :remote_test do
   gem 'mechanize'
   gem 'launchy'
   gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
 end
 
-
-gem 'rails', '~> 4.0.0'
+gem 'actionpack', '~> 4.0.0'
diff --git a/Gemfile.rails41 b/Gemfile.rails41
@@ -2,13 +2,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
-gem 'money', '~> 5.0'
 
 group :remote_test do
   gem 'mechanize'
   gem 'launchy'
   gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
 end
 
-
-gem 'rails', '~> 4.1.0'
+gem 'actionpack', '~> 4.1.0'
diff --git a/Gemfile.rails42 b/Gemfile.rails42
@@ -2,12 +2,11 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
-gem 'money', '~> 5.0'
 
 group :remote_test do
   gem 'mechanize'
   gem 'launchy'
   gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
 end
 
-gem 'rails', '~> 4.2.0'
+gem 'actionpack', '~> 4.2.0'
diff --git a/Gemfile.rails50 b/Gemfile.rails50
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'jruby-openssl', :platforms => :jruby
+
+group :remote_test do
+  gem 'mechanize'
+  gem 'launchy'
+  gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
+end
+
+gem 'actionpack', '~> 5.0.0'
diff --git a/Gemfile.rails51 b/Gemfile.rails51
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'jruby-openssl', :platforms => :jruby
+
+group :remote_test do
+  gem 'mechanize'
+  gem 'launchy'
+  gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
+end
+
+gem 'actionpack', '~> 5.1.0'
diff --git a/Gemfile.shopify b/Gemfile.shopify
@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'jruby-openssl', :platforms => :jruby
+
+group :remote_test do
+  gem 'mechanize'
+  gem 'launchy'
+  gem 'mongrel', '1.2.0.pre2', :platforms => :ruby
+end
+
+gem 'actionpack', '~> 5.0.0'
+gem 'money', git: 'https://github.com/Shopify/money.git'
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Offsite Payments
-[![Build Status](https://travis-ci.org/activemerchant/offsite_payments.png?branch=master)](https://travis-ci.org/activemerchant/offsite_payments)
-[![Code Climate](https://codeclimate.com/github/activemerchant/offsite_payments.png)](https://codeclimate.com/github/activemerchant/offsite_payments)
+[![Build Status](https://travis-ci.org/activemerchant/offsite_payments.svg?branch=master)](https://travis-ci.org/activemerchant/offsite_payments)
+[![Code Climate](https://codeclimate.com/github/activemerchant/offsite_payments/badges/gpa.svg)](https://codeclimate.com/github/activemerchant/offsite_payments)
 
 Offsite Payments is an extraction from the ecommerce system [Shopify](http://www.shopify.com). Shopify's requirements for a simple and unified API to handle dozens of different offsite payment pages (often called hosted payment pages) with very different exposed APIs was the chief principle in designing the library.
 

diff --git a/bin/console b/bin/console
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "offsite_payments"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)
diff --git a/bin/setup b/bin/setup
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here
diff --git a/generators/templates/notification_test.rb b/generators/templates/notification_test.rb
@@ -19,7 +19,7 @@ def test_accessors
   end
 
   def test_compositions
-    assert_equal Money.new(3166, 'USD'), @<%= identifier %>.amount
+    assert_equal Money.from_amount(31.66, 'USD'), @<%= identifier %>.amount
   end
 
   # Replace with real successful acknowledgement code

diff --git a/lib/offsite_payments.rb b/lib/offsite_payments.rb
@@ -2,8 +2,8 @@
 require 'cgi'
 require "timeout"
 require "socket"
-
-require 'active_support/core_ext/class/delegating_attributes'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 require 'active_utils'
 

diff --git a/lib/offsite_payments/helper.rb b/lib/offsite_payments/helper.rb
@@ -16,7 +16,7 @@ def self.inherited(subclass)
     end
 
     def initialize(order, account, options = {})
-      options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :description, :transaction_type, :authcode, :notify_url, :return_url, :redirect_param, :forward_url, :checkout_token, :deposit_flag])
+      options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :description, :transaction_type, :authcode, :notify_url, :return_url, :redirect_param, :forward_url, :checkout_token])
       @fields             = {}
       @raw_html_fields    = []
       @test               = options[:test]

diff --git a/lib/offsite_payments/integrations/bit_pay.rb b/lib/offsite_payments/integrations/bit_pay.rb
@@ -89,7 +89,6 @@ def transaction_id
 
         def item_id
           JSON.parse(params['posData'])['orderId']
-        rescue JSON::ParserError
         end
 
         def status
@@ -132,14 +131,12 @@ def acknowledge(authcode = nil)
           retrieved_json = JSON.parse(@raw).tap { |j| j.delete('currentTime') }
 
           posted_json == retrieved_json
-        rescue JSON::ParserError
         end
 
         private
         def parse(body)
           @raw = body
           @params = JSON.parse(@raw)
-        rescue JSON::ParserError
         end
       end