ravelin 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ecd05f211df024a040670b38688b4c5ac65ac1
-  data.tar.gz: 8c440378be06ab8ffc0a7a07f371af1adae51532
+  metadata.gz: 4b248ecddc8dd466d77736a5b37960ebd6312f30
+  data.tar.gz: 3fbde0a73dcb74135b4722c42568e9136978283b
 SHA512:
-  metadata.gz: d9d07afce70b9323ed5bc5290985a4aad5dd237d3931932e59dc469dd239d03f695265f8e24e88cc22b72949d2062a8f99ac94ef85b2c5efa68011921c4860d2
-  data.tar.gz: 6a4ca09861bc3b6dcd5bb330da9b145b2e78e3d0b0b44fb8664ea0b7222b833281e649a60a183a7277c2e639a3862d3483ec7e86d08e09f81abc5da5f4c841ed
+  metadata.gz: 80709c4159f06bd611eaa7400c538b35b1e9fda246fa5cd67b5b6e5e6b6e910513dd7953a20d833ad3eac9d811ddda3104e95fc90f5094c710ad5dd83b24a622
+  data.tar.gz: 9d838d99ec670371d6405be97abc6b846b2fb506ebbd78a81339b8f7803919931a318b091c04eabec6c29b7d88ebda8261e87037a5a017d3134f6a8403a93ec6

data/lib/ravelin/event.rb

@@ -52,7 +52,10 @@ module Ravelin
         when :'paymentmethod/voucher'
           validate_payload_inclusion_of :'voucher_redemption'
         when :pretransaction, :transaction
-          validate_payload_inclusion_of :order_id, :payment_method_id
+          validate_payload_must_include_one_of(
+            :payment_method_id, :payment_method
+          )
+          validate_payload_inclusion_of :order_id
         when :login
           validate_payload_inclusion_of :customer_id, :temp_customer_id
         when :checkout
@@ -77,6 +80,18 @@ module Ravelin
       end
     end
 
+    def validate_payload_must_include_one_of(*mutually_exclusive_keys)
+      intersection = mutually_exclusive_keys & self.payload.keys
+
+      if intersection.size > 1
+        raise ArgumentError
+          .new(%Q{parameters are mutally exclusive: #{mutually_exclusive_keys.join(', ')}})
+      elsif intersection.size == 0
+        raise ArgumentError
+          .new(%Q{payload must include one of: #{mutually_exclusive_keys.join(', ')}})
+      end
+    end
+
     def payload_customer_reference_present?
       self.payload.keys.any? {|k| %i(customer_id temp_customer_id).include? k }
     end

data/lib/ravelin/version.rb

@@ -1,3 +1,3 @@
 module Ravelin
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ravelin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sam Levy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday