tickle 1.2.0 → 2.0.0.rc1

data/spec/token_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+require_relative "../lib/tickle/token.rb"
+require 'rspec/its'
+
+module Tickle # for convenience
+
+describe "Token" do
+
+  describe "The basics" do
+    subject { Token.new( "" ) }
+    it { should be_a_kind_of ::String }
+    it { should respond_to :original }
+    it { should respond_to :word }
+    it { should respond_to :type }
+    it { should respond_to :interval }
+    it { should respond_to :start }
+    it { should respond_to :update! }
+    it { should respond_to :normalize! }
+  end
+
+
+  describe "Instantation" do
+    context "Given a token" do
+      context "and no options" do
+        subject { Token.new( "Today" ) }
+        its(:original) { should == "Today" }
+        its(:word) { should be_nil }
+        its(:type) { should be_nil }
+        its(:interval) { should be_nil }
+        its(:start) { should be_nil }
+        it { should == "Today" }
+      end
+    end
+  end
+
+  describe "After normalization" do
+    context "Given a token" do
+      context "That is not a number" do
+        context "and no options" do
+          subject { Token.new( "Today" ).normalize! }
+          it { should == "Today" }
+          its(:word) { should == "today" }
+        end
+      end
+      context "That is a number" do
+        context "and no options" do
+          subject { Token.new( "Twenty" ).normalize! }
+          it { should == "Twenty" }
+          its(:word) { should == "20" }
+        end
+      end
+    end
+  end
+
+
+  describe "update!" do
+    pending
+  end
+
+
+  describe "tokenize" do
+    subject { Token.tokenize "Next Monday" }
+    it { should == ["Next", "Monday"] }
+    its(:first) { should be_a_kind_of Token }
+  end
+
+
+  describe "scan" do
+    context "Given an invalid argument" do
+      it {
+        expect {Token.scan Token.tokenize 9999}.to raise_error ArgumentError
+      }
+    end
+    context "Given a valid argument (tokens)" do
+      subject { Token.scan! Token.tokenize "Next Monday" }
+      it { should == ["Next", "Monday"] }
+    end
+  end
+
+end
+
+end

data/test/helper.rb

@@ -6,8 +6,6 @@ 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,22 +4,16 @@ 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'})
-		Timecop.freeze Time_now
-		ENV["TZ"] = "UTC"
+
+    puts "Time.now"
+    p Time.now
 
     @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)
 
@@ -91,15 +85,12 @@ 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_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(: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.
+
     assert_tickle_match(@date.bump(:wday, 'Mon'), @date.bump(:wday, 'Mon'), nil, 'month', 'starting Monday repeat every month')
 
     year = @date >= Date.new(@date.year, 5, 13) ? @date.bump(:year,1) : @date.year
@@ -174,30 +165,30 @@ class TestParsing < Test::Unit::TestCase
 
   def test_argument_validation
     assert_raise(Tickle::InvalidArgumentException) do
-      Tickle.parse("may 27", :today => 'something odd')
+      time = Tickle.parse("may 27", :today => 'something odd')
     end
 
     assert_raise(Tickle::InvalidArgumentException) do
-      Tickle.parse("may 27", :foo => :bar)
+      time = Tickle.parse("may 27", :foo => :bar)
     end
 
     assert_raise(Tickle::InvalidArgumentException) do
-      Tickle.parse(nil)
+      time = Tickle.parse(nil)
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
       past_date = Date.civil(Date.today.year, Date.today.month, Date.today.day - 1)
-      Tickle.parse("every other day", {:start => past_date})
+      time = Tickle.parse("every other day", {:start => past_date})
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
-      start_date = Date.civil(Date.today.year, Date.today.month).next_day(10)
-      end_date = Date.civil(Date.today.year, Date.today.month).next_day(5)
-      Tickle.parse("every other day", :start => start_date, :until => end_date)
+      start_date = Date.civil(Date.today.year, Date.today.month, Date.today.day + 10)
+      end_date = Date.civil(Date.today.year, Date.today.month, Date.today.day + 5)
+      time = Tickle.parse("every other day", :start => start_date, :until => end_date)
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
-      end_date = Date.civil(Date.today.year, Date.today.month, Date.today.day).next_month(2)
+      end_date = Date.civil(Date.today.year, Date.today.month+2, Date.today.day)
       parse_now('every 3 months', {:until => end_date})
     end
   end

data/tickle.gemspec

@@ -20,15 +20,8 @@ Gem::Specification.new do |s|
   
   s.require_paths = ["lib"]
 
-  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"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "maruku"
-  s.add_development_dependency "timecop"
+  s.add_dependency "chronic",   "~> 0.10.2"
+  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: 1.2.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Joshua Lippiner
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gitlab-chronic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: numerizer
   requirement: !ruby/object:Gem::Requirement
@@ -40,117 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.3
-  type: :development
+        version: 0.10.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: texttube
   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'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: yard
-  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'
-- !ruby/object:Gem::Dependency
-  name: maruku
-  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'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 6.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.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.
@@ -168,14 +70,27 @@ files:
 - README.md
 - Rakefile
 - SCENARIOS.rdoc
+- benchmarks/main.rb
 - examples.rb
 - git-flow-version
+- lib/ext/array.rb
+- lib/ext/date_and_time.rb
+- lib/ext/string.rb
 - lib/tickle.rb
+- lib/tickle/filters.rb
 - lib/tickle/handler.rb
+- lib/tickle/helpers.rb
+- lib/tickle/patterns.rb
 - lib/tickle/repeater.rb
 - lib/tickle/tickle.rb
+- lib/tickle/tickled.rb
+- lib/tickle/token.rb
 - lib/tickle/version.rb
+- spec/helpers_spec.rb
+- spec/patterns_spec.rb
 - spec/spec_helper.rb
+- spec/tickle_spec.rb
+- spec/token_spec.rb
 - test/git-flow-version
 - test/helper.rb
 - test/test_parsing.rb
@@ -195,17 +110,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: natural language parser for recurring events
 test_files:
+- spec/helpers_spec.rb
+- spec/patterns_spec.rb
 - spec/spec_helper.rb
+- spec/tickle_spec.rb
+- spec/token_spec.rb
 - test/git-flow-version
 - test/helper.rb
 - test/test_parsing.rb