payson_api 0.2.2 → 0.3.0

data/Guardfile

@@ -5,5 +5,5 @@ guard 'test' do
   watch(%r{^test/unit/.+_test\.rb$}) { "test" }
   watch(%r{^test/fixtures/(.+)\.yml$}) { "test" }
   watch(%r{^test/integration/.+_test\.rb$}) { "test" }
-  watch('test/.+\.rb')   { "test" }
+  watch(%r{^test/.+_helper\.rb$})   { "test" }
 end

data/README.rdoc

@@ -14,14 +14,14 @@ Put this line in your Gemfile:
   gem 'payson_api'
 
 Then bundle:
-  % bundle
+  $ bundle
 
 
 == Usage
 
 === General configuration options
 
-You can configure the following default values by overriding these values using the <tt>PaysonAPI.configure</tt> method:
+You need to configure the gem with your own Payson credentials through the <tt>PaysonAPI.configure</tt> method:
 
   PaysonAPI.configure do |config|
     config.api_user_id = 'XXXX'

data/lib/payson_api/client.rb

@@ -38,16 +38,13 @@ class Client
   end
 
   def self.hash_to_params(hash)
-    out = ""
-    hash.each { |k, v| out << "#{k}=#{v}&" }
-    out.chop
+    hash.map { |k, v| "#{k}=#{v}" }.join('&')
   end
 
   def self.params_to_hash(params)
     {}.tap do |hash|
-      parts = params.split(/&/)
-      parts.each do |part|
-        key, val = part.split(/=/)
+      params.split('&').each do |param|
+        key, val = param.split('=')
         hash[key] = val
       end
     end
@@ -57,7 +54,7 @@ private
 
   def self.payson_request(action, data)
     action = '/%s/%s/' % [PAYSON_API_VERSION, action]
-    url = PAYSON_API_ENDPOINT + action
+    url = PAYSON_API_ENDPOINT % (PaysonAPI.test? ? 'test-api' : 'api') + action
     headers = {
       'PAYSON-SECURITY-USERID' => PaysonAPI.config.api_user_id,
       'PAYSON-SECURITY-PASSWORD' => PaysonAPI.config.api_password,

data/lib/payson_api/config.rb

@@ -1,10 +1,10 @@
 module PaysonAPI
   extend self
 
-  PAYSON_WWW_HOST = "https://www.payson.se"
+  PAYSON_WWW_HOST = "https://%s.payson.se"
   PAYSON_WWW_PAY_FORWARD_URL = "/paysecure/?token=%s"
 
-  PAYSON_API_ENDPOINT = "https://api.payson.se"
+  PAYSON_API_ENDPOINT = "https://%s.payson.se"
   PAYSON_API_VERSION = "1.0"
   PAYSON_API_PAY_ACTION = "Pay"
   PAYSON_API_PAYMENT_DETAILS_ACTION = "PaymentDetails"
@@ -42,4 +42,9 @@ module PaysonAPI
     config.api_user_id = 'XXXX'
     config.api_password = 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'
   end
+
+  def test?
+    @config.api_user_id == '1'
+  end
+
 end

data/lib/payson_api/response/payment.rb

@@ -14,7 +14,8 @@ class Payment
   end
 
   def forward_url
-    PAYSON_WWW_HOST + PAYSON_WWW_PAY_FORWARD_URL % @token
+    PAYSON_WWW_HOST % (PaysonAPI.test? ? 'test-www' : 'www') +
+      PAYSON_WWW_PAY_FORWARD_URL % @token
   end
 end
 end

data/lib/payson_api/version.rb

@@ -1,3 +1,3 @@
 module PaysonAPI
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/test/fixtures/config.yml

@@ -1,5 +1,2 @@
-#:api_user_id: XXXX
-#:api_password: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-
-:api_user_id: 13671
-:api_password: 305390e8-f866-41e5-a543-dc8747f545f8
+:api_user_id: '1'
+:api_password: 'fddb19ac-7470-42b6-a91d-072cb1495f0a'

data/test/fixtures/payment_data.yml

@@ -4,33 +4,27 @@
 :memo: Test
 :receivers:
   -
-    :email: mytest@domain.com
+    :email: test-shopper@payson.se
     :amount: 123
     :first_name: Test
-    :last_name: Person 1
+    :last_name: Shopper
     :primary: true
-  -
-    :email: mytest2@domain2.com
-    :amount: 234
-    :first_name: Test
-    :last_name: Person 2
-    :primary: false
 :sender:
-  :email: test_person@anotherdomain.com
+  :email: test-sender@payson.se
   :first_name: Test
-  :last_name: Receiver
+  :last_name: Sender
 :order_items:
   -
     :description: 'My order item description'
-    :unit_price: 1103
+    :unit_price: 1000 * 0.8
     :quantity: 3
-    :tax: 0
+    :tax: 0.25
     :sku: 'MY-ITEM-1'
   -
     :description: 'Another order item description'
-    :unit_price: 242
+    :unit_price: 1500 * 0.8
     :quantity: 2
-    :tax: 10
+    :tax: 0.25
     :sku: 'MY-ITEM-2'
 :fundings:
   -
@@ -40,3 +34,4 @@
 :fees_payer: EACHRECEIVER
 :guarantee_offered: NO
 :locale: SV
+:currency: SEK

data/test/integration/config_test.rb

@@ -10,5 +10,6 @@ class ConfigTest < Test::Unit::TestCase
   def test_ensure_expected_config
     assert_equal CONFIG[:api_user_id], PaysonAPI.config.api_user_id
     assert_equal CONFIG[:api_password], PaysonAPI.config.api_password
+    assert PaysonAPI.test?
   end
 end

data/test/integration/payment_details_test.rb

@@ -7,18 +7,15 @@ require 'payson_api'
 class PaymentDetailsTest < Test::Unit::TestCase
   include TestHelper
 
-  def test_generated_hash_from_payment_details
-    #token = acquire_token
-    #token = 'b28c31bb-1499-4988-9fc6-fa915c287e90'
-    token = '4d7328b0-9883-44e3-a19d-b25cef65a3b8'
-
-    if !token
-      puts "Token was not received, please look into your test config"
-      return
-    end
+  def test_payment_details_request
+    token = initiate_payment.token
 
     payment_details = PaysonAPI::Request::PaymentDetails.new(token)
     response = PaysonAPI::Client.get_payment_details(payment_details)
-#p response
+
+    assert response.success?
+    assert_equal token, response.token
+    assert_equal PAYMENT_DATA[:sender][:email], URI.unescape(response.sender_email)
+    assert_equal PAYMENT_DATA[:currency], response.currency
   end
 end

data/test/integration/payment_test.rb

@@ -7,6 +7,13 @@ require 'payson_api'
 class PaymentTest < Test::Unit::TestCase
   include TestHelper
 
+  def test_payment_initiation
+    response = initiate_payment
+
+    assert response.success?
+    assert response.forward_url =~ /test-www/
+  end
+
   def test_generated_hash_from_payment_data
     setup_payment_hash(include_order_items = true)
 
@@ -14,7 +21,7 @@ class PaymentTest < Test::Unit::TestCase
     assert_equal PAYMENT_DATA[:cancel_url], @payment_hash['cancelUrl']
     assert_equal PAYMENT_DATA[:ipn_url], @payment_hash['ipnNotificationUrl']
     assert_equal PAYMENT_DATA[:memo], @payment_hash['memo']
-    #assert_equal PAYMENT_DATA[:locale], @payment_hash['localeCode']
+    assert_equal PAYMENT_DATA[:locale], @payment_hash['localeCode']
 
     # Ensure expected format of receiver list
     receiver_format = PaysonAPI::Receiver::FORMAT_STRING
@@ -55,13 +62,4 @@ class PaymentTest < Test::Unit::TestCase
       assert_equal funding.constraint, constraint
     end
   end
-
-  def test_payment_initiation_request
-    token = acquire_token
-
-    if !token
-      puts "Token was not received, please look into your test config"
-      return
-    end
-  end
 end

data/test/test_helper.rb

@@ -61,19 +61,14 @@ module TestHelper
     @payment.fees_payer = PAYMENT_DATA[:fees_payer]
     @payment.locale = PAYMENT_DATA[:locale]
     @payment.guarantee_offered = PAYMENT_DATA[:guarantee_offered]
+    @payment.currency = PAYMENT_DATA[:currency]
 
     @payment_hash = @payment.to_hash
   end
 
-  # Note that for this method to succeed you must configure the tests
-  # with your personal details:
-  #   * The api_user_id/api_password must be valid (in config.yml)
-  #   * The receiver email must be valid for the supplied credentials
-  #       (in payment_data.yml)
-  def acquire_token
+  def initiate_payment
     setup_payment_hash
-    response = PaysonAPI::Client.initiate_payment(@payment_hash)
-    response.token
+    PaysonAPI::Client.initiate_payment(@payment_hash)
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payson_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake