judopay 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be5492295df9eda4aa30bdac5a083c8a3ed28475
-  data.tar.gz: 72ecefd096cb897e3ce5132e8a6860a3709701d6
+  metadata.gz: ee2fddf46aa4fa23cc6e41a1bf37766134704c47
+  data.tar.gz: 41e0f0af43a8c59434748d81a4a7a2f3b3736da1
 SHA512:
-  metadata.gz: 4ca9fabba65770732d986a48bb427aeb9e3668d469befb0154cf8cde4ef2ea21726b120ff02a3a50ecef3eac08a3fc7f1d031f97bb7900ad1a9c606caf4f7137
-  data.tar.gz: 06e176695194f2280a216c1c86231381419f25ed51fdd9e687ab11fd741cc9f946d50ccbf74d65c76633aaa4c6b238b231ad11fa810924821df36c1d79e02ba5
+  metadata.gz: 3b73e9514861890092abbfc44c3538298a2231ca8f296efb9cd602658c0f37061e1f1acce80b0194f0c9e55c7b8436de87130af057402038e40a025ddd703569
+  data.tar.gz: 505a41b6bfe31584202759a318fdc24369851b3d3cf12d511cbc293f4e757871384ec8fb99b1b007cb16536296851a93bab80694b6561b55d512d63f0a355a0d

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Alternative Payments Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/judopay.gemspec

@@ -6,9 +6,9 @@ require 'judopay/version'
 Gem::Specification.new do |spec|
   spec.name          = 'judopay'
   spec.version       = Judopay::SDK_VERSION
-  spec.authors       = ['judoPay']
+  spec.authors       = ['Judopay']
   spec.email         = ['developersupport@judopay.com']
-  spec.summary       = 'Ruby SDK wrapper for the Judopay REST API'
+  spec.summary       = 'Ruby gem for using the Judopay API'
   spec.description   = ''
   spec.homepage      = 'http://www.judopay.com'
   spec.license       = 'MIT'

data/lib/judopay/error.rb

@@ -46,8 +46,12 @@ module Judopay
       def extract_field_errors(field_errors)
         result = []
 
-        field_errors.to_a.each do |field_error|
-          result << FieldError.new(field_error['message'], field_error['code'], field_error['fieldName'], field_error['detail'])
+        if field_errors.is_a?(Hash) && field_errors.key?('receiptId')
+          result << 'Duplicate transaction. Receipt id: ' + field_errors['receiptId'].to_s
+        else
+          field_errors.to_a.each do |field_error|
+            result << FieldError.new(field_error['message'], field_error['code'], field_error['fieldName'], field_error['detail'])
+          end
         end
 
         result

data/lib/judopay/model.rb

@@ -116,3 +116,19 @@ module Judopay
     end
   end
 end
+
+module ActiveModel
+  module Validations
+    module ClassMethods
+      def validate_nested_model(*attr_names)
+        validates_with BlockValidator, _merge_attributes(attr_names) do |model, attr, value|
+          if value.is_a?(Judopay::Model) && !value.valid?
+            value.errors.each { |field, message| model.errors["#{attr}.#{field}"] = message }
+          elsif !value.is_a?(Judopay::Model)
+            model.errors[attr] = 'should be valid Model object'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/judopay/models/android_payment.rb

@@ -0,0 +1,26 @@
+require_relative '../model'
+require_relative 'inner/wallet'
+
+module Judopay
+  class AndroidPayment < Model
+    @resource_path = 'transactions/payments'
+    @valid_api_methods = [:create]
+
+    attribute :your_consumer_reference, String # required
+    attribute :your_payment_reference, String # required
+    attribute :your_payment_meta_data, Hash
+    attribute :judo_id, String # required
+    attribute :amount, Float # required
+    attribute :currency, String
+    attribute :client_details, Hash
+    attribute :wallet, Judopay::Wallet
+
+    validates_presence_of :your_consumer_reference,
+                          :your_payment_reference,
+                          :judo_id,
+                          :amount,
+                          :currency
+
+    validate_nested_model :wallet
+  end
+end

data/lib/judopay/models/android_preauth.rb

@@ -0,0 +1,8 @@
+require_relative '../model'
+require_relative 'android_payment'
+
+module Judopay
+  class AndroidPreauth < AndroidPayment
+    @resource_path = 'transactions/preauths'
+  end
+end

data/lib/judopay/models/apple_payment.rb

@@ -0,0 +1,26 @@
+require_relative '../model'
+require_relative 'inner/pk_payment'
+
+module Judopay
+  class ApplePayment < Model
+    @resource_path = 'transactions/payments'
+    @valid_api_methods = [:create]
+
+    attribute :your_consumer_reference, String # required
+    attribute :your_payment_reference, String # required
+    attribute :your_payment_meta_data, Hash
+    attribute :judo_id, String # required
+    attribute :amount, Float # required
+    attribute :currency, String
+    attribute :client_details, Hash
+    attribute :pk_payment, Judopay::PkPayment
+
+    validates_presence_of :your_consumer_reference,
+                          :your_payment_reference,
+                          :judo_id,
+                          :amount,
+                          :currency
+
+    validate_nested_model :pk_payment
+  end
+end

data/lib/judopay/models/apple_preauth.rb

@@ -0,0 +1,9 @@
+require_relative '../model'
+require_relative 'apple_payment'
+
+module Judopay
+  class ApplePreauth < ApplePayment
+    @resource_path = 'transactions/preauths'
+    @valid_api_methods = [:create]
+  end
+end

data/lib/judopay/models/card_payment.rb

@@ -1,7 +1,6 @@
 require_relative '../model'
 require_relative 'payment'
 require_relative 'card_address'
-require_relative 'consumer_location'
 
 module Judopay
   class CardPayment < Model
@@ -17,10 +16,10 @@ module Judopay
     attribute :expiry_date, String # required for card transactions
     attribute :cv2, String # required for card transactions
     attribute :card_address, Judopay::CardAddress
-    attribute :consumer_location, Judopay::ConsumerLocation
     attribute :mobile_number, String
     attribute :email_address, String
     attribute :currency, String
+    attribute :client_details, Hash
 
     validates_presence_of :your_consumer_reference,
                           :your_payment_reference,

data/lib/judopay/models/card_preauth.rb

@@ -1,7 +1,6 @@
 require_relative '../model'
 require_relative 'payment'
 require_relative 'card_address'
-require_relative 'consumer_location'
 
 module Judopay
   # Inherit from CardPayment - attributes are identical

data/lib/judopay/models/inner/pk_payment.rb

@@ -0,0 +1,17 @@
+require_relative 'transmitted_field'
+require_relative 'pk_payment_token'
+
+module Judopay
+  class PkPayment < TransmittedField
+    attribute :token, Judopay::PkPaymentToken
+    attribute :billing_address, String
+    attribute :shipping_address, String
+
+    validate_nested_model :token
+
+    def self.new(*args)
+      self.field_name = 'pk_payment'
+      super(*args)
+    end
+  end
+end

data/lib/judopay/models/inner/pk_payment_token.rb

@@ -0,0 +1,13 @@
+require_relative '../../model'
+
+module Judopay
+  class PkPaymentToken < Model
+    attribute :payment_instrument_name, String
+    attribute :payment_network, String
+    attribute :payment_data, Hash
+
+    validates_presence_of :payment_instrument_name,
+                          :payment_network,
+                          :payment_data
+  end
+end

data/lib/judopay/models/inner/transmitted_field.rb

@@ -0,0 +1,39 @@
+require_relative '../../model'
+require 'judopay/mash'
+require 'json'
+
+module Judopay
+  class TransmittedField < Model
+    WRONG_OBJECT_ERROR_MESSAGE = 'You passed wrong value to the %s. Please pass Hash or json-encoded string'.freeze
+    WRONG_JSON_ERROR_MESSAGE = 'Can\'t decode %s object from JSON'.freeze
+
+    class << self
+      attr_accessor :field_name
+
+      def new(*args)
+        super(validate_data(*args))
+      end
+
+      protected
+
+      def validate_data(data)
+        data = parse_string(data) if data.is_a?(String)
+        raise Judopay::ValidationError, format(WRONG_OBJECT_ERROR_MESSAGE, name) unless data.is_a?(Hash) || data.is_a?(Judopay::Mash)
+        data = Judopay::Mash.new(data)
+        data = data[field_name] if data.key?(field_name)
+
+        data
+      end
+
+      def parse_string(string)
+        JSON.parse(string)
+      rescue
+        raise Judopay::ValidationError, format(WRONG_JSON_ERROR_MESSAGE, name)
+      end
+    end
+
+    def ==(other)
+      to_yaml == other.to_yaml
+    end
+  end
+end

data/lib/judopay/models/inner/wallet.rb

@@ -0,0 +1,30 @@
+require_relative 'transmitted_field'
+
+module Judopay
+  class Wallet < TransmittedField
+    attribute :encrypted_message, String
+    attribute :environment, Integer
+    attribute :ephemeral_public_key, String
+    attribute :google_transaction_id, String
+    attribute :instrument_details, String
+    attribute :instrument_type, String
+    attribute :public_key, String
+    attribute :tag, String
+    attribute :version, Integer
+
+    validates_presence_of :encrypted_message,
+                          :environment,
+                          :ephemeral_public_key,
+                          :google_transaction_id,
+                          :instrument_details,
+                          :instrument_type,
+                          :public_key,
+                          :tag,
+                          :version
+
+    def self.new(*args)
+      self.field_name = 'wallet'
+      super(*args)
+    end
+  end
+end

data/lib/judopay/models/register_card.rb

@@ -1,7 +1,6 @@
 require_relative '../model'
 require_relative 'payment'
 require_relative 'card_address'
-require_relative 'consumer_location'
 
 module Judopay
   class RegisterCard < Model

data/lib/judopay/models/save_card.rb

@@ -1,7 +1,6 @@
 require_relative '../model'
 require_relative 'payment'
 require_relative 'card_address'
-require_relative 'consumer_location'
 
 module Judopay
   class SaveCard < Model

data/lib/judopay/models/token_payment.rb

@@ -1,7 +1,6 @@
 require_relative '../model'
 require_relative 'payment'
 require_relative 'card_address'
-require_relative 'consumer_location'
 
 module Judopay
   class TokenPayment < Model
@@ -16,10 +15,10 @@ module Judopay
     attribute :consumer_token, String
     attribute :card_token, String
     attribute :cv2, String
-    attribute :consumer_location, Judopay::ConsumerLocation
     attribute :mobile_number, String
     attribute :email_address, String
     attribute :currency, String
+    attribute :client_details, Hash
 
     validates_presence_of :your_consumer_reference,
                           :your_payment_reference,

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

@@ -16,6 +16,7 @@ module Judopay
       attribute :client_ip_address, String
       attribute :client_user_agent, String
       attribute :currency, String
+      attribute :client_details, Hash
       attribute :web_payment_operation, Judopay::WebPayments::WebPaymentOperation
 
       validates_presence_of :judo_id,

data/lib/judopay/version.rb

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

data/spec/factories.rb

@@ -11,13 +11,18 @@ models = %w(
   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
-    your_payment_reference 456
+    sequence :your_payment_reference do |n|
+      SecureRandom.hex(21) + n.to_s
+    end
     amount 1.01
   end
 
@@ -46,7 +51,9 @@ FactoryGirl.define do
   trait :valid_collection_or_refund_details do
     receipt_id '1234'
     amount 1.01
-    your_payment_reference 'payment12412312'
+    sequence :your_payment_reference do |n|
+      SecureRandom.hex(21) + n.to_s
+    end
   end
 
   trait :client_ip_address_and_user_agent do
@@ -145,4 +152,57 @@ FactoryGirl.define do
   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

data/spec/fixtures/transactions/android_payment.json

@@ -0,0 +1,26 @@
+{
+  "receiptId": "xxxxxxx",
+  "yourPaymentReference": "xxxxxxxxxxxxxxxxxxxxxx",
+  "type": "Payment",
+  "createdAt": "2016-11-03T15:02:26.8290+00:00",
+  "result": "Success",
+  "message": "AuthCode: xxxxxx",
+  "judoId": "xxxxxxxxx",
+  "merchantName": "xxxxxxxxxxxx",
+  "appearsOnStatementAs": "xxxxxxxxxxxxx",
+  "originalAmount": "0.02",
+  "netAmount": "0.02",
+  "amount": "0.02",
+  "currency": "GBP",
+  "cardDetails": {
+    "cardLastfour": "xxxx",
+    "endDate": "xxxx",
+    "cardToken": "xxxx",
+    "cardType": 1
+  },
+  "consumer": {
+    "consumerToken": "xxxxxxxxxxxxxx",
+    "yourConsumerReference": "xxxxxxxxxxxxxxxx"
+  },
+  "walletType": 2
+}

data/spec/fixtures/transactions/apple_payment.json

@@ -0,0 +1,26 @@
+{
+  "receiptId": "someReceipt",
+  "yourPaymentReference": "NEW_PR_123123123",
+  "type": "Payment",
+  "createdAt": "2016-10-31T10:09:10.4378+00:00",
+  "result": "Success",
+  "message": "AuthCode: xxxxxx",
+  "judoId": "someId",
+  "merchantName": "PiePay Project",
+  "appearsOnStatementAs": "APL*\/PiePayProject      ",
+  "originalAmount": "0.02",
+  "netAmount": "0.02",
+  "amount": "0.02",
+  "currency": "GBP",
+  "cardDetails": {
+    "cardLastfour": "xxxx",
+    "endDate": "xxxx",
+    "cardToken": "xxxxxxxxxxxxxx",
+    "cardType": 1
+  },
+  "consumer": {
+    "consumerToken": "xxxxxxxxx",
+    "yourConsumerReference": "Myconsumerref"
+  },
+  "walletType": 1
+}

data/spec/judopay/android_payment_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require_relative '../../lib/judopay/models/android_payment'
+
+describe Judopay::AndroidPayment do
+  it 'should create a new payment given wallet object' do
+    stub_post('/transactions/payments').
+      to_return(:status => 200,
+                :body => lambda { |_request| fixture('transactions/android_payment.json') })
+
+    payment = build(:android_payment)
+    response = payment.create
+
+    expect(response).to be_a(Hash)
+    expect(response.result).to eq('Success')
+  end
+
+  it 'should return a bad request exception if basic validation fails' do
+    expect(lambda do
+      Judopay::AndroidPayment.new.create
+    end).to raise_error(Judopay::ValidationError)
+  end
+
+  it 'should use the configured Judo ID if one isn\'t provided in the payment request' do
+    stub_post('/transactions/payments').
+      to_return(:status => 200,
+                :body => lambda { |_request| fixture('transactions/android_payment.json') })
+
+    Judopay.configure do |config|
+      config.judo_id = '123-456'
+    end
+
+    payment = build(:android_payment, :judo_id => nil)
+    payment.create
+
+    expect(payment.valid?).to eq(true)
+    expect(payment.judo_id).to eq('123-456')
+  end
+
+  it 'properly coerces wallet field from_json' do
+    json_string = '{"wallet":{"encryptedMessage":"SomeBase64encodedData","environment":1,'\
+      '"ephemeralPublicKey":"SomeBase64encodedData","googleTransactionId":"someId",'\
+      '"instrumentDetails":"1234","instrumentType":"VISA","publicKey":"SomeBase64encodedData",'\
+      '"tag":"SomeBase64encodedData","version":1}}'
+
+    wallet = Judopay::Wallet.new(
+      :encrypted_message => 'SomeBase64encodedData',
+      :environment => 1,
+      :ephemeral_public_key => 'SomeBase64encodedData',
+      :google_transaction_id => 'someId',
+      :instrument_details => '1234',
+      :instrument_type => 'VISA',
+      :publicKey => 'SomeBase64encodedData',
+      :tag => 'SomeBase64encodedData',
+      :version => 1
+    )
+
+    payment = build(:android_payment, :wallet => json_string)
+    expect(payment.wallet).to be == wallet
+  end
+
+  it 'should raise an error when bad wallet passed' do
+    expect(lambda do
+      Judopay::AndroidPayment.new(:wallet => '{"someInvalidJson}}')
+    end).to raise_error(Judopay::ValidationError, format(Judopay::Wallet::WRONG_JSON_ERROR_MESSAGE, 'Judopay::Wallet'))
+
+    expect(lambda do
+      Judopay::AndroidPayment.new(:wallet => 1)
+    end).to raise_error(Judopay::ValidationError, format(Judopay::Wallet::WRONG_OBJECT_ERROR_MESSAGE, 'Judopay::Wallet'))
+
+    expect(lambda do
+      build(:android_payment, :wallet => '{"valid_json":"Without token field"}').create
+    end).to raise_error(Judopay::ValidationError)
+  end
+end

data/spec/judopay/apple_payment_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'json'
+require_relative '../../lib/judopay/models/apple_payment'
+
+describe Judopay::ApplePayment do
+  it 'should create a new payment given pk_payment object' do
+    stub_post('/transactions/payments').
+      to_return(:status => 200,
+                :body => lambda { |_request| fixture('transactions/apple_payment.json') })
+
+    payment = build(:apple_payment)
+    response = payment.create
+
+    expect(response).to be_a(Hash)
+    expect(response.result).to eq('Success')
+  end
+
+  it 'should return a bad request exception if basic validation fails' do
+    expect(lambda do
+      Judopay::ApplePayment.new.create
+    end).to raise_error(Judopay::ValidationError)
+  end
+
+  it 'should use the configured Judo ID if one isn\'t provided in the payment request' do
+    stub_post('/transactions/payments').
+      to_return(:status => 200,
+                :body => lambda { |_request| fixture('transactions/apple_payment.json') })
+
+    Judopay.configure do |config|
+      config.judo_id = '123-456'
+    end
+
+    payment = build(:apple_payment, :judo_id => nil)
+    payment.create
+
+    expect(payment.valid?).to eq(true)
+    expect(payment.judo_id).to eq('123-456')
+  end
+
+  it 'properly coerces pk_payment field from_json' do
+    json_string = '{"pkPayment":{"token":{"paymentInstrumentName":"Visa XXXX","paymentNetwork":"Visa","paymentData"'\
+':{"version":"EC_v1","data":"SomeBase64encodedData","signature":"SomeBase64encodedData","header":{"ephemeralPublicKey"'\
+':"someKey","publicKeyHash":"someKey","transactionId":"someId"}}},"billingAddress":1,"shippingAddress":2}}'
+    pk_payment = Judopay::PkPayment.new(
+      :token => Judopay::PkPaymentToken.new(
+        :payment_instrument_name => 'Visa XXXX',
+        :payment_network => 'Visa',
+        :payment_data => {
+          'version' => 'EC_v1',
+          'data' => 'SomeBase64encodedData',
+          'signature' => 'SomeBase64encodedData',
+          'header' => {
+            'ephemeral_public_key' => 'someKey',
+            'public_key_hash' => 'someKey',
+            'transaction_id' => 'someId'
+          }
+        }
+      ),
+      :billing_address => '1',
+      :shipping_address => '2'
+    )
+
+    payment = build(:apple_payment, :pk_payment => json_string)
+    expect(payment.pk_payment).to be == pk_payment
+  end
+
+  it 'should raise an error when bad pk_payment passed' do
+    expect(lambda do
+      Judopay::ApplePayment.new(:pk_payment => '{"someInvalidJson}}')
+    end).to raise_error(Judopay::ValidationError, format(Judopay::PkPayment::WRONG_JSON_ERROR_MESSAGE, 'Judopay::PkPayment'))
+
+    expect(lambda do
+      Judopay::ApplePayment.new(:pk_payment => 1)
+    end).to raise_error(Judopay::ValidationError, format(Judopay::PkPayment::WRONG_OBJECT_ERROR_MESSAGE, 'Judopay::PkPayment'))
+
+    expect(lambda do
+      build(:apple_payment, :pk_payment => '{"valid_json":"Without token field"}').create
+    end).to raise_error(Judopay::ValidationError)
+  end
+end

data/test/base/payments_tests.rb

@@ -37,4 +37,11 @@ module PaymentTests
       get_model(:your_consumer_reference => nil).create
     end
   end
+
+  def test_duplicate_payment
+    model = get_model
+    TestHelpers::AssertionHelper.assert_successful_payment(model.create)
+
+    TestHelpers::AssertionHelper.api_exception_with_errors(1, 86, 409, 4) { model.create }
+  end
 end

data/test/base/token_payment_tests.rb

@@ -88,4 +88,11 @@ module TokenPaymentTests
       get_model(:your_consumer_reference => nil, :cv2 => nil).create
     end
   end
+
+  def test_duplicate_payment
+    model = get_model
+    TestHelpers::AssertionHelper.assert_successful_payment(model.create)
+
+    TestHelpers::AssertionHelper.api_exception_with_errors(1, 86, 409, 4) { model.create }
+  end
 end

data/test/register_card_test.rb

@@ -19,6 +19,12 @@ class RegisterCardTest < IntegrationBase
     assert_equal('1.01', result['amount'])
   end
 
+  def test_payment_without_currency
+    result = get_model(:currency => nil).create
+
+    TestHelpers::AssertionHelper.assert_successful_payment(result)
+  end
+
   def test_payment_with_negative_amount
     # Unneeded test
     assert_true(true)
@@ -29,9 +35,8 @@ class RegisterCardTest < IntegrationBase
     assert_true(true)
   end
 
-  def test_payment_without_currency
-    result = get_model(:currency => nil).create
-
-    TestHelpers::AssertionHelper.assert_successful_payment(result)
+  def test_duplicate_payment
+    # Unneeded test
+    assert_true(true)
   end
 end

data/test/void_test.rb

@@ -24,6 +24,7 @@ class VoidTest < IntegrationBase
     response = void.create
 
     TestHelpers::AssertionHelper.assert_successful_payment(response)
+    void.your_payment_reference = SecureRandom.hex(18) + Time.now.to_i.to_s
     TestHelpers::AssertionHelper.api_exception_with_errors(0, 51) { void.create }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judopay
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
-- judoPay
+- Judopay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -254,7 +254,7 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - judopay.gemspec
@@ -270,11 +270,18 @@ files:
 - lib/judopay/error.rb
 - lib/judopay/mash.rb
 - lib/judopay/model.rb
+- lib/judopay/models/android_payment.rb
+- lib/judopay/models/android_preauth.rb
+- lib/judopay/models/apple_payment.rb
+- lib/judopay/models/apple_preauth.rb
 - lib/judopay/models/card_address.rb
 - lib/judopay/models/card_payment.rb
 - lib/judopay/models/card_preauth.rb
 - lib/judopay/models/collection.rb
-- lib/judopay/models/consumer_location.rb
+- lib/judopay/models/inner/pk_payment.rb
+- lib/judopay/models/inner/pk_payment_token.rb
+- lib/judopay/models/inner/transmitted_field.rb
+- lib/judopay/models/inner/wallet.rb
 - lib/judopay/models/market/collection.rb
 - lib/judopay/models/market/payment.rb
 - lib/judopay/models/market/preauth.rb
@@ -307,6 +314,8 @@ files:
 - spec/fixtures/card_payments/validate.json
 - spec/fixtures/token_payments/create.json
 - spec/fixtures/transactions/all.json
+- spec/fixtures/transactions/android_payment.json
+- spec/fixtures/transactions/apple_payment.json
 - spec/fixtures/transactions/find.json
 - spec/fixtures/transactions/find_not_found.json
 - spec/fixtures/transactions/register_card.json
@@ -314,6 +323,8 @@ files:
 - spec/fixtures/transactions/void.json
 - spec/fixtures/web_payments/payments/create.json
 - spec/fixtures/web_payments/payments/find.json
+- spec/judopay/android_payment_spec.rb
+- spec/judopay/apple_payment_spec.rb
 - spec/judopay/card_address_spec.rb
 - spec/judopay/card_payment_spec.rb
 - spec/judopay/card_preauth_spec.rb
@@ -353,8 +364,6 @@ files:
 - test/token_payment_test.rb
 - test/token_preauth_test.rb
 - test/void_test.rb
-- tutorials/judo_getting_started.md
-- tutorials/judo_making_a_payment.md
 homepage: http://www.judopay.com
 licenses:
 - MIT
@@ -378,7 +387,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby SDK wrapper for the Judopay REST API
+summary: Ruby gem for using the Judopay API
 test_files:
 - spec/factories.rb
 - spec/faraday/response_spec.rb
@@ -389,6 +398,8 @@ test_files:
 - spec/fixtures/card_payments/validate.json
 - spec/fixtures/token_payments/create.json
 - spec/fixtures/transactions/all.json
+- spec/fixtures/transactions/android_payment.json
+- spec/fixtures/transactions/apple_payment.json
 - spec/fixtures/transactions/find.json
 - spec/fixtures/transactions/find_not_found.json
 - spec/fixtures/transactions/register_card.json
@@ -396,6 +407,8 @@ test_files:
 - spec/fixtures/transactions/void.json
 - spec/fixtures/web_payments/payments/create.json
 - spec/fixtures/web_payments/payments/find.json
+- spec/judopay/android_payment_spec.rb
+- spec/judopay/apple_payment_spec.rb
 - spec/judopay/card_address_spec.rb
 - spec/judopay/card_payment_spec.rb
 - spec/judopay/card_preauth_spec.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2016 Alternative Payments Ltd
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/judopay/models/consumer_location.rb

@@ -1,8 +0,0 @@
-require_relative '../model'
-
-module Judopay
-  class ConsumerLocation < Model
-    attribute :latitude, Float
-    attribute :longitude, Float
-  end
-end

data/tutorials/judo_getting_started.md

@@ -1,74 +0,0 @@
-# Getting started - Ruby
-
-[Include standard create account/getting started sections]
-
-## Installation
-
-The Judopay gem supports Ruby 1.9.3 and above (including 2.0.x and 2.1.x).
-
-Add this line to your application's Gemfile:
-
-    gem 'judopay'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install judopay
-
-## Dependencies
-
-These will all be automatically installed for you when you install the Judopay gem.
-
-### virtus
-https://github.com/solnic/virtus
-Provides a common API for defining attributes on a model
-
-### httpclient
-https://github.com/nahi/httpclient
-HTTP client adaptor used by Faraday
-
-### activemodel
-https://github.com/rails/rails/tree/master/activemodel
-Provides pre-request validation of user input
-
-### faraday
-https://github.com/lostisland/faraday
-Simple, but flexible HTTP client library
-
-### rash
-https://github.com/tcocca/rash
-Extension to Hashie::Mash to convert all keys in the hash to underscore
-
-### addressable
-https://github.com/sporkmonger/addressable
-Used for generation of URIs
-
-# Configuration
-
-You configure the Judopay gem by passing a block. For example:
-
-Judopay.configure do |config|
-	config.judo_id = 12345
-end
-
-# Authentication
-You can authenticate either with basic authentication by passing your login and password credentials or using an existing OAuth2 access token.
-
-### Basic authentication
-
-Judopay.configure do |config|
-	config.judo_id = 12345
-	config.api_token = 'your-token'
-  config.api_secret = 'your-secret'
-end
-
-### OAuth2 access token authentication
-
-Judopay.configure do |config|
-	config.judo_id = 12345
-	config.oauth_access_token = 'your-oauth-token'
-end
-

data/tutorials/judo_making_a_payment.md

@@ -1,84 +0,0 @@
-# Making a payment - Ruby
-
-First, configure Judopay with your authentication credentials (as described in the Getting Started guide).
-
-Judopay.configure do |config|
-	config.api_token = 'your-token'
-  config.api_secret = 'your-secret'
-end
-
-To make a new payment with full card details, create a new Judopay::Payment. You can check on the required fields and the format of each field in the _Judopay REST API reference_.
-
-transaction = Judopay::Payment.new(
-  :your_consumer_reference => '123',
-  :your_payment_reference => '456',
-  :judo_id => '123-456-789',
-  :amount => 5.01,
-  :card_number => '4976000000003436',
-  :expiry_date => '12/15',
-  :cv2 => '452',
-  :card_address => {
-  	:line1 => '32 Edward Street',
-  	:town => 'Camborne',
-  	:postcode => 'TR14 8PA'
-	},
-  :consumer_location => {
-    :latitude => 51.5033630,
-    :longitude => -0.1276250
-  }
-)
-
-To send the request to the API, call:
-
-response = payment.create
-
-If the payment is successful, you'll receive a response like this:
-
-#<Judopay::Mash amount=5.01 appears_on_statement_as="JudoPay/XXX" card_details=#<Judopay::Mash card_lastfour="3436" card_token="WidQ0QXs4VMloCCerfGFHQkLVFwbwjVc" card_type=1 end_date="1215"> consumer=#<Judopay::Mash consumer_token="rFl6UUihdSfpJt3x" your_consumer_reference="123"> created_at="2014-07-08T15:49:10.8587+01:00" currency="GBP" judo_id=100978394 merchant_name="XXXX" message="AuthCode: 570320" net_amount=5.01 original_amount=5.01 receipt_id="465377" result="Success" type="Payment">
-
-The Judopay::Mash object behaves like a traditional Hash, but with extra special powers. See:
-
-http://www.intridea.com/blog/2008/4/12/mash-mocking-hash-for-total-poser-objects
-
-## Error handling
-
-When making a payment, there are a number of different scenarios that can arise. It is important to handle all of the different exceptions in your code.
-
-begin
-  response = payment.create
-rescue Judopay::ValidationError => e
-	puts e.message
-	puts e.model_errors.inspect # Hash of validation errors
-rescue Judopay::BadRequest => e
-  # Invalid parameters were supplied to Judopay's API
-	puts e.message
-	puts e.model_errors.inspect # Hash of validation errors
-rescue Judopay::NotAuthorized => e
-  # You're not authorized to make the request - check credentials and permissions in the Judopay portal
-rescue Judopay::NotFound => e
-  # The resource was not found
-rescue Judopay::Conflict => e
-  # Rate limiting - you have made too many requests to the Judopay API
-rescue Judopay::Error => e
-  # There was a problem connecting to the API
-rescue => e
-  # A problem occurred outside the Judopay gem
-end
-
-## Logging
-
-To help you debug your Judopay integration, you can attach a logger to the gem.
-
-For example, to log debug messages to the file 'log.txt':
-
-logger = Logger.new('log.txt')
-logger.level = Logger::DEBUG
-Judopay.configure do |config|
-	config.logger = logger
-end
-
-If you're using Rails, you use the built-in logger to write to your existing application log file:
-
-Judopay.configure do |config|
-	config.logger = Rails.logger
-end