tickle 2.0.0.rc1 → 2.0.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d8b35a7f362cfb13d80ef3236f7f1f036cd7ebc
-  data.tar.gz: cec9f257100839052b8ea4e7b7a64fa560eebd01
+SHA256:
+  metadata.gz: 1f47be53e642fa9fd7cd412b7d76768807ed9398de11df69a77855f6d2b26b44
+  data.tar.gz: bc3a4d7d5c9048444ef7dfa47e6e55318c3e3577f7ec70145d4500bf441b5c4e
 SHA512:
-  metadata.gz: d3d2636db14e75ce64453d3bf42bfdb4f22fde65af54a01b5113a58447ab46e9530a39f16771265a28e345a16b22417ae6dca699c8828cd9d4825d756db38af0
-  data.tar.gz: e972f8974b427bcb5ad3be4333b4ac0951a82ada15f9cc8def342ff7414dd636e4169f757f579a3f17baa9c1578a265bc33865ee596f1e1aee2f2a4123be052b
+  metadata.gz: 6852b109c5091c3abee0bef6c8bf8ea804e9b2a7ff7b7ffd0d995b237f2dc799e3504ef10740a44e320dcd55544e1895e48235bbc745fde25394fc3b315f0121
+  data.tar.gz: 790b5b8790873c0e9a99c882cfe57628fd52ea756738e9c503ff76b38bd664b8ec469a6cc2fe313e823b26a498d6416f39d1986dda1236a3fa62c41c3dc057a3

data/.gitignore

@@ -20,3 +20,4 @@ Gemfile.lock
 .bundle/
 .rspec
 *.gem
+.ruby-version

data/.travis.yml

@@ -1,14 +1,12 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - ruby-head
-  - jruby-19mode
-#  - rbx-2.1.1  # not working right now, will look at later
+  - 2.7
+  - jruby
+  - truffleruby
 
 # whitelist
 branches:
   only:
     - master
     - develop
+    - v1-branch

data/CHANGES.md

@@ -1,13 +1,27 @@
 # CH CH CH CH CHANGES! #
 
+## Friday the 18th of September 2002, v2.0.0rc3
+
+* Changed the dependency from chronic to gitlab-chronic, thanks to @bjonord
+
+----
+
+## v2.0.0.rc2, Friday the 8th of December 2017 ##
+
+* Fixed issue #20 https://github.com/yb66/tickle/pull/20, thanks to [@antogon](https://github.com/antogon)
+
+----
+
+
 ## Saturday the 7th of November 2015, 2.0.0.rc1 ##
 
-- Rewrite of the internals.
-- API should be pretty much the same from the outside, but enough things on the inside change to warrant the major version bump.
-- Chronic updated to 0.10.2.
+* Rewrite of the internals.
+* API should be pretty much the same from the outside, but enough things on the inside change to warrant the major version bump.
+* Chronic updated to 0.10.2.
 
 ----
 
+
 ## Monday the 11th of November 2013, v1.0.2 ##
 
 * Shoulda and simplecov aren't runtime dependencies, fixed that in the gemfile.
@@ -15,6 +29,7 @@
 
 ----
 
+
 ## Monday the 11th of November 2013, v1.0.1 ##
 
 * Moved library to new maintainer [https://github.com/yb66/tickle](@yb66)
@@ -26,4 +41,4 @@
 * Moved library to Bundler to make it easier to set up and develop against.
 * Started using Yardoc for more niceness with documentation.
 
-----
+----

data/Gemfile

@@ -3,11 +3,13 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "wirble"
   gem "maruku"
   gem "yard"
-  gem "pry-byebug"
-  gem "activesupport"
+  unless RUBY_ENGINE == 'jruby'
+    gem "pry-byebug"
+    gem "pry-state"
+    gem "rb-readline"
+  end
 end
 
 group :test do

data/lib/tickle.rb

@@ -7,11 +7,16 @@
 #=============================================================================
 
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))     # For use/testing when no gem is installed
+if ENV["DEBUG"]
+  warn "DEBUG MODE ON"
+  require 'pry-byebug'
+  require 'pry-state'
+  binding.pry
+end
 
 require 'date'
 require 'time'
-require 'chronic'
+require 'gitlab-chronic'
 
 require 'tickle/tickle'
 require 'tickle/handler'
@@ -21,13 +26,6 @@ require_relative "ext/array.rb"
 require_relative "ext/date_and_time.rb"
 require_relative "ext/string.rb"
 
-# these are required not because they're used by the library
-# but because they clobber so much that testing
-# without them will miss possible problems
-require 'active_support/core_ext/string/conversions'
-require 'active_support/core_ext/date/calculations'
-require 'active_support/core_ext/date_time/calculations'
-require 'active_support/core_ext/time/calculations'
 
 # Tickle is a natural language parser for recurring events.
 module Tickle

data/lib/tickle/tickle.rb

@@ -50,7 +50,7 @@ module Tickle
       # check to see if this event starts some other time and reset now
       scan_expression! tickled
 
-      fail(InvalidDateExpression, "the start date (#{@start.to_date}) cannot occur in the past for a future event") if @start && @start.to_date < Date.today
+      fail(InvalidDateExpression, "the start date (#{@start.to_date}) cannot occur in the past for a future event") if @start && @start.to_date < tickled.now.to_date
       fail(InvalidDateExpression, "the start date (#{@start.to_date}) cannot occur after the end date") if @until && @start.to_date > @until.to_date
 
       # no need to guess at expression if the start_date is in the future
@@ -75,7 +75,7 @@ module Tickle
 
         # if we can't guess it maybe chronic can
         _guess = guess(@tokens, @start)
-        best_guess = _guess || chronic_parse(tickled.event) # TODO fix this call 
+        best_guess = _guess || chronic_parse(tickled.event) # TODO fix this call
       end
 
       fail(InvalidDateExpression, "the next occurrence takes place after the end date specified") if @until && (best_guess.to_date > @until.to_date)
@@ -131,10 +131,10 @@ module Tickle
           fail(InvalidDateExpression,"the ending date expression \"#{tickled.ending}\" could not be interpretted")
         end
       else
-        @until = 
+        @until =
           if  tickled.starting && !tickled.starting.to_s.blank?
             if tickled.until && !tickled.until.to_s.blank?
-              if tickled.until.to_time > tickled.starting.to_time
+              if tickled.until.to_time > @start
                 tickled.until.to_time
               end
             end

data/lib/tickle/tickled.rb

@@ -1,10 +1,9 @@
-require 'chronic'
 require 'texttube/base'
 require_relative "filters.rb"
-require 'chronic'
+require 'gitlab-chronic'
 
 module Tickle
-      
+
 
 
   # Contains the initial input and the result of parsing it.
@@ -39,7 +38,7 @@ module Tickle
         end
       end
 
-      t = 
+      t =
         if asked.respond_to?(:to_time)
           asked
         elsif (t = Time.parse(asked) rescue nil) # a legitimate use!
@@ -129,7 +128,7 @@ module Tickle
 
     [:starting, :ending, :event].each do |meth|
       define_method meth do
-        @opts[meth] 
+        @opts[meth]
       end
       define_method "#{meth}=" do |value|
         @opts[meth] = Tickled.new value
@@ -157,13 +156,13 @@ module Tickle
     def to_s
       self
     end
-  
+
     def blank?
       if respond_to? :empty?
         empty? || !self
       elsif respond_to? :localtime
         false
-      end 
+      end
     end
 
 #     def inspect

data/lib/tickle/version.rb

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

data/spec/spec_helper.rb

@@ -9,8 +9,10 @@ Spec_dir = File.expand_path( File.dirname __FILE__ )
 require 'simplecov'
 SimpleCov.start do
   add_filter "/vendor/"
+  add_filter "/vendor.noindex/"
   add_filter "/bin/"
   add_filter "/spec/"
+  add_filter "/coverage/" # It used to do this for some reason, defensive of me.
 end
 
 

data/spec/tickle_spec.rb

@@ -241,6 +241,14 @@ describe "Parsing" do
         end
       end
 
+      context "Given that start is in the past, respect now option in parse" do
+        context "every other day" do
+          subject{ Tickle.parse('every other day', {:start=>Time.parse("2009-05-09 00:00:00 +0000"), :now=>Time.parse("2009-05-09 00:00:00 +0000"), :until=>Time.parse("2017-10-21 00:00:00 +0000") }) }
+          let(:expected) { {:next=>Time.parse("2009-05-11 00:00:00 +0000"), :expression=>"every other day", :starting=>Time.parse("2009-05-09 00:00:00 +0000"), :until=>nil} }
+          it { should == expected }
+        end
+      end
+
       context "Given that now is in the future, 2020-04-01 00:00:00 +0000" do
         context "February" do
           subject{ Tickle.parse('February', {:start=>Time.parse("2020-04-01 00:00:00 +0000"), :now=>Time.parse("2020-04-01 00:00:00 +0000")}) }

data/tickle.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  
+
   s.require_paths = ["lib"]
 
   s.add_dependency "numerizer", "~> 0.2.0"
-  s.add_dependency "chronic",   "~> 0.10.2"
+  s.add_dependency "gitlab-chronic",   "~> 0.10.6"
   s.add_dependency "texttube",  "~> 6.0.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickle
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0rc3
 platform: ruby
 authors:
 - Joshua Lippiner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numerizer
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: gitlab-chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: texttube
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: natural language parser for recurring events