bill_hicks 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3acd6561e4f26a01ea35cb6589802e8fd7518797
-  data.tar.gz: 917c159dfebdad61b16bccf89ae2182f3cbfb56c
+  metadata.gz: 9f742da9e6373d6d8f67e7829b84bf8e4f7976cc
+  data.tar.gz: f1b1cc495b03b9376531024e27a701b99eef4cce
 SHA512:
-  metadata.gz: 2a7ef2a5f7adf6af9e6d050f62baceb4e39aaacb79539f9083480dd567bdb2c770ceaf0eecca3141a41abaa05293324e06851819296fc80db0d02f5fa0b55aee
-  data.tar.gz: 3a894f4dae4d6d6072942c5bf1758a9894ad5b53b5becab34181be6e5f77f827bd4328a8c9910480a1d02943b1a53e8e6d3b4886f6277af6b25b83a1a3d80efd
+  metadata.gz: ccc7e150e7818cc090abd33fb85296a35f5ccbbfdc3f09b8c2aa301af07990e387678713157a4f0a8a01d32e943e5632455a06612e7be0572cc0583da3e396e6
+  data.tar.gz: 72498c5001ad3422915e36edee6d64efc83cfb0699a9334e8aa863bc756c8e9c37f1d42dc5c3c62872eccdbee0b761e5f89d484003aed4952931a3c0e7b6b6ce

data/lib/bill_hicks/response_file.rb

@@ -1,15 +1,9 @@
 module BillHicks
   class ResponseFile < Base
 
-    attr_reader :content
     attr_reader :credentials
     attr_reader :filename
 
-    FILE_TYPES = {
-      "ACK" => "Purchase Order Acknowledgement",
-      "ASN" => "Advance Shipping Notice"
-    }
-
     # @option options [String] :username *required*
     # @option options [String] :password *required*
     # @option options [String] :filename *required*
@@ -32,6 +26,17 @@ module BillHicks
       end
     end
 
+    # Is the file a '855 Purchase Order Acknowledgement'?
+    def ack?
+      content.start_with?("ACK")
+    end
+
+    # Is the file a '856 Advance Shipping Notice'?
+    def asn?
+      content.start_with?("ASN")
+    end
+
+    # Use '#gettextfile' to read file contents as a string
     def content
       return @content if @content
       connect(@credentials) do |ftp|
@@ -40,10 +45,30 @@ module BillHicks
       end
     end
 
+    # Convert to easily readable key-value pairs
     def to_json
-      CSV.parse(content, headers: true, col_sep: "|").
-        map { |x| x.to_h }.
-        group_by { |x| x["PO Number"] }
+      if corrupt_asn?
+        CSV.parse(content.gsub("Price|", ""), headers: true, col_sep: "|").
+          map { |x| x.to_h }.
+          group_by { |x| x["PO Number"] }
+      else
+        CSV.parse(content, headers: true, col_sep: "|").
+          map { |x| x.to_h }.
+          group_by { |x| x["PO Number"] }
+      end
+    end
+
+    private
+
+    def corrupt_asn?
+      return false if ack?
+      lines = content.lines.map(&:chomp)
+      if lines[0].split("|").length != lines[1].split("|").length
+        puts "Notice: ASN file is malformed! (#{filename})"
+        true
+      else
+        false
+      end
     end
 
   end

data/lib/bill_hicks/version.rb

@@ -1,3 +1,3 @@
 module BillHicks
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bill_hicks
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Dale Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler