midnight 0.0.1.pre → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3d56134d1c94d57b2f7b0f429e0cdb7cc5d08ace
-  data.tar.gz: 9d5012f615745c6561d1d12c51af058ca613feb5
+SHA256:
+  metadata.gz: 4674742cf82219099a8f3c15b08532cacd3c9f0df3823b4a4d9575a19b2b379e
+  data.tar.gz: d14c1b0e5a1b89770955e7ed72bda8d014f9715a145c9d465fb94ab8f0d27820
 SHA512:
-  metadata.gz: ca450ea161e1ec9a365debbb9e22fb006c2df611c03d9039657b9095a522092db810fa1550437fa0b8e4e9d1b884e6d44fd9297523b9115a24d30425486ef0d9
-  data.tar.gz: b0e3af7eea74b3bc7d8e96b134e26c1a45a12574729b4dd99d08c1c29ab5ed17e26a9b8f4c2d33202c06f4bcbf256b053cf99702bd4c5d20c34c4f1f4e260076
+  metadata.gz: a409610413d05d537dafac3ef4c655b69d7b7417f3faa38e6aed5e116306f1958f2faeaf9ced763dcf4fbdab0ad1e547988640acf170cc02b24473566451b3b3
+  data.tar.gz: 74a73ff5f702c6146c17430ed0f836bbb162536edd9be67de001e693b9caf41307c4497735ceb29f865640e35e54ef8e4c63705790ac8cc4ced2b15b1811ea6c

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.6.5

data/README.md

@@ -2,11 +2,13 @@
 
 A library to parse natural language date/time into a cron expression.
 
+[![Build Status](https://travis-ci.org/bluefuton/midnight.svg?branch=master)](https://travis-ci.org/bluefuton/midnight)
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'midnight'
+    gem 'midnight', ">= 1.0.0"
 
 And then execute:
 
@@ -21,10 +23,22 @@ Or install it yourself as:
 <pre>Midnight.parse('every 5 minutes').to_s
  => "*/5 * * * *"</pre>
 
+### Supported phrases
+
+A full list of supported natural language phrases can be found in <a href="https://github.com/bluefuton/midnight/blob/master/test/test_parsing.rb">test_parsing.rb</a>.
+
+In the future there'll be support for more complex repetitions - a wishlist can be found in <a href="https://github.com/bluefuton/midnight/blob/master/todo.txt">todo.txt</a>.
+
+## Credits
+
+My tokeniser code is based on the excellent <a href="https://github.com/yb66/tickle">Tickle</a> gem, which in turn relies on <a href="https://github.com/mojombo/chronic">Chronic</a> for date parsing.
+
+Author: Chris Rosser <chris@bluefuton.com>
+
 ## Contributing
 
 1. Fork it ( http://github.com/bluefuton/midnight/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new pull request

data/lib/midnight/midnight.rb

@@ -1,4 +1,4 @@
-require_relative "../numerizer/numerizer.rb"
+require 'numerizer'
 
 module Midnight
   class << self

data/lib/midnight/repeater.rb

@@ -76,7 +76,8 @@ class Midnight::Repeater < Chronic::Tag #:nodoc:
       /^th(urs|ers)day?s?$/ => :thursday,
       /^thu$/ => :thursday,
       /^fr[iy](day)?s?$/ => :friday,
-      /^sat(t?[ue]rday)?s?$/ => :saturday
+      /^sat(t?[ue]rday)?s?$/ => :saturday,
+      /^weekdays?$/ => :weekday,
     }
 
     day_sequence = {
@@ -86,7 +87,8 @@ class Midnight::Repeater < Chronic::Tag #:nodoc:
       :wednesday => 3,
       :thursday => 4,
       :friday => 5,
-      :saturday => 6
+      :saturday => 6,
+      :weekday => '1-5',
     }
 
     scanner.each do |scanner_item, day|

data/lib/midnight/version.rb

@@ -1,3 +1,3 @@
 module Midnight
-  VERSION = '0.0.1.pre'
+  VERSION = '1.0.0'
 end

data/midnight.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", ">= 1.0.0"
   spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency 'test-unit'
   spec.add_dependency 'chronic', '=0.10.2'
+  spec.add_dependency 'numerizer', '~> 0.1.1'
 end

data/test/test_parsing.rb

@@ -41,7 +41,8 @@ class TestParsing < Test::Unit::TestCase
       'midnight on tuesdays' => '0 0 * * 2',
       'every 5 minutes on Tuesdays' => '*/5 * * * 2',
       'every other day' => nil, # other is currently unsupported
-      'noon' => '0 12 * * *'
+      'noon' => '0 12 * * *',
+      'midnight on weekdays' => '0 0 * * 1-5'
     }
 
     expected_results.each do |search,cron_string|

data/todo.txt

@@ -14,7 +14,6 @@ the 10th of the month
 the tenth of the month
 the 3rd Sunday of the month
 out of bounds values e.g. 4:61pm
-midday - 'noon' works, so Chronic could be patched
 every 5 minutes on fridays
 multiple days "every tuesday, wednesday and friday at 5pm"
 multiple hours or minutes

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: midnight
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 1.0.0
 platform: ruby
 authors:
 - bluefuton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,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: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: numerizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: ''
 email:
 - chris@bluefuton.com
@@ -66,7 +94,6 @@ files:
 - LICENSE
 - LICENSE.txt
 - README.md
-- README.textile
 - Rakefile
 - lib/midnight.rb
 - lib/midnight/converter.rb
@@ -75,7 +102,6 @@ files:
 - lib/midnight/midnight.rb
 - lib/midnight/repeater.rb
 - lib/midnight/version.rb
-- lib/numerizer/numerizer.rb
 - midnight.gemspec
 - test/helper.rb
 - test/test_cron_expression.rb
@@ -96,12 +122,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Parse natural language date/time into a cron expression
@@ -109,4 +134,3 @@ test_files:
 - test/helper.rb
 - test/test_cron_expression.rb
 - test/test_parsing.rb
-has_rdoc: 

data/README.textile

@@ -1,20 +0,0 @@
-h1. midnight
-
-<img src="https://api.travis-ci.org/bluefuton/midnight.png" alt="Travis build status" />
-
-A library to parse natural language date/time into a cron expression.
-
-<pre>Midnight.parse('every 5 minutes').to_s
- => "*/5 * * * *"</pre>
-
-h2. Supported phrases
-
-A full list of supported natural language phrases can be found in <a href="https://github.com/bluefuton/midnight/blob/develop/test/test_parsing.rb">test_parsing.rb</a>.
-
-In the future there'll be support for more complex repetitions - a wishlist can be found in <a href="https://github.com/bluefuton/midnight/blob/develop/todo.txt">todo.txt</a>.
-
-h2. Credits
-
-My tokeniser code is based on the excellent <a href="https://github.com/yb66/tickle">Tickle</a> gem, which in turn relies on <a href="https://github.com/mojombo/chronic">Chronic</a> for date parsing.
-
-Author: Chris Rosser <chris@bluefuton.com>

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