fuzzy-date 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be67faf3dd4b030851460dba616f21e3cf0ba8da
-  data.tar.gz: c865e0ef0a86ea0feef6c54138f487974e56056d
+  metadata.gz: f1c5f39aa71ab7653b430720262d166b8d42d425
+  data.tar.gz: 5849baad29c3d97756ea288a582e156391a3e646
 SHA512:
-  metadata.gz: 1e7f5a0a1998319549eedcadd8c4fb22b394b08121d0fe7d3eb877517d7aa41cdf51acbfb2a30b92198d9bdd4f40118c9d4a2322978afd58355a53724cf44137
-  data.tar.gz: 1f36b09a16547b6c13cf44b3da1a3b570739f3b58644b5b5f5d58af7acc13e643952280a3d37569ee3f3fafba963a13dac3eb892f3ffd64d8284ae06aefd869c
+  metadata.gz: cc59344c1eff14a1a46e10005a224e46bce57074baab089331b9af953cfcfa34e4cdad4f1ee34e60347dc67c4e99d87775a92f864080754076d9bff8e6349f42
+  data.tar.gz: d265085b4dd22b916ab4d954afd9dd93a59f5ab0bb7f52a3c25a25cd5fb7afd854ef089f26cbb6f935c6854a4f36a5025d766c973f23372211ff4a908ec45a8b

data/lib/fuzzy-date.rb

@@ -3,7 +3,7 @@ require 'fuzzy-date/variables'
 require 'fuzzy-date/fuzzy-date'
 
 class FuzzyDate
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 
   def self.parse( date, euro = false )
     fuzzy_date = FuzzyDate.new date, euro

data/lib/fuzzy-date/analyze.rb

@@ -6,15 +6,15 @@ class FuzzyDate
   #
   # Possible incoming date formats:
   # * YYYY-MM-DD  -  starts with 3 or 4 digit year, and month and day may be 1 or 2 digits
-  # * YYYY-MM  -  3 or 4 digit year, then 1 or 2 digit month
-  # * YYYY  -  3 or 4 digit year
+  # * YYYY-MM     -  3 or 4 digit year, then 1 or 2 digit month
+  # * YYYY        -  3 or 4 digit year
   # * MM-DD-YYYY  -  1 or 2 digit month, then 1 or 2 digit day, then 1 to 4 digit year
   # * DD-MM-YYYY  -  1 or 2 digit day, then 1 or 2 digit month, then 1 to 4 digit year if euro is true
-  # * MM-YYYY  -  1 or 2 digit month, then 1 to 4 digit year
-  # * DD-MMM  -  1 or 2 digit day, then month name or abbreviation
-  # * DD-MMM-YYYY  -  1 or 2 digit day, then month name or abbreviation, then 1 to 4 digit year
-  # * MMM-YYYY   -  month name or abbreviation, then 1 to 4 digit year
-  # * MMM-DD-YYYY  -  month name or abbreviation, then 1 or 2 digit day, then 1 to 4 digit year
+  # * MM-YYYY     -  1 or 2 digit month, then 1 to 4 digit year
+  # * DD-MMM      -  1 or 2 digit day, then month name or abbreviation
+  # * DD-MMM-YYYY -  1 or 2 digit day, then month name or abbreviation, then 1 to 4 digit year
+  # * MMM-YYYY    -  month name or abbreviation, then 1 to 4 digit year
+  # * MMM-DD-YYYY -  month name or abbreviation, then 1 or 2 digit day, then 1 to 4 digit year
   #
   # Notes:
   # - Commas are optional.
@@ -33,56 +33,46 @@ class FuzzyDate
     date = massage date
     @date_parts[ :fixed ] = date
 
-    #- Takes care of YYYY
-    if date =~ /^(\d{1,4})$/
-      year = $1.to_i.to_s
-      month = nil
-      day = nil
-
-    #- Takes care of YYYY-MM-DD and YYYY-MM
-    elsif date =~ /^(\d{3,4})(?:-(\d{1,2})(?:-(\d{1,2}))?)?$/
-      year = $1.to_i.to_s
-      month = $2 ? $2.to_i.to_s : nil
-      day = $3 ? $3.to_i.to_s : nil
-
-    #- Takes care of DD-MM-YYYY
-    elsif date =~ /^(\d{1,2})-(\d{1,2})-(\d{1,4})$/ and euro
-      day = $1.to_i.to_s
-      month = $2.to_i.to_s
-      year = $3.to_i.to_s
-
-    #- Takes care of MM-DD-YYYY
-    elsif date =~ /^(\d{1,2})-(\d{1,2})-(\d{1,4})$/
-      month = $1.to_i.to_s
-      day = $2.to_i.to_s
-      year = $3.to_i.to_s
-
-    #- Takes care of MM-YYYY
-    elsif date =~ /^(\d{1,2})-(\d{1,4})?$/
-      month = $1.to_i.to_s
-      day = nil
-      year = $2.to_i.to_s
-
-    #- Takes care of DD-MMM-YYYY and DD-MMM
-    elsif date =~ /^(\d{1,2})(?:-(#{ @month_abbreviations.keys.join( '|' ) }).*?(?:-(\d{1,4}))?)?$/i
-      month_text = $2.to_s.capitalize
-      month = @month_names.key( @month_abbreviations[ month_text ] ).to_i.to_s
-      day = $1.to_i.to_s
-      year = $3 ? $3.to_i.to_s : nil
-
-    #- Takes care of MMM-DD-YYYY
-    elsif date =~ /^(#{ @month_abbreviations.keys.join( '|' ) }).*?-(\d{1,2})-(\d{1,4})$/i
-      month_text = $1.to_s.capitalize
-      month = @month_names.key( @month_abbreviations[ month_text ] ).to_i.to_s
-      day = $2.to_i.to_s
-      year = $3 ? $3.to_i.to_s : nil
-
-    #- Takes care of MMM-YYYY and MMM
-    elsif date =~ /^(#{ @month_abbreviations.keys.join( '|' ) }).*?(?:-(\d{1,4}))?$/i
-      month_text = $1.to_s.capitalize
-      month = @month_names.key( @month_abbreviations[ month_text ] ).to_i.to_s
-      day = nil
-      year = $2 ? $2.to_i.to_s : nil
+    year, month, day = nil
+
+    if date =~ @date_patterns[ :yyyy ]
+      year  = stringify $1
+
+    elsif date =~ @date_patterns[ :yyyy_mm_dd_and_yyyy_mm ]
+      year  = stringify $1
+      month = stringify $2 unless $2.nil?
+      day   = stringify $3 unless $3.nil?
+
+    elsif date =~ @date_patterns[ :dd_mm_yyyy ] and euro
+      day   = stringify $1
+      month = stringify $2
+      year  = stringify $3
+
+    elsif date =~ @date_patterns[ :mm_dd_yyyy ]
+      month = stringify $1
+      day   = stringify $2
+      year  = stringify $3
+
+    elsif date =~ @date_patterns[ :mm_yyyy ]
+      month = stringify $1
+      year  = stringify $2
+
+    elsif date =~ @date_patterns[ :dd_mmm_yyyy_and_dd_mmm ]
+      month_text  = $2.to_s.capitalize
+      month       = stringify @month_names.key( @month_abbreviations[ month_text ] )
+      day         = stringify $1
+      year        = stringify $3 unless $3.nil?
+
+    elsif date =~ @date_patterns[ :mmm_dd_yyyy ]
+      month_text  = $1.to_s.capitalize
+      month       = stringify @month_names.key( @month_abbreviations[ month_text ] )
+      day         = stringify $2
+      year        = stringify $3 unless $3.nil?
+
+    elsif date =~ @date_patterns[ :mmm_yyyy_and_mmm ]
+      month_text  = $1.to_s.capitalize
+      month       = stringify @month_names.key( @month_abbreviations[ month_text ] )
+      year        = stringify $2 unless $2.nil?
 
     else
       raise ArgumentError.new( 'Cannot parse date.' )
@@ -91,7 +81,6 @@ class FuzzyDate
     @date_parts[ :year   ] = year  ? year.to_i   : nil
     @date_parts[ :month  ] = month ? month.to_i  : nil
     @date_parts[ :day    ] = day   ? day.to_i    : nil
-    #return { :circa => "day: #{ day }, month: #{ month }, year: #{ year }" }
 
     #- Some error checking at this point
     if month.to_i > 13
@@ -163,4 +152,8 @@ class FuzzyDate
     date_in_parts.join '-'
   end
 
+  def stringify( capture )
+    capture.to_i.to_s
+  end
+
 end

data/lib/fuzzy-date/variables.rb

@@ -79,6 +79,18 @@ class FuzzyDate
       'CE',
       'BCE'
       ]
+    
+    @date_patterns = {
+      yyyy:                   /^(\d{1,4})$/,
+      yyyy_mm_dd_and_yyyy_mm: /^(\d{3,4})(?:-(\d{1,2})(?:-(\d{1,2}))?)?$/,
+      dd_mm_yyyy:             /^(\d{1,2})-(\d{1,2})-(\d{1,4})$/,
+      mm_dd_yyyy:             /^(\d{1,2})-(\d{1,2})-(\d{1,4})$/,
+      mm_yyyy:                /^(\d{1,2})-(\d{1,4})?$/,
+      dd_mmm_yyyy_and_dd_mmm: /^(\d{1,2})(?:-(#{ @month_abbreviations.keys.join( '|' ) }).*?(?:-(\d{1,4}))?)?$/i,
+      mmm_dd_yyyy:            /^(#{ @month_abbreviations.keys.join( '|' ) }).*?-(\d{1,2})-(\d{1,4})$/i,
+      mmm_yyyy_and_mmm:       /^(#{ @month_abbreviations.keys.join( '|' ) }).*?(?:-(\d{1,4}))?$/i
+    }
+
   end
 
   def set_up_date_parts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-date
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - David Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies: []
 description: The fuzzy-date gem provides a way to parse and use incomplete dates,
   like those found in history or genealogy.
@@ -18,13 +18,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
 - demo.rb
 - lib/fuzzy-date.rb
+- lib/fuzzy-date/analyze.rb
 - lib/fuzzy-date/fuzzy-date.rb
 - lib/fuzzy-date/variables.rb
-- lib/fuzzy-date/analyze.rb
 homepage: https://github.com/davidcole/fuzzy-date
 licenses:
 - MIT
@@ -35,17 +35,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a way to use partial and incomplete dates.