hflr 0.11.0 → 1.0.1

data/History.txt

@@ -1,4 +1,14 @@
+== 1.0.1 / 2010-01-21
+
+* Fixed warnings 
+* Added better exception handling for badly formatted output data
+
+
 == 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.)
+   

data/hflr.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hflr}
-  s.version = "0.11.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Davis"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2011-02-09}
   s.description = %q{HFLR -- Hierarchical Fixed Length Records
 
 Allows you to read and write files of fixed width records when the file contains one or more
@@ -17,25 +17,15 @@ Install with 'gem install hflr'
 See the tests and examples bundled with this gem.}
   s.email = %q{colin.c.davis@gmail.com}
   s.extra_rdoc_files = ["History.txt", "README.txt"]
-  s.files = ["History.txt", "README.txt", "Rakefile", "hflr.gemspec", "lib/hflr.rb", "lib/hflr/fl_record_file.rb", "lib/hflr/hflr.rb", "lib/hflr/record_template.rb", "spec/hflr_spec.rb", "spec/spec_helper.rb", "test/customer_orders.dat", "test/customers.dat", "test/examples.rb", "test/fixed_length_record_file_test.rb", "test/record_template_test.rb", "test/sample.dat", "test/sample2_out.dat", "test/sample_activities.dat", "test/sample_out.dat", "test/test_helper.rb", "test/test_hflr.rb"]
-  s.homepage = %q{http://ruff.rubyforge.org}
-  s.rdoc_options = ["--main", "README.txt"]
+  s.files = ["History.txt", "README.txt",  "hflr.gemspec", 
+  "lib/hflr.rb", "lib/hflr/fl_record_file.rb", "lib/hflr/hflr.rb", "lib/hflr/record_template.rb", 
+  "test/customer_orders.dat", "test/customers.dat", "test/examples.rb", "test/flrfile_test.rb","test/record_template_test.rb", 
+  "test/sample.dat", "test/sample2_out.dat", "test/sample_activities.dat", "test/sample_out.dat", "test/test_helper.rb", "test/test_hflr.rb"]
+  #s.homepage = %q{http://rubygems.org}
+  #s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{hflr}
+
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{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}
   s.test_files = ["test/test_hflr.rb", "test/test_helper.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
-    else
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
-    end
-  else
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
-  end
 end

data/lib/hflr/fl_record_file.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/record_template')
+#require File.expand_path(File.dirname(__FILE__) + '/record_template')
 
 
 
@@ -13,7 +13,10 @@ class FLRFile
   def initialize(source, record_types, record_layouts, logical_first_column=0, extra_columns = nil)
     # Allow record layouts like 
     # {:type1=>[:var1=>1..5,:var2=>7..8],:type2=>[:var1=>1..1,:var2=>3..4]}
-    # ... todo
+    if record_layouts.values.first.is_a? Hash
+      record_layouts = create_layouts(record_layouts)
+    end
+    
     @line_number = 0
     @file = source    
     @record_type_labels=record_types
@@ -65,8 +68,7 @@ def get_next_known_line_type
     line = @file.gets
     record_type = line_type(line)
   end
-  record_type == :unknown ? nil : line
-    
+  record_type == :unknown ? nil : line   
 end
 
 def each
@@ -105,5 +107,23 @@ def self.open(path, mode, record_types, record_layouts, logical_first_column=0)
     file.close
   end
 end
+
+private
+
+# If the layout is given in the convenient Ruby form
+def create_layouts(layout)
+  var_class = Struct.new(:name,:start,:len)
+new_layout = {}
+  layout.each_pair do |record_type,vars|
   
+    new_layout[record_type] = []
+    new_vars = vars.each_pair do |var_name, range|
+    
+      new_layout[record_type] << var_class.new(var_name.to_s,range.first, range.last - range.first + 1)        
+    end
+    new_layout[record_type].sort!{|a,b| a.start<=>b.start}
+  end
+  return new_layout
+end
+ 
 end

data/lib/hflr/record_template.rb

@@ -24,12 +24,12 @@ def self.create(record_layouts, record_type_symbols, first_column_location, extr
   templates = {}
   self.check_record_layouts(record_layouts)
   
-  record_layouts.keys.each do |record_type|    
+  record_layouts.each_pair do |record_type, vars|    
     record_label = record_type_symbols == :none ? :none : record_type_symbols[record_type]
     templates[record_type] = 
     self.create_template_class(record_type,
       record_label,
-    record_layouts[record_type], 
+    vars, 
     first_column_location, 
     extra_columns[record_type]) 
   end

data/test/examples.rb

@@ -46,5 +46,22 @@ customer_orders_file = FLRFile.new(
     show record
   end
   
+
+puts " ----- You can also use metadata in Ruby -----"
+# Use Ruby metadata
+
+layout = {:customer=>{
+  :name=>1..25,
+  :zip=>26..30,
+  :balance=>31..35
   
-  
+}
+}
+customer_file = FLRFile.new(File.new("customers.dat"), :customer, layout, 1, [:line_number])
+
+
+# You can read through the file and access the fields with methods named after the columns:
+customer_file.each do |record|
+  puts "Customer #{customer_file.line_number.to_s} #{record.name} #{record.zip} "
+end
+

metadata

@@ -1,27 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: hflr
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  prerelease: false
+  segments: 
+    - 1
+    - 0
+    - 1
+  version: 1.0.1
 platform: ruby
 authors: 
-- Colin Davis
+  - Colin Davis
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -06:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+dependencies: []
+
 description: |-
   HFLR -- Hierarchical Fixed Length Records
   
@@ -37,71 +33,57 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- README.txt
+  - History.txt
+  - README.txt
 files: 
-- History.txt
-- README.txt
-- Rakefile
-- hflr.gemspec
-- lib/hflr.rb
-- lib/hflr/fl_record_file.rb
-- lib/hflr/hflr.rb
-- lib/hflr/record_template.rb
-- sample2_out.dat
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
-- test/customer_orders.dat
-- test/customers.dat
-- test/examples.rb
-- test/flrfile_test.rb
-- test/record_template_test.rb
-- test/sample.dat
-- test/sample2_out.dat
-- test/sample_activities.dat
-- test/sample_out.dat
-- test/test_helper.rb
-- test/test_hflr.rb
+  - History.txt
+  - README.txt
+  - hflr.gemspec
+  - lib/hflr.rb
+  - lib/hflr/fl_record_file.rb
+  - lib/hflr/hflr.rb
+  - lib/hflr/record_template.rb
+  - test/customer_orders.dat
+  - test/customers.dat
+  - test/examples.rb
+  - test/flrfile_test.rb
+  - test/record_template_test.rb
+  - test/sample.dat
+  - test/sample2_out.dat
+  - test/sample_activities.dat
+  - test/sample_out.dat
+  - test/test_helper.rb
+  - test/test_hflr.rb
 has_rdoc: true
-homepage: http://ruff.rubyforge.org
+homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
-rubyforge_project: hflr
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: 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
 test_files: 
-- test/test_hflr.rb
-- test/test_helper.rb
+  - test/test_hflr.rb
+  - test/test_helper.rb

data/Rakefile

@@ -1,31 +0,0 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-
-begin
-  require 'bones'
-  Bones.setup
-rescue LoadError
-
-  begin
-    load 'tasks/setup.rb'
-  rescue LoadError
-    raise RuntimeError, '### please install the "bones" gem ###'
-  end
-end
-
-ensure_in_path 'lib'
-require 'hflr'
-
-task :default => 'spec:run'
-
-PROJ.name = 'hflr'
-PROJ.authors = 'Colin Davis'
-PROJ.email = 'colin.c.davis@gmail.com'
-PROJ.url = 'http://ruff.rubyforge.org'
-PROJ.version = Hflr::VERSION
-PROJ.rubyforge.name = 'hflr'
-
-PROJ.spec.opts << '--color'
-
-# EOF

data/sample2_out.dat

@@ -1 +0,0 @@
-joe                      025

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/bones.rake

@@ -1,20 +0,0 @@
-
-if HAVE_BONES
-
-namespace :bones do
-
-  desc 'Show the PROJ open struct'
-  task :debug do |t|
-    atr = if t.application.top_level_tasks.length == 2
-      t.application.top_level_tasks.pop
-    end
-
-    if atr then Bones::Debug.show_attr(PROJ, atr)
-    else Bones::Debug.show PROJ end
-  end
-
-end  # namespace :bones
-
-end  # HAVE_BONES
-
-# EOF