tickle 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a728255bc9bd0d6f7bac246cfd6970b1e7dcbf62
-  data.tar.gz: 7001178b3e3e47fe21d6797380a15f4a47ff20f0
+  metadata.gz: 6c9f24bf840e38c2196e61c1428caa9d84eeb7b5
+  data.tar.gz: 6e8111fb7b6098f3c285d537b2adb529ede9ad36
 SHA512:
-  metadata.gz: da19d5f7cc11c2311197671418d055f52fcfaa243bc2836cf8a90a0e84786fd6de50aa0906f949c8de6b2847d8b2e0f399fd3f6ecf26a96bce94609043b2f38c
-  data.tar.gz: d98ec40a885d1378e745600c707a3293d0c273616738e151221936657b05e3dbb49924e6d08bb242348f68ba8cf8556420aaca4925d7c9d0ee1d3e4641e309e7
+  metadata.gz: 84a13f5b64bd9e49327bca5456bbcb197b7d66b90b0f349ea035f842ffe8aa440a263aefc690d163c5023ac24e13b398b395da9e6d7240e9a89220c7c4ca9433
+  data.tar.gz: 2514f63b04e43ec3610932dc115ad127b29b9a384e9b99fe6c52606982ebb2537cb20ac06beccf2cfcc25630a5c2f7c5021870119ab39395b7fe9f4361af5a1b

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 2.7
+  - jruby
+  - truffleruby
+
+# whitelist
+branches:
+  only:
+    - master
+    - develop
+    - v1-branch

data/CHANGES.md

@@ -1,5 +1,16 @@
 # CH CH CH CH CHANGES! #
 
+## Friday the 18th of September 2020, v1.2.0
+
+- Changed the dependency from chronic to gitlab-chronic
+- Required numerizer explicitly to stop a bug
+- Formatted the regex for legibility
+- Fixed bug with "today and" in the tests
+- Fixed a bug previously fixed on the v2 branch in 2f2a32ce9 with @start
+- Added Timecop because we're beyond the date chosen in the tests. Tempus fugit!
+
+----
+
 ## Wednesday the 15th of March 2017, v1.1.1 ##
 
 * Bit of easier debugging added in.
@@ -7,7 +18,6 @@
 
 ----
 
-
 ## Wednesday the 22nd of February 2017, v1.1.0 ##
 
 * Numerizer duplication removed. Thanks to https://github.com/bjonord.

data/README.md

@@ -407,7 +407,7 @@ or if you're using Bundler, add this to the Gemfile:
 
 Chronic gem:
 
-`gem install chronic`
+`gem install gitlab-chronic`
 
 thoughtbot's [shoulda](https://rubygems.org/gems/shoulda):
 

data/lib/tickle.rb

@@ -18,7 +18,7 @@ end
 
 require 'date'
 require 'time'
-require 'chronic'
+require 'gitlab-chronic'
 
 require 'tickle/tickle'
 require 'tickle/handler'

data/lib/tickle/tickle.rb

@@ -19,6 +19,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'numerizer'
+
 module Tickle
   class << self
     # == Configuration options
@@ -105,9 +107,25 @@ module Tickle
     def scan_expression(text, options)
       starting = ending = nil
 
-      start_every_regex = /^(start(?:s|ing)?)\s(.*)(\s(?:every|each|\bon\b|repeat)(?:s|ing)?)(.*)/i
+      start_every_regex = /^
+        (start(?:s|ing)?)                 # 0
+        \s
+        (.*)
+        (\s(?:every|each|\bon\b|repeat)   # 1
+        (?:s|ing)?)                       # 2
+        (.*)                              # 3
+      /ix
       every_start_regex = /^(every|each|\bon\b|repeat(?:the)?)\s(.*)(\s(?:start)(?:s|ing)?)(.*)/i
-      start_ending_regex = /^(start(?:s|ing)?)\s(.*)(\s(?:\bend|until)(?:s|ing)?)(.*)/i
+      start_ending_regex = /^
+        (start(?:s|ing)?)   # 0
+        \s+
+        (.*?)(?:\s+and)?      # 1
+        (\s
+          (?:\bend|until)
+          (?:s|ing)?
+        )                   # 2
+        (.*)                # 3
+      /ix
       if text =~ start_every_regex
         starting = text.match(start_every_regex)[2].strip
         text = text.match(start_every_regex)[4].strip
@@ -117,8 +135,9 @@ module Tickle
         text = text.match(every_start_regex)[4].strip
         starting, ending = process_for_ending(text)
       elsif text =~ start_ending_regex
-        starting = text.match(start_ending_regex)[2].strip
-        ending = text.match(start_ending_regex)[4].strip
+        md = text.match start_ending_regex
+        starting = md.captures[1]
+        ending = md.captures.last.strip
         event = 'day'
       else
         event, ending = process_for_ending(text)
@@ -127,6 +146,7 @@ module Tickle
       # they gave a phrase so if we can't interpret then we need to raise an error
       if starting
         Tickle.dwrite("starting: #{starting}")
+        @start ||= nil # initialize the variable to quell warnings
         @start = chronic_parse(pre_filter(starting))
         if @start
           @start.to_time
@@ -172,8 +192,7 @@ module Tickle
       text.gsub!(/repeat(s|ing)?(\s)?/, '')
       text.gsub!(/on the(\s)?/, '')
       text.gsub!(/([^\w\d\s])+/, '')
-      text.downcase.strip
-      text = normalize_us_holidays(text)
+      normalize_us_holidays(text.downcase.strip)
     end
 
     # Split the text on spaces and convert each word into

data/lib/tickle/version.rb

@@ -1,5 +1,5 @@
 module Tickle
 
   # This library's current version.
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/helper.rb

@@ -6,6 +6,8 @@ end
 
 require 'test/unit'
 require 'shoulda'
+require 'timecop'
+
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_parsing.rb

@@ -4,16 +4,22 @@ require 'test/unit'
 
 class TestParsing < Test::Unit::TestCase
 
+	Time_now = Time.parse "2010-05-09 20:57:36 +0000"
   def setup
     Tickle.debug = (ARGV.detect {|a| a == '--d'})
     @verbose = (ARGV.detect {|a| a == '--v'})
-
-    puts "Time.now"
-    p Time.now
+		Timecop.freeze Time_now
+		ENV["TZ"] = "UTC"
 
     @date = Date.today
+    @tz = ENV["TZ"]
   end
 
+	def teardown
+		Timecop.return
+		ENV["TZ"] = @tz
+	end
+
   def test_parse_best_guess_simple
     start = Date.new(2020, 04, 01)
 
@@ -85,11 +91,14 @@ class TestParsing < Test::Unit::TestCase
     assert_date_match(Date.new(2020, 04, 21), 'the twenty first of the month', {:start => start, :now => start})
   end
 
-  def test_parse_best_guess_complex
-    start = Date.new(2020, 04, 01)
-
+  def test_parse_best_guess_complex_and
     assert_tickle_match(@date.bump(:day, 1), @date, @date.bump(:week, 1), 'day', 'starting today and ending one week from now') if Time.now.hour < 21 # => demonstrates leaving out the actual time period and implying it as daily
     assert_tickle_match(@date.bump(:day, 1), @date.bump(:day, 1), @date.bump(:week, 1), 'day','starting tomorrow and ending one week from now') # => demonstrates leaving out the actual time period and implying it as daily.
+	end
+
+
+  def test_parse_best_guess_complex
+    start = Date.new(2020, 04, 01)
 
     assert_tickle_match(@date.bump(:wday, 'Mon'), @date.bump(:wday, 'Mon'), nil, 'month', 'starting Monday repeat every month')
 

data/tickle.gemspec

@@ -20,14 +20,15 @@ Gem::Specification.new do |s|
   
   s.require_paths = ["lib"]
 
-  s.add_dependency "chronic", "~> 0.2.3"
+  s.add_dependency "gitlab-chronic", "~> 0.10.6"
+  s.add_dependency "numerizer", "~> 0.2.0"
   s.add_development_dependency "shoulda", "~> 2.10.3"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "test-unit"
-
-  s.add_development_dependency "bundler", "~> 1.2"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "yard"
   s.add_development_dependency "maruku"
+  s.add_development_dependency "timecop"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickle
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Joshua Lippiner
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: gitlab-chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.10.6
+- !ruby/object:Gem::Dependency
+  name: numerizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +85,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tickle is a date/time helper gem to help parse natural language into
   a recurring pattern.  Tickle is designed to be a compliment of Chronic and can interpret
   things such as "every 2 days, every Sunday, Sundays, Weekly, etc.
@@ -133,6 +161,7 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENCE
@@ -171,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: natural language parser for recurring events