attentive 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c00c687fb2775e98c9241f3d5b50cfeda1f081
-  data.tar.gz: 160136973d7d6f3a6b3c661a0f91259a2b719a4c
+  metadata.gz: 30975536bce928d23402e0042c837b4632e1736a
+  data.tar.gz: 404d44e02460fe642bda70f08264b51f894f4eaa
 SHA512:
-  metadata.gz: e4b1788cecb43890e207c919be1061cff04a894035e4fa343bf6b66302d54b8cd20e97b86e384e2626519821e539a34511f27a28c968ad0766330dfaa4166950
-  data.tar.gz: 76a8fa1d38d9a6800b07f2fa72fbe47589b1186a87ca779de832627c64edde5c3be48f8dbb013087ba128f5168f826252f0aff915c897bccdbb1353055f4ac7f
+  metadata.gz: b1a9416baceffca676810f74519fe64bf55d2b1ec6c131aa99defc4941c9f80d34d4a051f918800f0b7cf28258134acd2df9daa613975e86fbe029cf2ee27725
+  data.tar.gz: 7e5ca689fb5554f023eeacb5695e423f4f25e1a568900fe9d2b69a9488f2fa04b2be5de9194aa4cc4074be2b3ed19309338a6ab85d0bc507077ad1bff80b0eac

data/lib/attentive/entities/core/date/duration/units.rb

@@ -1,5 +1,4 @@
 require "attentive/entity"
-require "date"
 
 Attentive::Entity.define "core.date.duration.units",
     "day",

data/lib/attentive/entities/core/time/duration/units.rb

@@ -0,0 +1,25 @@
+require "attentive/entity"
+
+Attentive::Entity.define "core.time.duration.units",
+    "second",
+    "seconds",
+    "s",
+    "minute",
+    "minutes",
+    "min",
+    "m",
+    "hour",
+    "hours",
+    "hr",
+    "hrs",
+    "h",
+    published: false do |match|
+
+  case match.phrase
+  when "second", "seconds", "s" then :seconds
+  when "minute", "minutes", "min", "m" then :minutes
+  when "hour", "hours", "hr", "hrs", "h" then :hours
+  else
+    nomatch!
+  end
+end

data/lib/attentive/entities/core/time/duration.rb

@@ -0,0 +1,32 @@
+require "attentive/entity"
+require "attentive/duration"
+require "attentive/entities/core/time/duration/units"
+
+Attentive::Entity.define "core.time.duration.single",
+    "{{n:core.number.integer.positive}} {{unit:core.time.duration.units}}",
+    published: false do |match|
+
+  unit = match["unit"]
+  n = match["n"]
+  Attentive::Duration.new(unit => n)
+
+end
+
+Attentive::Entity.define "core.time.duration",
+    %q{(?:(?<hours>\d\d?):(?<minutes>\d\d):(?<seconds>\d\d))},
+    "{{a:core.time.duration.single}} {{b:core.time.duration}}",
+    "{{a:core.time.duration.single}} and {{b:core.time.duration}}",
+    "{{a:core.time.duration.single}}" do |match|
+
+  if match.matched?("hours")
+    return Attentive::Duration.new(
+      hours: match["hours"],
+      minutes: match["minutes"],
+      seconds: match["seconds"])
+  else
+    a = match["a"]
+    a += match["b"] if match.matched?("b")
+    a
+  end
+
+end

data/lib/attentive/entities/core/time.rb

@@ -0,0 +1,31 @@
+require "attentive/entities/core/time/duration"
+require "date"
+require "time"
+
+Attentive::Entity.define "core.time",
+    "noon",
+    "midnight",
+    %q{(?:(?<hours>\d\d?):(?<minutes>\d\d)\s*(?<pm>pm?))},
+    %q{(?:(?<hours>\d\d?)\s*(?:am?|(?<pm>pm?)))},
+    %q{(?:(?<hours>\d\d?):(?<minutes>\d\d))} do |match|
+
+  minutes = 0
+
+  p match
+  if match.matched?("hours")
+    hours = match["hours"].to_i
+    hours += 12 if match.matched?("pm")
+    minutes = match["minutes"].to_i if match.matched?("minutes")
+  else
+    case match.to_s
+    when "noon" then hours = 12
+    when "midnight" then hours = 0
+    else nomatch!
+    end
+  end
+
+  nomatch! if hours < 0 || hours > 24
+  nomatch! if minutes < 0 || minutes > 60
+
+  today = Date.today; Time.new(today.year, today.month, today.day, hours, minutes)
+end

data/lib/attentive/entities/core.rb

@@ -1,3 +1,4 @@
 require "attentive/entities/core/number"
 require "attentive/entities/core/date"
+require "attentive/entities/core/time"
 require "attentive/entities/core/email"

data/lib/attentive/match.rb

@@ -12,7 +12,7 @@ module Attentive
     end
 
     def matched?(variable_name)
-      @match_data.key? variable_name.to_s
+      !@match_data[variable_name.to_s].nil?
     end
 
     def [](variable_name)

data/lib/attentive/version.rb

@@ -1,3 +1,3 @@
 module Attentive
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attentive
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe
@@ -196,6 +196,9 @@ files:
 - lib/attentive/entities/core/number/integer/positive.rb
 - lib/attentive/entities/core/number/negative.rb
 - lib/attentive/entities/core/number/positive.rb
+- lib/attentive/entities/core/time.rb
+- lib/attentive/entities/core/time/duration.rb
+- lib/attentive/entities/core/time/duration/units.rb
 - lib/attentive/entity.rb
 - lib/attentive/errors.rb
 - lib/attentive/listener.rb