hflr2 1.0.1 → 1.0.2

data/History.txt

@@ -1,14 +1,6 @@
-== 1.0.1 / 2010-01-21
+== 1.0.2 ==
 
-* Fixed warnings 
-* Added better exception handling for badly formatted output data
+* Discriminator can be regular expression
 
-
-== 0.11.0 / 2009-08-04
-
-*  Removed useless files 
-  * Corrected version number 
-
-== 1.0.1 / 2011-02-09
-   * Added ability to specify file format in Ruby with Range class (see example.rb in /test.)
-   
+== 1.0.1 ==
+* Initial

data/README.txt

@@ -1,45 +1,43 @@
-= HFLR
-
-* http://ruff.rubyforge.org
-
-== Description:
-
-HFLR -- Hierarchical Fixed Length Records
-
-Allows you to read and write files of fixed width records when the file contains one or more
-than one type of record.  
-
-Install with 'gem install hflr'
-
-
-
-
-See the tests and examples bundled with this gem.
-
-
-
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009  Colin C. Davis 
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+= HFLR2
+
+* https://rubygems.org/gems/hflr2/
+
+== Description:
+
+HFLR2 -- Hierarchical Fixed Length Records 2
+
+Allows you to read and write files of fixed width records when the file contains one or more
+than one type of record.  
+
+Install with 'gem install hflr2'
+
+
+See the tests and examples bundled with this gem.
+
+
+NOTE: This gem is based on the HFLR gem but may be not compatible with it.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2012  Bozydar Sobczak
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/hflr2.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hflr2}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Davis", "Bozydar Sobczak"]
-  s.date = %q{2012-10-24}
+  s.date = %q{2012-10-29}
   s.description = %q{HFLR2 -- Hierarchical Fixed Length Records
 
 NOTE: This gem is a modification of the hflr gem. It can be not compatible with it.

data/lib/hflr/fl_record_file.rb

@@ -21,6 +21,7 @@ class FLRFile
     end
   end
 
+
   def set_fast
     @fast = !@record_type_labels.is_a?(Hash)
     unless @fast
@@ -75,8 +76,15 @@ class FLRFile
     if @record_type_labels.is_a?(Hash)
       matching_pair = @record_type_labels.find do |_, value|
         discriminator = value[:discriminator]
-        position = value[:position] - 1
-        line[position..-1].start_with?(discriminator)
+        case discriminator
+          when String
+            position = value[:position] - 1
+            line[position..-1].start_with?(discriminator)
+          when Regexp
+            line =~ discriminator
+          else
+            nil
+        end
       end
       if matching_pair
         matching_pair[0]

data/test/flrfile_test.rb

@@ -64,6 +64,23 @@ class FLRFileTest < Test::Unit::TestCase
 
   end
 
+  def test_record_type_with_regexp
+    record_types = {:household => {:discriminator => /^H.*$/ }, :person => {:discriminator => /^P.*$/} }
+
+    sample_data_path = File.dirname(__FILE__)
+    fwf = FLRFile.new(
+        File.new("#{sample_data_path}/sample.dat"),
+        record_types, # Record types to read from the file, all others will be ignored
+        @layouts, # metadata for all record types
+        1, # column  0 starts at logical location 1
+        {:household => [:people], :person => [:household_id, :pserial]} # extra columns by record type
+    )
+    assert_nil fwf.get_record_type(nil)
+    assert_equal :household, fwf.get_record_type("H123")
+    assert_equal :person, fwf.get_record_type("P1234")
+    assert_equal nil, fwf.get_record_type("C123")
+  end
+
 
   def test_build_record
     sample_data_path = File.dirname(__FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hflr2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Colin Davis
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-24 00:00:00 Z
+date: 2012-10-29 00:00:00 Z
 dependencies: []
 
 description: |-