rvista 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,7 +1,13 @@
-v0.6.3 (13th November 2009)
+v0.6.4 (18th November 2009)
+- RVista::POA, RVista::Invoice
 - Use correct vista date format (dd-mm-yy)
 - return dates as ruby date objects
 
+v0.6.3 (13th November 2009)
+- RVista::PO
+  - Use correct vista date format (dd-mm-yy)
+  - return dates as ruby date objects
+
 v0.6.2 (19th August 2009)
 - don't barf on input files with quotes in them
 

data/Rakefile

@@ -5,10 +5,9 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require "rubygems"
 
-PKG_VERSION = "0.6.3"
+PKG_VERSION = "0.6.4"
 PKG_NAME = "rvista"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-RUBY_FORGE_PROJECT = "rbook"
 
 CLEAN.include "**/.*.sw*"
 
@@ -54,7 +53,6 @@ spec = Gem::Specification.new do |spec|
                        '--main'  << 'README' << '-q'
   spec.author = "James Healy"
   spec.email = "jimmy@deefa.com"
-  spec.rubyforge_project = RUBY_FORGE_PROJECT
   spec.add_dependency('chronic')
   spec.description = <<END_DESC
   rvista is a small library for reading Vista HDS order files.

data/lib/rvista/invoice.rb

@@ -3,16 +3,17 @@
 module RVista
 
   # Represents a single Vista Invoice
-  class Invoice
+  class Invoice < Message
 
     attr_accessor :sender_id, :receiver_id, :doc_type, :description
-    attr_accessor :doc_number, :doc_date, :delivery_location, :currency
+    attr_accessor :doc_number, :delivery_location, :currency
     attr_accessor :items
     attr_accessor :total_value, :total_qty, :total_gst
 
     # creates a new RVista::Invoice object
     def initialize
       @items = []
+      @doc_date = nil
     end
 
     # reads a vista invoice file into memory. input should be a string
@@ -30,6 +31,14 @@ module RVista
       return self.build_message(data)
     end
 
+    def doc_date
+      vista_string_to_date(@doc_date)
+    end
+
+    def doc_date=(val)
+      @doc_date = process_date(val)
+    end
+
     # print a string representation of this order that meets the spec
     def to_s
       # message header
@@ -40,7 +49,7 @@ module RVista
       msg << "#{doc_type.to_s[0,4]},"
       msg << "#{description.to_s[0,30]},"
       msg << "#{doc_number.to_s[0,8]},"
-      msg << "#{doc_date.to_s[0,8]},"
+      msg << "#{@doc_date},"
       msg << "#{delivery_location.to_s[0,10]},"
       msg << "#{currency.to_s[0,4]}\n"
 

data/lib/rvista/message.rb

@@ -0,0 +1,31 @@
+# coding: utf-8
+
+module RVista
+
+  # Parent class of all 3 vista HDS message types
+  class Message #nodoc
+
+    private
+
+    # convert a vista date format
+    def vista_string_to_date(str)
+      if str.nil? || str.to_s[0,2] == "00" || str.to_s.size != 8
+        nil
+      else
+        year  = "20#{str[6,2]}"
+        month = str[3,2]
+        day   = str[0,2]
+        Chronic.parse("#{year}-#{month}-#{day}")
+      end
+    end
+
+    def process_date(value)
+      if value.respond_to?(:strftime)
+        value.strftime("%d-%m-%y")
+      else
+        value
+      end
+    end
+  end
+
+end

data/lib/rvista/po.rb

@@ -3,7 +3,7 @@
 module RVista
 
   # Represents a single Vista message (purchase order).
-  class PO
+  class PO < Message
 
     attr_accessor :sender_id, :receiver_id, :internal_control_number, :po_number
     attr_accessor :po_subset_code, :purpose_code, :purpose_desc
@@ -144,32 +144,5 @@ module RVista
       # return the results
       return msg
     end
-
-    def vista_string_to_date(str)
-      if str.nil? || str.to_s[0,2] == "00" || str.to_s.size != 8
-        nil
-      else
-        year  = "20#{str[6,2]}"
-        month = str[3,2]
-        day   = str[0,2]
-        Chronic.parse("#{year}-#{month}-#{day}")
-      end
-    end
-
-    def process_date(value)
-      if value.respond_to?(:strftime)
-        value.strftime("%d-%m-%y")
-      else
-        value
-      end
-    end
-  end
-
-  class Message < PO
-
-    def initialize
-      $stderr.puts "WARNING: RVista::Message is a deprecated class. Please use RVista::PO instead."
-      super
-    end
   end
 end

data/lib/rvista/poa.rb

@@ -3,16 +3,18 @@
 module RVista
 
   # Represents a single Vista Purchase Order Ack (POA).
-  class POA
+  class POA < Message
 
-    attr_accessor :sender_id, :receiver_id, :po_number, :date
-    attr_accessor :supply_after, :supply_before, :delivery_location
-    attr_accessor :delivery_location_name
+    attr_accessor :sender_id, :receiver_id, :po_number
+    attr_accessor :delivery_location, :delivery_location_name
     attr_accessor :items
 
     # creates a new RVista::POA object
     def initialize
       @items = []
+      @date = nil
+      @supply_before = nil
+      @supply_after = nil
     end
 
     # reads a vista poa file into memory. input should be a string 
@@ -30,6 +32,30 @@ module RVista
       return self.build_message(data)
     end
 
+    def date
+      vista_string_to_date(@date)
+    end
+
+    def date=(val)
+      @date = process_date(val)
+    end
+
+    def supply_after
+      vista_string_to_date(@supply_after)
+    end
+
+    def supply_after=(val)
+      @supply_after = process_date(val)
+    end
+
+    def supply_before
+      vista_string_to_date(@supply_before)
+    end
+
+    def supply_before=(val)
+      @supply_before = process_date(val)
+    end
+
     # print a string representation of this order that meets the spec
     def to_s
       # message header
@@ -42,10 +68,10 @@ module RVista
       msg << ","
       msg << ","
       msg << "#{po_number},"
-      msg << "#{date},"
+      msg << "#{@date},"
       msg << ","
-      msg << "#{supply_after},"
-      msg << "#{supply_before},"
+      msg << "#{@supply_after},"
+      msg << "#{@supply_before},"
       msg << "SP,"
       msg << "#{delivery_location},"
       msg << "#{delivery_location_name}\n"

data/lib/rvista.rb

@@ -22,6 +22,7 @@ end
 
 
 require File.dirname(__FILE__) + '/rvista/errors'
+require File.dirname(__FILE__) + '/rvista/message'
 require File.dirname(__FILE__) + '/rvista/invoice'
 require File.dirname(__FILE__) + '/rvista/invoice_line_item'
 require File.dirname(__FILE__) + '/rvista/po'

data/test/data/invoice/valid.txt

@@ -1,4 +1,4 @@
-H,1111111,2222222,IN,Invoice,5678,071011,1111111,
+H,1111111,2222222,IN,Invoice,5678,11-10-07,1111111,
 D,1,1234,EN,9781857230765,Eye of the World,2,EA,500,4000,450,Y,1000,600,1000,100,F
 D,2,1234,EN,9780744590104,Eye of the Wolf,3,EA,500,4000,450,Y,1500,900,1000,100,F
 S,2,2200,5,200

data/test/data/poa/valid.txt

@@ -1,4 +1,4 @@
-H,1111111,2222222,,,,,1234,060915,,071010,071030,SP,1111111,Some Store
+H,1111111,2222222,,,,,1234,15-09-06,,10-10-07,30-10-07,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,6

data/test/unit/invoice_test.rb

@@ -69,7 +69,7 @@ class InvoiceTest < Test::Unit::TestCase
     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.doc_date, Chronic.parse("2007-10-11")
     assert_equal msg.delivery_location, "1111111"
     assert_equal msg.currency, nil
   end

data/test/unit/poa_test.rb

@@ -66,9 +66,9 @@ class POATest < Test::Unit::TestCase
     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.date, Chronic.parse("2006-09-15")
+    assert_equal msg.supply_after, Chronic.parse("2007-10-10")
+    assert_equal msg.supply_before, Chronic.parse("2007-10-30")
     assert_equal msg.delivery_location, "1111111"
     assert_equal msg.delivery_location_name, "Some Store"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvista
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +11:00
+date: 2009-11-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - lib/rvista/poa_line_item.rb
 - lib/rvista/po.rb
 - lib/rvista/invoice_line_item.rb
+- lib/rvista/message.rb
 - lib/rvista/poa.rb
 - lib/rvista/po_line_item.rb
 - test/data/poa/invalid_line.txt
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rbook
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3