Fix warning and spec failure related to company_descriptive_date

Author: jm81

lib/ach/ach_file.rb

@@ -166,7 +166,7 @@ def parse_descriptive_date(date_string)
         Date.today.to_datetime + (same_day_hour + same_day_minute/60) / 24
       end
 
-      date_time || Data.parse(date_string)
+      date_time || ACH::Data.parse(date_string)
     rescue
       date_string
     end

lib/ach/string_formatting_helper.rb

@@ -1,12 +1,15 @@
 module ACH
   module StringFormattingHelper
-    # Passing in SD to the date signifies same-day to banks. This is used for the company_descriptive_date
+    # Passing in SD to the date signifies same-day to banks. This is used for
+    # the company_descriptive_date
     def self.stringify_with_same_day(f)
       return f.upcase if f.to_s.upcase.match(/^SD\d+$/)
 
-      f.strftime('%y%m%d')
-    rescue
-      f
+      if f.respond_to?(:strftime)
+        f = f.strftime('%y%m%d')
+      end
+
+      f[0..5].rjust(6)
     end
   end
 end

spec/ach/parse_spec.rb

@@ -21,7 +21,6 @@
 
     it "should parse return/notification of change file" do
       fake_current_datetime = Date.new(2012, 10, 15)
-      expected_datetime = DateTime.new(2012, 10, 15, 19, 32)
       allow(Date).to receive(:today).and_return(fake_current_datetime)
 
       ach = ACH::ACHFile.new(@data)
@@ -42,7 +41,7 @@
       expect(bh.full_company_identification).to eq("1412345678")
       expect(bh.standard_entry_class_code).to eq('COR')
       expect(bh.company_entry_description).to eq("DESCRIPT")
-      expect(bh.company_descriptive_date).to eq(expected_datetime)
+      expect(bh.company_descriptive_date).to eq('SD1932')
       expect(bh.effective_entry_date).to eq(Date.parse('121015'))
       expect(bh.originating_dfi_identification).to eq("99222222")