rvista 0.2 → 0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require "rubygems"
 
-PKG_VERSION = "0.2"
+PKG_VERSION = "0.5"
 PKG_NAME = "rvista"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -53,7 +53,7 @@ spec = Gem::Specification.new do |spec|
 	spec.extra_rdoc_files = %w{README COPYING LICENSE}
 	spec.rdoc_options << '--title' << 'rvista Documentation' <<
 	                     '--main'  << 'README' << '-q'
-  spec.add_dependency('fastercsv', '>= 0.2.1')
+  spec.add_dependency('fastercsv', '>= 1.2.1')
   spec.author = "James Healy"
 	spec.email = "jimmy@deefa.com"
 	spec.description = <<END_DESC

data/examples/test.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + "/../lib/rvista"
+
+#filename = File.dirname(__FILE__) + "/../test/data/seperate_delivery_location.txt"
+filename = File.dirname(__FILE__) + "/../test/data/no_delivery_location.txt"
+#filename = File.dirname(__FILE__) + "/../test/data/valid.txt"
+
+msg = RVista::Message.load_from_file(filename)
+if msg.delivery_location.nil?
+  puts "nil delivery location"
+else
+  puts msg.delivery_location
+end

data/lib/rvista/invoice.rb

@@ -0,0 +1,104 @@
+require 'rubygems'
+require 'fastercsv'
+
+module RVista
+
+  # Represents a single Vista Invoice
+  class Invoice
+
+    attr_accessor :sender_id, :receiver_id, :doc_type, :description
+    attr_accessor :doc_number, :doc_date, :delivery_location, :currency
+    attr_accessor :items
+
+    # creates a new RVista::Invoice object
+    def initialize
+      @items = []
+    end
+
+    # reads a vista invoice file into memory. input should be a string 
+    # that specifies the file path
+    def self.load_from_file(input)
+      raise InvalidFileError, 'Invalid file' unless File.exist?(input)
+      data = FasterCSV.read(input)
+      return self.build_message(data)
+    end
+
+    # creates a RVista::Invoice object from a string. Input should
+    # be a complete vista file as a string
+    def self.load_from_string(input)
+      data = FasterCSV.parse(input)
+      return self.build_message(data)
+    end
+
+    # print a string representation of this order that meets the spec
+    def to_s
+      # message header
+      msg = ""
+      msg << "H,"
+      msg << "#{sender_id},"
+      msg << "#{receiver_id},"
+      msg << "#{doc_type},"
+      msg << "#{description},"
+      msg << "#{doc_number},"
+      msg << "#{doc_date},"
+      msg << "#{delivery_location},"
+      msg << "#{currency}\n"
+      
+      total_value = BigDecimal.new("0")
+      total_qty   = BigDecimal.new("0")
+      total_gst   = BigDecimal.new("0")
+
+      # message line items
+      @items.each do |item| 
+        msg << item.to_s << "\n"
+        total_value += item.value
+        total_qty   += item.qty
+        total_gst   += item.gst
+      end
+
+      # message summary
+      msg << "S,"
+      msg << "#{@items.size.to_s},"
+      msg << sprintf("%.2f", total_value)
+      msg << ","
+      msg << sprintf("%.0f", total_qty)
+      msg << ","
+      msg << sprintf("%.2f", total_gst)
+      msg << "\n"
+
+      return msg
+    end
+
+    private
+
+    def self.build_message(data)
+      raise InvalidFileError, 'File appears to be too short' unless data.size >= 3
+      raise InvalidFileError, 'Missing header information' unless data[0][0].eql?("H")
+      raise InvalidFileError, 'Missing footer information' unless data[-1][0].eql?("S")
+
+      msg = self.new
+
+      # set message attributes
+      msg.sender_id   = data[0][1]
+      msg.receiver_id = data[0][2]
+      msg.doc_type    = data[0][3]
+      msg.description = data[0][4]
+      msg.doc_number  = data[0][5]
+      msg.doc_date    = data[0][6]
+      msg.delivery_location = data[0][7]
+      msg.currency    = data[0][8]
+
+      # load each lineitem into the message
+      data[1,data.size - 2].each do |row| 
+        raise InvalidLineItemError, 'Invalid line detected' unless row[0].eql?("D")
+        item = InvoiceLineItem.load_from_array(row)
+        msg.items << item
+      end
+
+      raise InvalidFileError, 'Line item count doesn\'t match footer' unless data[-1][1].to_i.eql?(msg.items.size)
+
+      # return the results
+      return msg
+    end
+  end
+end

data/lib/rvista/invoice_line_item.rb

@@ -0,0 +1,86 @@
+require 'bigdecimal'
+
+module RVista
+
+  # represents a single line on an invoice. Has attributes like
+  # price, qty and description
+  class InvoiceLineItem
+
+    attr_accessor :line_num, :po_number, :qualifier, :ean, :description
+    attr_accessor :qty, :unit_measure, :rrp, :discount_percent
+    attr_accessor :nett_unit_price, :gst_inclusive, :value
+    attr_accessor :discount_value, :nett_value, :gst, :firm_sale
+
+    # returns a new RVista::POALineItem object using the data passed in as an
+    # array. The array should have exactly 14 items in it. Refer to the Vista
+    # standard to see what those 14 items should be.
+    def self.load_from_array(data)
+      item = self.new
+      raise InvalidLineItemError, 'incorrect number of data points' unless data.size == 17
+
+      item.line_num = data[1].to_i
+      item.po_number = data[2]
+      item.qualifier = data[3]
+      item.ean = data[4]
+      item.description = data[5]
+      item.qty = data[6].to_i
+      item.unit_measure = data[7]
+      item.rrp = BigDecimal.new(data[8]) unless data[8].nil?
+      item.discount_percent = BigDecimal.new(data[9]) unless data[9].nil?
+      item.nett_unit_price = BigDecimal.new(data[10]) unless data[10].nil?
+      if data[11].eql?("Y")
+        item.gst_inclusive = true
+      else
+        item.gst_inclusive = false
+      end
+      item.value = BigDecimal.new(data[12]) unless data[12].nil?
+      item.discount_value = BigDecimal.new(data[13]) unless data[13].nil?
+      item.nett_value = BigDecimal.new(data[14]) unless data[14].nil?
+      item.gst = BigDecimal.new(data[15]) unless data[15].nil?
+      if data[16].eql?("F")
+        item.firm_sale = true
+      else
+        item.firm_sale = false
+      end
+
+      return item
+    end
+    
+    # output a string that represents this line item that meets the vista spec
+    def to_s
+      msg = ""
+      msg << "D," 
+      msg << "#{line_num},"
+      msg << "#{po_number},"
+      msg << "#{qualifier},"
+      msg << "#{ean},"
+      msg << "#{description},"
+      msg << "#{qty},"
+      msg << "#{unit_measure},"
+      msg << sprintf("%.2f", rrp) unless rrp.nil?
+      msg << ","
+      msg << sprintf("%.2f", discount_percent) unless discount_percent.nil?
+      msg << ","
+      msg << sprintf("%.2f", nett_unit_price) unless nett_unit_price.nil?
+      msg << ","
+      if gst_inclusive
+        msg << "Y,"
+      else
+        msg << ","
+      end
+      msg << sprintf("%.2f", value) unless value.nil?
+      msg << ","
+      msg << sprintf("%.2f", discount_value) unless discount_value.nil?
+      msg << ","
+      msg << sprintf("%.2f", nett_value) unless nett_value.nil?
+      msg << ","
+      msg << sprintf("%.2f", gst) unless gst.nil?
+      msg << ","
+      if firm_sale
+        msg << "F"
+      end
+
+      return msg
+    end
+  end
+end

data/lib/rvista/{message.rb → po.rb}

@@ -1,12 +1,10 @@
 require 'rubygems'
 require 'fastercsv'
-require File.dirname(__FILE__) + '/line_item'
-require File.dirname(__FILE__) + '/errors'
 
 module RVista
 
   # Represents a single Vista message (purchase order).
-  class Message
+  class PO
 
     attr_accessor :sender_id, :receiver_id, :internal_control_number, :po_number
     attr_accessor :po_subset_code, :purpose_code, :purpose_desc, :date
@@ -78,7 +76,7 @@ module RVista
       raise InvalidFileError, 'Missing header information' unless data[0][0].eql?("H")
       raise InvalidFileError, 'Missing footer information' unless data[-1][0].eql?("S")
 
-      msg = Message.new
+      msg = self.new
 
       # set message attributes
       msg.sender_id = data[0][1]
@@ -104,7 +102,7 @@ module RVista
       # load each lineitem into the message
       data[1,data.size - 2].each do |row| 
         raise InvalidLineItemError, 'Invalid line detected' unless row[0].eql?("D")
-        item = LineItem.load_from_array(row)
+        item = POLineItem.load_from_array(row)
         msg.items << item
       end
 

data/lib/rvista/{line_item.rb → po_line_item.rb}

@@ -4,7 +4,7 @@ module RVista
 
   # represents a single line on the purchase order. Has attributes like
   # price, qty and description
-  class LineItem
+  class POLineItem
 
     attr_accessor :line_num, :qualifier, :ean, :description
     attr_accessor :qty, :nett_unit_price, :unit_measure
@@ -55,7 +55,7 @@ module RVista
       if backorder == true
         msg << "Y,"
       else
-        "N,"
+        msg << "N,"
       end
       msg << "#{additional_discount},"
       msg << "#{firm_sale}"

data/lib/rvista/poa.rb

@@ -0,0 +1,96 @@
+require 'rubygems'
+require 'fastercsv'
+
+module RVista
+
+  # Represents a single Vista Purchase Order Ack (POA).
+  class POA
+
+    attr_accessor :sender_id, :receiver_id, :po_number, :date
+    attr_accessor :supply_after, :supply_before, :delivery_location
+    attr_accessor :delivery_location_name
+    attr_accessor :items
+
+    # creates a new RVista::POA object
+    def initialize
+      @items = []
+    end
+
+    # reads a vista poa file into memory. input should be a string 
+    # that specifies the file path
+    def self.load_from_file(input)
+      raise InvalidFileError, 'Invalid file' unless File.exist?(input)
+      data = FasterCSV.read(input)
+      return self.build_message(data)
+    end
+
+    # creates a RVista::POA object from a string. Input should
+    # be a complete vista file as a string
+    def self.load_from_string(input)
+      data = FasterCSV.parse(input)
+      return self.build_message(data)
+    end
+
+    # print a string representation of this order that meets the spec
+    def to_s
+      # message header
+      msg = ""
+      msg << "H,"
+      msg << "#{sender_id},"
+      msg << "#{receiver_id},"
+      msg << ","
+      msg << ","
+      msg << ","
+      msg << ","
+      msg << "#{po_number},"
+      msg << "#{date},"
+      msg << ","
+      msg << "#{supply_after},"
+      msg << "#{supply_before},"
+      msg << "SP,"
+      msg << "#{delivery_location},"
+      msg << "#{delivery_location_name}\n"
+      
+      # message line items
+      @items.each { |item| msg << item.to_s << "\n"}
+
+      # message summary
+      msg << "S,#{@items.size.to_s},\n"
+
+
+      return msg
+    end
+
+    private
+
+    def self.build_message(data)
+      raise InvalidFileError, 'File appears to be too short' unless data.size >= 3
+      raise InvalidFileError, 'Missing header information' unless data[0][0].eql?("H")
+      raise InvalidFileError, 'Missing footer information' unless data[-1][0].eql?("S")
+
+      msg = self.new
+
+      # set message attributes
+      msg.sender_id = data[0][1]
+      msg.receiver_id = data[0][2]
+      msg.po_number = data[0][7]
+      msg.date = data[0][8]
+      msg.supply_after = data[0][10]
+      msg.supply_before = data[0][11]
+      msg.delivery_location = data[0][13]
+      msg.delivery_location_name = data[0][14]
+
+      # load each lineitem into the message
+      data[1,data.size - 2].each do |row| 
+        raise InvalidLineItemError, 'Invalid line detected' unless row[0].eql?("D")
+        item = POALineItem.load_from_array(row)
+        msg.items << item
+      end
+
+      raise InvalidFileError, 'Line item count doesn\'t match footer' unless data[-1][1].to_i.eql?(msg.items.size)
+
+      # return the results
+      return msg
+    end
+  end
+end

data/lib/rvista/poa_line_item.rb

@@ -0,0 +1,71 @@
+require 'bigdecimal'
+
+module RVista
+
+  # represents a single line on the purchase order ack. Has attributes like
+  # price, qty and description
+  class POALineItem
+
+    attr_accessor :line_num, :ean, :description
+    attr_accessor :nett_unit_price, :qty_inners, :tax_rate
+    attr_accessor :buying_location, :buying_location_name, :delivered_qty
+    attr_accessor :status_code, :demand_qty, :rrp, :discount_percent
+    attr_accessor :availability_date, :text
+
+    # returns a new RVista::POALineItem object using the data passed in as an
+    # array. The array should have exactly 14 items in it. Refer to the Vista
+    # standard to see what those 14 items should be.
+    def self.load_from_array(data)
+      item = self.new
+      raise InvalidLineItemError, 'incorrect number of data points' unless data.size == 20
+
+      item.line_num = data[1].to_i
+      item.ean = data[2]
+      item.description = data[4]
+      item.nett_unit_price = BigDecimal.new(data[5]) unless data[5].nil?
+      item.qty_inners = data[7].to_i
+      item.tax_rate = BigDecimal.new(data[8]) unless data[8].nil?
+      item.buying_location = data[10]
+      item.buying_location_name = data[11]
+      item.delivered_qty = data[13].to_i
+      item.status_code = data[14]
+      item.demand_qty = data[15].to_i
+      item.rrp = BigDecimal.new(data[16]) unless data[16].nil?
+      item.discount_percent = BigDecimal.new(data[17]) unless data[17].nil?
+      item.availability_date = data[18] # TODO: convert this to a Date? 
+      item.text = data[19]
+
+      return item
+    end
+    
+    # output a string that represents this line item that meets the vista spec
+    def to_s
+      msg = ""
+      msg << "D," 
+      msg << "#{line_num},"
+      msg << "#{ean},"
+      msg << ","
+      msg << "#{description},"
+      msg << sprintf("%.2f", nett_unit_price) unless nett_unit_price.nil?
+      msg << ","
+      msg << "1,"
+      msg << "#{qty_inners},"
+      msg << sprintf("%.2f", tax_rate) unless tax_rate.nil?
+      msg << ","
+      msg << ","
+      msg << "#{buying_location},"
+      msg << "#{buying_location_name},"
+      msg << ","
+      msg << "#{delivered_qty},"
+      msg << "#{status_code},"
+      msg << "#{demand_qty},"
+      msg << sprintf("%.2f", rrp) unless rrp.nil?
+      msg << ","
+      msg << sprintf("%.2f", discount_percent) unless discount_percent.nil?
+      msg << ","
+      msg << "#{availability_date},"
+      msg << "#{text}"
+      return msg
+    end
+  end
+end

data/lib/rvista.rb

@@ -1,7 +1,11 @@
 
-require File.dirname(__FILE__) + '/rvista/message'
-require File.dirname(__FILE__) + '/rvista/line_item'
 require File.dirname(__FILE__) + '/rvista/errors'
+require File.dirname(__FILE__) + '/rvista/invoice'
+require File.dirname(__FILE__) + '/rvista/invoice_line_item'
+require File.dirname(__FILE__) + '/rvista/po'
+require File.dirname(__FILE__) + '/rvista/po_line_item'
+require File.dirname(__FILE__) + '/rvista/poa'
+require File.dirname(__FILE__) + '/rvista/poa_line_item'
 
 # Ruby module for reading Vista HDS order files
 #

data/test/data/invoice/invalid_line.txt

@@ -0,0 +1,4 @@
+H,1111111,2222222,IN,Invoice,5678,071011,2222222,
+D,1,1234,EN,9781857230765,Eye of the World,2,EA,5.00,40.00,4.50,Y,10.00,6.00,9.50
+D,2,1234,EN,9780744590104,Eye of the Wolf,3,EA,5.00,40.00,4.50,Y,15.00,9.00,9.50,1.50,F
+S,2,25.00.00,5,3.00

data/test/data/invoice/invalid_missing_footer.txt

@@ -0,0 +1,3 @@
+H,1111111,2222222,IN,Invoice,5678,071011,2222222,
+D,1,1234,EN,9781857230765,Eye of the World,2,EA,5.00,40.00,4.50,Y,10.00,6.00,9.50,1.00,F
+D,2,1234,EN,9780744590104,Eye of the Wolf,3,EA,5.00,40.00,4.50,Y,15.00,9.00,9.50,1.50,F

data/test/data/invoice/invalid_missing_header.txt

@@ -0,0 +1,3 @@
+D,1,1234,EN,9781857230765,Eye of the World,2,EA,5.00,40.00,4.50,Y,10.00,6.00,9.50,1.00,F
+D,2,1234,EN,9780744590104,Eye of the Wolf,3,EA,5.00,40.00,4.50,Y,15.00,9.00,9.50,1.50,F
+S,2,25.00.00,5,3.00

data/test/data/invoice/valid.txt

@@ -0,0 +1,4 @@
+H,1111111,2222222,IN,Invoice,5678,071011,1111111,
+D,1,1234,EN,9781857230765,Eye of the World,2,EA,5.00,40.00,4.50,Y,10.00,6.00,9.50,1.00,F
+D,2,1234,EN,9780744590104,Eye of the Wolf,3,EA,5.00,40.00,4.50,Y,15.00,9.00,9.50,1.50,F
+S,2,25.00,5,2.50

data/test/data/po/no_delivery_location.txt

@@ -0,0 +1,3 @@
+H,9024298,9013725,,024/60152,,00,,070501,,000000,000000,,,,,,,,
+D,1,EN,9780809142217,,175,,,,,,Y,,
+S,1,,

data/test/data/po/seperate_delivery_location.txt

@@ -0,0 +1,3 @@
+H,9024298,9013725,,024/60152,,00,,070501,,000000,000000,,,,,,9013091,,
+D,1,EN,9780809142217,,175,,,,,,Y,,
+S,1,,

data/test/data/poa/invalid_line.txt

@@ -0,0 +1,4 @@
+H,1111111,2222222,,,,,1234,060915,,071010,071030,SP,1111111,Some Store
+D,1,0701180358,,DIGGING TO AMERICA,10.00,1,0,,1111111,Some Store,,1,01,1,11.00,40,20071015,
+D,2,071267344X,,THE LAST ENEMY,15.00,1,0,,1111111,Some Store,,7,02,5,16.50,50
+S,2,,

data/test/data/poa/invalid_missing_footer.txt

@@ -0,0 +1,3 @@
+H,1111111,2222222,,,,,1234,060915,,071010,071030,SP,1111111,Some Store
+D,1,0701180358,,DIGGING TO AMERICA,10.00,1,0,,1111111,Some Store,,1,01,1,11.00,40,20071015,
+D,2,071267344X,,THE LAST ENEMY,15.00,1,0,,1111111,Some Store,,7,02,5,16.50,50,20071015,

data/test/data/poa/invalid_missing_header.txt

@@ -0,0 +1,3 @@
+D,1,0701180358,,DIGGING TO AMERICA,10.00,1,0,,1111111,Some Store,,1,01,1,11.00,40,20071015,
+D,2,071267344X,,THE LAST ENEMY,15.00,1,0,,1111111,Some Store,,7,02,5,16.50,50,20071015,
+S,2,,

data/test/data/poa/valid.txt

@@ -0,0 +1,4 @@
+H,1111111,2222222,,,,,1234,060915,,071010,071030,SP,1111111,Some Store
+D,1,0701180358,,DIGGING TO AMERICA,10.00,1,0,10.00,,1111111,Some Store,,1,01,1,11.00,40.00,20071015,
+D,2,071267344X,,THE LAST ENEMY,15.00,1,0,10.00,,1111111,Some Store,,7,02,5,16.50,50.00,20071015,
+S,2,

data/test/unit/invoice_line_item_test.rb

@@ -0,0 +1,71 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'test/unit'
+require 'rvista'
+require 'fastercsv'
+
+class InvoiceLineItemTest < Test::Unit::TestCase
+
+  def setup
+    @row = []
+    @row << "D"
+    @row << "1"
+    @row << "1234"
+    @row << "EN"
+    @row << "9781857230765"
+    @row << "Eye of the World"
+    @row << "5"
+    @row << "EA"
+    @row << "19.95"
+    @row << "40.00"
+    @row << "17.95"
+    @row << "Y"
+    @row << "89.75"
+    @row << "35.90"
+    @row << "53.85"
+    @row << "2.00"
+    @row << "F"
+  end
+
+  # ensure the load_from_array method works as expected
+  def test_load_from_array
+    item = RVista::InvoiceLineItem.load_from_array(@row)
+    assert_kind_of RVista::InvoiceLineItem, item
+
+    assert_equal item.line_num, 1
+    assert_equal item.po_number, "1234"
+    assert_equal item.qualifier, "EN"
+    assert_equal item.ean, "9781857230765"
+    assert_equal item.description, "Eye of the World"
+    assert_equal item.qty, 5
+    assert_equal item.unit_measure, "EA"
+    assert_equal item.rrp, 19.95
+    assert_equal item.discount_percent, 40.00
+    assert_equal item.nett_unit_price, 17.95
+    assert_equal item.gst_inclusive, true
+    assert_equal item.value, 89.75
+    assert_equal item.discount_value, 35.90
+    assert_equal item.nett_value, 53.85
+    assert_equal item.gst, 2.00
+    assert_equal item.firm_sale, true
+  end
+
+  # ensure the load_from_file method throws the correct exceptions
+  # when it encounters a problem
+  def test_product_validation
+    assert_raise(RVista::InvalidLineItemError) {
+      item = RVista::InvoiceLineItem.load_from_array(%w[D blah])
+    }
+  end
+
+  def test_to_s
+    item = RVista::InvoiceLineItem.load_from_array(@row)
+    str = item.to_s
+    arr = FasterCSV.parse(str).first
+
+    assert_equal 17, arr.size
+  end
+
+end
+
+

data/test/unit/invoice_test.rb

@@ -0,0 +1,73 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'test/unit'
+require 'rvista'
+
+class InvoiceTest < Test::Unit::TestCase
+
+  VALID = File.dirname(__FILE__) + "/../data/invoice/valid.txt"
+  INVALID_MISSING_HEADER = File.dirname(__FILE__) + "/../data/invoice/invalid_missing_header.txt"
+  INVALID_MISSING_FOOTER = File.dirname(__FILE__) + "/../data/invoice/invalid_missing_footer.txt"
+  INVALID_LINE = File.dirname(__FILE__) + "/../data/invoice/invalid_line.txt"
+  INVALID_DOESNT_EXIST = File.dirname(__FILE__) + "/../data/blah.txt"
+
+  # ensure the load_from_file method works as expected
+  def test_load_from_file
+    msg = RVista::Invoice.load_from_file(VALID)
+    assert_kind_of RVista::Invoice, msg
+    assert_equal msg.items.size, 2
+
+    validate_msg(msg)
+  end
+
+  # ensure the load_from_file method works as expected
+  def test_load_from_string
+    msg = RVista::Invoice.load_from_string(File.read(VALID))
+    assert_kind_of RVista::Invoice, msg
+    assert_equal msg.items.size, 2
+    
+    validate_msg(msg)
+  end
+
+  # ensure the load_from_file method throws the correct exceptions
+  # when it encounters a problem
+  def test_product_validation
+    
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::Invoice.load_from_file(INVALID_MISSING_HEADER)
+    }
+
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::Invoice.load_from_file(INVALID_MISSING_FOOTER)
+    }
+    
+    assert_raise(RVista::InvalidLineItemError) {
+      msg = RVista::Invoice.load_from_file(INVALID_LINE)
+    }
+
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::Invoice.load_from_file(INVALID_DOESNT_EXIST)
+    }
+  end
+
+  def test_to_s
+    msg = RVista::Invoice.load_from_file(VALID)
+    content = File.read(VALID)
+    assert_equal content, msg.to_s
+  end
+
+  private
+
+  # ensures the properties of the supplied RVista::Invoice object
+  # match the properties specified in the VALID file
+  def validate_msg(msg)
+    assert_equal msg.sender_id, "1111111"
+    assert_equal msg.receiver_id, "2222222"
+    assert_equal msg.doc_type, "IN"
+    assert_equal msg.description, "Invoice"
+    assert_equal msg.doc_number, "5678"
+    assert_equal msg.doc_date, "071011"
+    assert_equal msg.delivery_location, "1111111"
+    assert_equal msg.currency, nil
+  end
+end

data/test/unit/line_item_test.rb

@@ -2,8 +2,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'test/unit'
 require 'rvista'
+require 'fastercsv'
 
-class LineItemTest < Test::Unit::TestCase
+class POLineItemTest < Test::Unit::TestCase
 
   def setup
     @row = []
@@ -21,12 +22,28 @@ class LineItemTest < Test::Unit::TestCase
     @row << "Y"
     @row << nil
     @row << nil
+
+    @row2 = []
+    @row2 << "D"
+    @row2 << "1"
+    @row2 << "IB"
+    @row2 << "0701180358"
+    @row2 << "DIGGING TO AMERICA"
+    @row2 << "3"
+    @row2 << "0.00"
+    @row2 << "EA"
+    @row2 << nil
+    @row2 << nil
+    @row2 << "43"
+    @row2 << "N"
+    @row2 << nil
+    @row2 << nil
   end
 
   # ensure the load_from_array method works as expected
   def test_load_from_array
-    item = RVista::LineItem.load_from_array(@row)
-    assert_kind_of RVista::LineItem, item
+    item = RVista::POLineItem.load_from_array(@row)
+    assert_kind_of RVista::POLineItem, item
 
     assert_equal item.line_num, 1
     assert_equal item.qualifier, "IB"
@@ -48,11 +65,25 @@ class LineItemTest < Test::Unit::TestCase
   def test_product_validation
     
     assert_raise(RVista::InvalidLineItemError) {
-      item = RVista::LineItem.load_from_array(%w[D blah])
+      item = RVista::POLineItem.load_from_array(%w[D blah])
     }
 
   end
 
+  def test_to_s
+    item = RVista::POLineItem.load_from_array(@row)
+    str = item.to_s
+    arr = FasterCSV.parse(str).first
+
+    assert_equal 14, arr.size
+    
+    item = RVista::POLineItem.load_from_array(@row2)
+    str = item.to_s
+    arr = FasterCSV.parse(str).first
+
+    assert_equal 14, arr.size
+  end
+
 end
 
 

data/test/unit/message_test.rb

@@ -3,18 +3,18 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'test/unit'
 require 'rvista'
 
-class MessageTest < Test::Unit::TestCase
+class POTest < Test::Unit::TestCase
 
-  VALID = File.dirname(__FILE__) + "/../data/valid.txt"
-  INVALID_MISSING_HEADER = File.dirname(__FILE__) + "/../data/invalid_missing_header.txt"
-  INVALID_MISSING_FOOTER = File.dirname(__FILE__) + "/../data/invalid_missing_footer.txt"
-  INVALID_LINE = File.dirname(__FILE__) + "/../data/invalid_line.txt"
+  VALID = File.dirname(__FILE__) + "/../data/po/valid.txt"
+  INVALID_MISSING_HEADER = File.dirname(__FILE__) + "/../data/po/invalid_missing_header.txt"
+  INVALID_MISSING_FOOTER = File.dirname(__FILE__) + "/../data/po/invalid_missing_footer.txt"
+  INVALID_LINE = File.dirname(__FILE__) + "/../data/po/invalid_line.txt"
   INVALID_DOESNT_EXIST = File.dirname(__FILE__) + "/../data/blah.txt"
 
   # ensure the load_from_file method works as expected
   def test_load_from_file
-    msg = RVista::Message.load_from_file(VALID)
-    assert_kind_of RVista::Message, msg
+    msg = RVista::PO.load_from_file(VALID)
+    assert_kind_of RVista::PO, msg
     assert_equal msg.items.size, 38
 
     validate_msg(msg)
@@ -23,8 +23,8 @@ class MessageTest < Test::Unit::TestCase
 
   # ensure the load_from_file method works as expected
   def test_load_from_string
-    msg = RVista::Message.load_from_string(File.read(VALID))
-    assert_kind_of RVista::Message, msg
+    msg = RVista::PO.load_from_string(File.read(VALID))
+    assert_kind_of RVista::PO, msg
     assert_equal msg.items.size, 38
     
     validate_msg(msg)
@@ -35,32 +35,32 @@ class MessageTest < Test::Unit::TestCase
   def test_product_validation
     
     assert_raise(RVista::InvalidFileError) {
-      msg = RVista::Message.load_from_file(INVALID_MISSING_HEADER)
+      msg = RVista::PO.load_from_file(INVALID_MISSING_HEADER)
     }
 
     assert_raise(RVista::InvalidFileError) {
-      msg = RVista::Message.load_from_file(INVALID_MISSING_FOOTER)
+      msg = RVista::PO.load_from_file(INVALID_MISSING_FOOTER)
     }
     
     assert_raise(RVista::InvalidLineItemError) {
-      msg = RVista::Message.load_from_file(INVALID_LINE)
+      msg = RVista::PO.load_from_file(INVALID_LINE)
     }
 
     assert_raise(RVista::InvalidFileError) {
-      msg = RVista::Message.load_from_file(INVALID_DOESNT_EXIST)
+      msg = RVista::PO.load_from_file(INVALID_DOESNT_EXIST)
     }
 
   end
 
   def test_to_s
-    msg = RVista::Message.load_from_file(VALID)
+    msg = RVista::PO.load_from_file(VALID)
     content = File.read(VALID)
     assert_equal content, msg.to_s
   end
 
   private
 
-  # ensures the properties of the supplied RVista::Message object
+  # ensures the properties of the supplied RVista::PO object
   # match the properties specified in the VALID file
   def validate_msg(msg)
     assert_equal msg.sender_id, "1111111"

data/test/unit/poa_line_item_test.rb

@@ -0,0 +1,75 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'test/unit'
+require 'rvista'
+require 'fastercsv'
+
+class POALineItemTest < Test::Unit::TestCase
+
+  def setup
+    @row = []
+    @row << "D"
+    @row << "1"
+    @row << "0701180358"
+    @row << nil
+    @row << "DIGGING TO AMERICA"
+    @row << "10.00"
+    @row << "1"
+    @row << "0"
+    @row << "10.00"
+    @row << nil
+    @row << "1111111"
+    @row << "Some Store"
+    @row << nil
+    @row << "1"
+    @row << "01"
+    @row << "1"
+    @row << "11.00"
+    @row << "40.00"
+    @row << "20071015"
+    @row << nil
+  end
+
+  # ensure the load_from_array method works as expected
+  def test_load_from_array
+    item = RVista::POALineItem.load_from_array(@row)
+    assert_kind_of RVista::POALineItem, item
+
+    assert_equal item.line_num, 1
+    assert_equal item.ean, "0701180358"
+    assert_equal item.description, "DIGGING TO AMERICA"
+    assert_equal item.nett_unit_price, 10.00
+    assert_equal item.qty_inners, 0
+    assert_equal item.tax_rate, 10.00
+    assert_equal item.buying_location, "1111111"
+    assert_equal item.buying_location_name, "Some Store"
+    assert_equal item.delivered_qty, 1
+    assert_equal item.status_code, "01"
+    assert_equal item.demand_qty, 1
+    assert_equal item.rrp, 11.00
+    assert_equal item.discount_percent, 40.00
+    assert_equal item.availability_date, "20071015"
+    assert_equal item.text, nil
+  end
+
+  # ensure the load_from_file method throws the correct exceptions
+  # when it encounters a problem
+  def test_product_validation
+    
+    assert_raise(RVista::InvalidLineItemError) {
+      item = RVista::POALineItem.load_from_array(%w[D blah])
+    }
+
+  end
+
+  def test_to_s
+    item = RVista::POALineItem.load_from_array(@row)
+    str = item.to_s
+    arr = FasterCSV.parse(str).first
+
+    assert_equal 20, arr.size
+  end
+
+end
+
+

data/test/unit/poa_test.rb

@@ -0,0 +1,78 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+
+require 'test/unit'
+require 'rvista'
+
+class POATest < Test::Unit::TestCase
+
+  VALID = File.dirname(__FILE__) + "/../data/poa/valid.txt"
+  INVALID_MISSING_HEADER = File.dirname(__FILE__) + "/../data/poa/invalid_missing_header.txt"
+  INVALID_MISSING_FOOTER = File.dirname(__FILE__) + "/../data/poa/invalid_missing_footer.txt"
+  INVALID_LINE = File.dirname(__FILE__) + "/../data/poa/invalid_line.txt"
+  INVALID_DOESNT_EXIST = File.dirname(__FILE__) + "/../data/blah.txt"
+
+  # ensure the load_from_file method works as expected
+  def test_load_from_file
+    msg = RVista::POA.load_from_file(VALID)
+    assert_kind_of RVista::POA, msg
+    assert_equal msg.items.size, 2
+
+    validate_msg(msg)
+      
+  end
+
+  # ensure the load_from_file method works as expected
+  def test_load_from_string
+    msg = RVista::POA.load_from_string(File.read(VALID))
+    assert_kind_of RVista::POA, msg
+    assert_equal msg.items.size, 2
+    
+    validate_msg(msg)
+  end
+
+  # ensure the load_from_file method throws the correct exceptions
+  # when it encounters a problem
+  def test_product_validation
+    
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::POA.load_from_file(INVALID_MISSING_HEADER)
+    }
+
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::POA.load_from_file(INVALID_MISSING_FOOTER)
+    }
+    
+    assert_raise(RVista::InvalidLineItemError) {
+      msg = RVista::POA.load_from_file(INVALID_LINE)
+    }
+
+    assert_raise(RVista::InvalidFileError) {
+      msg = RVista::POA.load_from_file(INVALID_DOESNT_EXIST)
+    }
+
+  end
+
+  def test_to_s
+    msg = RVista::POA.load_from_file(VALID)
+    content = File.read(VALID)
+    assert_equal content, msg.to_s
+  end
+
+  private
+
+  # ensures the properties of the supplied RVista::POA object
+  # match the properties specified in the VALID file
+  def validate_msg(msg)
+    assert_equal msg.sender_id, "1111111"
+    assert_equal msg.receiver_id, "2222222"
+    assert_equal msg.po_number, "1234"
+    assert_equal msg.date, "060915"
+    assert_equal msg.supply_after, "071010"
+    assert_equal msg.supply_before, "071030"
+    assert_equal msg.delivery_location, "1111111"
+    assert_equal msg.delivery_location_name, "Some Store"
+  end
+
+end
+
+

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: rvista
 version: !ruby/object:Gem::Version 
-  version: "0.2"
-date: 2006-11-19 00:00:00 +11:00
+  version: "0.5"
+date: 2007-10-11 00:00:00 +10:00
 summary: A small library for reading Vista HDS order files
 require_paths: 
 - lib
@@ -25,22 +25,45 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - James Healy
 files: 
+- examples/test.rb
 - lib/rvista
-- lib/rvista.rb
 - lib/rvista/errors.rb
-- lib/rvista/message.rb
-- lib/rvista/line_item.rb
+- lib/rvista/poa.rb
+- lib/rvista/po.rb
+- lib/rvista/po_line_item.rb
+- lib/rvista/poa_line_item.rb
+- lib/rvista/invoice_line_item.rb
+- lib/rvista/invoice.rb
+- lib/rvista.rb
 - test/unit
-- test/data
 - test/unit/message_test.rb
 - test/unit/line_item_test.rb
-- test/data/valid.txt
-- test/data/invalid_missing_footer.txt
-- test/data/invalid_line.txt
-- test/data/invalid_missing_header.txt
+- test/unit/poa_test.rb
+- test/unit/poa_line_item_test.rb
+- test/unit/invoice_line_item_test.rb
+- test/unit/invoice_test.rb
+- test/data
+- test/data/poa
+- test/data/poa/invalid_line.txt
+- test/data/poa/valid.txt
+- test/data/poa/invalid_missing_footer.txt
+- test/data/poa/invalid_missing_header.txt
+- test/data/invoice
+- test/data/invoice/invalid_line.txt
+- test/data/invoice/valid.txt
+- test/data/invoice/invalid_missing_header.txt
+- test/data/invoice/invalid_missing_footer.txt
+- test/data/po
+- test/data/po/invalid_line.txt
+- test/data/po/invalid_missing_footer.txt
+- test/data/po/invalid_missing_header.txt
+- test/data/po/no_delivery_location.txt
+- test/data/po/valid.txt
+- test/data/po/seperate_delivery_location.txt
 - Rakefile
 - README
 - COPYING
@@ -71,5 +94,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 1.2.1
     version: