timetoday 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac87b8766d97e1d50f4607e276e4ee194ff07029
-  data.tar.gz: c8ae74db101314bc7afa4a3e6b4c1a4b1963192e
+  metadata.gz: 25c972ff8dad7d8864ffa4d17f4f45a2b8b9c6d2
+  data.tar.gz: 1bd94f62bd64cdb8dab318fd42586664cfb09b73
 SHA512:
-  metadata.gz: b720b3220dbe051c23de1bdb7bc4ac928a5812136f148b71df660cb20eb202520f21e8320aa73b6b06b73e6860bceca52720d7b78e67237efb713390836fcf98
-  data.tar.gz: e9cca22a42d524e8230f0e9d893e2dc4006d9862a9bc6775da2b80410b9b16f679214d9b20fa025582b3e2cb828ed93757d668eeeef0e7cf698f95fe83e06f26
+  metadata.gz: c2d73b7ad76274809593f8ceee8be6bdb10f5bab2789e375b9c71ddb089a4bd9bb5cba6d934697be9827afb24c0d97cee892292cf7e39664cd35a0efe021200b
+  data.tar.gz: 087fe327f716c62449d6a7b0acab185e09ae8251bbfef0e14ae4cc24570345d6be04036020d21ba5e6392c7592e4a2743a36ddb24ab27c57c772753f171c96eb

data/lib/timetoday.rb

@@ -5,15 +5,22 @@
 require 'date'
 require 'time'
 require 'chronic_duration'
+require 'app-routes'
 
 class TimeToday
+  include AppRoutes
+  
+  def initialize()
+    super()
+    expressions()
+  end
 
-  def self.any()
+  def self.any(d=Date.today)
     #seconds_in_day = (DateTime.now + 1).to_time - DateTime.now.to_time
     seconds_in_day = 86399.999461942 # result from above
 
     any_time = Time.at rand(seconds_in_day)
-    day, mon, year = Time.now.to_a.values_at 3,4,5
+    day, mon, year = d.day, d.month, d.year
     s, min, hr = any_time.to_a.values_at 0,1,2
     Time.new(year, mon, day, hr, min, s)  
   end
@@ -31,4 +38,23 @@ class TimeToday
   def self.within(duration)
     Time.now + rand(ChronicDuration.parse(duration))
   end
-end
+  
+  def between(s)
+    expression = find_expression(s)
+  end
+
+  private
+  
+  def expressions()
+    
+    # e.g. 2-3 days
+    get /(\d+)\s*-\s*(\d+)\s+days/ do |n1, n2|
+      d = Date.today
+      tt = TimeToday
+      rand(tt.any(d+n1.to_i)..tt.any(d+n2.to_i)).to_time
+    end
+  end
+
+  alias find_expression run_route
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetoday
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,27 +12,47 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDIxNTAwNDMzOVoXDTE1MDIxNTAwNDMzOVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDUyNjEwMzg1N1oXDTE2MDUyNTEwMzg1N1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALb/IcOGgkOkNbmPUoRpw6sb2Vcr9446xPFR8lvzxASOdXGHrhTsXQM9DHiC
-  T1ZHPes3sa+aTnXVL4WdpaMPRiFFu7qugCbcaAB4wpiPvPTKXAAyRcy4vacZpx7r
-  opHmGx5cQwJZZGRmIn0plJPlqxq9XZqSLYGhL78QmMqa7ciDoS7k/Pk+75w6vG0x
-  m5ULIm8nIHh7cLxOsNuVXS2gOgc5QzJP3jjXuSC1EDq1Wk0chD+woQdelFmre7Jc
-  btIhIE5pBrdlb5/3fxxRhxImZr378GVjc0fdbtC7tIFIYaxnkeA6nbj5exJxgsnV
-  wRdEPwSAlfUWwWk2QBaJXJ6c8f8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU4nMU2X//RsjFtVNmiKEEerGl6TMwJgYDVR0RBB8w
+  ggEBAKgm4P3NRPuf56I71RKn/3fvlGLbGSDL6Og0LsOkJykzr5KsH8ZuvTBjXXDh
+  8voB7qWYVF/hkjVpSAVKzdotAW+Wptk1JRQt3R0XS18V/VrNJvn08BjBognxsOeY
+  pv17SaCvmppgFHDrakRAU6oKddfjNJ0pMly7BmBasHi0xVYprYSd2Ha9AgivK9w1
+  XlHT1CjftKa3NUhSG2xcdlulgDlXyR5lwwA2//YcoNdL3UZZ6oaKp/0m0CiEU4uO
+  9aeK3YOV0lSOkGqY/+sktJB5Wb4DxnrSrG7jDE/GCI5yoLQj9V38Tud8q9s+HCNe
+  d4+MEqMG7BXAIZj2HA8nRlheX2UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU6QD2XR9qmsWofQ4dq/WeB0xFa3MwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAmusdkQxP
-  TJxmBStkFbNFoZvRgHcsNs3J9eeUHsbwHVxcE9dyTiOcvfrkplWfxSxmnl5q+nKO
-  otwZl1Qro68qla1UxIbGyIOQykHgA1XNDJomnS0oc5fstyGRunV+X0InCfg/ckgo
-  ePLVnqoLKT1V+idsL4/tpYEl1GssHSh+cEAd9X8xbHpDnNt01TNSbh4pipB8Ea8S
-  MZ4qsZhMdgi/Iq2f84oKlVtjiRxxmmb48MlHZByELP4g5ZKQFrZplmQyuzWVcjqU
-  rGghecp8JqIaUMAdC4BGAk9sovzQGa3E4XUZ30J5rO7ViOudmTUOQ3NZ90Usvoyw
-  HgARigdEjMspZA==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAY9EdxP37
+  nuiKPJL9nqrar3cCdIh8FUu5kBR8kAztpF0D2Tfe43YyPluV2lHjje0kZcW8bn9s
+  ReXcsWkWUjr++JAO0RAdWVA1GO9BeyRc0sjyKnGrVqyIQls7AlXB4vsSIftMbasI
+  Ya4Iq/7PFt8M1cwutcJvz6Q1fS+n8BfmWtEC2xfJGPGOLJB0WTDoTqTWV+GsSEKZ
+  l736PGXhZBMYdr8KUsgO5wGBCXhz4o3sOtFqmCq5jJOxBFuOJ1+DT4t1hSiCRiSM
+  7s9YWJUGwWFx0WEW7VLSKp3bM78JDg+8wlBvxT/TSFDiJIBzK016GlpIke8pVT4R
+  eTHFMg6pfobNKQ==
   -----END CERTIFICATE-----
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: app-routes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -42,7 +62,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +72,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.6
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -80,8 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: timetoday
+summary: Returns a random time today, or within a few days (e.g. "4 days"), or between
+  a few days (e.g. "2-3 days")
 test_files: []