quando 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 154079261b51a488a0d8683470d1f956e5dbab5dc6bc6170ef3c9e53f30c316e
-  data.tar.gz: 40b7f21bdce1e2fd3e037ead3f843d495517839a41f4ea8fe90d6545f12129c6
+  metadata.gz: dc9ef7c527d685d3da9942e1d53aff6017c012a7a25fc3e1fd47f667c2f94167
+  data.tar.gz: a1794e5af7f816d5b8edeb36bd8a762073f48afbcbc353a304d68bfd9c2a48e3
 SHA512:
-  metadata.gz: c30142befe5484d340f148c9b99f3e272c7cf640b398eaf51e6147aee71f96bc6bc32935ef572a43f4d1ce39cf51c6e8c15b0e2d96b46946a89ec1dcca120a02
-  data.tar.gz: '092c000f53ecf32db45765d568c840e792fb8bda963db5e3be0a1c27f3c74bd901b96635e310537e259db25e9f411c86505bfce9d236986af4c4c933737441e2'
+  metadata.gz: 55afbcc5d55fd62967ed3dfbbcbccf4e23933cf44f98ae9249ff47f631c7c4a62c1dea93f6961da81d62035547d516849bd1527ca98bf060eff1a659b2a61e7a
+  data.tar.gz: d6e38f8106e168aeb5ce8b6c9e8f14108c00eff87fdba43dcf0edc75c2c1d330f248e777b461ff7378fdaa5b894a2181883013337764662b422b91ed15c2962b

data/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
-.idea/
+.idea
+.gem
 bundle
-docker
 docker-compose.yml
 pkg
+up

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quando (0.0.5)
+    quando (0.0.8)
 
 GEM
   remote: https://rubygems.org/
@@ -12,7 +12,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (11.3.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -31,11 +31,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.15)
+  bundler (>= 1.15)
   pry
   quando!
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rake (~> 11)
+  rspec (>= 3.0)
 
 BUNDLED WITH
    1.17.2

data/README.md

@@ -1,4 +1,4 @@
-![Quando](quando.png "Quando")
+# Quando
 
 [![Gem Version](https://badge.fury.io/rb/quando.svg)](https://badge.fury.io/rb/quando)
 [![Build Status](https://semaphoreci.com/api/v1/kinkou/quando/branches/master/shields_badge.svg)](https://semaphoreci.com/kinkou/quando)
@@ -131,7 +131,7 @@ Quando.configure do |c|
   c.formats = [
     /^ #{c.day} #{c.dlm} #{c.month_txt} #{c.dlm} #{c.year} $/xi,
     # compiles into something like
-    # /^ (?<day>…) [ .]+ (?<month>jan|feb|…) [ .]+ (?<year>…) $/xi
+    # /^ (?<day> …) [ -.\/]+ (?<month> jan|feb|…) [ -.\/]+ (?<year> …) $/xi
     # and returns ~ #<MatchData "14 Apr 1965" day:"14" month:"Apr" year:"1965">
     # on successful match 
   ]
@@ -152,7 +152,7 @@ Quando.config.formats = [
 Quando.parse('04.2019') #=> #<Date: 2019-04-01>
 ```
 
-If there is a named capture ```:year```, it is used in the result. If the format matcher did not define such named group, current year is used. If the captured value is less than ```100``` (which is the case for years written as 2-digit numbers), Quando will add a value from ```Quando.config.century``` (defaults to ```2000```), effectively converting, for example, ```18``` to ```2018``` (ok, it's not really a century, but rather a *nittonhundratalet*, but let's keep things simple). Be mindful of this behaviour, adjusting ```Quando.config.century``` accordingly:
+If there is a named capture ```:year```, it is used in the result. If the format matcher did not define such named group, current UTC year is used. If the captured value is less than ```100``` (which is the case for years written as 2-digit numbers), Quando will use the ```Quando.config.century``` setting (defaults to ```21```), effectively converting, for example, ```18``` to ```2018```. Be mindful of this behaviour, adjusting ```Quando.config.century``` accordingly:
 
 ```ruby
 Quando.config.formats = [Quando.config.year]
@@ -161,9 +161,9 @@ Quando.parse('2019') #=> #<Date: 2019-01-01>
 Quando.config.formats = [Quando.config.year2]
 Quando.parse('65') #=> #<Date: 2065-01-01>
 
-Quando.parse('65', century: 1900) #=> #<Date: 1965-01-01>
+Quando.parse('65', century: 20) #=> #<Date: 1965-01-01>
 # or
-Quando.config.century = 1900
+Quando.config.century = 20
 Quando.parse('65') #=> #<Date: 1965-01-01>
 ```
 
@@ -203,6 +203,8 @@ m = /(?<year>#{Quando.config.year}) (?<day>\d\d) (?<month>[A-Z]+)/i
 Quando.parse('1965 14 Apr', matcher: m) #=> #<Date: 1965-04-14>
 ```
 
+In both cases it will not change the global configuration (but note that calling setter methods on ```Quando.config``` will).
+
 ### Requirements
 
 Ruby >= 1.9.3. Enjoy!

data/lib/quando.rb

@@ -9,8 +9,8 @@ module Quando
 
   # @param date [String]
   # @param opts [Hash]
-  # @option opts [Regexp, Array<Regexp>] :matcher (nil)
-  # @option opts [Integer] :century (nil)
+  # @option opts [Regexp, Array<Regexp>] :matcher
+  # @option opts [Integer] :century
   # @return [Date, nil]
   def self.parse(date, opts = {})
     return if (date = date.to_s.strip).empty?

data/lib/quando/config.rb

@@ -7,65 +7,77 @@ module Quando
     MONTHS = [:jan, :feb, :mar, :apr, :may, :jun, :jul, :aug, :sep, :oct, :nov, :dec]
     AUTOUPDATE = [:dlm, :year, :year2, :day, *MONTHS, :month_num]
     COMPOUND = [:month_txt, :formats]
-    OPTIONS = [*AUTOUPDATE, *COMPOUND, :century]
+    OPTIONS = [*AUTOUPDATE, *COMPOUND]
+    CENTURY = 21
 
     private_constant :AUTOUPDATE, :COMPOUND, :OPTIONS
 
     attr_accessor *OPTIONS
 
     def initialize
-      @century = 2000
-
-      @dlm = /[ -.\/]+/
-      @year = /(?<year> \d{4})/x
-      @year2 = /(?<year> \d{2})/x
-      @month_num = /(?<month> 1[0-2] | 0?[1-9])/x
-      @day = /(?<day> 3[0-1] | [12][0-9] | 0?[1-9])/x
-
-      @jan = /JAN(?:UARY)?/xi
-      @feb = /FEB(?:RUARY)? /xi
-      @mar = /MAR(?:CH)?/xi
-      @apr = /APR(?:IL)?/xi
-      @may = /MAY/xi
-      @jun = /JUNE?/xi
-      @jul = /JULY?/xi
-      @aug = /AUG(?:UST)?/xi
-      @sep = /SEP(?:TEMBER)?/xi
-      @oct = /OCT(?:OBER)?/xi
-      @nov = /NOV(?:EMBER)? /xi
-      @dec = /DEC(?:EMBER)? /xi
+      @dlm = /[- .\/]+/
+      @year = /(?<year>\d{4})/
+      @year2 = /(?<year>\d{2})/
+      @month_num = /(?<month> 1[012] | 0?[1-9])/x
+      @day = /(?<day> 3[01] | [12]\d | 0?[1-9])/x
+
+      @jan = /JAN(?:UARY)?/i
+      @feb = /FEB(?:RUARY)?/i
+      @mar = /MAR(?:CH)?/i
+      @apr = /APR(?:IL)?/i
+      @may = /MAY/i
+      @jun = /JUNE?/i
+      @jul = /JULY?/i
+      @aug = /AUG(?:UST)?/i
+      @sep = /SEP(?:TEMBER)?/i
+      @oct = /OCT(?:OBER)?/i
+      @nov = /NOV(?:EMBER)?/i
+      @dec = /DEC(?:EMBER)?/i
+
+      self.century=(CENTURY)
 
       uniupdate!
     end
 
-    # Sets @month_txt which is a compound of all month regexps and matches any month name
+    # Sets @month_txt, a compound of all month regexps that matches any month name
     def unimonth!
       all_months_txt_rxs = MONTHS.map { |m| instance_variable_get("@#{m}".to_sym) }.join('|')
       @month_txt = Regexp.new("(?<month>#{all_months_txt_rxs})", true)
     end
 
-    # Sets @formats which is an array of regexps used in succession to match and identify parts of the dates
+    # Sets @formats which is an array of regexps used in succession to match and identify date parts
     def uniformats!
       @formats = [
         # Formats with a 4-digits year
         # 14.4.1965, 14/04/1965, 14-4-1965, 14 04 1965, …
-        /\A\s* #{@day} #{@dlm} #{@month_num} #{@dlm} #{@year} \s*\z/xi,
+        /^\s* #{@day} #{@dlm} #{@month_num} #{@dlm} #{@year} \s*$/xi,
 
         # 14-APRIL-1965, 14-apr-1965, 14/Apr/1965, …
-        /\A\s* #{@day} #{@dlm} #{@month_txt} #{@dlm} #{@year} \s*\z/xi,
+        /^\s* #{@day} #{@dlm} #{@month_txt} #{@dlm} #{@year} \s*$/xi,
 
         # April 1965, apr.1965, …
-        /\A\s* #{@month_txt} #{@dlm} #{@year} \s*\z/xi,
+        /^\s* #{@month_txt} #{@dlm} #{@year} \s*$/xi,
 
         # Same formats with a 2-digits year
         # 13.12.05, 13/12/05, 13-12-05, …
-        /\A\s* #{@day} #{@dlm} #{@month_num} #{@dlm} #{@year2} \s*\z/xi,
+        /^\s* #{@day} #{@dlm} #{@month_num} #{@dlm} #{@year2} \s*$/xi,
 
         # April, DECEMBER, sep., …
-        /\A\s* #{@month_txt} \s*\z/xi,
+        /^\s* #{@month_txt} \s*$/xi,
       ]
     end
 
+    # @return [Integer]
+    def century
+      @century
+    end
+
+    # @param value [Integer]
+    # @return [Integer]
+    def century=(value)
+      @century = (value == 0 ? 1 : value) || CENTURY
+    end
+
     # A single method to update all compound matchers when a part matcher was changed
     def uniupdate!
       unimonth!

data/lib/quando/parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Quando
-
   class Parser
 
     def initialize
@@ -10,7 +9,7 @@ module Quando
 
     # @return [Quando::Parser]
     def configure
-      yield(@config = Quando.config.dup)
+      yield(@config ||= Quando.config.dup)
       self
     end
 
@@ -22,11 +21,11 @@ module Quando
     # @param text_date [String]
     # @return [Date, nil]
     def parse(text_date)
-      config.formats.each do |rx|
-        @date_parts = text_date.match(rx)
+      config.formats.each do |regexp|
+        @date_parts = text_date.match(regexp)
         next unless @date_parts
 
-        @current_format = rx
+        @current_format = regexp
         year, month, day = detect_year, detect_month, detect_day
         next unless (year && month && day)
 
@@ -40,46 +39,39 @@ module Quando
 
     # @return [Integer, nil]
     def detect_year
-      unless searched?(:year)
-        return Time.current.year if Time.respond_to?(:current)
-        return Time.now.getlocal.year
-      end
-
+      return Time.now.utc.year unless wanted?(:year)
       return unless found?(:year)
 
       year = @date_parts[:year].to_i
-      year < 100 ? year + config.century : year
+      year.abs < 100 ? year + century_to_hundreds : year
     end
 
     # @return [Integer, nil]
     def detect_month
-      return 1 unless searched?(:month)
+      return 1 unless wanted?(:month)
       return unless found?(:month)
 
       month = @date_parts[:month]
 
-      month_num = if config.month_num.match(month)
-        month.to_i
-      else
-        month_index = Quando::Config::MONTHS.find_index do |month_name|
-          month_name_rx = config.send(month_name)
-          month_name_rx.match(month)
-        end
+      month_index = Quando::Config::MONTHS.find_index do |month_name|
+        config.send(month_name) =~ month
+      end
 
-        month_index + 1 if month_index
+      if month_index
+        month_index += 1
+        return month_index if valid_month?(month_index)
       end
 
-      month_num if (1..12).include?(month_num)
+      month.to_i if valid_month?(month)
     end
 
     # @return [Integer, nil]
     def detect_day
-      return 1 unless searched?(:day)
+      return 1 unless wanted?(:day)
       return unless found?(:day)
 
       day = @date_parts[:day].to_i
-
-      day if (1..31).include?(day)
+      day if valid_day?(day)
     end
 
     # @param date_part [Symbol]
@@ -88,10 +80,23 @@ module Quando
     end
 
     # @param date_part [Symbol]
-    def searched?(date_part)
-      !!@current_format.named_captures[date_part.to_s]
+    def wanted?(date_part)
+      @current_format.names.include?(date_part.to_s)
     end
 
-  end
+    # @param value [Integer]
+    def valid_month?(value)
+      (1..12).include?(value.to_i)
+    end
+
+    # @param value [Integer]
+    def valid_day?(value)
+      (1..31).include?(value.to_i)
+    end
 
+    def century_to_hundreds
+      (config.century > 0 ? config.century - 1 : config.century + 1) * 100
+    end
+
+  end
 end

data/lib/quando/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quando
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

data/quando.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler', '>= 1.15'
+  spec.add_development_dependency 'rake', '~> 11'
+  spec.add_development_dependency 'rspec', '>= 3.0'
   spec.add_development_dependency 'pry'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: quando
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Sergey Konotopov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
@@ -30,26 +30,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -88,7 +88,6 @@ files:
 - lib/quando/parser.rb
 - lib/quando/version.rb
 - quando.gemspec
-- quando.png
 homepage: https://github.com/kinkou/quando
 licenses:
 - MIT