securetrading 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa0b858de02b3d93f7394e6b2b2b86de5bd544c7
-  data.tar.gz: de7c1bc1b95797567c9789ee960af85b7b498cc2
+  metadata.gz: e492a8204ba370b3a1cb5ad2557d393b7c89ab57
+  data.tar.gz: 9f4cac8333e5a1d241b50c4948cf062f70265656
 SHA512:
-  metadata.gz: 6b8441e9c2d9edfef640a416d84dfa10a52fba29417361652e53376f275fad4a121cc54ac3347bd769b1707a8cd263dcaf9d3c2bb683dd9a52fa7de28c0f962b
-  data.tar.gz: 9fb7c71a6538567f39e6f9a5acc986c535b481e82920a994fb1c460a7164968b426b661e865528918049d75baedc12a383a87455b68bf5f5414d0a1aa01d2a43
+  metadata.gz: 8f8cb1924e2736aab95decd6f42ad5df06fe58ab9df48065af300706d3de7dffa81dd8f759ab772394481a37a3228f90c3bdf059a32fe1a38eef41552b23940c
+  data.tar.gz: bda56c6357a89945c27c20c8f158ea91838dac242d0b0aae3167413185a40e985082ab662fc6d3342992b3387b7ee0609ffe1fd592e7e3425ed71247552533a0

data/CHANGELOG.md

@@ -10,6 +10,11 @@
 
 * [Fixed]
 
+## 0.3.1 / 2015-08-28
+
+* [Fixed]
+  * Amount xml generation
+
 ## 0.3.0 / 2015-08-25
 
 * [Added] 

data/Guardfile

@@ -18,6 +18,13 @@ group :red_green_refactor, halt_on_fail: true do
     watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
       Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance'
     end
+
+    # BaseModel subclasses
+    watch('lib/securetrading/base_model.rb') do
+      %w(amount billing record response).map do |name|
+        "spec/securetrading/#{name}_spec.rb"
+      end 
+    end
   end
 
   guard :rubocop, all_on_start: false, cli: ['--rails', '--auto-correct'] do

data/README.md

@@ -44,7 +44,7 @@ Currently supported methods:
 
 Parameters:
 - amount - refunded amount in cents
-- order reference - original transaction reference you want to refund. Required for Refund. Not required for CFT Refund.
+- parent_transaction - original transaction reference you want to refund.
 - options - Hash of options.
   - merchant - Check XML specification for merchant xml tags.
   - account_type - default to ECOM. If you want to set different ```accounttypedescription``` xml tag you should set this option.

data/lib/securetrading/amount.rb

@@ -1,12 +1,16 @@
 module Securetrading
   class Amount < BaseModel
+    def currency_code
+      attributes_hash['currencycode']
+    end
+
     def value
-      attributes_hash['__content__']
+      attributes_hash['content']
     end
 
     def ox_xml
       el = XmlDoc.new_element(xml_tag_name)
-      el['currencycode'] = currencycode
+      el['currencycode'] = currency_code if currency_code.present?
       el << value.to_s
     end
   end

data/lib/securetrading/base_model.rb

@@ -1,15 +1,27 @@
 module Securetrading
   class BaseModel
     def initialize(attrs_hash = {})
-      @attributes_hash = attrs_hash.presence && attrs_hash.stringify_keys
+      @attributes_hash = attrs_hash.presence &&
+                         attrs_hash.transform_keys! { |k| k.to_s.tr('__', '') }
     end
 
     def ox_xml
-      XmlDoc.elements(xml_tag_name => @attributes_hash).first
+      ox = ox_from_values
+      sub_classes.each do |sub_class_name|
+        next unless attributes_hash.key?(sub_class_name)
+        ox << send(sub_class_name).ox_xml
+      end
+      ox
     end
 
     private
 
+    def ox_from_values
+      XmlDoc
+        .elements(xml_tag_name => @attributes_hash.except(*sub_classes))
+        .first
+    end
+
     def xml_tag_name
       self.class.name.demodulize.downcase
     end

data/lib/securetrading/refund.rb

@@ -33,7 +33,7 @@ module Securetrading
     end
 
     def billing
-      Billing.new(amount: @amount).ox_xml
+      Billing.new(amount: { content: @amount }).ox_xml
     end
 
     def merchant

data/lib/securetrading/version.rb

@@ -1,3 +1,3 @@
 module Securetrading
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/securetrading/xml_doc.rb

@@ -16,7 +16,7 @@ module Securetrading
 
     # rubocop:disable Metrics/MethodLength
     def self.elements(hash)
-      return '' unless hash.present?
+      return [''] unless hash.present?
       hash.flat_map do |k, v|
         return v.flat_map { |e| elements(k => e) } if v.is_a?(Array)
         el = new_element(k.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: securetrading
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bitgamelabs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty