activemerchant 1.100.0 → 1.133.0

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # Convenience methods that can be included into a custom Credit Card object, such as an ActiveRecord based Credit Card object.
@@ -6,26 +8,50 @@ module ActiveMerchant #:nodoc:
         'visa'               => ->(num) { num =~ /^4\d{12}(\d{3})?(\d{3})?$/ },
         'master'             => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), MASTERCARD_RANGES) },
         'elo'                => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), ELO_RANGES) },
+        'cabal'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 8), CABAL_RANGES) },
         'alelo'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), ALELO_RANGES) },
-        'discover'           => ->(num) { num =~ /^(6011|65\d{2}|64[4-9]\d)\d{12,15}|(62\d{14,17})$/ },
+        'discover'           => ->(num) { num =~ /^(6011|65\d{2}|64[4-9]\d)\d{12,15}$/ },
         'american_express'   => ->(num) { num =~ /^3[47]\d{13}$/ },
         'naranja'            => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), NARANJA_RANGES) },
-        'diners_club'        => ->(num) { num =~ /^3(0[0-5]|[68]\d)\d{11}$/ },
-        'jcb'                => ->(num) { num =~ /^35(28|29|[3-8]\d)\d{12}$/ },
+        'diners_club'        => ->(num) { num =~ /^3(0[0-5]|[68]\d)\d{11,16}$/ },
+        'jcb'                => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 4), JCB_RANGES) },
         'dankort'            => ->(num) { num =~ /^5019\d{12}$/ },
-        'maestro'            => ->(num) { (12..19).cover?(num&.size) && in_bin_range?(num.slice(0, 6), MAESTRO_RANGES) },
+        'maestro'            => lambda { |num|
+          (12..19).cover?(num&.size) && (
+            in_bin_range?(num.slice(0, 6), MAESTRO_RANGES) ||
+            MAESTRO_BINS.any? { |bin| num.slice(0, bin.size) == bin }
+          )
+        },
+        'maestro_no_luhn'    => ->(num) { num =~ /^(501080|501081|501082)\d{6,13}$/ },
         'forbrugsforeningen' => ->(num) { num =~ /^600722\d{10}$/ },
-        'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818)\d{10}$/ },
+        'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818|505864|505865)\d{10}$/ },
+        'alia'               => ->(num) { num =~ /^(504997|505878|601030|601073|505874)\d{10}$/ },
         'vr'                 => ->(num) { num =~ /^(627416|637036)\d{10}$/ },
-        'cabal'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 8), CABAL_RANGES) },
+        'unionpay'           => ->(num) { (16..19).cover?(num&.size) && in_bin_range?(num.slice(0, 8), UNIONPAY_RANGES) },
         'carnet'             => lambda { |num|
           num&.size == 16 && (
             in_bin_range?(num.slice(0, 6), CARNET_RANGES) ||
             CARNET_BINS.any? { |bin| num.slice(0, bin.size) == bin }
           )
-        }
+        },
+        'cartes_bancaires' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), CARTES_BANCAIRES_RANGES) },
+        'olimpica' => ->(num) { num =~ /^636853\d{10}$/ },
+        'creditel' => ->(num) { num =~ /^601933\d{10}$/ },
+        'confiable' => ->(num) { num =~ /^560718\d{10}$/ },
+        'synchrony' => ->(num) { num =~ /^700600\d{10}$/ },
+        'routex' => ->(num) { num =~ /^(700676|700678)\d{13}$/ },
+        'mada' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), MADA_RANGES) },
+        'bp_plus' => ->(num) { num =~ /^(7050\d\s\d{9}\s\d{3}$|705\d\s\d{8}\s\d{5}$)/ },
+        'passcard' => ->(num) { num =~ /^628026\d{10}$/ },
+        'edenred' => ->(num) { num =~ /^637483\d{10}$/ },
+        'anda' => ->(num) { num =~ /^603199\d{10}$/ },
+        'tarjeta-d' => ->(num) { num =~ /^601828\d{10}$/ },
+        'hipercard' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), HIPERCARD_RANGES) },
+        'panal' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), PANAL_RANGES) }
       }
 
+      SODEXO_NO_LUHN = ->(num) { num =~ /^(505864|505865)\d{10}$/ }
+
       # http://www.barclaycard.co.uk/business/files/bin_rules.pdf
       ELECTRON_RANGES = [
         [400115],
@@ -51,26 +77,100 @@ module ActiveMerchant #:nodoc:
       ]
 
       CARNET_BINS = Set.new(
-        [
-          '286900', '502275', '606333', '627535', '636318', '636379', '639388',
-          '639484', '639559', '50633601', '50633606', '58877274', '62753500',
-          '60462203', '60462204', '588772'
+        %w[
+          286900 502275 606333 627535 636318 636379 639388
+          639484 639559 50633601 50633606 58877274 62753500
+          60462203 60462204 588772
         ]
       )
 
+      CARTES_BANCAIRES_RANGES = [
+        (507589..507590),
+        (507593..507595),
+        [507597],
+        [560408],
+        [581752],
+        (585402..585405),
+        (585501..585505),
+        (585577..585582)
+      ]
+
       # https://www.mastercard.us/content/dam/mccom/global/documents/mastercard-rules.pdf, page 73
       MASTERCARD_RANGES = [
         (222100..272099),
         (510000..559999),
+        [605272],
+        [606282],
+        [637095],
+        [637568],
+        (637599..637600),
+        [637609],
       ]
 
-      # https://www.mastercard.us/content/dam/mccom/global/documents/mastercard-rules.pdf, page 73
+      MAESTRO_BINS = Set.new(
+        %w[ 500057
+            501018 501043 501045 501047 501049 501051 501072 501075 501083 501087 501089 501095
+            501500 501623
+            501879 502113 502120 502121 502301
+            503175 503337 503645 503670
+            504310 504338 504363 504533 504587 504620 504639 504656 504738 504781 504910
+            507001 507002 507004 507082 507090
+            560014 560565 561033
+            572402 572610 572626
+            576904
+            578614
+            581149
+            585274 585697
+            586509
+            588729 588792
+            589244 589407 589471 589605 589633 589647 589671 589916
+            590043 590206 590263 590265 590278 590361 590362 590379 590393 590590
+            591235 591420 591481 591620 591770 591948 591994
+            592024 592161 592184 592186 592201 592384 592393 592528 592566 592704 592735 592879 592884
+            593074 593264 593272 593355 593496 593556 593589 593666 593709 593825 593963 593994
+            594184 594409 594468 594475 594581 594665 594691 594710 594874 594968
+            595355 595364 595532 595547 595561 595568 595743 595929
+            596245 596289 596399 596405 596590 596608 596645 596646 596791 596808 596815 596846
+            597077 597094 597143 597370 597410 597765 597855 597862
+            598053 598054 598395 598585 598793 598794 598815 598835 598838 598880 598889
+            599000 599069 599089 599148 599191 599310 599741 599742 599867
+            601070 601452 601628 601638
+            602648
+            603326 603450 603689
+            604983
+            606126
+            608710
+            627339 627453 627454 627973
+            636117 636380 636422 636502 636639
+            637046 637529 637568 637600 637756
+            639130 639229 639350
+            690032]
+      )
+
+      # https://www.mastercard.us/content/dam/mccom/global/documents/mastercard-rules.pdf, page 79
       MAESTRO_RANGES = [
+        (500032..500033),
+        (501015..501016),
+        (501020..501021),
+        (501023..501029),
+        (501038..501041),
+        (501053..501058),
+        (501060..501063),
+        (501066..501067),
+        (501091..501092),
+        (501104..501105),
+        (501107..501108),
+        (501104..501105),
+        (501107..501108),
+        (501800..501899),
+        (502000..502099),
+        (503800..503899),
         (561200..561269),
         (561271..561299),
         (561320..561356),
         (581700..581751),
         (581753..581800),
+        (589300..589399),
         (589998..591259),
         (591261..596770),
         (596772..598744),
@@ -83,21 +183,23 @@ module ActiveMerchant #:nodoc:
         (601256..601276),
         (601640..601652),
         (601689..601700),
-        (602011..602050),
+        (602011..602048),
+        [602050],
+        (630400..630499),
         (639000..639099),
         (670000..679999),
       ]
 
       # https://dev.elo.com.br/apis/tabela-de-bins, download csv from left sidebar
       ELO_RANGES = [
-        506707..506708, 506715..506715, 506718..506722, 506724..506724, 506726..506736, 506739..506739, 506741..506743,
-        506745..506747, 506753..506753, 506774..506776, 506778..506778, 509000..509001, 509003..509003, 509007..509007,
-        509020..509022, 509035..509035, 509039..509042, 509045..509045, 509048..509048, 509051..509071, 509073..509074,
-        509077..509080, 509084..509084, 509091..509094, 509098..509098, 509100..509100, 509104..509104, 509106..509109,
-        627780..627780, 636368..636368, 650031..650033, 650035..650045, 650047..650047, 650406..650410, 650434..650436,
-        650439..650439, 650485..650504, 650506..650530, 650577..650580, 650582..650591, 650721..650727, 650901..650922,
-        650928..650928, 650938..650939, 650946..650948, 650954..650955, 650962..650963, 650967..650967, 650971..650971,
-        651652..651667, 651675..651678, 655000..655010, 655012..655015, 655051..655052, 655056..655057
+        506707..506708, 506715..506715, 506717..506722, 506724..506736, 506739..506743,
+        506745..506747, 506753..506753, 506774..506778, 509000..509007, 509009..509014,
+        509020..509030, 509035..509042, 509044..509089, 509091..509101, 509104..509807,
+        509831..509877, 509897..509900, 509918..509964, 509971..509986, 509995..509999,
+        627780..627780, 636297..636298, 636368..636368, 650031..650033, 650035..650051,
+        650057..650081, 650406..650439, 650485..650504, 650506..650538, 650552..650598,
+        650720..650727, 650901..650922, 650928..650928, 650938..650939, 650946..650978,
+        651652..651704, 655000..655019, 655021..655057
       ]
 
       # Alelo provides BIN ranges by e-mailing them out periodically.
@@ -109,20 +211,46 @@ module ActiveMerchant #:nodoc:
         402588..402588, 404347..404347, 405876..405876, 405882..405882, 405884..405884,
         405886..405886, 430471..430471, 438061..438061, 438064..438064, 470063..470066,
         496067..496067, 506699..506704, 506706..506706, 506713..506714, 506716..506716,
-        506749..506750, 506752..506752, 506754..506756, 506758..506762, 506764..506767,
-        506770..506771, 509015..509019, 509880..509882, 509884..509885, 509987..509988
+        506749..506750, 506752..506752, 506754..506756, 506758..506767, 506770..506771,
+        506773..506773, 509015..509019, 509880..509882, 509884..509885, 509887..509887,
+        509987..509992
       ]
 
       CABAL_RANGES = [
         60420100..60440099,
         58965700..58965799,
-        60352200..60352299
+        60352200..60352299,
+        65027200..65027299,
+        65008700..65008700
+      ]
+
+      MADA_RANGES = [
+        504300..504300, 506968..506968, 508160..508160, 585265..585265, 588848..588848,
+        588850..588850, 588982..588983, 589005..589005, 589206..589206, 604906..604906,
+        605141..605141, 636120..636120, 968201..968209, 968211..968211
       ]
 
       NARANJA_RANGES = [
         589562..589562
       ]
 
+      # https://www.discoverglobalnetwork.com/content/dam/discover/en_us/dgn/pdfs/IPP-VAR-Enabler-Compliance.pdf
+      UNIONPAY_RANGES = [
+        62000000..62000000, 62212600..62379699, 62400000..62699999, 62820000..62889999,
+        81000000..81099999, 81100000..81319999, 81320000..81519999, 81520000..81639999, 81640000..81719999
+      ]
+
+      JCB_RANGES = [
+        3528..3589, 3088..3094, 3096..3102, 3112..3120, 3158..3159, 3337..3349
+      ]
+
+      HIPERCARD_RANGES = [
+        384100..384100, 384140..384140, 384160..384160, 606282..606282, 637095..637095,
+        637568..637568, 637599..637599, 637609..637609, 637612..637612
+      ]
+
+      PANAL_RANGES = [[602049]]
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -130,7 +258,7 @@ module ActiveMerchant #:nodoc:
       def self.in_bin_range?(number, ranges)
         bin = number.to_i
         ranges.any? do |range|
-          range.cover?(bin)
+          range.include?(bin)
         end
       end
 
@@ -197,8 +325,8 @@ module ActiveMerchant #:nodoc:
         def valid_number?(number)
           valid_test_mode_card_number?(number) ||
             valid_card_number_length?(number) &&
-            valid_card_number_characters?(number) &&
-            valid_by_algorithm?(brand?(number), number)
+              valid_card_number_characters?(brand?(number), number) &&
+              valid_by_algorithm?(brand?(number), number)
         end
 
         def card_companies
@@ -238,6 +366,7 @@ module ActiveMerchant #:nodoc:
 
         def last_digits(number)
           return '' if number.nil?
+
           number.length <= 4 ? number : number.slice(-4..-1)
         end
 
@@ -259,11 +388,14 @@ module ActiveMerchant #:nodoc:
 
         def valid_card_number_length?(number) #:nodoc:
           return false if number.nil?
+
           number.length >= 12
         end
 
-        def valid_card_number_characters?(number) #:nodoc:
+        def valid_card_number_characters?(brand, number) #:nodoc:
           return false if number.nil?
+          return number =~ /\A[0-9 ]+\Z/ if brand == 'bp_plus'
+
           !number.match(/\D/)
         end
 
@@ -272,16 +404,28 @@ module ActiveMerchant #:nodoc:
             %w[1 2 3 success failure error].include?(number)
         end
 
+        def sodexo_no_luhn?(numbers)
+          SODEXO_NO_LUHN.call(numbers)
+        end
+
         def valid_by_algorithm?(brand, numbers) #:nodoc:
           case brand
           when 'naranja'
             valid_naranja_algo?(numbers)
+          when 'creditel'
+            valid_creditel_algo?(numbers)
+          when 'alia', 'confiable', 'maestro_no_luhn', 'anda', 'tarjeta-d', 'hipercard'
+            true
+          when 'sodexo'
+            sodexo_no_luhn?(numbers) ? true : valid_luhn?(numbers)
+          when 'bp_plus', 'passcard', 'edenred'
+            valid_luhn_non_zero_check_digit?(numbers)
           else
             valid_luhn?(numbers)
           end
         end
 
-        ODD_LUHN_VALUE = {
+        BYTES_TO_DIGITS = {
           48 => 0,
           49 => 1,
           50 => 2,
@@ -295,7 +439,7 @@ module ActiveMerchant #:nodoc:
           nil => 0
         }.freeze
 
-        EVEN_LUHN_VALUE = {
+        BYTES_TO_DIGITS_DOUBLED = {
           48 => 0, # 0 * 2
           49 => 2, # 1 * 2
           50 => 4, # 2 * 2
@@ -305,7 +449,7 @@ module ActiveMerchant #:nodoc:
           54 => 3, # 6 * 2 - 9
           55 => 5, # etc ...
           56 => 7,
-          57 => 9,
+          57 => 9
         }.freeze
 
         # Checks the validity of a card number by use of the Luhn Algorithm.
@@ -315,28 +459,57 @@ module ActiveMerchant #:nodoc:
           sum = 0
 
           odd = true
-          numbers.reverse.bytes.each do |number|
+          numbers.reverse.bytes.each do |bytes|
             if odd
               odd = false
-              sum += ODD_LUHN_VALUE[number]
+              sum += BYTES_TO_DIGITS[bytes]
             else
               odd = true
-              sum += EVEN_LUHN_VALUE[number]
+              sum += BYTES_TO_DIGITS_DOUBLED[bytes]
             end
           end
 
           sum % 10 == 0
         end
 
-        # Checks the validity of a card number by use of Naranja's specific algorithm.
+        def valid_luhn_with_check_digit?(numbers, check_digit)
+          sum = 0
+
+          doubler = true
+
+          numbers.reverse.bytes.each do |bytes|
+            doubler ? sum += BYTES_TO_DIGITS_DOUBLED[bytes] : sum += BYTES_TO_DIGITS[bytes]
+            doubler = !doubler
+          end
+
+          (10 - (sum % 10)) % 10 == check_digit.to_i
+        end
+
+        def valid_luhn_non_zero_check_digit?(numbers)
+          return valid_luhn?(numbers.delete(' ')) if numbers[5] == ' '
+
+          check_digit = numbers[-1]
+          luhn_payload = numbers.delete(' ').chop
+          valid_luhn_with_check_digit?(luhn_payload, check_digit)
+        end
+
+        # Checks the validity of a card number by use of specific algorithms
         def valid_naranja_algo?(numbers) #:nodoc:
           num_array = numbers.to_s.chars.map(&:to_i)
           multipliers = [4, 3, 2, 7, 6, 5, 4, 3, 2, 7, 6, 5, 4, 3, 2]
-          num_sum = num_array[0..14].zip(multipliers).map { |a, b| a*b }.reduce(:+)
+          num_sum = num_array[0..14].zip(multipliers).map { |a, b| a * b }.reduce(:+)
           intermediate = 11 - (num_sum % 11)
           final_num = intermediate > 9 ? 0 : intermediate
           final_num == num_array[15]
         end
+
+        def valid_creditel_algo?(numbers) #:nodoc:
+          num_array = numbers.to_s.chars.map(&:to_i)
+          multipliers = [5, 4, 3, 2, 1, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9]
+          num_sum = num_array[0..14].zip(multipliers).map { |a, b| a * b }.reduce(:+)
+          final_num = num_sum % 10
+          final_num == num_array[15]
+        end
       end
     end
   end

data/lib/active_merchant/billing/cvv_result.rb

@@ -4,7 +4,6 @@ module ActiveMerchant
     # http://www.bbbonline.org/eExport/doc/MerchantGuide_cvv2.pdf
     # Check additional codes from cybersource website
     class CVVResult
-
       MESSAGES = {
         'D'  =>  'CVV check flagged transaction as suspicious',
         'I'  =>  'CVV failed data validation check',

data/lib/active_merchant/billing/gateway.rb

@@ -80,22 +80,23 @@ module ActiveMerchant #:nodoc:
       #                        as network tokenization.
 
       STANDARD_ERROR_CODE = {
-        :incorrect_number => 'incorrect_number',
-        :invalid_number => 'invalid_number',
-        :invalid_expiry_date => 'invalid_expiry_date',
-        :invalid_cvc => 'invalid_cvc',
-        :expired_card => 'expired_card',
-        :incorrect_cvc => 'incorrect_cvc',
-        :incorrect_zip => 'incorrect_zip',
-        :incorrect_address => 'incorrect_address',
-        :incorrect_pin => 'incorrect_pin',
-        :card_declined => 'card_declined',
-        :processing_error => 'processing_error',
-        :call_issuer => 'call_issuer',
-        :pickup_card => 'pick_up_card',
-        :config_error => 'config_error',
-        :test_mode_live_card => 'test_mode_live_card',
-        :unsupported_feature => 'unsupported_feature',
+        incorrect_number: 'incorrect_number',
+        invalid_number: 'invalid_number',
+        invalid_expiry_date: 'invalid_expiry_date',
+        invalid_cvc: 'invalid_cvc',
+        expired_card: 'expired_card',
+        incorrect_cvc: 'incorrect_cvc',
+        incorrect_zip: 'incorrect_zip',
+        incorrect_address: 'incorrect_address',
+        incorrect_pin: 'incorrect_pin',
+        card_declined: 'card_declined',
+        processing_error: 'processing_error',
+        call_issuer: 'call_issuer',
+        pickup_card: 'pick_up_card',
+        config_error: 'config_error',
+        test_mode_live_card: 'test_mode_live_card',
+        unsupported_feature: 'unsupported_feature',
+        invalid_amount: 'invalid_amount'
       }
 
       cattr_reader :implementations
@@ -123,8 +124,9 @@ module ActiveMerchant #:nodoc:
       class_attribute :supported_cardtypes
       self.supported_cardtypes = []
 
+      # This default list of currencies without fractions are from https://en.wikipedia.org/wiki/ISO_4217
       class_attribute :currencies_without_fractions, :currencies_with_three_decimal_places
-      self.currencies_without_fractions = %w(BIF BYR CLP CVE DJF GNF ISK JPY KMF KRW PYG RWF UGX VND VUV XAF XOF XPF)
+      self.currencies_without_fractions = %w(BIF BYR CLP CVE DJF GNF ISK JPY KMF KRW PYG RWF UGX UYI VND VUV XAF XOF XPF)
       self.currencies_with_three_decimal_places = %w()
 
       class_attribute :homepage_url
@@ -155,15 +157,13 @@ module ActiveMerchant #:nodoc:
 
       def self.supported_countries=(country_codes)
         country_codes.each do |country_code|
-          unless ActiveMerchant::Country.find(country_code)
-            raise ActiveMerchant::InvalidCountryCodeError, "No country could be found for the country #{country_code}"
-          end
+          raise ActiveMerchant::InvalidCountryCodeError, "No country could be found for the country #{country_code}" unless ActiveMerchant::Country.find(country_code)
         end
         @supported_countries = country_codes.dup
       end
 
       def self.supported_countries
-        @supported_countries ||= []
+        @supported_countries ||= (self.superclass.supported_countries || [])
       end
 
       def supported_countries
@@ -224,11 +224,11 @@ module ActiveMerchant #:nodoc:
 
       def user_agent
         @@ua ||= JSON.dump({
-          :bindings_version => ActiveMerchant::VERSION,
-          :lang => 'ruby',
-          :lang_version => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
-          :platform => RUBY_PLATFORM,
-          :publisher => 'active_merchant'
+          bindings_version: ActiveMerchant::VERSION,
+          lang: 'ruby',
+          lang_version: "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+          platform: RUBY_PLATFORM,
+          publisher: 'active_merchant'
         })
       end
 
@@ -250,16 +250,16 @@ module ActiveMerchant #:nodoc:
 
       def amount(money)
         return nil if money.nil?
-        cents = if money.respond_to?(:cents)
-                  ActiveMerchant.deprecated 'Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents'
-                  money.cents
-                else
-                  money
-        end
 
-        if money.is_a?(String)
-          raise ArgumentError, 'money amount must be a positive Integer in cents.'
-        end
+        cents =
+          if money.respond_to?(:cents)
+            ActiveMerchant.deprecated 'Support for Money objects is deprecated and will be removed from a future release of ActiveMerchant. Please use an Integer value in cents'
+            money.cents
+          else
+            money
+          end
+
+        raise ArgumentError, 'money amount must be a positive Integer in cents.' if money.is_a?(String)
 
         if self.money_format == :cents
           cents.to_s
@@ -280,6 +280,7 @@ module ActiveMerchant #:nodoc:
         amount = amount(money)
 
         return amount unless non_fractional_currency?(currency) || three_decimal_currency?(currency)
+
         if non_fractional_currency?(currency)
           if self.money_format == :cents
             sprintf('%.0f', amount.to_f / 100)
@@ -301,6 +302,7 @@ module ActiveMerchant #:nodoc:
 
       def truncate(value, max_size)
         return nil unless value
+
         value.to_s[0, max_size]
       end
 
@@ -319,7 +321,7 @@ module ActiveMerchant #:nodoc:
             raise ArgumentError.new("Missing required parameter: #{param.first}") unless hash.has_key?(param.first)
 
             valid_options = param[1..-1]
-            raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:words_connector => 'or')}") unless valid_options.include?(hash[param.first])
+            raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(words_connector: 'or')}") unless valid_options.include?(hash[param.first])
           else
             raise ArgumentError.new("Missing required parameter: #{param}") unless hash.has_key?(param)
           end