sepa 0.0.14 → 0.0.15

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: d57cc7203c00c3f47dc18189cca69b7b7397c424d0cf390f3fd9d4a948cbd9cbcefffe9efbbad0338ccc202c10c9d9199b051b874e99e3b2fd13e5fd37062752
+  data.tar.gz: f7a93dafda118a000313bbf186f35fbcdeab9f9d53892cf06dccf6bd1f422019269293f6f1e92035b49b48ee9f1384c97307bbc6c8adffc2706bc1cbcd425847
+SHA1: 
+  metadata.gz: a02ba9d2473675049d7bcba39addd3e4513d69bd
+  data.tar.gz: fba85ca92384748652582373d4d235315969e988

data/README.md

@@ -3,16 +3,16 @@
 An implementation of pain.008.001 CustomerDirectDebitInitiation - versions 02 and 04. WARNING:
 NO WARRANTY, USE AT YOUR OWN RISK AND PERIL. By using this software, you warrant and represent
 and declare that having studied and examined and tested the source, you are satisfied, sure, and
-certain that the version you use does exactly what you want it to do. This 
+certain that the version you use does exactly what you want it to do. This
 
 MORE WARNING: This is alpha-quality software. The API is not yet stable. New versions will break
 compatibility in unpredictable ways. Use at your own risk and peril.
 
 ANOTHER WARNING: While I aim for ISO-20022 compatibility in all its glorious detail, this gem
 implements only a subset of ISO-20022, and possibly does so incorrectly. On top of that, your
-bank's interpretation of ISO-20022 may differ from mine, may require some fields that are 
+bank's interpretation of ISO-20022 may differ from mine, may require some fields that are
 optional in the ISO specification, and may ignore some other fields that are mandatory in the
-specification. 
+specification.
 
 I wanted to make it as easy as possible to define message types and components so this library
 will be easy to grow to implement the entire standard.
@@ -73,6 +73,9 @@ a message-id.
 The last line returns a string that you will then need to send to your bank one way or another. For example, you might use an EBICS client. Or your bank might provide
 software to send the file. Or perhaps you can upload it via their website.
 
+## History
+
+0.0.15 Ruby 1.8.7 compatibility
 
 ## Contributing
 
@@ -83,3 +86,8 @@ Other message types are totally welcome.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Contributors
+
+Author: [Conan Dalton](http://www.conandalton.net), aka [conanite](https://github.com/conanite)
+With thanks to [corny](https://github.com/corny), [TheConstructor](https://github.com/TheConstructor)

data/lib/sepa/base.rb

@@ -3,7 +3,7 @@ module Sepa
   class Base
     include Aduki::Initializer
 
-    @@attribute_defs = Hash.new { |h,k| h[k] = { } }
+    @@attribute_defs = Hash.new { |h,k| h[k] = [] }
 
     def build_xml_attributes names
       result = { }
@@ -19,13 +19,16 @@ module Sepa
 
     def normalize str
       return str if str.is_a? Fixnum
-      return str if str.is_a? Float
-      str.gsub(/[àéèûîôüïöÿçÇÉÈáÀÁÜÏÖß]/, {
-        'à' => 'a', 'é' => 'e', 'è' => 'e',
-        'û' => 'u', 'î' => 'i', 'ô' => 'o', 'ü' => 'u', 'ï' => 'i', 'ö' => 'o',
-        'ÿ' => 'y', 'ç' => 'c', 'Ç' => 'C', 'É' => 'E', 'È' => 'E', 'á' => 'a',
-        'À' => 'A', 'Á' => 'A', 'Ü' => 'U', 'Ï' => 'I', 'Ö' => 'O', 'ß' => 'ss'
-      }).gsub(/[^a-zA-Z0-9_@ \.,()'+\/\?-]/, '')
+      return ("%.2f" % str) if str.is_a? Float
+      replacements = {
+          'à' => 'a', 'é' => 'e', 'è' => 'e',
+          'û' => 'u', 'î' => 'i', 'ô' => 'o', 'ü' => 'u', 'ï' => 'i', 'ö' => 'o',
+          'ÿ' => 'y', 'ç' => 'c', 'Ç' => 'C', 'É' => 'E', 'È' => 'E', 'á' => 'a',
+          'À' => 'A', 'Á' => 'A', 'Ü' => 'U', 'Ï' => 'I', 'Ö' => 'O', 'ß' => 'ss'
+      }
+      str = replacements.to_a.
+        inject(str) { |s, kv| s.gsub(kv[0], kv[1]) }.
+        gsub(/[^a-zA-Z0-9_@ \.,()'+\/\?-]/, '')
     end
 
     def to_xml builder
@@ -79,18 +82,18 @@ module Sepa
         typed_attribute name, tag, type, options
       else
         attr_accessor name
-        attribute_defs[name] = { :tag => tag, :type => type, :options => options }
+        attribute_defs << [name, { :tag => tag, :type => type, :options => options }]
       end
     end
 
     def self.typed_attribute name, tag, type, options
-      attribute_defs[name] = { :tag => tag, :type => type, :options => options }
+      attribute_defs << [name, { :tag => tag, :type => type, :options => options }]
       attr_accessor name
       aduki name => type
     end
 
     def self.array_attribute name, tag, member_type=nil, options={ }
-      attribute_defs[name] = { :tag => tag, :type => :[], :member_type => member_type, :options => options }
+      attribute_defs << [name, { :tag => tag, :type => :[], :member_type => member_type, :options => options }]
       attr_accessor name
       aduki(name => member_type) if member_type
     end

data/lib/sepa/direct_debit_order.rb

@@ -84,7 +84,7 @@ class Sepa::DirectDebitOrder
         "group_header.control_sum"             => creditor_payments.inject(0) { |sum, cp| sum + cp.control_sum            },
       }
 
-      hsh = hsh.merge initiating_party.to_properties("group_header.initiating_party", opts.merge({context: :initiating_party}))
+      hsh = hsh.merge initiating_party.to_properties("group_header.initiating_party", opts.merge({:context => :initiating_party}))
 
       cps = []
       if opts[:pain_008_001_version] == "02"
@@ -181,7 +181,8 @@ class Sepa::DirectDebitOrder
         seq_types[dd.sequence_type] << dd
       end
 
-      seq_types.each do |seq_type, dds|
+      %w{FRST RCUR FNAL OOFF}.each do |seq_type|
+        dds = seq_types[seq_type]
         next if dds.empty?
         ncp = CreditorPayment.new(creditor, creditor_account, "#{id}-#{seq_type}", collection_date, sepa_identification, dds)
         ncp.sequence_type = seq_type
@@ -213,7 +214,7 @@ class Sepa::DirectDebitOrder
         hsh["#{prefix}.payment_type_information.sequence_type"] = sequence_type
       end
 
-      hsh = hsh.merge creditor.to_properties("#{prefix}.creditor", opts.merge({ context: :creditor }))
+      hsh = hsh.merge creditor.to_properties("#{prefix}.creditor", opts.merge({ :context => :creditor }))
       hsh = hsh.merge creditor_account.to_properties("#{prefix}.creditor", opts)
       hsh = hsh.merge sepa_identification.to_properties("#{prefix}.creditor_scheme_identification", opts)
 

data/lib/sepa/version.rb

@@ -1,3 +1,3 @@
 module Sepa
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/sepa/direct_debit_order_spec.rb

@@ -24,7 +24,7 @@ describe Sepa::DirectDebitOrder do
     dd20 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13793 PVT 3", 1935.35, "EUR", mandate2
     dd21 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13794 PVT 3", 1236.36, "EUR", mandate2
 
-    sepa_now = Time.strptime "1992-02-28T18:30:00", "%Y-%m-%dT%H:%M:%S"
+    sepa_now = Time.local(1992, 2, 28, 18, 30, 0, 0, 0)
     Time.stub(:now).and_return sepa_now
 
     creditor = Sepa::DirectDebitOrder::Party.new "Mon École", "3, Livva de Getamire", nil, "75022", "Paris", "Frankreich", "M. le Directeur", "+33 999 999 999", "directeur@monecole.softify.com"
@@ -39,25 +39,28 @@ describe Sepa::DirectDebitOrder do
 
   it "should produce v02 xml corresponding to the given inputs" do
     o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier
-    xml = o.to_xml pain_008_001_version: "02"
+    xml = o.to_xml :pain_008_001_version => "02"
+    xml = check_doc_header_02 xml
     expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v02.xml", __FILE__))
-    expected.force_encoding(Encoding::UTF_8)
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
     xml.should == expected
   end
 
   it "should produce v04 xml corresponding to the given inputs" do
     o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier
-    xml = o.to_xml pain_008_001_version: "04"
+    xml = o.to_xml :pain_008_001_version => "04"
+    xml = check_doc_header_04 xml
     expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v04.xml", __FILE__))
-    expected.force_encoding(Encoding::UTF_8)
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
     xml.should == expected
   end
 
   it "should produce v04 xml corresponding to the given inputs with an organisation identifier for the creditor" do
     o = order Sepa::DirectDebitOrder::OrganisationSepaIdentifier
-    xml = o.to_xml pain_008_001_version: "04"
+    xml = o.to_xml :pain_008_001_version => "04"
+    xml = check_doc_header_04 xml
     expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v04_with_org_id.xml", __FILE__))
-    expected.force_encoding(Encoding::UTF_8)
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
     xml.should == expected
   end
 

data/spec/sepa/expected-simple.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04 pain.008.001.04.xsd">
+<Document>
   <CstmrDrctDbtInitn>
     <GrpHdr>
       <MsgId>MSG0001</MsgId>

data/spec/sepa/expected_customer_direct_debit_initiation_v02.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02 pain.008.001.02.xsd">
+<Document>
   <CstmrDrctDbtInitn>
     <GrpHdr>
       <MsgId>MSG0001</MsgId>
@@ -121,7 +121,7 @@
       <PmtInfId>MONECOLE_PAYMENTS_20130703-RCUR</PmtInfId>
       <PmtMtd>DD</PmtMtd>
       <NbOfTxs>4</NbOfTxs>
-      <CtrlSum>5536.349999999999</CtrlSum>
+      <CtrlSum>5536.35</CtrlSum>
       <PmtTpInf>
         <SvcLvl>
           <Cd>SEPA</Cd>

data/spec/sepa/expected_customer_direct_debit_initiation_v04.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04 pain.008.001.04.xsd">
+<Document>
   <CstmrDrctDbtInitn>
     <GrpHdr>
       <MsgId>MSG0001</MsgId>

data/spec/sepa/expected_customer_direct_debit_initiation_v04_with_org_id.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04 pain.008.001.04.xsd">
+<Document>
   <CstmrDrctDbtInitn>
     <GrpHdr>
       <MsgId>MSG0001</MsgId>

data/spec/sepa/payments_initiation/pain00800104/customer_direct_debit_initiation_spec.rb

@@ -68,16 +68,17 @@ describe Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation d
 
   it "should raise an error unless the version is '02' or '04'" do
     pain = Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation.new(props)
-    expect { pain.generate_xml(pain_008_001_version: '2') }.to raise_error
-    expect { pain.generate_xml(pain_008_001_version: 2) }.to raise_error
-    expect { pain.generate_xml(pain_008_001_version: "") }.to raise_error
+    expect { pain.generate_xml(:pain_008_001_version => '2') }.to raise_error
+    expect { pain.generate_xml(:pain_008_001_version => 2) }.to raise_error
+    expect { pain.generate_xml(:pain_008_001_version => "") }.to raise_error
     expect { pain.generate_xml({ }) }.to raise_error
   end
 
   it "should produce xml corresponding to the given inputs" do
-    xml = Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation.new(props).generate_xml(pain_008_001_version: '04')
+    xml = Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation.new(props).generate_xml(:pain_008_001_version => '04')
+    xml = check_doc_header_04 xml
     expected = File.read(File.expand_path("../../../expected-simple.xml", __FILE__))
-    expected.force_encoding(Encoding::UTF_8)
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
     xml.should == expected
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,41 @@
 require 'sepa'
 
+#
+# Ruby 1.8 hashes are unordered, which results in xml tag attributes appearing in arbitrary order, so
+# we can't just do a plain string compare of output.
+# XmlHelper replaces <Document blah blah blah> with <Document>, and checks that the "blah blah blah"
+# part is still correct
+#
+module XmlHelper
+  XMLNSXSI = 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
+  XMLNS_02 = 'xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02"'
+  XSI_02   = 'xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.02 pain.008.001.02.xsd"'
+
+  XMLNS_04 = 'xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04"'
+  XSI_04   = 'xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.001.04 pain.008.001.04.xsd"'
+
+  DOCUMENT_TAG = /<Document [^>]+>/
+
+  def check_doc_header_02 xml
+    document_tag = xml.match(DOCUMENT_TAG).to_s
+    document_tag.should include XMLNSXSI
+    document_tag.should include XMLNS_02
+    document_tag.should include XSI_02
+    xml.sub(DOCUMENT_TAG, '<Document>')
+  end
+
+  def check_doc_header_04 xml
+    document_tag = xml.match(DOCUMENT_TAG).to_s
+    document_tag.should include XMLNSXSI
+    document_tag.should include XMLNS_04
+    document_tag.should include XSI_04
+    xml.sub(DOCUMENT_TAG, '<Document>')
+  end
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.order = 'random'
+  config.include XmlHelper
 end

metadata

@@ -1,105 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sepa
-version: !ruby/object:Gem::Version
-  version: 0.0.14
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.0.15
 platform: ruby
-authors:
+authors: 
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aduki
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aduki
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.3
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: countries
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.3
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
-- !ruby/object:Gem::Dependency
-  name: rspec_numbering_formatter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        version: "2.9"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec_numbering_formatter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! ' Generate ISO20022 XML messages. Implements a subset of pain.008.001.02
-  and pain.008.001.04 CustomerDirectDebitInitiation for now. WARNING: NO WARRANTY,
-  USE AT YOUR OWN RISK AND PERIL. '
-email:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id006
+description: " Generate ISO20022 XML messages. Implements a subset of pain.008.001.02 and pain.008.001.04 CustomerDirectDebitInitiation for now. WARNING: NO WARRANTY, USE AT YOUR OWN RISK AND PERIL. "
+email: 
 - conan@conandalton.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -157,32 +125,29 @@ files:
 - spec/sepa/payments_initiation/pain00800104/customer_direct_debit_initiation_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/conanite/sepa
-licenses:
+licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: ! 'pain.008.001.04 and pain.008.001.02 CustomerDirectDebitInitiation ISO20022
-  XML. WARNING: NO WARRANTY, USE AT YOUR OWN RISK AND PERIL.'
-test_files:
+specification_version: 4
+summary: "pain.008.001.04 and pain.008.001.02 CustomerDirectDebitInitiation ISO20022 XML. WARNING: NO WARRANTY, USE AT YOUR OWN RISK AND PERIL."
+test_files: 
 - spec/sepa/direct_debit_order_spec.rb
 - spec/sepa/direct_debit_properties.yml
 - spec/sepa/expected-simple.xml