dates_from_string 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7662e99ace9fe3f7108daf45b833ffaaac7843ac
-  data.tar.gz: e7c4679c1ef9e8ff081c56867db6a49719a29052
+SHA256:
+  metadata.gz: 4cb8ac6233b9bb96084df2a43b1ccf83144f5321785575ca308c395c3b40bd97
+  data.tar.gz: ea4ed89852e3ce67aeaf675f66b49bcf3d90f50efa52b2eb0989d2a0f05c23fb
 SHA512:
-  metadata.gz: c6466abf9543ba69ea65d1aa8a70c55a868dff061b590ee6da850bd1732d3127d8459abb8ae907c0675ffa9b45eaf8d502ecd0536b7d1d1b96b77bb982b46c9f
-  data.tar.gz: 919b454cebf0c9db80a67b75cb2225ceb391fa092025fe665e49072d6db3ec90bfdd195418f58a0ba5a69049f52bbc7fce12634d1886471647f7c510049e4776
+  metadata.gz: 0260d1045bdd5b6b9aa884582f0dff2548aaac6ab1dc60e1768fc02f747f3d0419ee9a283df37177ed99eee78cc14ce3a7073dbd5f72056689194dd9053ea33b
+  data.tar.gz: f3b47d374c1afc2e169c741dfb981c08b13c36bdf01c9bbdba8cb89442485586e9c51a3445f3b387eb9ecec0aa205d7911c560d03b616b91f55024ff05a1fb02

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.1
-before_install: gem install bundler -v 1.13.6
+  - 2.6.3
+before_install: gem install bundler -v 2.0

data/README.md

@@ -27,8 +27,11 @@ Or install it yourself as:
 ```ruby
 text = "1988-1990 and 2000 and one more date 04.04.2015"        # parsing text
 key_words = ['between','-']                                     # you can define special separator
-date_format = {date_format: :usa}                               # year,day,month by default year,month,day
-dates_from_string = DatesFromString.new(key_words,date_format)  # define DatesFromString object
+options = {
+  date_format: :usa,                                            # year,day,month by default year,month,day
+  ordinals: ['nd', 'st', 'th']                                  # a string list that might accompany a day, default none
+}                               
+dates_from_string = DatesFromString.new(key_words, options)     # define DatesFromString object
 dates_from_string.get_structure(text)                           # parsing text
 
 #=> returns
@@ -129,6 +132,15 @@ obj.get_structure(input)
 # [{:type=>:year, :value=>"1960", :distance=>2, :key_words=>['and']},
 # {:type=>:year, :value=>"1965", :distance=>0, :key_words=>[]},]
 
+dates_from_string_with_ordinals = DatesFromString.new(['and'], ordinals: ['st', 'th', 'nd'])
+input = 'around September 2nd, 2013'
+dates_from_string_with_ordinals.get_structure(input)
+
+#=> return
+# [{:type=>:month, :value=>"09", :distance=>1, :key_words=>[]},
+# {:type=>:day, :value=>"2", :distance=>1, :key_words=>[]},
+# {:type=>:year, :value=>"2013", :distance=>0, :key_words=>[]}]
+
 input = "In September 2011, following a change in the law extending
          the presidential term from four years to six,[5] Putin announced
          that he would seek a third, non-consecutive term as President in

data/dates_from_string.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
   # Only with ruby 2.0.x
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.13.6"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
 
 
   spec.add_development_dependency 'pry-rails'

data/lib/dates_from_string.rb

@@ -5,9 +5,10 @@ require 'dates_from_string/patterns'
 class DatesFromString
   include Patterns
 
-  def initialize(key_words = [], date_format: :default)
+  def initialize(key_words = [], date_format: :default, ordinals: [])
     @key_words = key_words
     @date_format = date_format_by_country(date_format)
+    @ordinals = Array(ordinals)
   end
 
   def find_date(string)
@@ -27,6 +28,17 @@ class DatesFromString
     DATE_COUNTRY_FORMAT[date_format.to_sym].call
   end
 
+  def day_regex
+    @day_regex ||= begin
+      if @ordinals.any?
+        ordinal_regex = "(#{@ordinals.join('|')})?"
+        /^\d{1,2}#{ordinal_regex},?$/
+      else
+        /^\d{1,2},?$/
+      end
+    end
+  end
+
   def get_structure(string)
     unless string.nil? || string.empty?
       @main_arr = []
@@ -142,8 +154,8 @@ class DatesFromString
   end
 
   def get_day(string)
-    if string =~ (/^\d{2}$/)
-      string
+    if string =~ (day_regex)
+      string.gsub(Regexp.union(@ordinals + [',']), '')
     else
       nil
     end
@@ -162,7 +174,7 @@ class DatesFromString
 
   def get_month_by_list(string)
     month = ['January','February','March','April','May','June','July','August','September','October','November','December']
-    index = month.index(string)
+    index = month.index(string.chomp(','))
 
     if index
       sprintf('%02d',(index+1))
@@ -174,7 +186,7 @@ class DatesFromString
 
   def get_short_month(string)
     short_month = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']
-    short_index = short_month.index(string)
+    short_index = short_month.index(string.chomp(','))
 
     if short_index
       sprintf('%02d',(short_index+1))

data/lib/dates_from_string/version.rb

@@ -1,3 +1,3 @@
 class DatesFromString
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dates_from_string
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Sergey Chechaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Flexible solution for finding all formats of dates in text