multicash 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a2eb079904b7f749e89c682740f34d9cd9794c
-  data.tar.gz: 3847c1756f0745763e8ffbdabdb4277f699e366d
+  metadata.gz: 6d245ece852ed962113e40b05202f0526fe03708
+  data.tar.gz: af5aafce8aa5e763f7552384ae62dfea3fdcdcaa
 SHA512:
-  metadata.gz: ffcc2887d1a901eedafd445e45fd07583aecf4ec008218624f2b7a1c53cb9fbfd498f624512dd64bba668577d6260afd6068cce98e9ea3e88a848a6b33e61169
-  data.tar.gz: 305177c4f9fb018f68ff8f0d4fb5ca1dad68f605c6d4344c0a7fd33ad063f1937610a0183f78867b07d1651e81247626124b097e249245a59cb46774de320daa
+  metadata.gz: fc8a89ad85f98e10db1ff60c63c7b9ff3835c061ffa6d206656cba3387d5553894e5a5bd63f9a520fee6f31ad063745023e0d5a43ec0ef7e7c442490a8f784a0
+  data.tar.gz: e6dce9bd9b7362d5fbbfc0309cd53cb19adc59144143475c3cc99430b1270f4a7c29cdc33b64435cb177adee0597555a3040df7e45430c35f1616a21ba11a2c4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/multicash/credit_transfer.rb

@@ -46,7 +46,7 @@ module Multicash
       lines << transfer_labels.label_72_footer
       lines << "-}"
 
-      lines.join("\n")
+      lines.join("\x0D\x0A")
     end
 
     def order_reference

data/lib/multicash/labels/credit_transfer.rb

@@ -29,7 +29,7 @@ module Multicash
         value = ""
         value << transfer.today
         value << transfer.currency
-        value << print_currency_with_comma(transfer.ammount, -15)
+        value << print_currency_with_comma(transfer.ammount, -10)
 
         "#{label}#{print_string((value), -22)}"
       end
@@ -38,7 +38,7 @@ module Multicash
         label = ":50K:"
         value = "/"
         value << transfer.ordering_iban
-        value << "\n"
+        value << "\r\n"
         value << transfer.ordering_name
 
         "#{label}#{value}"
@@ -46,8 +46,8 @@ module Multicash
 
       def label_52D
         label = ":52D:"
-        value = print_string(transfer.ordering_bae, -35)
-        value << "\n"
+        value = transfer.ordering_bae
+        value << "\r\n"
         value << print_string(transfer.ordering_bank_name, -35)
 
         "#{label}#{value}"
@@ -55,8 +55,8 @@ module Multicash
 
       def label_57D
         label = ":57D:"
-        value = print_string(transfer.destination_bae, -35)
-        value << "\n"
+        value = transfer.destination_bae
+        value << "\r\n"
         value << print_string(transfer.destination_bank_name, -35)
 
         "#{label}#{value}"
@@ -66,7 +66,7 @@ module Multicash
         label = ":59:"
         value = '/'
         value << transfer.destination_iban
-        value << "\n"
+        value << "\r\n"
         value << print_string(transfer.destination_name, -35)
 
         "#{label}#{value}"
@@ -80,9 +80,10 @@ module Multicash
       end
 
       def label_70_footer
-        value = "\n/"
+        value = "/"
+        value << "\r\n"
         value << "/NTYPE/000000000000"
-        value << "\n/"
+        value << "\r\n"
         value << "/OPNAT/J"
 
         value
@@ -98,14 +99,14 @@ module Multicash
 
       def label_72
         label = ":72:"
-        value = print_string(transfer.payment_system, -35)
+        value = transfer.payment_system
 
         "#{label}#{value}"
       end
 
       def label_72_footer
         value = "/BAEREF/000000000000000000"
-        value << "\n/"
+        value << "\r\n"
         value << "/PROL/NORM"
       end
     end

data/lib/multicash/labels/payment_order.rb

@@ -34,8 +34,8 @@ module Multicash
       end
 
       def label_B1T
-        label = ":B1T:006"
-        value = ""
+        label = ":B1T:"
+        value = sprintf("%03d", payment_order.transfers.size)
         value << payment_order.currency
         value << print_currency_with_comma(payment_order.total_ammount.to_s, -9)
 

data/lib/multicash/payment_order.rb

@@ -48,7 +48,7 @@ module Multicash
       lines << payment_labels.label_77E
       lines << payment_labels.label_B1T
 
-      lines.join("\n") + "\n-}"
+      lines.join("\x0D\x0A") + "\x0D\x0A-}"
     end
 
     def body
@@ -70,7 +70,7 @@ module Multicash
       return false unless self.errors.blank?
 
       bank_file = File.join(Dir.tmpdir, "#{Time.now.strftime('%Y-%m-%d')}.txt")
-      File.open(bank_file, "w+", cr_newline: true, external_encoding: Encoding::CP1251) do |file|
+      File.open(bank_file, "w+", cr_newline: false, external_encoding: Encoding::CP1251) do |file|
         file.write generate.encode("CP1251")
       end
 

data/multicash.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: multicash 0.0.3 ruby lib
+# stub: multicash 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "multicash"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Yordanov"]
-  s.date = "2014-02-04"
+  s.date = "2014-02-05"
   s.description = "Generate payment order under the multicash spec"
   s.email = "anton.yordnaov@gmail.com"
   s.extra_rdoc_files = [

data/spec/labels/credit_transfer_spec.rb

@@ -28,31 +28,31 @@ describe "Multicash::Labels::CreditTransfer" do
     let(:transfer_labels) { Multicash::Labels::CreditTransfer.new(credit_transfer) }
 
     specify "label_20" do
-      expect(transfer_labels.label_20.size).to eq(20) # + 4 for label
+      expect(transfer_labels.label_20.size).to eq(20)
     end
 
     specify "label_23B" do
-      expect(transfer_labels.label_23B.size).to eq(9)  # + 4 for label
+      expect(transfer_labels.label_23B.size).to eq(9)
     end
 
     specify "label_32A" do
-      expect(transfer_labels.label_32A.size).to eq(29)  # + 4 for label
+      expect(transfer_labels.label_32A.size).to eq(27)
     end
 
     specify "label_50K" do
-      expect(transfer_labels.label_50K.size).to eq(37)
+      expect(transfer_labels.label_50K.size).to eq(38)
     end
 
     specify "label_52D" do
-      expect(transfer_labels.label_52D.size).to eq(76)
+      expect(transfer_labels.label_52D.size).to eq(50)
     end
 
     specify "label_57D" do
-      expect(transfer_labels.label_57D.size).to eq(76)
+      expect(transfer_labels.label_57D.size).to eq(50)
     end
 
     specify "label_59" do
-      expect(transfer_labels.label_59.size).to eq(64) # 4 + 1 + 22 + 1 + 35
+      expect(transfer_labels.label_59.size).to eq(65)
     end
 
     specify "label_71A" do
@@ -60,7 +60,7 @@ describe "Multicash::Labels::CreditTransfer" do
     end
 
     specify "label_72" do
-      expect(transfer_labels.label_72.size).to eq(39)
+      expect(transfer_labels.label_72.size).to eq(5)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multicash
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Anton Yordanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel