tickle 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7c98a6545c1b7e583d69309c0d76be4f91266c
-  data.tar.gz: 0039b3ba223bf9082d7a290dd71b16395c5fe023
+  metadata.gz: f37559d98569337ef293a7dab47aff50bbf79ddc
+  data.tar.gz: ae5ab433c8e9561b83ce453c25ca1bebb957f024
 SHA512:
-  metadata.gz: a9dc27b51edc3cc4d3cd5d9df5dfbcbdbd6f249317a0bc3771238caa852fa079ed0f4873fd9bb1820f5bf0baabb535c0463b71c6b2cf52788d956661b46938ed
-  data.tar.gz: 11697818c4cfa90fd2ee9fd539c34e3d8e813129e277effd4376a6c3179a9ead45a939eedb73fd6d44068ba05c724be333221d1ac073e53c16642f4b53fea238
+  metadata.gz: c46c9d0305c4c0ed9bc669998c05951e551a2c96d10a117a49fcf72e13d3dc7afce702c47c68f2262d5e3ed3d29fa1fc5730a4b284a08bbd2f6348675fae781f
+  data.tar.gz: 305f4b9f2c78624d5d98e71d13563eb6892e1b2c88e9cae0be7f990ec763b8ab345952684b32f41197c14d4087a142cac54207464dee39653e983e14f32deace

data/CHANGES.md

@@ -1,14 +1,21 @@
 # CH CH CH CH CHANGES! #
 
+## Wednesday the 22nd of February 2017, v1.1.0 ##
 
-## Monday the 11th of November, v1.0.2 ##
+* Numerizer duplication removed. Thanks to https://github.com/bjonord.
+* Some very minor changes to the project, no other code changes.
+
+----
+
+
+## Monday the 11th of November 2015, v1.0.2 ##
 
 * Shoulda and simplecov aren't runtime dependencies, fixed that in the gemfile.
 * Got the version number right this time ;-)
 
 ----
 
-## Monday the 11th of November, v1.0.1 ##
+## Monday the 11th of November 2015, v1.0.1 ##
 
 * Moved library to new maintainer [https://github.com/yb66/tickle](@yb66)
 * Moved library to [http://semver.org/](semver).

data/Gemfile

@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "wirble"
 group :test do
   gem "rspec"
 end

data/Rakefile

@@ -5,8 +5,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 

data/lib/tickle.rb

@@ -16,10 +16,8 @@ require 'chronic'
 require 'tickle/tickle'
 require 'tickle/handler'
 require 'tickle/repeater'
-require 'numerizer/numerizer'
 
 module Tickle #:nodoc:
-  VERSION = "0.1.7"
 
   def self.debug=(val); @debug = val; end
 
@@ -49,20 +47,20 @@ class Date #:nodoc:
     amount ||= 1
     case attr
     when :day then
-      Date.civil(self.year, self.month, self.day + amount)
+      Date.civil(self.year, self.month, self.day).next_day(amount)
     when :wday then
       amount = Date::ABBR_DAYNAMES.index(amount) if amount.is_a?(String)
       raise Exception, "specified day of week invalid.  Use #{Date::ABBR_DAYNAMES}" unless amount
       diff = (amount > self.wday) ? (amount - self.wday) : (7 - (self.wday - amount))
-      Date.civil(self.year, self.month, self.day + diff)
+      Date.civil(self.year, self.month, self.day).next_day(diff)
     when :week then
-      Date.civil(self.year, self.month, self.day + (7*amount))
+      Date.civil(self.year, self.month, self.day).next_day(7*amount)
     when :month then
-      Date.civil(self.year, self.month+amount, self.day)
+      Date.civil(self.year, self.month, self.day).next_month(amount)
     when :year then
-      Date.civil(self.year + amount, self.month, self.day)
+      Date.civil(self.year, self.month, self.day).next_year(amount)
     else
-            raise Exception, "type \"#{attr}\" not supported."
+      raise Exception, "type \"#{attr}\" not supported."
     end
   end
 end
@@ -72,27 +70,27 @@ class Time #:nodoc:
     amount ||= 1
     case attr
     when :sec then
-      Time.local(self.year, self.month, self.day, self.hour, self.min, self.sec + amount)
+      Time.local(self.year, self.month, self.day, self.hour, self.min, self.sec) + amount
     when :min then
-      Time.local(self.year, self.month, self.day, self.hour, self.min + amount, self.sec)
+      Time.local(self.year, self.month, self.day, self.hour, self.min, self.sec) + (amount * 60)
     when :hour then
-      Time.local(self.year, self.month, self.day, self.hour + amount, self.min, self.sec)
+      Time.local(self.year, self.month, self.day, self.hour, self.min, self.sec) + (amount * 60 * 60)
     when :day then
-      Time.local(self.year, self.month, self.day + amount, self.hour, self.min, self.sec)
+      Time.local(self.year, self.month, self.day, self.hour, self.min, self.sec) + (amount * 60 * 60 * 24)
     when :wday then
       amount = Time::RFC2822_DAY_NAME.index(amount) if amount.is_a?(String)
       raise Exception, "specified day of week invalid.  Use #{Time::RFC2822_DAY_NAME}" unless amount
       diff = (amount > self.wday) ? (amount - self.wday) : (7 - (self.wday - amount))
-      Time.local(self.year, self.month, self.day + diff, self.hour, self.min, self.sec)
+      DateTime.civil(self.year, self.month, self.day, self.hour, self.min, self.sec, self.zone).next_day(diff)
     when :week then
-      Time.local(self.year, self.month, self.day + (amount * 7), self.hour, self.min, self.sec)
+      DateTime.civil(self.year, self.month, self.day, self.hour, self.min, self.sec, self.zone).next_day(amount * 7)
     when :month then
-      Time.local(self.year, self.month + amount, self.day, self.hour, self.min, self.sec)
+      DateTime.civil(self.year, self.month, self.day, self.hour, self.min, self.sec, self.zone).next_month(amount)
     when :year then
-      Time.local(self.year + amount, self.month, self.day, self.hour, self.min, self.sec)
+      DateTime.civil(self.year, self.month, self.day, self.hour, self.min, self.sec, self.zone).next_year(amount)
     else
       raise Exception, "type \"#{attr}\" not supported."
-    end
+    end.to_time.localtime
   end
 end
 

data/lib/tickle/tickle.rb

@@ -19,8 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require_relative "../numerizer/numerizer.rb"
-
 module Tickle
   class << self
     # == Configuration options

data/lib/tickle/version.rb

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

data/test/test_parsing.rb

@@ -165,30 +165,30 @@ class TestParsing < Test::Unit::TestCase
 
   def test_argument_validation
     assert_raise(Tickle::InvalidArgumentException) do
-      time = Tickle.parse("may 27", :today => 'something odd')
+      Tickle.parse("may 27", :today => 'something odd')
     end
 
     assert_raise(Tickle::InvalidArgumentException) do
-      time = Tickle.parse("may 27", :foo => :bar)
+      Tickle.parse("may 27", :foo => :bar)
     end
 
     assert_raise(Tickle::InvalidArgumentException) do
-      time = Tickle.parse(nil)
+      Tickle.parse(nil)
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
       past_date = Date.civil(Date.today.year, Date.today.month, Date.today.day - 1)
-      time = Tickle.parse("every other day", {:start => past_date})
+      Tickle.parse("every other day", {:start => past_date})
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
-      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)
+      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)
     end
 
     assert_raise(Tickle::InvalidDateExpression) do
-      end_date = Date.civil(Date.today.year, Date.today.month+2, Date.today.day)
+      end_date = Date.civil(Date.today.year, Date.today.month, Date.today.day).next_month(2)
       parse_now('every 3 months', {:until => end_date})
     end
   end

data/tickle.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "chronic", "~> 0.2.3"
   s.add_development_dependency "shoulda", "~> 2.10.3"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "test-unit"
 
   s.add_development_dependency "bundler", "~> 1.2"
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickle
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Lippiner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !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
@@ -127,7 +141,6 @@ files:
 - SCENARIOS.rdoc
 - examples.rb
 - git-flow-version
-- lib/numerizer/numerizer.rb
 - lib/tickle.rb
 - lib/tickle/handler.rb
 - lib/tickle/repeater.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