client_bank_exchange 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92621e68a03565d0b587d1c7b954298ffbf58f16
-  data.tar.gz: 0b7f97f49af52dbdae699e10b9c0dd61df105902
+  metadata.gz: 6bfdafd757b6310d7af6584f01678d8d6d532884
+  data.tar.gz: 60354c097156b3a6d33e4737f523fe34974df8ef
 SHA512:
-  metadata.gz: 89d08d70a5fa54e68f77b04ac4e8bc40d9748bc304d97cb1d4248c867593b9ae3ea1cb28cc513a6afa9d285ca264a96cb79da679c29bf93a82fd2f6ef96efba1
-  data.tar.gz: 9f369100b8cecbc1281d4845164288026f752217f75e555a5b71d6150bac2193559dee823559645bc369298973f13da5d7c0388c13ae054d0c9cc1d4fa5c5b0c
+  metadata.gz: 3895e088af950f8c205708977d413ca2d6b6f34728a50f813b3b56a92f392b35be5a55af7b716ed409a49e6edf014ae9fc2fa4f4668f1b685b5e3b3d27d3bf00
+  data.tar.gz: a730f4d40994af695ea4d480ee00cd29ff5260ef3f2084c188a81dc14664785b14f59fdf905eb9b50f74f9393ebca257344c5a1274d6368398d57b9ba02cc57e

data/lib/client_bank_exchange.rb

@@ -1,87 +1,91 @@
 require 'date'
 require 'time'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 module ClientBankExchange
-  def self.parse_file path
-    self.parse File.read(path)
-  end
-
-  def self.parse content
-    result = {
-      errors: [],
-      general: {},
-      remainings: {},
-      filters: {},
-      documents: []
-    }
-
-    if content.start_with? '1CClientBankExchange'
-      # parse general info (key=value)
-      [
-        :ВерсияФормата, :Кодировка,
-        :Отправитель, :Получатель,
-        :ДатаСоздания, :ВремяСоздания
-      ].each do |key|
-        /#{key}=(.*)/.match(content) do |match|
-          result[:general][key] = match[1]
+  class << self
+    def parse_file path
+      parse File.read(path)
+    end
+  
+    def parse content
+      result = {
+        errors: [],
+        general: {},
+        remainings: {},
+        filters: {},
+        documents: []
+      }
+  
+      if content.start_with? '1CClientBankExchange'
+        # parse general info (key=value)
+        [
+          :ВерсияФормата, :Кодировка,
+          :Отправитель, :Получатель,
+          :ДатаСоздания, :ВремяСоздания
+        ].each do |key|
+          /#{key}=(.*)/.match(content) do |match|
+            result[:general][key] = match[1]
+          end
         end
+  
+        hash_value_to_date result[:general], :ДатаСоздания
+        hash_value_to_time result[:general], :ВремяСоздания
+  
+        # parse remainings
+        /СекцияРасчСчет([\s\S]*?)\sКонецРасчСчет/.match(content) do |match|
+          # remainings properties (key=value)
+          match[1].scan(/(.*)=(.*)/) { |k, v| result[:remainings][k.to_sym] = v }
+  
+          # normalize
+          hash_value_to_date result[:remainings], :ДатаНачала
+          hash_value_to_date result[:remainings], :ДатаКонца
+          hash_value_to_d result[:remainings], :НачальныйОстаток
+          hash_value_to_d result[:remainings], :ВсегоПоступило
+          hash_value_to_d result[:remainings], :ВсегоСписано
+          hash_value_to_d result[:remainings], :КонечныйОстаток
+        end
+  
+        # parse documents
+        regexp_document = /СекцияДокумент=(.*)\s([\s\S]*?)\sКонецДокумента/
+        result[:documents] = content.scan(regexp_document).map do |doc|
+          # document type
+          document = { СекцияДокумент: doc[0] }
+  
+          # document properties (key=value)
+          doc[1].scan(/(.*)=(.*)/) { |k, v| document[k.to_sym] = v }
+  
+          # normalize
+          hash_value_to_i document, :Номер
+          hash_value_to_date document, :Дата
+          hash_value_to_d document, :Сумма
+  
+          document
+        end
+      else
+        result[:errors] << 'Wrong format: 1CClientBankExchange not found'
       end
-
-      hash_value_to_date result[:general], :ДатаСоздания
-      hash_value_to_time result[:general], :ВремяСоздания
-
-      # parse remainings
-      /СекцияРасчСчет([\s\S]*?)\sКонецРасчСчет/.match(content) do |match|
-        # remainings properties (key=value)
-        match[1].scan(/(.*)=(.*)/) { |k, v| result[:remainings][k.to_sym] = v }
-
-        # normalize
-        hash_value_to_date result[:remainings], :ДатаНачала
-        hash_value_to_date result[:remainings], :ДатаКонца
-        hash_value_to_f result[:remainings], :НачальныйОстаток
-        hash_value_to_f result[:remainings], :ВсегоПоступило
-        hash_value_to_f result[:remainings], :ВсегоСписано
-        hash_value_to_f result[:remainings], :КонечныйОстаток
-      end
-
-      # parse documents
-      regexp_document = /СекцияДокумент=(.*)\s([\s\S]*?)\sКонецДокумента/
-      result[:documents] = content.scan(regexp_document).map do |doc|
-        # document type
-        document = { СекцияДокумент: doc[0] }
-
-        # document properties (key=value)
-        doc[1].scan(/(.*)=(.*)/) { |k, v| document[k.to_sym] = v }
-
-        # normalize
-        hash_value_to_i document, :Номер
-        hash_value_to_date document, :Дата
-        hash_value_to_f document, :Сумма
-
-        document
-      end
-    else
-      result[:errors] << 'Wrong format: 1CClientBankExchange not found'
+  
+      result
+    end
+  
+    private
+  
+    def hash_value_to_date hash, key
+      hash[key] = Date.parse(hash[key]) if hash[key]
+    end
+  
+    def hash_value_to_time hash, key
+      hash[key] = Time.parse(hash[key]) if hash[key]
+    end
+  
+    def hash_value_to_i hash, key
+      hash[key] = hash[key].to_i if hash[key]
+    end
+  
+    def hash_value_to_d hash, key
+      hash[key] = hash[key].to_d if hash[key]
     end
-
-    result
-  end
-
-  private
-
-  def self.hash_value_to_date hash, key
-    hash[key] = Date.parse(hash[key]) if hash[key]
-  end
-
-  def self.hash_value_to_time hash, key
-    hash[key] = Time.parse(hash[key]) if hash[key]
-  end
-
-  def self.hash_value_to_i hash, key
-    hash[key] = hash[key].to_i if hash[key]
-  end
-
-  def self.hash_value_to_f hash, key
-    hash[key] = hash[key].to_f if hash[key]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_bank_exchange
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrey Zharikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies: []
 description: 'Format specification: http://v8.1c.ru/edi/edi_stnd/100/101.htm'
 email: andrey@zharikov.pro