pxpay 0.2.0 → 0.2.1

data/README.md

@@ -23,7 +23,7 @@ Usage
 -----
     >> require 'nokogiri'
     >> require 'pxpay'
-    >> request = Pxpay::Request.new( 1, 12.00 )
+    >> request = Pxpay::Request.new( 1, 12.00, {:url_success => 'http://example.com/success/', :url_failure => 'http://example.com/failure'})
     => #<Pxpay::Request:0x00000101c9a840 >
     >> request.url
     => "https://sec2.paymentexpress.com/pxpay/pxpay.aspx?userid=Fake_Dev&request=xxxxxxxxxx"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/pxpay/base.rb

@@ -13,7 +13,7 @@ module Pxpay
     end
   
     class << self
-      attr_accessor :pxpay_user_id, :pxpay_key, :success_url, :failure_url
+      attr_accessor :pxpay_user_id, :pxpay_key, :url_success, :url_failure
     end
   end
 end

data/lib/pxpay/request.rb

@@ -11,12 +11,19 @@ module Pxpay
     # Create a new instance of Pxpay::Request
     # Pxpay::Request.new( id, amount, options = {} )
     # Current available options are:
-    # :currency, currency for transaction, default is NZD, can be any of Pxpay::Base.currency_types
-    # :reference, a reference field, default is the id.
-    # :email, email address of user, default is nil.
-    # :token_billing, boolean value, set to true to enable token billing.
-    # :billing_id, optional billing_id field only used if token_billing is set to true.
-    # :txn_type, can be set to :auth for Auth transaction, defaults to Purchase
+    # :currency_input,  currency for transaction, default is NZD, can be any of Pxpay::Base.currency_types
+    # :reference,       a reference field, default is the id.
+    # :email_address,   email address of user, optional.
+    # :token_billing,   boolean value, set to true to enable token billing.
+    # :billing_id,      optional billing_id field only used if token_billing is set to true.
+    # :txn_type,        can be set to :auth for Auth transaction, defaults to Purchase
+    # :url_success,     Success URL, can optionally be set globally via Pxpay::Base.url_success=
+    # :url_failure,     Failure URL, can optionally be set globally via Pxpay::Base.url_failure=
+    # :txn_data1,       Optional data
+    # :txn_data2,       Optional data
+    # :txn_data3,       Optional data
+    # :txn_data4,       Optional data
+    # :opt,             Optional data
     
     def initialize( id , price, options = {} )
       @post = build_xml( id, price, options )
@@ -29,7 +36,7 @@ module Pxpay
       if response_text.at_css("Request").attributes["valid"].value == "1"
         url = response_text.at_css("URI").inner_html
       else
-        if Pxpay::Base.pxpay_user_id
+        if Pxpay::Base.pxpay_user_id && Pxpay::Base.pxpay_key
           raise Pxpay::Error, response_text.at_css("Request").inner_html
         else
           raise Pxpay::MissingKey, "Your Pxpay config is not set up properly, run rails generate pxpay:install"
@@ -43,18 +50,23 @@ module Pxpay
     def build_xml( id, price, options )
       xml = ::Builder::XmlMarkup.new
       xml.GenerateRequest do
-        xml.PxPayUserId ::Pxpay::Base.pxpay_user_id
-        xml.PxPayKey ::Pxpay::Base.pxpay_key
-        xml.AmountInput sprintf("%.2f", price)
-        xml.CurrencyInput options[:currency] || "NZD"
-        xml.MerchantReference options[:reference] || id.to_s
-        xml.EmailAddress options[:email]
-        xml.TxnType options[:txn_type] ? options[:txn_type].to_s.capitalize : "Purchase"
-        xml.TxnId id
-        xml.UrlSuccess ::Pxpay::Base.success_url
-        xml.UrlFail ::Pxpay::Base.failure_url
-        xml.EnableAddBillCard 1 if options[:token_billing]
-        xml.BillingId options[:billing_id] if options[:token_billing]
+        xml.PxPayUserId       ::Pxpay::Base.pxpay_user_id
+        xml.PxPayKey          ::Pxpay::Base.pxpay_key
+        xml.AmountInput       sprintf("%.2f", price)
+        xml.TxnId             id
+        xml.TxnType           options[:txn_type]        ? options[:txn_type].to_s.capitalize : "Purchase"
+        xml.CurrencyInput     options[:currency_input]  || "NZD"
+        xml.MerchantReference options[:reference]       || id.to_s
+        xml.UrlSuccess        options[:url_success]     || ::Pxpay::Base.url_success 
+        xml.UrlFail           options[:url_failure]     || ::Pxpay::Base.url_failure
+        xml.EmailAddress      options[:email_address]   if options[:email_address]
+        xml.TxnData1          options[:txn_data1]       if options[:txn_data1]
+        xml.TxnData2          options[:txn_data2]       if options[:txn_data2]
+        xml.TxnData3          options[:txn_data3]       if options[:txn_data3]
+        xml.TxnData4          options[:txn_data4]       if options[:txn_data4]
+        xml.Opt               options[:opt]             if options[:opt]
+        xml.EnableAddBillCard 1                         if options[:token_billing]
+        xml.BillingId         options[:billing_id]      if options[:token_billing]
       end
     end
   end

data/lib/pxpay/templates/pxpay.rb

@@ -5,7 +5,8 @@ Pxpay::Base.pxpay_user_id = 'ExampleUser'
 Pxpay::Base.pxpay_key = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 
 # Return Endpoints for payment confirmation
-Pxpay::Base.success_url = 'http://localhost:3000/success'
-Pxpay::Base.failure_url = 'http://localhost:3000/failure'
+# Uncomment for global success & failure URLs
+# Pxpay::Base.url_success = 'http://localhost:3000/success'
+# Pxpay::Base.url_failure = 'http://localhost:3000/failure'
 
 # Coming Soon Global Variables

data/pxpay.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pxpay}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bradley Priest"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-04-27}
   s.description = %q{A Ruby wrapper around the DPS-hosted PxPay service}
   s.email = %q{bradleypriest@gmail.com}
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bradleypriest/pxpay}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Ruby wrapper for the Payment Express' PxPay API}
   s.test_files = [
     "test/helper.rb",
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/helper.rb

@@ -18,8 +18,8 @@ require 'rest_client'
 
 Pxpay::Base.pxpay_user_id = 'Test_Dev'
 Pxpay::Base.pxpay_key = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-Pxpay::Base.success_url = 'http://localhost:3000/success'
-Pxpay::Base.failure_url = 'http://localhost:3000/failure'
+Pxpay::Base.url_success = 'http://localhost:3000/success'
+Pxpay::Base.url_failure = 'http://localhost:3000/failure'
 
 class Test::Unit::TestCase
 end

data/test/test_pxpay.rb

@@ -19,6 +19,11 @@ class TestPxpay < Test::Unit::TestCase
       assert_match(/<AmountInput>12.34<\/AmountInput>/, @request.post)
     end
     
+    should "generate xml with provided endpoints" do
+      request_with_url = Pxpay::Request.new( 1, 12.34, { :url_success => "http://example.com/success", :url_failure => "http://example.com/success" })
+      assert_match %r(<UrlSuccess>http://example.com/success</UrlSuccess><UrlFail>http://example.com/success</UrlFail>), request_with_url.post
+      assert_no_match /localhost/, request_with_url.post
+    end
     # should "return a URL" do
     #   assert_match(/https:\/\/sec2.paymentexpress.com\/pxpay\/pxpay.aspx\?userid=\w{64}&request=\S{270}/, @request.url)
     # end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pxpay
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bradley Priest
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +12:00
+date: 2011-04-27 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -37,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -52,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -80,8 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -93,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -106,8 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -119,8 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -132,8 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -145,8 +119,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -195,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 617512467652124965
+      hash: -3326667328160921882
       segments: 
       - 0
       version: "0"
@@ -204,13 +176,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Payment Express' PxPay API