tickle 0.0.4 → 0.0.5

data/README.rdoc

@@ -88,8 +88,12 @@ Tickle HEAVILY uses chronic for parsing both the event and the start date.
   Tickle.parse('the fifth')  #=> 2010-05-05 12:00:00 -0400
   Tickle.parse('the 3rd Sunday of May')  #=> 2010-05-16 12:00:00 -0400
   Tickle.parse('the 3rd Sunday of the month')  #=> 2010-05-16 12:00:00 -0400
-
-
+  Tickle.parse('the 23rd of June')  #=> 2010-06-23 12:00:00 -0400
+  Tickle.parse('the twenty third of June')  #=> 2010-06-23 12:00:00 -0400
+  Tickle.parse('the thirty first of August')  #=> 2010-08-31 12:00:00 -0400
+  Tickle.parse('the twenty first')  #=> 2010-05-21 12:00:00 -0400
+  Tickle.parse('the twenty first of the month')  #=> 2010-05-21 12:00:00 -0400
+  
 
 -- USING IN APP
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/git-flow-version

@@ -1 +1 @@
-GITFLOW_VERSION=0.0.4
+GITFLOW_VERSION=0.0.5

data/lib/tickle.rb

@@ -45,7 +45,7 @@ end
 
 class String
   def is_ordinal?
-    scanner = %w{first second third fourth fifth sixth seventh eighth ninth tenth eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventieth eighteenth nineteenth twenty thirty thirtieth}
+    scanner = %w{first second third fourth fifth sixth seventh eighth ninth tenth eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventeenth eighteenth nineteenth twenty thirty thirtieth}
     regex = /\b(\d*)(st|nd|rd|th)\b/
     !(self =~ regex).nil? || scanner.include?(self.downcase)
   end

data/lib/tickle/handler.rb

@@ -114,7 +114,6 @@ module Tickle
       @tokens.detect {|token| token.type == type}
     end
 
-
     private
 
     def get_next_month(ordinal)

data/lib/tickle/repeater.rb

@@ -16,7 +16,7 @@ class Tickle::Repeater < Chronic::Tag #:nodoc:
 
   def self.scan_for_numbers(token)
     num = Float(token.word) rescue nil
-    token.update(:number, nil, num.to_i) if num
+    token.update(:number, num.to_i, num.to_i) if num
     token
   end
 
@@ -40,8 +40,7 @@ class Tickle::Repeater < Chronic::Tag #:nodoc:
     /seventeenth/ => '17th',
     /eighteenth/ => '18th',
     /nineteenth/ => '19th',
-    /twenty/ => '20th',
-    /thirty/ => '30th',
+    /twentieth/ => '20th',
     /thirtieth/ => '30th',
     }
     scanner.keys.each do |scanner_item|
@@ -55,7 +54,7 @@ class Tickle::Repeater < Chronic::Tag #:nodoc:
     token.update(:ordinal, token.original, 365) if !(token.original =~ regex).nil?
     token
   end
-
+  
   def self.scan_for_month_names(token)
     scanner = {/^jan\.?(uary)?$/ => :january,
       /^feb\.?(ruary)?$/ => :february,

data/lib/tickle/tickle.rb

@@ -32,6 +32,11 @@ module Tickle
       # remove all tokens without a type
       @tokens.reject! {|token| token.type.nil? }
 
+      # combine number and ordinals into single number
+      combine_multiple_numbers
+
+      @tokens.each {|x| puts x.inspect} if Tickle.debug
+
       return guess
     end
 
@@ -55,7 +60,7 @@ module Tickle
         token.word = normalize(token.original)
       end
     end
-    
+
     # Clean up the specified input text by stripping unwanted characters,
     # converting idioms to their canonical form, converting number words
     # to numbers (three => 3), and converting ordinal words to numeric
@@ -87,7 +92,19 @@ module Tickle
     def numericize_ordinals(text) #:nodoc:
       text = text.gsub(/\b(\d*)(st|nd|rd|th)\b/, '\1')
     end
-    
+
+    # Turns compound numbers, like 'twenty first' => 21
+    def combine_multiple_numbers
+      if [:number, :ordinal].all? {|type| token_types.include? type}
+        number = token_of_type(:number)
+        ordinal = token_of_type(:ordinal)
+        combined_value = (number.start.to_s[0] + ordinal.start.to_s)
+        new_number_token = Token.new(combined_value, combined_value, :ordinal, combined_value, 365)
+        @tokens.reject! {|token| (token.type == :number || token.type == :ordinal)}
+        @tokens << new_number_token
+      end
+    end
+
     # Returns an array of types for all tokens
     def token_types
       @tokens.map(&:type)
@@ -97,9 +114,12 @@ module Tickle
   class Token #:nodoc:
     attr_accessor :original, :word, :type, :interval, :start
 
-    def initialize(original)
+    def initialize(original, word=nil, type=nil, start=nil, interval=nil)
       @original = original
-      @word = @type = @interval = @start = nil
+      @word = word
+      @type = type
+      @interval = interval
+      @start = start
     end
 
     def update(type, start=nil, interval=nil)

data/test/test_parsing.rb

@@ -13,60 +13,68 @@ class TestParsing < Test::Unit::TestCase
     p Time.now
 
     parse_now('each day')
-      
-      parse_now('every day')
-      parse_now('every week')
-      parse_now('every Month')
-      parse_now('every year')
-      
-      parse_now('daily')
-      parse_now('weekly')
-      parse_now('monthly')
-      parse_now('yearly')
-      
-      parse_now('every 3 days')
-      parse_now('every 3 weeks')
-      parse_now('every 3 months')
-      parse_now('every 3 years')
-      
-      parse_now('every other day')
-      parse_now('every other week')
-      parse_now('every other month')
-      parse_now('every other year')
-      parse_now('every other day starting May 1st')
-      parse_now('every other week starting this Sunday')
-      
-      parse_now('every Monday')
-      parse_now('every Wednesday')
-      parse_now('every Friday')
-      
-      parse_now('every May')
-      parse_now('every june')
-      
-      parse_now('beginning of the week')
-      parse_now('middle of the week')
-      parse_now('end of the week')
-      
-      parse_now('beginning of the month')
-      parse_now('middle of the month')
-      parse_now('end of the month')
-      
-      parse_now('beginning of the year')
-      parse_now('middle of the year')
-      parse_now('end of the year')
-
-      parse_now('the 3rd of May')
-      parse_now('the 3rd of February', {:start => Date.new(2010, 03, 01).to_time})
-      
-      parse_now('the 10th of the month')
-      parse_now('the tenth of the month')
-      
-      parse_now('the first of the month')
-      parse_now('the thirtieth')
-      parse_now('the fifth', {:start => Date.new(2010, 03, 15)})
+
+    parse_now('every day')
+    parse_now('every week')
+    parse_now('every Month')
+    parse_now('every year')
+
+    parse_now('daily')
+    parse_now('weekly')
+    parse_now('monthly')
+    parse_now('yearly')
+
+    parse_now('every 3 days')
+    parse_now('every 3 weeks')
+    parse_now('every 3 months')
+    parse_now('every 3 years')
+
+    parse_now('every other day')
+    parse_now('every other week')
+    parse_now('every other month')
+    parse_now('every other year')
+    parse_now('every other day starting May 1st')
+    parse_now('every other week starting this Sunday')
+
+    parse_now('every Monday')
+    parse_now('every Wednesday')
+    parse_now('every Friday')
+
+    parse_now('every May')
+    parse_now('every june')
+
+    parse_now('beginning of the week')
+    parse_now('middle of the week')
+    parse_now('end of the week')
+
+    parse_now('beginning of the month')
+    parse_now('middle of the month')
+    parse_now('end of the month')
+
+    parse_now('beginning of the year')
+    parse_now('middle of the year')
+    parse_now('end of the year')
+
+    parse_now('the 3rd of May')
+    parse_now('the 3rd of February', {:start => Date.new(2010, 03, 01).to_time})
+
+    parse_now('the 10th of the month')
+    parse_now('the tenth of the month')
+
+    parse_now('the first of the month')
+    parse_now('the thirtieth')
+    parse_now('the fifth', {:start => Date.new(2010, 03, 15)})
 
     parse_now('the 3rd Sunday of May')
     parse_now('the 3rd Sunday of the month')
+
+    parse_now('the 23rd of June')
+    parse_now('the twenty third of June')
+    parse_now('the thirty first of August')
+
+
+    parse_now('the twenty first')
+    parse_now('the twenty first of the month')
   end
 
   def test_argument_validation

data/tickle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tickle}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Lippiner"]
-  s.date = %q{2010-04-24}
+  s.date = %q{2010-04-25}
   s.description = %q{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.}
   s.email = %q{jlippiner@noctivity.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Joshua Lippiner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 -04:00
+date: 2010-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency