pickup_line 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606b26af2658058243012cf5cf12c26180bad1e8
-  data.tar.gz: be3f805b0a1ae07cf1b20431e1427bc831aeb815
+  metadata.gz: 302706c1ef67371cfb55292c3eb91442153a0bed
+  data.tar.gz: c715008bbf16d2ff0b38d32700ae3a40300b75f5
 SHA512:
-  metadata.gz: e065489960f57c71753ffb401e0158fd70b7ebb3cecf62cf996434c0d1730623f1331dbc04ed2ea83ac527e9733a02637e39f39a3f4788515e8fbc3e2db935b7
-  data.tar.gz: c7503ed813babf7e82db522efd9da358293fbd75e79a40e745b429b40fc22ee506bbc548ea689989a548efb7d46eba43162cc893f38cf8760fa2ac61eec58e3d
+  metadata.gz: ef174886390cfe422ff2297fa25d1dfa1a66d0d9e725858fc359d608ad4bffae5f5c048a18b9d775d2eb534e56dac4a3344df829797ba1cfd97276b59e46543c
+  data.tar.gz: cdb342454debca3a68d83a68748105fa69a255dc90bc61b5618c724835e9ea96bac84809838c327bfe21c7dc3e947e7be04f99b1a0e3b61d8992c56edf84934c

data/lib/pickup_line/parser.rb

@@ -10,13 +10,12 @@ module PickupLine
     def locate(str)
       str = str.downcase
       words = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten']
-      # Full month names
-      if str =~ /(#{Date::MONTHNAMES.compact.map(&:downcase).join('|')})(\s+\d+)?/
+      # Full month names with date
+      if str =~ /(#{Date::MONTHNAMES.compact.map(&:downcase).join('|')})\s+(\d{1,2})(?!\d)/
         month_num = Date::MONTHNAMES.compact.map(&:downcase).index($1) + 1
-        day = $2 ? $2.to_i : -1
-        future_date day, month_num, @date.year
-      # Abbreviated month names
-      elsif str =~ /(#{Date::ABBR_MONTHNAMES.compact.map(&:downcase).join('|')})\.?(\s+\d+)?/
+        future_date $2.to_i, month_num, @date.year
+      # Abbreviated month names with date
+      elsif str =~ /(#{Date::ABBR_MONTHNAMES.compact.map(&:downcase).join('|')})\.?\s+(\d{1,2})(?!\d)/
         month_num = Date::ABBR_MONTHNAMES.compact.map(&:downcase).index($1) + 1
         day = $2 ? $2.to_i : -1
         future_date day, month_num, @date.year
@@ -34,7 +33,7 @@ module PickupLine
         d += 1 until d.wday == dindex
         d
       # In N days
-      elsif str =~ /in\s+(\d+)\s+days?/
+      elsif str =~ /in\s+(\d)\s+days?/
         @date + $1.to_i
       # In N days (with words)
       elsif str =~ /in\s+(#{words.join('|')})\s+days?/

data/lib/pickup_line/version.rb

@@ -1,3 +1,3 @@
 module PickupLine
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pickup_line
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec