rvista 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.6.3 (13th November 2009)
+- 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,9 +5,10 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require "rubygems"
 
-PKG_VERSION = "0.6.2"
+PKG_VERSION = "0.6.3"
 PKG_NAME = "rvista"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+RUBY_FORGE_PROJECT = "rbook"
 
 CLEAN.include "**/.*.sw*"
 
@@ -53,6 +54,8 @@ 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.
 END_DESC

data/lib/rvista/po.rb

@@ -6,9 +6,8 @@ module RVista
   class PO
 
     attr_accessor :sender_id, :receiver_id, :internal_control_number, :po_number
-    attr_accessor :po_subset_code, :purpose_code, :purpose_desc, :date
-    attr_accessor :myer_code, :supply_after, :supply_before, :advertised_date
-    attr_accessor :department, :supplier_ref, :buying_location
+    attr_accessor :po_subset_code, :purpose_code, :purpose_desc
+    attr_accessor :myer_code, :department, :supplier_ref, :buying_location
     attr_accessor :buying_location_name, :delivery_location
     attr_accessor :delivery_location_name, :label_code
     attr_accessor :items
@@ -16,6 +15,10 @@ module RVista
     # creates a new RVista::PO object
     def initialize
       @items = []
+      @date = nil
+      @supply_before = nil
+      @supply_after = nil
+      @advertised_date = nil
     end
 
     # reads a vista text file into memory. input should be a string 
@@ -33,6 +36,38 @@ 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
+
+    def advertised_date
+      vista_string_to_date(@advertised_date)
+    end
+
+    def advertised_date=(val)
+      @advertised_date = process_date(val)
+    end
+
     # print a string representation of this order that meets the spec
     def to_s
       # message header
@@ -45,11 +80,11 @@ module RVista
       msg << "#{po_subset_code},"
       msg << "#{purpose_code},"
       msg << "#{purpose_desc},"
-      msg << "#{date},"
+      msg << "#{@date},"
       msg << "#{myer_code},"
-      msg << "#{supply_after},"
-      msg << "#{supply_before},"
-      msg << "#{advertised_date},"
+      msg << "#{@supply_after},"
+      msg << "#{@supply_before},"
+      msg << "#{@advertised_date},"
       msg << "#{department},"
       msg << "#{supplier_ref},"
       msg << "#{buying_location},"
@@ -64,7 +99,6 @@ module RVista
       # message summary
       msg << "S,#{@items.size.to_s},,\n"
 
-
       return msg
     end
 
@@ -110,6 +144,25 @@ 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

data/lib/rvista.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'rubygems'
+require 'chronic'
 
 # faster csv is distributed with ruby 1.9 as "CSV", so we only
 # need to load the gem on ruby < 1.9

data/test/data/po/valid.txt

@@ -1,4 +1,4 @@
-H,1111111,2222222,,0000009525908,,00,,060915,,000000,000000,,,,,,1111111,,
+H,1111111,2222222,,0000009525908,,00,,15-09-06,,000000,000000,,,,,,1111111,,
 D,1,IB,0701180358,DIGGING TO AMERICA,3,0.00,EA,,,43,Y,,
 D,2,IB,071267344X,THE LAST ENEMY,3,0.00,EA,,,43,Y,,
 D,3,IB,1841593001,COLLECTED STORIES: DAHL,2,0.00,EA,,,43,Y,,

data/test/unit/message_test.rb

@@ -79,10 +79,10 @@ class POTest < Test::Unit::TestCase
     assert_equal msg.po_subset_code, nil
     assert_equal msg.purpose_code, "00"
     assert_equal msg.purpose_desc, nil
-    assert_equal msg.date, "060915"
+    assert_equal msg.date, Chronic.parse("2006-09-15")
     assert_equal msg.myer_code, nil
-    assert_equal msg.supply_after, "000000"
-    assert_equal msg.supply_before, "000000"
+    assert_equal msg.supply_after, nil
+    assert_equal msg.supply_before, nil
     assert_equal msg.advertised_date, nil
     assert_equal msg.department, nil
     assert_equal msg.supplier_ref, nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvista
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - James Healy
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 +10:00
+date: 2009-11-13 00:00:00 +11:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: "  rvista is a small library for reading Vista HDS order files.\n"
 email: jimmy@deefa.com
 executables: []
@@ -28,32 +37,32 @@ files:
 - lib/rvista.rb
 - lib/rvista/errors.rb
 - lib/rvista/invoice.rb
-- lib/rvista/invoice_line_item.rb
+- lib/rvista/poa_line_item.rb
 - lib/rvista/po.rb
-- lib/rvista/po_line_item.rb
+- lib/rvista/invoice_line_item.rb
 - lib/rvista/poa.rb
-- lib/rvista/poa_line_item.rb
-- test/data/invoice/invalid_line.txt
-- test/data/invoice/invalid_missing_footer.txt
-- test/data/invoice/invalid_missing_header.txt
-- test/data/invoice/valid.txt
-- 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/seperate_delivery_location.txt
-- test/data/po/valid.txt
-- test/data/po/quotes.txt
+- lib/rvista/po_line_item.rb
 - test/data/poa/invalid_line.txt
-- test/data/poa/invalid_missing_footer.txt
-- test/data/poa/invalid_missing_header.txt
 - test/data/poa/valid.txt
-- test/unit/invoice_line_item_test.rb
-- test/unit/invoice_test.rb
-- test/unit/line_item_test.rb
-- test/unit/message_test.rb
+- test/data/poa/invalid_missing_header.txt
+- test/data/poa/invalid_missing_footer.txt
+- test/data/po/no_delivery_location.txt
+- test/data/po/quotes.txt
+- test/data/po/invalid_line.txt
+- test/data/po/valid.txt
+- test/data/po/seperate_delivery_location.txt
+- test/data/po/invalid_missing_header.txt
+- test/data/po/invalid_missing_footer.txt
+- 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/unit/poa_line_item_test.rb
 - test/unit/poa_test.rb
+- test/unit/message_test.rb
+- test/unit/line_item_test.rb
+- test/unit/invoice_line_item_test.rb
+- test/unit/invoice_test.rb
 - Rakefile
 - README
 - COPYING
@@ -86,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.4
+rubyforge_project: rbook
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A small library for reading Vista HDS ecommerce files