multicash 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109e38aa0bce3a07aae3beae23b1e0d5bb5cee00
-  data.tar.gz: b13ee8cd30ee798c4db0f3053aecd6dc4f509ba8
+  metadata.gz: 82a2eb079904b7f749e89c682740f34d9cd9794c
+  data.tar.gz: 3847c1756f0745763e8ffbdabdb4277f699e366d
 SHA512:
-  metadata.gz: e19e707697946023ce8bcf7bfcf64c09ad3a5f0d3a859d4b4e6aee21936587de20160899efeaac7ffbcc1a522cf96575d94d197fac59db7eeb246be55dc7d409
-  data.tar.gz: 930e185f3707633320a4e0e417dc53daf538226f318e9bbe826d9868f4d4e059ff5e02498662315869ac6e3bac1c012f0ebb1ac56bc79eb0866bab42be0092ca
+  metadata.gz: ffcc2887d1a901eedafd445e45fd07583aecf4ec008218624f2b7a1c53cb9fbfd498f624512dd64bba668577d6260afd6068cce98e9ea3e88a848a6b33e61169
+  data.tar.gz: 305177c4f9fb018f68ff8f0d4fb5ca1dad68f605c6d4344c0a7fd33ad063f1937610a0183f78867b07d1651e81247626124b097e249245a59cb46774de320daa

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/multicash/ammount.rb

@@ -4,7 +4,7 @@ module Multicash
     include ActiveModel::Validations
 
     CURRENCIES = %w{AUD BGN CAD CHF DKK EUR GBP JPY NOK RUR SEK TRL USD}
-    CURRENCY_FORMAT = /\A\d{1,11}.\d{2}\z/
+    CURRENCY_FORMAT = /\A\d{1,11}.\d{1,2}\z/
 
     attr_accessor :value, :currency
     attr_reader :errors

data/lib/multicash/credit_transfer.rb

@@ -13,7 +13,7 @@ module Multicash
     end
 
     def generate
-      return self.errors.full_messages unless self.valid
+      return self.errors.full_messages.to_sentence unless self.valid?
 
      "#{self.header}#{self.body}"
     end

data/lib/multicash/payment_order.rb

@@ -1,12 +1,15 @@
 module Multicash
   class PaymentOrder
-    attr_accessor :reference,  :transfers_number
-    attr_reader :transfers, :total_ammount, :currency, :ordering_bae, :date, :errors
+    extend  ActiveModel::Naming
+    include ActiveModel::Validations
+
+    attr_accessor :reference,  :transfers_number, :errors
+    attr_reader :transfers, :total_ammount, :currency, :ordering_bae, :date
 
     def initialize
       @currency = nil
       @date = Time.now.strftime('%y%m%d')
-      @errors = []
+      @errors = ActiveModel::Errors.new(self)
       @ordering_bae = nil
       @transfers = []
       @total_ammount = 0.00
@@ -15,11 +18,12 @@ module Multicash
     def << (transfer)
       if transfer.valid?
         @transfers << transfer
+        transfer.reference_counter = @transfers.size
         @total_ammount += (transfer.ammount.to_f)
         @currency ||= transfer.currency
         @ordering_bae ||= transfer.ordering_bae
       else
-        errors.add(:transfer, transfer.errors.full_messages)
+        errors.add("#{transfer.reference_counter}", transfer.errors.full_messages)
       end
     end
 
@@ -49,11 +53,8 @@ module Multicash
 
     def body
       lines = []
-      transfers.reverse.each_with_index do |transfer|
-        if transfer.valid?
-          transfer.reference_counter += 1
-          lines << transfer.generate
-        end
+      transfers.each do |transfer|
+        lines << transfer.generate
       end
 
       lines.join("\x0C")

data/lib/multicash/transfer.rb

@@ -78,7 +78,6 @@ module Multicash
 
     def payment_system
       @payment_system.is_a?(Array) ? "/#{@payment_system.join("/")}" : "/#{@payment_system}"
-
     end
 
     private

data/multicash.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: multicash 0.0.2 ruby lib
+# stub: multicash 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "multicash"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Yordanov"]

data/spec/payment_order_spec.rb

@@ -26,12 +26,17 @@ describe "Multicash::PaymentOrder" do
   context "generate" do
     subject { Multicash::PaymentOrder.new }
 
+    specify "increment transfer reference_counter" do
+      subject << transfer
+      expect(transfer.reference_counter).to eq(1)
+      subject << transfer
+      expect(transfer.reference_counter).to eq(2)
+    end
+
     specify "save to file" do
       subject << transfer
       subject << transfer
       file_name = subject.save_to_file
-
-
       expect(File.exist?(file_name)).to be_true
     end
   end

data/spec/payment_spec.rb

@@ -13,12 +13,12 @@ describe "Multicash::Payment" do
       expect(Multicash::Payment.new(attributes)).to be_valid
     end
 
-    it "not be valid if ammount is not valid" do
+    it "not valid if ammount is not valid" do
       attributes[:ammount] = Multicash::Ammount.new(value: 222.12222222, currency: 'BGN')
       expect(Multicash::Payment.new(attributes)).to_not be_valid
     end
 
-    it "not be valid if charges are not in allowed range" do
+    it "not valid if charges are not in allowed range" do
       attributes[:charges] = 'FRR'
       expect(Multicash::Payment.new(attributes)).to_not be_valid
     end

data/spec/transfer_spec.rb

@@ -19,7 +19,7 @@ describe "Multicash::Transfer" do
   let(:payment) { Multicash::Payment.new( ammount: ammount, details: 'Details', charges: 'SHA') }
 
   context "validations" do
-    it "valid on valid initilization objects" do
+    it "valid on valid initilization attributes" do
       expect(Multicash::Transfer.new( ordering_account: ordering_account,
         destination_account: destination_account,
         payment: payment,
@@ -27,7 +27,7 @@ describe "Multicash::Transfer" do
       ).to be_valid
     end
 
-    it "invalid on invalid ordering_account" do
+    it "invalid on invalid ordering_account attribute" do
       ordering_account.name = ''
 
       expect(Multicash::Transfer.new(ordering_account: ordering_account,
@@ -37,7 +37,7 @@ describe "Multicash::Transfer" do
       ).to_not be_valid
     end
 
-    it "invalid on invalid destination_account" do
+    it "invalid on invalid destination_account attribute" do
       destination_account.name = ''
 
       expect(Multicash::Transfer.new(ordering_account: ordering_account,
@@ -47,7 +47,7 @@ describe "Multicash::Transfer" do
       ).to_not be_valid
     end
 
-    it "invalid on invalid payment" do
+    it "invalid on invalid payment attribute" do
       payment.ammount.value = 'fffff'
 
       expect(Multicash::Transfer.new(ordering_account: ordering_account,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multicash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Anton Yordanov