judopay 2.1.0 → 2.1.3

data/lib/judopay/models/web_payments/web_payment_operation.rb

@@ -1,8 +1,8 @@
-module Judopay
-  module WebPayments
-    module WebPaymentOperation
-      PAYMENT = 0
-      REGISTER = 1
-    end
-  end
-end
+module Judopay
+  module WebPayments
+    module WebPaymentOperation
+      PAYMENT = 0
+      REGISTER = 1
+    end
+  end
+end

data/lib/judopay/null_logger.rb

@@ -1,11 +1,9 @@
-require 'logger'
-
-module Judopay
-  class NullLogger < Logger
-    def initialize(*)
-    end
-
-    def add(*)
-    end
-  end
-end
+require 'logger'
+
+module Judopay
+  class NullLogger < Logger
+    def initialize(*) end
+
+    def add(*) end
+  end
+end

data/lib/judopay/request.rb

@@ -1,50 +1,50 @@
-require 'openssl'
-require 'json'
-
-module Judopay
-  # Defines HTTP request methods
-  module Request
-    # Perform an HTTP GET request
-    def get(path, options = {}, raw = false)
-      request(:get, path, options, raw)
-    end
-
-    # Perform an HTTP POST request
-    def post(path, options = {}, raw = false)
-      request(:post, path, options, raw)
-    end
-
-    # Perform an HTTP PUT request
-    def put(path, options = {}, raw = false)
-      request(:put, path, options, raw)
-    end
-
-    # Perform an HTTP DELETE request
-    def delete(path, options = {}, raw = false)
-      request(:delete, path, options, raw)
-    end
-
-    private
-
-    # Perform an HTTP request
-    def request(method, path, options, raw = false)
-      response = connection(raw).send(method) do |request|
-        case method
-        when :get, :delete
-          request.url(path, options)
-        when :post, :put
-          request.path = path
-          unless options.nil?
-            request.body = Judopay::Serializer.new(options).as_json
-            Judopay.log(Logger::DEBUG, 'Request body: ' + request.body)
-          end
-        end
-      end
-
-      Judopay.log(Logger::DEBUG, response)
-
-      return response if raw
-      Response.create(response.body)
-    end
-  end
-end
+require 'openssl'
+require 'json'
+
+module Judopay
+  # Defines HTTP request methods
+  module Request
+    # Perform an HTTP GET request
+    def get(path, options = {}, raw = false)
+      request(:get, path, options, raw)
+    end
+
+    # Perform an HTTP POST request
+    def post(path, options = {}, raw = false)
+      request(:post, path, options, raw)
+    end
+
+    # Perform an HTTP PUT request
+    def put(path, options = {}, raw = false)
+      request(:put, path, options, raw)
+    end
+
+    # Perform an HTTP DELETE request
+    def delete(path, options = {}, raw = false)
+      request(:delete, path, options, raw)
+    end
+
+    private
+
+    # Perform an HTTP request
+    def request(method, path, options, raw = false)
+      response = connection(raw).send(method) do |request|
+        case method
+        when :get, :delete
+          request.url(path, options)
+        when :post, :put
+          request.path = path
+          unless options.nil?
+            request.body = Judopay::Serializer.new(options).as_json
+            Judopay.log(Logger::DEBUG, 'Request body: ' + request.body)
+          end
+        end
+      end
+
+      Judopay.log(Logger::DEBUG, response)
+
+      return response if raw
+      Response.create(response.body)
+    end
+  end
+end

data/lib/judopay/response.rb

@@ -1,7 +1,7 @@
-module Judopay
-  module Response
-    def self.create(response_hash)
-      response_hash
-    end
-  end
-end
+module Judopay
+  module Response
+    def self.create(response_hash)
+      response_hash
+    end
+  end
+end

data/lib/judopay/serializer.rb

@@ -1,27 +1,27 @@
-module Judopay
-  # @private
-  class Serializer
-    attr_reader :serialized_object
-
-    def initialize(serialized_object)
-      @serialized_object = serialized_object
-    end
-
-    def as_json
-      output_hash = hashify(@serialized_object).camel_case_keys!
-      JSON.generate(output_hash)
-    end
-
-    # Turn a hash with nested Virtus objects into a simple nested hash
-    def hashify(source)
-      output_hash = {}
-      source.to_hash.each do |key, value|
-        next if value.nil?
-
-        # Is this a Virtus model object that we need to hashify?
-        output_hash[key] = value.class.included_modules.include?(Virtus::Model::Core) ? hashify(value) : value
-      end
-      output_hash
-    end
-  end
-end
+module Judopay
+  # @private
+  class Serializer
+    attr_reader :serialized_object
+
+    def initialize(serialized_object)
+      @serialized_object = serialized_object
+    end
+
+    def as_json
+      output_hash = hashify(@serialized_object).camel_case_keys!
+      JSON.generate(output_hash)
+    end
+
+    # Turn a hash with nested Virtus objects into a simple nested hash
+    def hashify(source)
+      output_hash = {}
+      source.to_hash.each do |key, value|
+        next if value.nil?
+
+        # Is this a Virtus model object that we need to hashify?
+        output_hash[key] = value.class.included_modules.include?(Virtus::Model::Core) ? hashify(value) : value
+      end
+      output_hash
+    end
+  end
+end

data/lib/judopay/version.rb

@@ -1,4 +1,4 @@
-module Judopay
-  SDK_VERSION = '2.1.0'.freeze
-  API_VERSION = '5.2.0'.freeze
-end
+module Judopay
+  SDK_VERSION = '2.1.3'.freeze
+  API_VERSION = '5.2.0'.freeze
+end

data/spec/factories.rb

@@ -1,208 +1,227 @@
-models = %w(
-  card_payment
-  card_preauth
-  collection
-  refund
-  token_payment
-  token_preauth
-  web_payments/payment
-  market/collection
-  market/refund
-  save_card
-  register_card
-  void
-  apple_payment
-  android_payment
-)
-models.each { |model| require_relative '../lib/judopay/models/' + model }
-require 'securerandom'
-
-FactoryGirl.define do
-  trait :payment_details do
-    your_consumer_reference 123
-    sequence :your_payment_reference do |n|
-      SecureRandom.hex(21) + n.to_s
-    end
-    amount 1.01
-  end
-
-  trait :valid_card do
-    card_number '4976000000003436'
-    expiry_date '12/20'
-    cv2 452
-  end
-
-  trait :declined_card do
-    card_number '4221690000004963'
-    expiry_date '12/20'
-    cv2 125
-  end
-
-  trait :valid_token_details do
-    consumer_token '3UW4DV9wI0oKkMFS'
-    card_token 'SXw4hnv1vJuEujQR'
-    cv2 452
-  end
-
-  trait :valid_judo_id do
-    judo_id '100435-197'
-  end
-
-  trait :valid_collection_or_refund_details do
-    receipt_id '1234'
-    amount 1.01
-    sequence :your_payment_reference do |n|
-      SecureRandom.hex(21) + n.to_s
-    end
-  end
-
-  trait :client_ip_address_and_user_agent do
-    client_ip_address '127.0.0.1'
-    client_user_agent 'Mozilla/5.0 (Windows NT 6.2; Win64; x64)...'
-  end
-
-  factory :card_payment, :class => Judopay::CardPayment do
-    payment_details
-    valid_judo_id
-    valid_card
-    currency 'GBP'
-
-    trait :declined do
-      card_number '4221690000004963'
-      cv2 125
-    end
-  end
-
-  factory :card_preauth, :class => Judopay::CardPreauth do
-    payment_details
-    valid_card
-    valid_judo_id
-    currency 'GBP'
-
-    trait :declined do
-      card_number '4221690000004963'
-      cv2 125
-    end
-  end
-
-  factory :collection, :class => Judopay::Collection do
-    valid_collection_or_refund_details
-  end
-
-  factory :refund, :class => Judopay::Refund do
-    valid_collection_or_refund_details
-  end
-
-  factory :token_payment, :class => Judopay::TokenPayment do
-    payment_details
-    valid_token_details
-    valid_judo_id
-    currency 'GBP'
-  end
-
-  factory :token_preauth, :class => Judopay::TokenPreauth do
-    payment_details
-    valid_token_details
-    valid_judo_id
-    currency 'GBP'
-  end
-
-  factory :web_payment, :class => Judopay::WebPayments::Payment do
-    valid_judo_id
-    payment_details
-    client_ip_address_and_user_agent
-
-    partner_service_fee 1.00
-  end
-
-  factory :web_preauth, :class => Judopay::WebPayments::Payment do
-    valid_judo_id
-    payment_details
-    client_ip_address_and_user_agent
-
-    partner_service_fee 1.00
-  end
-
-  factory :market_collection, :class => Judopay::Market::Collection do
-    valid_collection_or_refund_details
-  end
-
-  factory :market_refund, :class => Judopay::Market::Refund do
-    valid_collection_or_refund_details
-  end
-
-  factory :save_card, :class => Judopay::SaveCard do
-    valid_card
-
-    your_consumer_reference 123
-  end
-
-  factory :register_card, :class => Judopay::RegisterCard do
-    payment_details
-    valid_card
-    valid_judo_id
-    currency 'GBP'
-
-    trait :declined do
-      card_number '4221690000004963'
-      cv2 125
-    end
-  end
-
-  factory :void, :class => Judopay::Void do
-    valid_collection_or_refund_details
-  end
-
-  factory :apple_payment, :class => Judopay::ApplePayment do
-    payment_details
-    valid_judo_id
-    currency 'GBP'
-
-    client_details do
-      {
-        :key => 'someValidKey',
-        :value => 'someValidValue'
-      }
-    end
-
-    pk_payment do
-      {
-        :token => {
-          :payment_instrument_name => 'Visa 9911',
-          :payment_network => 'Visa',
-          :payment_data => {
-            :version => 'EC_v1',
-            :data => 'someData',
-            :signature => 'someData',
-            :header => {
-              :ephemeralPublicKey => 'someData',
-              :publicKeyHash => 'someData',
-              :transactionId => 'someData'
-            }
-          }
-        },
-        :billing_address => nil,
-        :shipping_address => nil
-      }
-    end
-  end
-  factory :android_payment, :class => Judopay::AndroidPayment do
-    payment_details
-    valid_judo_id
-    currency 'GBP'
-
-    wallet do
-      {
-        :encrypted_message => 'ZW5jcnlwdGVkTWVzc2FnZQ==',
-        :environment => 3,
-        :ephemeral_public_key => 'ZXBoZW1lcmFsUHVibGljS2V5',
-        :google_transaction_id => '123456789',
-        :instrument_details => '1234',
-        :instrument_type => 'VISA',
-        :public_key => 'someKey',
-        :tag => 'c2lnbmF0dXJl',
-        :version => 1
-      }
-    end
-  end
-end
+models = %w(
+  card_payment
+  card_preauth
+  collection
+  refund
+  token_payment
+  token_preauth
+  web_payments/payment
+  market/collection
+  market/refund
+  save_card
+  register_card
+  void
+  apple_payment
+  android_payment
+  encrypt_details
+  one_use_token_payment
+)
+models.each { |model| require_relative '../lib/judopay/models/' + model }
+require 'securerandom'
+
+FactoryBot.define do
+  trait :payment_details do
+    your_consumer_reference 123
+    sequence :your_payment_reference do |n|
+      SecureRandom.hex(21) + n.to_s
+    end
+    amount 1.01
+  end
+
+  trait :valid_card do
+    card_number '4976000000003436'
+    expiry_date '12/20'
+    cv2 452
+  end
+
+  trait :declined_card do
+    card_number '4221690000004963'
+    expiry_date '12/20'
+    cv2 125
+  end
+
+  trait :valid_token_details do
+    consumer_token '3UW4DV9wI0oKkMFS'
+    card_token 'SXw4hnv1vJuEujQR'
+    cv2 452
+  end
+
+  trait :valid_judo_id do
+    judo_id '100435-197'
+  end
+
+  trait :valid_collection_or_refund_details do
+    receipt_id '1234'
+    amount 1.01
+    sequence :your_payment_reference do |n|
+      SecureRandom.hex(21) + n.to_s
+    end
+  end
+
+  trait :client_ip_address_and_user_agent do
+    client_ip_address '127.0.0.1'
+    client_user_agent 'Mozilla/5.0 (Windows NT 6.2; Win64; x64)...'
+  end
+
+  factory :card_payment, :class => Judopay::CardPayment do
+    payment_details
+    valid_judo_id
+    valid_card
+    currency 'GBP'
+
+    trait :declined do
+      card_number '4221690000004963'
+      cv2 125
+    end
+  end
+
+  factory :card_preauth, :class => Judopay::CardPreauth do
+    payment_details
+    valid_card
+    valid_judo_id
+    currency 'GBP'
+
+    trait :declined do
+      card_number '4221690000004963'
+      cv2 125
+    end
+  end
+
+  factory :collection, :class => Judopay::Collection do
+    valid_collection_or_refund_details
+  end
+
+  factory :refund, :class => Judopay::Refund do
+    valid_collection_or_refund_details
+  end
+
+  factory :token_payment, :class => Judopay::TokenPayment do
+    payment_details
+    valid_token_details
+    valid_judo_id
+    currency 'GBP'
+  end
+
+  factory :token_preauth, :class => Judopay::TokenPreauth do
+    payment_details
+    valid_token_details
+    valid_judo_id
+    currency 'GBP'
+  end
+
+  factory :web_payment, :class => Judopay::WebPayments::Payment do
+    valid_judo_id
+    payment_details
+    client_ip_address_and_user_agent
+
+    partner_service_fee 1.00
+  end
+
+  factory :web_preauth, :class => Judopay::WebPayments::Payment do
+    valid_judo_id
+    payment_details
+    client_ip_address_and_user_agent
+
+    partner_service_fee 1.00
+  end
+
+  factory :market_collection, :class => Judopay::Market::Collection do
+    valid_collection_or_refund_details
+  end
+
+  factory :market_refund, :class => Judopay::Market::Refund do
+    valid_collection_or_refund_details
+  end
+
+  factory :save_card, :class => Judopay::SaveCard do
+    valid_card
+
+    your_consumer_reference 123
+  end
+
+  factory :register_card, :class => Judopay::RegisterCard do
+    payment_details
+    valid_card
+    valid_judo_id
+    currency 'GBP'
+
+    trait :declined do
+      card_number '4221690000004963'
+      cv2 125
+    end
+  end
+
+  factory :void, :class => Judopay::Void do
+    valid_collection_or_refund_details
+  end
+
+  factory :apple_payment, :class => Judopay::ApplePayment do
+    payment_details
+    valid_judo_id
+    currency 'GBP'
+
+    client_details do
+      {
+        :key => 'someValidKey',
+        :value => 'someValidValue'
+      }
+    end
+
+    pk_payment do
+      {
+        :token => {
+          :payment_instrument_name => 'Visa 9911',
+          :payment_network => 'Visa',
+          :payment_data => {
+            :version => 'EC_v1',
+            :data => 'someData',
+            :signature => 'someData',
+            :header => {
+              :ephemeralPublicKey => 'someData',
+              :publicKeyHash => 'someData',
+              :transactionId => 'someData'
+            }
+          }
+        },
+        :billing_address => nil,
+        :shipping_address => nil
+      }
+    end
+  end
+
+  factory :android_payment, :class => Judopay::AndroidPayment do
+    payment_details
+    valid_judo_id
+    currency 'GBP'
+
+    wallet do
+      {
+        :encrypted_message => 'ZW5jcnlwdGVkTWVzc2FnZQ==',
+        :environment => 3,
+        :ephemeral_public_key => 'ZXBoZW1lcmFsUHVibGljS2V5',
+        :google_transaction_id => '123456789',
+        :instrument_details => '1234',
+        :instrument_type => 'VISA',
+        :public_key => 'someKey',
+        :tag => 'c2lnbmF0dXJl',
+        :version => 1
+      }
+    end
+  end
+
+  factory :encrypt_details, :class => Judopay::EncryptDetails do
+    card_number '4976000000003436'
+    expiry_date '12/20'
+    cv2 452
+  end
+
+  factory :one_use_token_payment, :class => Judopay::OneUseTokenPayment do
+    your_consumer_reference 'oneUseTokenTestConsumer'
+    sequence :your_payment_reference do |n|
+      SecureRandom.hex(21) + n.to_s
+    end
+    amount 1.01
+    currency "GBP"
+  end
+
+end