date_parser 0.1.41 → 0.1.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592cec3a9d927234909d05075ffc420aad8215e9
-  data.tar.gz: ca673826410f557feedea6ac8d44ed5518cf76c0
+  metadata.gz: c0959b29b43db4cbc85e1caf41bbc772a982dcd3
+  data.tar.gz: c21a12f1c9db39be7ddbbb0ed04ad2e579dd4990
 SHA512:
-  metadata.gz: 01f07e1867c72a4c81afa994f4c43391182410b4a61c24f4d2c1a4884d18764d10495d1dccd48af3abd84092ca779cbe355d4abe70d48c14023c0fc011dad048
-  data.tar.gz: 1174abd562af7bc04eb9f1b4041fa9b1096841ff07cf7b0de63a65943c59cde210f8bb18b4236c42b3137627137fba6a45da9757f1d420d0cc879125d0853bb3
+  metadata.gz: 3c64ede34f21aa666a6c84af33518649aebcfd89b10810cefa43092a36a3e6bbdcf11feee065485f512a3f811fcb1f147ae61022b74fee26bde6410b607c08f7
+  data.tar.gz: 70792a4a296919f6b3290e04244cc5791db7c75d33b3f9949781233734b7c45dd052cf3c69780286b37cf461c0c0fa5f652125480a27b73d13ac57b72a51a826

data/NEWS.md

@@ -1,3 +1,7 @@
+# DateParser 0.1.51
+* Missed a common case: XX/XX/XXXX and variations. Now resolved.
+* Strengthened check for dates that could be of the form XX/XX
+
 # DateParser 0.1.4
 * Improved namespacing.
     + NaturalDateParsing and Utils now part of the DateParser namespace.

data/README.md

@@ -40,6 +40,10 @@ DateParser::parse(text, creation_date).to_s
 text = "7-24-2015"
 DateParser::parse(text).to_s
     #=> [#<Date: 2015-07-24 ((2457228j,0s,0n),+0s,2299161j)>]
+    
+text = "7/24/2015"
+DateParser::parse(text).to_s
+    #=> [#<Date: 2015-07-24 ((2457228j,0s,0n),+0s,2299161j)>]
 
 
 text = "2012-02-12"

data/lib/date_parser/natural_date_parsing.rb

@@ -263,11 +263,6 @@ module DateParser
         end
       end
       
-      # Parsing strings of the form XX/XX
-      if word.include? '/'
-        return slash_date(word, creation_date)
-      end
-      
       # Parsing strings like "23rd"
       if (SUFFIXED_NUMERIC_DAY.include? word) && parse_ambiguous_dates
         return numeric_single_day(word, creation_date)
@@ -283,11 +278,15 @@ module DateParser
         return default_year(word)
       end
       
-      # Parsing XX-XX-XXXX or XXXX-XX-XX
+      # Parsing XX-XX-XXXX, XXXX-XX-XX, XX/XX/XXXX, or XXXX/XX/XX
       if full_numeric_date?(word)
         return full_numeric_date(word)
       end
       
+      # Parsing strings of the form XX/XX
+      if slash_date?(word)
+        return slash_date(word, creation_date)
+      end
     end
     
     
@@ -389,8 +388,11 @@ module DateParser
     end
     
     # Parses a single word of the form XXXX-XX-XX, DD-MM-YYYY or MM-DD-YYYY
+    # Also accepts words of the form XXXX/XX/XX
     def NaturalDateParsing.full_numeric_date(word)
-      subparts = word.split("-")
+      demarcating_token = get_demarcating_token(word)
+      
+      subparts = word.split(demarcating_token)
       
       # This is a weak check to see where the year is
       year_index = (subparts[0].to_i).abs > 31 ? 0 : 2
@@ -456,22 +458,43 @@ module DateParser
       return ((date1 - date2) / 7).to_i
     end
     
-    # Is it of the form XXXX-XX-XX?
+    # Determines if a given date could be a slash date.
+    # I.e., of the form XX/XX
+    def NaturalDateParsing.slash_date?(word)
+      substrings = word.split("/")
+      
+      if substrings.size != 2
+        return false
+      end
+      
+      for substring in substrings do
+        if !Utils.is_int?(substring)
+          return false
+        end
+      end
+      
+      return true
+    end
+    
+    # Is it generally of the form XXXX-XX-XX or XXXX/XX/XX?
     def NaturalDateParsing.full_numeric_date?(word)
-      output = true
+      demarcating_token = get_demarcating_token(word)
+      substrings = word.split(demarcating_token)
       
-      if word.include? "-"
-        substrings = word.split("-")
-        for substring in substrings do
-          output = output && Utils.is_int?(substring)
+      if substrings.length != 3
+        return false
+      end
+      
+      for substring in substrings do
+        if !Utils.is_int?(substring)
+          return false
         end
-      else
-        output = false
       end
       
-      return output
+      return true
     end
     
+    # Converts a numeric month to a string.
     def NaturalDateParsing.numeric_month_to_string(numeric)
       months = ["january", "february", "march", "april", "may", "june",
                 "july", "august", "september", "october", "november",
@@ -480,5 +503,23 @@ module DateParser
       return months[numeric - 1]
     end
     
+    # Given a string, tries to determine if the word
+    # contains a demarcating token such as '-' or '/'
+    # If so, returns that demarcating token. Assumes that
+    # only one such token is present.
+    #
+    # If no such token is found, returns an empty string.
+    def NaturalDateParsing.get_demarcating_token(word)
+      demarcating_token = ""
+      
+      if word.include? "-"
+        demarcating_token = "-"
+      elsif word.include? "/"
+        demarcating_token = "/"
+      end
+      
+      return demarcating_token
+    end
+    
   end
 end

data/lib/spec/date_parser_spec.rb

@@ -114,6 +114,33 @@ describe DateParser do
         expect(DateParser::parse(text)).to eql(answer)
       end
     end
+    
+    context "Parse date separated by /" do
+      text = "2012/02/12"
+      answer = [Date.parse("2012-02-12")]
+      
+      it "correctly grabs the date" do
+        expect(DateParser::parse(text)).to eql(answer)
+      end
+    end
+    
+    context "Parse American date separated by /" do
+      text = "7/24/2015"
+      answer = [Date.parse("July 24, 2015")]
+      
+      it "correctly grabs the date" do
+        expect(DateParser::parse(text)).to eql(answer)
+      end
+    end
+    
+    context "Parse International Standard fully numeric date separated by /" do
+      text = "24/07/2015"
+      answer = [Date.parse("24-07-2015")]
+      
+      it "correctly grabs the date" do
+        expect(DateParser::parse(text)).to eql(answer)
+      end
+    end
   end
   
   #########################################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.51
 platform: ruby
 authors:
 - Ryan Kwon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies: []
 description: DateParser is a simple, fast, and effective way to parse dates from natural
   language text.