tickle 1.0.2 → 2.0.0rc3

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/tickle.gemspec

@@ -17,16 +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 "chronic", "~> 0.2.3"
-  s.add_development_dependency "shoulda", "~> 2.10.3"
-  s.add_development_dependency "simplecov"
+  s.require_paths = ["lib"]
 
-  s.add_development_dependency "bundler", "~> 1.2"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "yard"
-  s.add_development_dependency "maruku"
+  s.add_dependency "numerizer", "~> 0.2.0"
+  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: 1.0.2
+  version: 2.0.0rc3
 platform: ruby
 authors:
 - Joshua Lippiner
@@ -9,106 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: numerizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: gitlab-chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.3
-  type: :development
+        version: 0.10.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.3
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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'
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: texttube
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
+        version: 6.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-- !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'
+        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.
@@ -119,21 +63,34 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
 - SCENARIOS.rdoc
+- benchmarks/main.rb
 - examples.rb
 - git-flow-version
-- lib/numerizer/numerizer.rb
+- 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
@@ -153,17 +110,20 @@ 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.4.5
+rubygems_version: 3.1.2
 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

data/lib/numerizer/numerizer.rb

@@ -1,103 +0,0 @@
-require 'strscan'
-
-class Numerizer
-
-  DIRECT_NUMS = [
-                  ['eleven', '11'],
-                  ['twelve', '12'],
-                  ['thirteen', '13'],
-                  ['fourteen', '14'],
-                  ['fifteen', '15'],
-                  ['sixteen', '16'],
-                  ['seventeen', '17'],
-                  ['eighteen', '18'],
-                  ['nineteen', '19'],
-                  ['ninteen', '19'], # Common mis-spelling
-                  ['zero', '0'],
-                  ['one', '1'],
-                  ['two', '2'],
-                  ['three', '3'],
-                  ['four(\W|$)', '4\1'],  # The weird regex is so that it matches four but not fourty
-                  ['five', '5'],
-                  ['six(\W|$)', '6\1'],
-                  ['seven(\W|$)', '7\1'],
-                  ['eight(\W|$)', '8\1'],
-                  ['nine(\W|$)', '9\1'],
-                  ['ten', '10'],
-                  ['\ba[\b^$]', '1'] # doesn't make sense for an 'a' at the end to be a 1
-                ]
-
-  TEN_PREFIXES = [ ['twenty', 20],
-                    ['thirty', 30],
-                    ['fourty', 40],
-                    ['fifty', 50],
-                    ['sixty', 60],
-                    ['seventy', 70],
-                    ['eighty', 80],
-                    ['ninety', 90]
-                  ]
-
-  BIG_PREFIXES = [ ['hundred', 100],
-                    ['thousand', 1000],
-                    ['million', 1_000_000],
-                    ['billion', 1_000_000_000],
-                    ['trillion', 1_000_000_000_000],
-                  ]
-
-class << self
-  def numerize(string)
-    string = string.dup
-  
-    # preprocess
-    string.gsub!(/ +|([^\d])-([^d])/, '\1 \2') # will mutilate hyphenated-words but shouldn't matter for date extraction
-    string.gsub!(/a half/, 'haAlf') # take the 'a' out so it doesn't turn into a 1, save the half for the end
-
-    # easy/direct replacements
-  
-    DIRECT_NUMS.each do |dn|
-      string.gsub!(/#{dn[0]}/i, dn[1])
-    end
-
-    # ten, twenty, etc.
-
-    TEN_PREFIXES.each do |tp|
-      string.gsub!(/(?:#{tp[0]})( *\d(?=[^\d]|$))*/i) { (tp[1] + $1.to_i).to_s }
-    end
-
-    # hundreds, thousands, millions, etc.
-
-    BIG_PREFIXES.each do |bp|
-      string.gsub!(/(\d*) *#{bp[0]}/i) { (bp[1] * $1.to_i).to_s}
-      andition(string)
-      #combine_numbers(string) # Should to be more efficient way to do this
-    end
-
-    # fractional addition
-    # I'm not combining this with the previous block as using float addition complicates the strings
-    # (with extraneous .0's and such )
-    string.gsub!(/(\d+)(?: | and |-)*haAlf/i) { ($1.to_f + 0.5).to_s }
-
-    string
-  end
-
-private
-  def andition(string)
-    sc = StringScanner.new(string)
-    while(sc.scan_until(/(\d+)( | and )(\d+)(?=[^\w]|$)/i))
-      if sc[2] =~ /and/ || sc[1].size > sc[3].size
-        string[(sc.pos - sc.matched_size)..(sc.pos-1)] = (sc[1].to_i + sc[3].to_i).to_s
-        sc.reset
-      end
-    end
-  end
-
-#  def combine_numbers(string)
-#    sc = StringScanner.new(string)
-#    while(sc.scan_until(/(\d+)(?: | and |-)(\d+)(?=[^\w]|$)/i))
-#      string[(sc.pos - sc.matched_size)..(sc.pos-1)] = (sc[1].to_i + sc[2].to_i).to_s
-#      sc.reset
-#    end
-#  end
-
-end
-end