tns_payments 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.8 / 2012-04-11
+
+* Default open_timeout and read_timeout to something sensible.
+* Refactored order_id minimum into separate class.
+
 ## 0.0.7 / 2012-04-03
 
 * Set order_id to 10000000000 plus the passed order_id.

data/lib/tns_payments.rb

@@ -1,6 +1,7 @@
 require 'tns_payments/connection'
 require 'tns_payments/request'
 require 'tns_payments/response'
+require 'tns_payments/transaction'
 require 'tns_payments/version'
 
 module TNSPayments

data/lib/tns_payments/connection.rb

@@ -3,7 +3,6 @@ require 'base64'
 module TNSPayments
   class Connection
     CREDIT_CARD_TOKEN_FORMAT = /^9\d{15}/
-    MINIMUM_ORDER_ID         = 10000000000
 
     attr_accessor :api_key, :host, :merchant_id
     attr_writer :session_token
@@ -22,7 +21,8 @@ module TNSPayments
     end
 
     def purchase transaction, token
-      order_id       = MINIMUM_ORDER_ID + transaction.order_id.to_i
+      transaction    = Transaction.new transaction
+      order_id       = transaction.order_id
       transaction_id = transaction.transaction_id
       params         = {
         'apiOperation' => 'PAY',
@@ -35,7 +35,8 @@ module TNSPayments
     end
 
     def refund transaction
-      order_id       = MINIMUM_ORDER_ID + transaction.order_id.to_i
+      transaction    = Transaction.new transaction
+      order_id       = transaction.order_id.to_i
       transaction_id = transaction.transaction_id
       params         = {
         'apiOperation' => 'REFUND',

data/lib/tns_payments/request.rb

@@ -3,23 +3,29 @@ require 'rest-client'
 
 module TNSPayments
   class Request
-    attr_accessor :connection, :method, :path, :options
+    attr_accessor :connection, :method, :path, :payload
 
-    def initialize connection, method, path, options = {}
-      self.connection, self.method, self.path, self.options = connection, method, path, options
+    def initialize connection, method, path, payload = {}
+      self.connection, self.method, self.path, self.payload = connection, method, path, payload
     end
 
     def perform
-      authorization = options.fetch(:authorization) { true }
+      authorization = payload.fetch(:authorization) { true }
       url           = "#{connection.host}/api/rest/version/4#{path}"
       auth_headers  = {:Authorization => encode_credentials}
       headers       = {:content_type => 'Application/json;charset=UTF-8', :accept => '*/*'}
       headers.merge! auth_headers if authorization
 
-      args = [headers]
-      args.unshift(options.to_json) unless [:delete, :get, :head].include? method
+      args = {
+        :method       => method,
+        :url          => url,
+        :payload      => payload.to_json,
+        :headers      => headers,
+        :timeout      => 120,
+        :open_timeout => 30
+      }
 
-      Response.new RestClient.send(method, url, *args)
+      Response.new RestClient::Request.execute(args)
     rescue RestClient::Exception => e
       Response.new({:result => e.message.upcase, :response => JSON.parse(e.response || '{}')}.to_json)
     end

data/lib/tns_payments/transaction.rb

@@ -0,0 +1,18 @@
+module TNSPayments
+  class Transaction < SimpleDelegator
+    attr_writer :minimum_order_id
+
+    def initialize transaction
+      @transaction = transaction
+      super
+    end
+
+    def minimum_order_id
+      @minimum_order_id ||= 10000000000
+    end
+
+    def order_id
+      minimum_order_id + @transaction.order_id.to_i
+    end
+  end
+end

data/lib/tns_payments/version.rb

@@ -1,3 +1,3 @@
 module TNSPayments
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/unit/conntection_test.rb

@@ -199,7 +199,8 @@ private
   end
 
   def stub_session_token_purchase_request transaction, token
-    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{TNSPayments::Connection::MINIMUM_ORDER_ID + transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
+    transaction = Transaction.new transaction
+    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
       with :body => JSON.generate({
              'apiOperation' => 'PAY',
              'order'        => {'reference' => transaction.reference.to_s},
@@ -215,7 +216,8 @@ private
   end
 
   def stub_credit_card_token_purchase_request transaction, token
-    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{TNSPayments::Connection::MINIMUM_ORDER_ID + transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
+    transaction = Transaction.new transaction
+    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
       with :body => JSON.generate({
              'apiOperation' => 'PAY',
              'order'        => {'reference' => transaction.reference.to_s},
@@ -231,7 +233,8 @@ private
   end
 
   def stub_refund_request transaction
-    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{TNSPayments::Connection::MINIMUM_ORDER_ID + transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
+    transaction = Transaction.new transaction
+    stub_request(:put, /https:\/\/:#{@gateway.api_key}@secure\.ap\.tnspayments\.com\/api\/rest\/version\/4\/merchant\/#{@gateway.merchant_id}\/order\/#{transaction.order_id}\/transaction\/#{transaction.transaction_id}/).
       with :body => JSON.generate({
              'apiOperation' => 'REFUND',
              'transaction'  => {'amount' => transaction.amount.to_s, 'currency' => transaction.currency, 'reference' => transaction.transaction_id.to_s}

data/test/unit/transaction_test.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+class TNSPayments::TransactionTest < MiniTest::Unit::TestCase
+  def test_order_id_is_tns_minimum
+    transaction = MiniTest::Mock.new
+    transaction.expect :order_id, 0
+
+    assert_equal 10000000000, Transaction.new(transaction).order_id
+    assert transaction.verify
+  end
+
+  def test_minimum_order_id_is_injectable
+    mock = MiniTest::Mock.new
+    mock.expect :order_id, 10
+    transaction = Transaction.new mock
+    transaction.minimum_order_id = 0
+
+    assert_equal 10, transaction.order_id
+    assert mock.verify
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tns_payments
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Tim Cooper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 +10:00
+date: 2012-04-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,10 +106,12 @@ files:
 - lib/tns_payments/connection.rb
 - lib/tns_payments/request.rb
 - lib/tns_payments/response.rb
+- lib/tns_payments/transaction.rb
 - lib/tns_payments/version.rb
 - test/helper.rb
 - test/unit/conntection_test.rb
 - test/unit/response_test.rb
+- test/unit/transaction_test.rb
 - tns_payments.gemspec
 has_rdoc: true
 homepage: ""
@@ -149,3 +151,4 @@ test_files:
 - test/helper.rb
 - test/unit/conntection_test.rb
 - test/unit/response_test.rb
+- test/unit/transaction_test.rb