rvista 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,7 +1,10 @@
+v0.6.5 (16th January 2010)
+- RVista::POA: handle invalid looking numbers sanely
+
 v0.6.4 (18th November 2009)
 - RVista::POA, RVista::Invoice
-- Use correct vista date format (dd-mm-yy)
-- return dates as ruby date objects
+  - Use correct vista date format (dd-mm-yy)
+  - return dates as ruby date objects
 
 v0.6.3 (13th November 2009)
 - RVista::PO

data/Rakefile

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

data/lib/rvista/poa_line_item.rb

@@ -34,7 +34,7 @@ module RVista
       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.availability_date = data[18] # TODO: convert this to a Date?
       item.text = data[19]
 
       return item
@@ -75,21 +75,22 @@ module RVista
         "UNKNOWN"
       end
     end
-    
+
     # output a string that represents this line item that meets the vista spec
     def to_s
+      nil_numeric_values
+      normalise_numeric_values
+
       msg = ""
-      msg << "D," 
+      msg << "D,"
       msg << "#{line_num},"
       msg << "#{ean},"
       msg << ","
       msg << "#{description},"
-      msg << sprintf("%.2f", nett_unit_price) unless nett_unit_price.nil?
-      msg << ","
+      msg << "#{formatted_nett_unit_price},"
       msg << "1,"
       msg << "#{qty_inners},"
-      msg << sprintf("%.2f", tax_rate) unless tax_rate.nil?
-      msg << ","
+      msg << "#{formatted_tax_rate},"
       msg << ","
       msg << "#{buying_location},"
       msg << "#{buying_location_name},"
@@ -97,13 +98,47 @@ module RVista
       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 << "#{formatted_rrp},"
+      msg << "#{formatted_discount_percent},"
       msg << "#{availability_date},"
       msg << "#{text}"
       return msg
     end
+
+    private
+
+    # ensure all decimal attributes are BigDecimals
+    #
+    def nil_numeric_values
+      self.nett_unit_price = nil  if self.nett_unit_price.to_s.size == 0
+      self.tax_rate = nil         if self.tax_rate.to_s.size == 0
+      self.rrp = nil              if self.rrp.to_s.size == 0
+      self.discount_percent = nil if self.discount_percent.to_s.size == 0
+    end
+
+    # set empty numerics to nil
+    #
+    def normalise_numeric_values
+      self.nett_unit_price = BigDecimal.new(self.nett_unit_price.to_s) unless self.nett_unit_price.nil?
+      self.tax_rate = BigDecimal.new(self.tax_rate.to_s) unless self.tax_rate.nil?
+      self.rrp = BigDecimal.new(self.rrp.to_s) unless self.rrp.nil?
+      self.discount_percent = BigDecimal.new(self.discount_percent.to_s) unless self.discount_percent.nil?
+    end
+
+    def formatted_nett_unit_price
+      self.nett_unit_price.nil? ? "" : "%.2f" % self.nett_unit_price
+    end
+
+    def formatted_tax_rate
+      self.tax_rate.nil? ? "" : "%.2f" % self.tax_rate
+    end
+
+    def formatted_rrp
+      self.rrp.nil? ? "" : "%.2f" % self.rrp
+    end
+
+    def formatted_discount_percent
+      self.discount_percent.nil? ? "" : "%.2f" % self.discount_percent
+    end
   end
 end

data/lib/rvista.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'andand'
 require 'chronic'
 
 # faster csv is distributed with ruby 1.9 as "CSV", so we only

data/test/unit/poa_line_item_test.rb

@@ -74,6 +74,18 @@ class POALineItemTest < Test::Unit::TestCase
     assert_equal 20, arr.size
   end
 
+  def test_to_s_with_invalid_decimals
+    item = RVista::POALineItem.load_from_array(@row)
+    item.nett_unit_price = ""
+    item.rrp = ""
+    item.tax_rate = ""
+    item.discount_percent = ""
+
+    str = item.to_s
+    arr = FasterCSV.parse(str).first
+    assert_equal 20, arr.size
+  end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvista
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - James Healy
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +11:00
+date: 2010-01-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: andand
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: chronic
   type: :runtime