fuzzy-date 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05d588d34b5ef9a7d88a2349a33430ce52bf663
-  data.tar.gz: 77db67adfb77666190900c36f3940c34f590ae11
+  metadata.gz: c03332e5af7f98fd582adced4d612eacc1dbfcc2
+  data.tar.gz: 0f0a9d6e3330d4a4008673acedcfa98111573302
 SHA512:
-  metadata.gz: 7286ae86ea2dd0c5b716dc0601160412ee765f19450f8ec87eea802bd30d46aacb2c2ada53397e613de45898a12258e31cc3144fd5f71731c948c20b5e371aa9
-  data.tar.gz: 187e48e36faa6c7b3609b842b138b551dbe9a2da3764182ce573439b74fc6885c493e1acb118220c762ccce8c72d8e803a149e300161c7001fd5592e9789c033
+  metadata.gz: 4c369ee5f9e83714d4f8c99b904cb146c64b5ac839b6e5477e49299c6ab6872dc067cb0e1704eac89cd724c8e6ad717ad96b855379baa094256bea95a4b223b6
+  data.tar.gz: c8738c3c79385f556ca2d06f2b87a8018974bff04b2b8cbb272210f48defe248f80f828277c2d399cff7237b17b5a41b401911932e4b8a294247cf30e6c4528f

data/README.md

@@ -12,7 +12,7 @@ With fuzzy-date, when you parse an incomplete date, you'll be given a hash of in
 
 ## Contributing
 
-If you'd like to hack on FuzzyDate - and we home you do! - start by forking the repo on GitHub:
+If you'd like to hack on FuzzyDate - and we hope you do! - start by forking the repo on GitHub:
 
 https://github.com/davidcole-fuzzydate
 

data/demo.rb

@@ -3,4 +3,3 @@ require( 'fuzzy-date' )
 
 fuzzy_date = FuzzyDate::parse( '15 March 1971' )
 puts fuzzy_date.inspect
-

data/lib/fuzzy-date.rb

@@ -3,7 +3,7 @@ require 'fuzzy-date/variables'
 require 'fuzzy-date/fuzzy-date'
 
 class FuzzyDate
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   # *Note*: This is only for single dates - not ranges.
   #

data/lib/fuzzy-date/fuzzy-date.rb

@@ -0,0 +1,153 @@
+require 'date'
+
+class FuzzyDate
+  def initialize( date, euro = false )
+    setup
+    analyze date, euro
+  end
+
+  def analyze( date, euro )
+
+    date = clean_parameter date
+
+    @date_parts[ :original ] = date
+
+    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
+
+    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
+
+    @date_parts
+
+  end
+
+  def to_hash
+    @date_parts
+  end
+
+  private
+
+  def clean_parameter( date )
+    date.to_s.strip if date.respond_to? :to_s
+  end
+
+  def massage( 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_in_parts.join '-'
+  end
+end

data/lib/fuzzy-date/variables.rb

@@ -0,0 +1,94 @@
+class FuzzyDate
+  DATE_SEPARATOR = '[^A-Za-z0-9]'
+
+  private
+
+  def setup
+
+    @date_parts = set_up_date_parts
+
+    @month_names = {
+      1 => 'January',
+      2 => 'February',
+      3 => 'March',
+      4 => 'April',
+      5 => 'May',
+      6 => 'June',
+      7 => 'July',
+      8 => 'August',
+      9 => 'September',
+      10 => 'October',
+      11 => 'November',
+      12 => 'December'
+      }
+
+    @month_abbreviations = {
+      'Jan' => 'January',
+      'Feb' => 'February',
+      'Mar' => 'March',
+      'Apr' => 'April',
+      'May' => 'May',
+      'Jun' => 'June',
+      'Jul' => 'July',
+      'Aug' => 'August',
+      'Sep' => 'September',
+      'Oct' => 'October',
+      'Nov' => 'November',
+      'Dec' => 'December'
+      }
+
+    @days_in_month = {
+      1 => 31,
+      2 => 28,
+      3 => 31,
+      4 => 30,
+      5 => 31,
+      6 => 30,
+      7 => 31,
+      8 => 31,
+      9 => 30,
+      10 => 31,
+      11 => 30,
+      12 => 31
+      }
+
+    @range_words = [
+      'Between',
+      'Bet',
+      'Bet.',
+      'From'
+      ]
+
+    @middle_range_words = [
+      # '-',  -  Not used because it is more commonly used as a delimiter
+      'To',
+      'And'
+      ]
+
+    @circa_words = [
+      'Circa',
+      'About',
+      'Abt',
+      'Abt.',
+      '~'
+      ]
+
+    @era_words = [
+      'AD',
+      'BC',
+      'CE',
+      'BCE'
+      ]
+  end
+
+  def set_up_date_parts
+    @date_parts = {}
+    @date_parts[ :original ] = nil
+    @date_parts[ :circa    ] = false
+    @date_parts[ :year     ] = nil
+    @date_parts[ :month    ] = nil
+    @date_parts[ :day      ] = nil
+    @date_parts[ :era      ] = 'AD'
+    @date_parts
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-date
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - David Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-17 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.
@@ -22,6 +22,8 @@ files:
 - LICENSE
 - demo.rb
 - lib/fuzzy-date.rb
+- lib/fuzzy-date/fuzzy-date.rb
+- lib/fuzzy-date/variables.rb
 homepage: https://github.com/davidcole/fuzzy-date
 licenses:
 - MIT
@@ -42,8 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: fuzzy-date provides a way to use partial and incomplete dates.
+summary: Provides a way to use partial and incomplete dates.
 test_files: []