securetrading 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b970bad76fbb9da1e4118576b2afac998b1842fa
-  data.tar.gz: 5f49fa59a0f03981da3a95984b0dfaa300dbc590
+  metadata.gz: d65719b50f70a2f1733f1171d9904e83413a6b95
+  data.tar.gz: 22f0cf9463306e4d27962a7d3d4e17521e86ea2e
 SHA512:
-  metadata.gz: 0d15ca99623960737276ae2858941a6fb80551509d4be53bf16c27a17a5275397fa198a4e3adb7e2209cef7250e2976351a894f60e2947a75cceec01d7d04b79
-  data.tar.gz: afcef8ea5b271bc84e1ca724f1d41cb2d60f62d062824afe217dac632fb7dadf094feddc5703d65634843057501bb8226201f11a376966784f47e6930b315ccc
+  metadata.gz: 09e54f038bb0ac136d5b9c4fbabb9f63f40162415dfa0d5a4c7796c6967368d9181551d1018e1c5ab534bf64d5ea617457380227275c69cb3ee18bfedd333732
+  data.tar.gz: 4a459edcb584bee187125a3f329f9a0a2f8e3f9120686142cea3aaa411163f181027438f31c36250f63e542b3053e92f1501c42dc0cc7216627e1cd9f91074b3

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Securetrading change log
 
-## 0.4.0 / Unreleased
+## 0.4.1 / Unreleased
 
 * [Added] 
 
@@ -10,6 +10,17 @@
 
 * [Fixed]
 
+## 0.4.0 / 2015-12-17
+
+* [Added] 
+  * Allow to pass configuration options directly to requests.
+
+* [Deprecated]
+
+* [Removed]
+
+* [Fixed]
+
 ## 0.3.2 / 2015-09-07
 
 * [Fixed]

data/README.md

@@ -36,6 +36,14 @@ Securetrading.configure do |c|
 end
 ```
 
+Alternatively you may pass configuration options directly to request.
+
+```
+> config = { user: 'user', passowrd: 'password', site_reference: 'ref' }
+> ref = Securetrading::Refund.new(11, '1-9-1912893', { merchant: { orderreference: 'order2'}, account_type: 'CFT' }, config)
+> ref.perform
+```
+
 ### Supported Api requests
 
 Currently supported methods:

data/lib/securetrading/configuration.rb

@@ -4,6 +4,13 @@ module Securetrading
     attr_accessor :user, :password
     attr_writer :site_reference, :auth_method, :site_security_password
 
+    def initialize(options = {})
+      %i(user password site_reference auth_method
+         site_security_password).each do |var|
+        instance_variable_set("@#{var}", options[var])
+      end
+    end
+
     def site_security_password
       return @site_security_password if @site_security_password.present?
       fail ConfigurationError, 'You are trying to use site security '\

data/lib/securetrading/connection.rb

@@ -19,8 +19,19 @@ module Securetrading
 
     private
 
+    attr_reader :config_options
+
+    def config
+      @config ||= configuration
+    end
+
+    def configuration
+      return Securetrading.config unless config_options.present?
+      Configuration.new(config_options)
+    end
+
     def doc
-      @doc ||= XmlDoc.new(request_type, @account_type).doc
+      @doc ||= XmlDoc.new(request_type, @account_type, config.user).doc
     end
 
     def request_type
@@ -39,7 +50,7 @@ module Securetrading
     end
 
     def dynamic_headers
-      { 'Authorization' => "Basic #{Securetrading.config.auth}" }
+      { 'Authorization' => "Basic #{config.auth}" }
     end
 
     def prepare_doc

data/lib/securetrading/refund.rb

@@ -1,10 +1,11 @@
 module Securetrading
   class Refund < Connection
-    def initialize(amount, parent_transaction, options = {})
+    def initialize(amount, parent_transaction, opts = {}, config_opts = {})
       @amount = amount
       @parent_transaction = parent_transaction
-      @account_type = options[:account_type].presence || 'ECOM'
-      @options = options
+      @account_type = opts[:account_type].presence || 'ECOM'
+      @options = opts
+      @config_options = config_opts
     end
 
     def perform(options = {})
@@ -26,7 +27,7 @@ module Securetrading
 
     def operation
       Operation.new(
-        sitereference: Securetrading.config.site_reference,
+        sitereference: config.site_reference,
         accounttypedescription: @account_type,
         parenttransactionreference: @parent_transaction
       ).ox_xml

data/lib/securetrading/site_security.rb

@@ -1,20 +1,26 @@
 module Securetrading
   class SiteSecurity
-    def self.hash(fields)
-      Digest::SHA256.hexdigest(str_to_encode(fields))
+    def self.hash(fields, config_options = nil)
+      Digest::SHA256.hexdigest(str_to_encode(fields, config_options))
     end
 
-    def self.str_to_encode(fields)
+    def self.str_to_encode(fields, config_options = nil)
+      config = configuration(config_options)
       str = ''
-      fields.reverse_merge!(authmethod: Securetrading.config.auth_method)
-      [:currencyiso3a, :mainamount, :sitereference, :settlestatus,
-       :settleduedate, :authmethod, :paypaladdressoverride,
-       :strequiredfields, :version, :stprofile, :ruleidentifier,
-       :successfulurlredirect, :declinedurlredirect].each do |field|
+      fields.reverse_merge!(authmethod: config.auth_method)
+      %i(currencyiso3a mainamount sitereference settlestatus authmethod
+         settleduedate paypaladdressoverride strequiredfields version
+         stprofile ruleidentifier successfulurlredirect
+         declinedurlredirect).each do |field|
         str << fields[field].to_s
       end
-      str << Securetrading.config.site_security_password
+      str << config.site_security_password
     end
-    private_class_method :str_to_encode
+
+    def self.configuration(config_options)
+      return Securetrading.config unless config_options.present?
+      Configuration.new(config_options)
+    end
+    private_class_method :str_to_encode, :configuration
   end
 end

data/lib/securetrading/transaction_query.rb

@@ -1,7 +1,8 @@
 module Securetrading
   class TransactionQuery < Connection
-    def initialize(filters)
+    def initialize(filters, config_options = {})
       @filters = filters
+      @config_options = config_options
     end
 
     def perform(options = {})

data/lib/securetrading/version.rb

@@ -1,3 +1,3 @@
 module Securetrading
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/securetrading/xml_doc.rb

@@ -1,8 +1,9 @@
 module Securetrading
   class XmlDoc
-    def initialize(request_type, account_type)
+    def initialize(request_type, account_type, user = nil)
       @account_type = account_type
       @request_type = request_type
+      @user = user
     end
 
     def doc
@@ -41,7 +42,7 @@ module Securetrading
     end
 
     def alias_el
-      self.class.elements(alias: Securetrading.config.user).first
+      self.class.elements(alias: @user || Securetrading.config.user).first
     end
 
     def request_el

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: securetrading
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Bitgamelabs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby library for securetrading.com API integration.