newgistics 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ab73882de4020ebd57fbc2250e106fa2d1bd6b
-  data.tar.gz: 126362028aa37f405cfb09fb20b2db3726e68f24
+  metadata.gz: 64dcab77c965fb14c316ac1c00dc5ac9fac14824
+  data.tar.gz: 6dc6b36a937c9cb77c8cb62b564d5600ae3f6e28
 SHA512:
-  metadata.gz: 7f76f6c594c07fed343a5f3f55a5b9494cce548bfa75149509d61a494bb2b21014bdbbbd3d92e4af4eda07189a28155f5e452bf5d33439f5cdd389d66c1bee81
-  data.tar.gz: 43fcb4670ba29a96569bd475c78c1b59bd8c518c871aca04ab0722ea53e366bae0267104ec2761e59567cff0fb01cfa0a25d678a4bad73dbc58aabaf2b79790f
+  metadata.gz: 4aed4d616111d0261f497d74f0f9d1edc3f333069670b896c60ff1afaf0d4b9a74172fedb335af6676fd8617529c7c087fa6d9abb39f32dde00ba2a8004b946c
+  data.tar.gz: a4480045ea1b18c1915e929996e39df8c3b485d85ef376f8bb53db0c4e49d682590e82a073186e0f9f2e6f7c5d1ea16dd59c1c8faa0f9293f2c54821f5c781fa

data/lib/newgistics.rb

@@ -3,6 +3,9 @@ require "nokogiri"
 require "faraday"
 require "tzinfo"
 
+require "newgistics/time_parsers"
+require "newgistics/time_parsers/iso8601"
+require "newgistics/time_parsers/american_datetime"
 require "newgistics/api"
 require "newgistics/default_logger"
 require "newgistics/configuration"

data/lib/newgistics/manifest_slip.rb

@@ -2,10 +2,10 @@ module Newgistics
   class ManifestSlip
     include Newgistics::Model
 
-    attribute :actual_arrival_date, Timestamp
-    attribute :actual_received_date, Timestamp
+    attribute :actual_arrival_date, Timestamp, parser: TimeParsers.american_datetime
+    attribute :actual_received_date, Timestamp, parser: TimeParsers.american_datetime
     attribute :carton_count, Integer
-    attribute :created_date, Timestamp
+    attribute :created_date, Timestamp, parser: TimeParsers.american_datetime
     attribute :estimated_arrival_date, Date
     attribute :manifest_id, String
     attribute :manifest_name, String

data/lib/newgistics/time_parsers.rb

@@ -0,0 +1,11 @@
+module Newgistics
+  module TimeParsers
+    def self.iso8601
+      @iso8601 ||= ISO8601.new
+    end
+
+    def self.american_datetime
+      @american_datetime ||= AmericanDatetime.new
+    end
+  end
+end

data/lib/newgistics/time_parsers/american_datetime.rb

@@ -0,0 +1,30 @@
+module Newgistics
+  module TimeParsers
+    class AmericanDatetime
+      DATE_FORMAT = "%m/%d/%Y %I:%M %p %z".freeze
+
+      def parse(string)
+        date = date_with_timezone(string)
+        parse_date(date, string)
+      end
+
+      private
+
+      def date_with_timezone(string)
+        return string if includes_timezone?(string)
+        "#{string} #{Newgistics.time_zone.utc_offset}"
+      end
+
+      def includes_timezone?(string)
+        string =~ /[+-]\d{2}:\d{2}\z/
+      end
+
+      def parse_date(date, fallback)
+        Time.strptime(date, DATE_FORMAT).
+          getlocal(Newgistics.local_time_zone.utc_offset)
+      rescue ArgumentError
+        fallback
+      end
+    end
+  end
+end

data/lib/newgistics/time_parsers/iso8601.rb

@@ -0,0 +1,25 @@
+module Newgistics
+  module TimeParsers
+    class ISO8601
+      def parse(string)
+        date = string.dup
+        unless includes_timezone?(string)
+          date << Newgistics.time_zone.utc_offset
+        end
+        parse_date(date, string)
+      end
+
+      private
+
+      def parse_date(date, fallback)
+        Time.iso8601(date).getlocal(Newgistics.local_time_zone.utc_offset)
+      rescue ArgumentError
+        fallback
+      end
+
+      def includes_timezone?(value)
+        value =~ /Z|[+-]\d{2}:\d{2}\z/
+      end
+    end
+  end
+end

data/lib/newgistics/timestamp.rb

@@ -1,31 +1,15 @@
 module Newgistics
   class Timestamp < Virtus::Attribute
+    accept_options :parser
+
+    parser TimeParsers.iso8601
+
     def coerce(value)
       if value.is_a? String
-        coerce_string(value)
+        options[:parser].parse(value)
       else
         value
       end
     end
-
-    private
-
-    def coerce_string(value)
-      date = value.dup
-      unless includes_timezone?(value)
-        date << Newgistics.time_zone.utc_offset
-      end
-      parse_date(date, value)
-    end
-
-    def parse_date(date, fallback)
-      Time.iso8601(date).getlocal(Newgistics.local_time_zone.utc_offset)
-    rescue ArgumentError
-      fallback
-    end
-
-    def includes_timezone?(value)
-      value =~ /Z|[+-]\d{2}:\d{2}\z/
-    end
   end
 end

data/lib/newgistics/version.rb

@@ -1,3 +1,3 @@
 module Newgistics
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newgistics
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Manuel Martinez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -236,6 +236,9 @@ files:
 - lib/newgistics/shipment_cancellation.rb
 - lib/newgistics/shipment_update.rb
 - lib/newgistics/string_helper.rb
+- lib/newgistics/time_parsers.rb
+- lib/newgistics/time_parsers/american_datetime.rb
+- lib/newgistics/time_parsers/iso8601.rb
 - lib/newgistics/time_zone.rb
 - lib/newgistics/timestamp.rb
 - lib/newgistics/version.rb