fuzzy-date 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76cd668fdf666c2a3c389eb6654ede8a67ce78c
-  data.tar.gz: 384f9a86a76d423497de05af75952acc6226b150
+  metadata.gz: 3566a7b503dd739c3eaee9cfc6cdbfe4a8a0e3bf
+  data.tar.gz: f3f2ddbe5c6d38efad627d8e293843267f7f2c05
 SHA512:
-  metadata.gz: f177d19cd1e39645ec975a12035db464f886b350c35bcbb89d1c7f2bb47a68cad4894692dd1a4679e469556a216013383c9257e1ea114c1189bf30f8dfd636b2
-  data.tar.gz: 94b41c11f31e266a3123786a0983dcd0c0883e45bde478a612b92207c001a5d499617b199af0b1a7a8d10d96d15005d8c8bdd2a02faf99021915cb62c4ac0977
+  metadata.gz: 54bef59ade20151fc60bab750d1153d815753b40101fab78ac212a8172cfa80da737265e9456d83bd9edf78053a6dec1899e96ec3a1461add276fc512fed4506
+  data.tar.gz: e95bf44e9ce6d7e12f59e561ff9c8c7565ee2498252ac94751a0e4614498510dd2e6ff1109237b773c54aba0aeec6992084e35f877e7bb4010eeada2599366a6

data/README.md

@@ -4,12 +4,31 @@ The fuzzy-date gem provides a way to parse and use incomplete dates, like those
 
 For example, if you know your great-great-great grandmother was born in April, 1836, but you don't know the day of the month, that's not going to work if you try to parse it as a Date object.
 
-With fuzzy-date, when you parse an incomplete date, you'll be given a hash of information about the date that can be stored as a string.
+With fuzzy-date, when you parse an incomplete date, you'll be given an object of information about the date.
 
 ## Installation
 
   `gem install fuzzy-date`
 
+## Usage:
+
+	require 'rubygems'
+	require 'fuzzy-date'
+
+	fuzzy_date = FuzzyDate::parse( '15 March 1971' )
+
+	puts "PARSING: #{ fuzzy_date.original }"
+
+	puts "Short date:     #{ fuzzy_date.short       }"
+	puts "Long date:      #{ fuzzy_date.long        }"
+	puts "Full date:      #{ fuzzy_date.full        }"
+	puts "Year:           #{ fuzzy_date.year        }"
+	puts "Month:          #{ fuzzy_date.month       }"
+	puts "Day:            #{ fuzzy_date.day         }"
+	puts "Month name:     #{ fuzzy_date.month_name  }"
+	puts "Circa:          #{ fuzzy_date.circa       }"
+	puts "Era:            #{ fuzzy_date.era         }"
+
 ## Contributing
 
 If you'd like to hack on FuzzyDate - and we hope you do! - start by forking the repo on GitHub:

data/demo.rb

@@ -1,5 +1,5 @@
-require( 'rubygems' )
-require( 'fuzzy-date' )
+require 'rubygems'
+require 'fuzzy-date'
 
 fuzzy_date = FuzzyDate::parse( '15 March 1971' )
 

data/lib/fuzzy-date.rb

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

data/lib/fuzzy-date/analyze.rb

@@ -17,6 +17,7 @@ class FuzzyDate
   # * 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
+  # * YYYY-MMM    -  1 to 4 digit year, then month name or abbreviation
   #
   # Notes:
   # - Commas are optional.
@@ -30,115 +31,107 @@ class FuzzyDate
 
     date = clean_parameter date
 
-    @date_parts[ :original ] = date
+    @original = date
 
     date = massage date
-    @date_parts[ :fixed ] = date
+    @fixed = date
 
-    year, month, day = nil
+    @year, @month, @day = nil
 
     if date =~ @date_patterns[ :yyyy ]
-      year  = stringify $1
+      @year  = $1.to_i
 
     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?
+      @year  = $1.to_i
+      @month = $2.to_i unless $2.nil?
+      @day   = $3.to_i unless $3.nil?
 
     elsif date =~ @date_patterns[ :dd_mm_yyyy ] and euro
-      day   = stringify $1
-      month = stringify $2
-      year  = stringify $3
+      @day   = $1.to_i
+      @month = $2.to_i
+      @year  = $3.to_i
 
     elsif date =~ @date_patterns[ :mm_dd_yyyy ]
-      month = stringify $1
-      day   = stringify $2
-      year  = stringify $3
+      @month = $1.to_i
+      @day   = $2.to_i
+      @year  = $3.to_i
 
     elsif date =~ @date_patterns[ :mm_yyyy ]
-      month = stringify $1
-      year  = stringify $2
+      @month = $1.to_i
+      @year  = $2.to_i
 
     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?
+      @month      = @month_names.key( @month_abbreviations[ month_text ] )
+      @day        = $1.to_i
+      @year       = $3.to_i 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?
+      @month      = @month_names.key( @month_abbreviations[ month_text ] )
+      @day        = $2.to_i
+      @year       = $3.to_i 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?
+      @month      = @month_names.key( @month_abbreviations[ month_text ] )
+      @year       = $2.to_i unless $2.nil?
+
+    elsif date =~ @date_patterns[ :yyyy_mmm_dd ]
+      @year       = $1.to_i unless $1.nil?
+      month_text  = $2.to_s.capitalize
+      @month      = @month_names.key( @month_abbreviations[ month_text ] )
+      @day        = $3.to_i
+
+    elsif date =~ @date_patterns[ :yyyy_mmm ]
+      @year       = $1.to_i unless $1.nil?
+      month_text  = $2.to_s.capitalize
+      @month      = @month_names.key( @month_abbreviations[ month_text ] )
 
     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
-
-    #- Some error checking at this point
-    if month.to_i > 13
+    #- Make sure the dates make sense
+    if @month and @month > 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
+    elsif @month and @day and @day > @days_in_month[ @month ]
+      unless @month == 2 and @year and Date.parse( '1/1/' + @year ).leap? and @day == 29
         raise ArgumentError.new( 'Too many days in this month.' )
       end
-    elsif month and month.to_i < 1
+    elsif @month and @month < 1
       raise ArgumentError.new( 'Month cannot be less than 1.' )
-    elsif day and day.to_i < 1
+    elsif @day and @day < 1
       raise ArgumentError.new( 'Day cannot be less than 1.' )
     end
 
-    month_name = @month_names[ month.to_i ]
-    @date_parts[ :month_name ] = month_name
+    @month_name = @month_names[ @month ]
 
     # ----------------------------------------------------------------------
 
-    show_era = @date_parts[ :era ] == 'BC' ? ' ' + @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 ]
+    show_era    = @eras[@era] == :bce ? ' ' + @era : ''
+    show_circa  = @circa ? 'About ' : ''
+
+    if @year and @month and @day
+      @short = show_circa + @month.to_s + '/' + @day.to_s + '/' + @year.to_s + show_era
+      @long  = show_circa + @month_name + ' ' + @day.to_s + ', ' + @year.to_s + show_era
+      modified_long = show_circa + @month_name + ' ' + @day.to_s + ', ' + @year.to_s.rjust( 4, "0" ) + show_era
+      @full  = show_circa + Date.parse( modified_long ).strftime( '%A,' ) + Date.parse( @day.to_s + ' ' + @month_name + ' ' + @year.to_s.rjust( 4, "0" ) ).strftime( ' %B %-1d, %Y' ) + show_era
+    elsif @year and @month
+      @short = show_circa + @month.to_s + '/' + @year.to_s + show_era
+      @long  = show_circa + @month_name + ', ' + @year.to_s + show_era
+      @full  = @long
+    elsif @month and @day
+      month_text = @month_abbreviations.key( month_text ) || month_text
+      @short = show_circa + @day.to_s + '-' + month_text
+      @long  = show_circa + @day.to_s + ' ' + @month_name
+      @full  = @long
     elsif year
-      @date_parts[ :short  ] = show_circa + year + show_era
-      @date_parts[ :long   ] = @date_parts[ :short  ]
-      @date_parts[ :full   ] = @date_parts[ :long   ]
+      @short  = show_circa + @year.to_s + show_era
+      @long   = @short
+      @full   = @long
     end
 
-    @short      = @date_parts[ :short       ]
-    @long       = @date_parts[ :long        ]
-    @full       = @date_parts[ :full        ]
-    @original   = @date_parts[ :original    ]
-    @fixed      = @date_parts[ :fixed       ]
-    @year       = @date_parts[ :year        ]
-    @month      = @date_parts[ :month       ]
-    @day        = @date_parts[ :day         ]
-    @month_name = @date_parts[ :month_name  ]
-    @circa      = @date_parts[ :circa       ]
-    @era        = @date_parts[ :era         ]
-
-    @date_parts
-
   end
 
   def clean_parameter( date )
@@ -156,18 +149,14 @@ class FuzzyDate
     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
+      @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
+    if date_in_parts.last.match Regexp.new( @eras.keys.join( '|' ), true )
+      @era = date_in_parts.pop.upcase.strip
     end
 
     date_in_parts.join '-'
   end
 
-  def stringify( capture )
-    capture.to_i.to_s
-  end
-
-end
+end

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

@@ -6,7 +6,19 @@ class FuzzyDate
   end
 
   def to_hash
-    @date_parts
+    {
+      circa:      @circa,
+      day:        @day,
+      era:        @era,
+      fixed:      @fixed,
+      full:       @full,
+      long:       @long,
+      month:      @month,
+      month_name: @month_name,
+      original:   @original,
+      short:      @short,
+      year:       @year
+    }
   end
 
 end

data/lib/fuzzy-date/variables.rb

@@ -5,7 +5,7 @@ class FuzzyDate
 
   def setup
 
-    @date_parts = set_up_date_parts
+    set_up_date_parts
 
     @month_names = {
       1 => 'January',
@@ -73,15 +73,17 @@ class FuzzyDate
       '~'
       ]
 
-    @era_words = [
-      'AD',
-      'BC',
-      'CE',
-      'BCE'
-      ]
-    
+    @eras = {
+      'AD' => :ce,
+      'BC' => :bce,
+      'CE' => :ce,
+      'BCE' => :bce
+      }
+
     @date_patterns = {
       yyyy:                   /^(\d{1,4})$/,
+      yyyy_mmm:               /^(\d{1,4})-(#{ @month_abbreviations.keys.join( '|' ) }).*?$/i,
+      yyyy_mmm_dd:            /^(\d{1,4})-(#{ @month_abbreviations.keys.join( '|' ) }).*?-(\d{1,2})$/i,
       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})$/,
@@ -89,18 +91,16 @@ class FuzzyDate
       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
-    @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
+    @original = nil
+    @circa    = false
+    @year     = nil
+    @month    = nil
+    @day      = nil
+    @era      = 'AD'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuzzy-date
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2015-06-11 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.
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provides a way to use partial and incomplete dates.