fuzzy-date 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1f0d1b0e41ae1637b944efb8170a9e6c6ab7fdb
-  data.tar.gz: e644b3e39b3840d789f1649faecbdde72cf019b0
+  metadata.gz: e05d588d34b5ef9a7d88a2349a33430ce52bf663
+  data.tar.gz: 77db67adfb77666190900c36f3940c34f590ae11
 SHA512:
-  metadata.gz: f2dd3f91af0b73c47d7187b26ff5ebf1f3d34d3609a1cf1f06772bfd5894c5da250fc08609ad943230da40129fecca220278f808ede8d2bf99839243288fa359
-  data.tar.gz: 0dc5789dc10626d75b992945066642ce2116a133dfbcec9eabf94db5df1f5700b5b2883d83026b52a7bdc0c034179c797e94f2692e364254eae86cdffe510801
+  metadata.gz: 7286ae86ea2dd0c5b716dc0601160412ee765f19450f8ec87eea802bd30d46aacb2c2ada53397e613de45898a12258e31cc3144fd5f71731c948c20b5e371aa9
+  data.tar.gz: 187e48e36faa6c7b3609b842b138b551dbe9a2da3764182ce573439b74fc6885c493e1acb118220c762ccce8c72d8e803a149e300161c7001fd5592e9789c033

data/lib/fuzzy-date.rb

@@ -1,9 +1,9 @@
-require 'date'
 
 require 'fuzzy-date/variables'
+require 'fuzzy-date/fuzzy-date'
 
-module FuzzyDate
-  VERSION = '0.1.3'
+class FuzzyDate
+  VERSION = '0.1.4'
 
   # *Note*: This is only for single dates - not ranges.
   #
@@ -26,151 +26,7 @@ module FuzzyDate
   # - Dates may be prefixed by circa words (Circa, About, Abt).
 
   def self.parse( date, euro = false )
-
-    date = clean_parameter date
-
-    return '' if date == ''
-
-    date_parts = set_up_date_parts date
-
-    date_in_parts = []
-
-    date_separator = Regexp.new DATE_SEPARATOR, true
-
-    #- Split the string
-
-    date_in_parts = date.split date_separator
-    date_in_parts.delete_if { |d| d.to_s.empty? }
-    if date_in_parts.first.match Regexp.new( @circa_words.join( '|' ), true )
-      date_parts[ :circa ] = true
-      date_in_parts.shift
-    end
-    if date_in_parts.last.match Regexp.new( @era_words.join( '|' ), true )
-      date_parts[ :era ] = date_in_parts.pop.upcase.strip
-    end
-
-    date = date_in_parts.join '-'
-    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
-
-    else
-      raise ArgumentError.new( 'Cannot parse date.' )
-    end
-
-    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
-      raise ArgumentError.new( 'Month cannot be greater than 12.' )
-    elsif month and day and day.to_i > @days_in_month[ month.to_i ]
-      unless month.to_i == 2 and year and Date.parse( '1/1/' + year ).leap? and day.to_i == 29
-        raise ArgumentError.new( 'Too many days in this month.' )
-      end
-    elsif month and month.to_i < 1
-      raise ArgumentError.new( 'Month cannot be less than 1.' )
-    elsif day and day.to_i < 1
-      raise ArgumentError.new( 'Day cannot be less than 1.' )
-    end
-
-    month_name = @month_names[ month.to_i ]
-    date_parts[ :month_name ] = month_name
-
-    # ----------------------------------------------------------------------
-
-    show_era = ' ' + date_parts[ :era ]
-    show_circa = date_parts[ :circa ] == true ? 'About ' : ''
-
-    if year and month and day
-      date_parts[ :short  ] = show_circa + month + '/' + day + '/' + year + show_era
-      date_parts[ :long   ] = show_circa + month_name + ' ' + day + ', ' + year + show_era
-      modified_long = show_circa + month_name + ' ' + day + ', ' + year.rjust( 4, "0" ) + show_era
-      date_parts[ :full   ] = show_circa + Date.parse( modified_long ).strftime( '%A,' ) + Date.parse( day + ' ' + month_name + ' ' + year.rjust( 4, "0" ) ).strftime( ' %B %-1d, %Y' ) + show_era
-    elsif year and month
-      date_parts[ :short  ] = show_circa + month + '/' + year + show_era
-      date_parts[ :long   ] = show_circa + month_name + ', ' + year + show_era
-      date_parts[ :full   ] = date_parts[ :long ]
-    elsif month and day
-      month_text = @month_abbreviations.key(month_text) || month_text
-      date_parts[ :short  ] = show_circa + day + '-' + month_text
-      date_parts[ :long   ] = show_circa + day + ' ' + month_name
-      date_parts[ :full   ] = date_parts[ :long ]
-    elsif year
-      date_parts[ :short  ] = show_circa + year + show_era
-      date_parts[ :long   ] = date_parts[ :short  ]
-      date_parts[ :full   ] = date_parts[ :long   ]
-    end
-
-    return date_parts
-
-  end
-
-  private
-
-  def self.clean_parameter( date )
-    date.to_s.strip if date.respond_to? :to_s
-  end
-
-  def self.set_up_date_parts( date )
-    date_parts = {}
-    date_parts[ :original ] = date
-    date_parts[ :circa    ] = false
-    date_parts[ :year     ] = nil
-    date_parts[ :month    ] = nil
-    date_parts[ :day      ] = nil
-    date_parts[ :era      ] = 'AD'
-    date_parts
+    fuzzy_date = FuzzyDate.new date, euro
+    fuzzy_date.to_hash
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-date
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 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.