lib/gs1/validations/date_validation.rb in gs1-0.1.5 vs lib/gs1/validations/date_validation.rb in gs1-0.1.6

@@ -7,13 +7,42 @@
     module DateValidation
       def validate_date(_options = {})
         errors << 'Invalid date' unless valid_date?
       end
 
+      def validate_date_month_based(_options = {})
+        errors << 'Invalid date' unless valid_month_based_date?
+      end
+
       def valid_date?
         return true if data.is_a?(::Date)
 
         ::Date.parse(data)
+
+        true
+      rescue TypeError, ArgumentError
+        false
+      end
+
+      def valid_month_based_date?
+        return true if data.is_a?(::Date)
+
+        valid_format_a?(data) || valid_format_b?(data)
+      end
+
+      def valid_format_a?(data)
+        valid_date_format?(data, '%y%m%d')
+      end
+
+      # Read more about this date format in the GS1::Extensions::MonthBasedDate class.
+      def valid_format_b?(data)
+        valid_date_format?(data, '%y%m00')
+      end
+
+      private
+
+      def valid_date_format?(data, pattern)
+        ::Date.strptime(data, pattern)
 
         true
       rescue TypeError, ArgumentError
         false
       end