client_bank_exchange 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca3f459fb28df9f64638d694bac5c6fb7b94ca7
-  data.tar.gz: 6ed45f33ea178bac40060af178a0307dfa366bc4
+  metadata.gz: b0e125b29b3a88634eb45b8277850fc2e895b766
+  data.tar.gz: 5d3d4998c0e83e92bc35fe1b6416a360f14f21d7
 SHA512:
-  metadata.gz: 1f518108e898883c825c6e7aa080f8e68def7c4e690517bfe8aaf803cb9c362cb5d96b12f2e59e3e107b356487b1d2f92e72155cacd5fb37cee96885425723ba
-  data.tar.gz: e2a41738c64eb9af18c93474bbf39043be6e50923c296e055ba68f9424c4a7813122d0dd083d940845bafdce70b80265896ed79386ddeff3b87c32d0330ef68e
+  metadata.gz: 552f39fc7231a4640b1c079ac5be386ee3ce3d9cdb40b1cb433640e78b470a0b3dcb1a0d64b31d8ba8f36195ad1588fbbdc38a092c3d7311feded4f108873505
+  data.tar.gz: f074e30a9327472a287805821835f8ad7ef3d25e7ad96365e481df3ab17be16bf2ef0e2c431a9a01f338e0c5a3365ea1de9c3cb24a5ab13a52cdfca675ed502e

data/lib/client_bank_exchange.rb

@@ -19,50 +19,11 @@ module ClientBankExchange
       }
   
       if content.start_with? '1CClientBankExchange'
-        # parse general info (key=value)
-        [
-          :ВерсияФормата, :Кодировка,
-          :Отправитель, :Получатель,
-          :ДатаСоздания, :ВремяСоздания
-        ].each do |key|
-          /#{key}=(.*)/.match(content) do |match|
-            result[:general][key] = match[1].strip
-          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.strip }
-  
-          # 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.strip }
+        result[:general] = general(content)
   
-          # normalize
-          hash_value_to_i document, :Номер
-          hash_value_to_date document, :Дата
-          hash_value_to_d document, :Сумма
+        result[:remainings] = remainings(content)
   
-          document
-        end
+        result[:documents] = documents(content)
       else
         result[:errors] << 'Wrong format: 1CClientBankExchange not found'
       end
@@ -71,6 +32,63 @@ module ClientBankExchange
     end
   
     private
+
+    def general content
+      result = {}
+
+      # parse general info (key=value)
+      [
+        :ВерсияФормата, :Кодировка,
+        :Отправитель, :Получатель,
+        :ДатаСоздания, :ВремяСоздания
+      ].each do |key|
+        /#{key}=(.*)/.match(content) do |match|
+          result[key] = match[1].strip
+        end
+      end
+
+      hash_value_to_date result, :ДатаСоздания
+      hash_value_to_time result, :ВремяСоздания
+
+      result
+    end
+
+    def remainings content
+      result = {}
+
+      /СекцияРасчСчет([\s\S]*?)\sКонецРасчСчет/.match(content) do |match|
+        # remainings properties (key=value)
+        match[1].scan(/(.*)=(.*)/) { |k, v| result[k.to_sym] = v.strip }
+
+        # normalize
+        hash_value_to_date result, :ДатаНачала
+        hash_value_to_date result, :ДатаКонца
+        hash_value_to_d result, :НачальныйОстаток
+        hash_value_to_d result, :ВсегоПоступило
+        hash_value_to_d result, :ВсегоСписано
+        hash_value_to_d result, :КонечныйОстаток
+      end
+
+      result
+    end
+
+    def documents content
+      regexp_document = /СекцияДокумент=(.*)\s([\s\S]*?)\sКонецДокумента/
+      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.strip }
+
+        # normalize
+        hash_value_to_i document, :Номер
+        hash_value_to_date document, :Дата
+        hash_value_to_d document, :Сумма
+
+        document
+      end
+    end  
   
     def hash_value_to_date hash, key
       hash[key] = Date.parse(hash[key]) if hash[key]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_bank_exchange
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrey Zharikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies: []
 description: 'Format specification: http://v8.1c.ru/edi/edi_stnd/100/101.htm'
 email: andrey@zharikov.pro
@@ -37,9 +37,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Import and export for 1CClientBankExchange v1.02 file format
 test_files: []
-has_rdoc: