attentive 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30975536bce928d23402e0042c837b4632e1736a
-  data.tar.gz: 404d44e02460fe642bda70f08264b51f894f4eaa
+  metadata.gz: 9c2dd05878b484a741af79656ca91f860f4ee6cb
+  data.tar.gz: ae71608dbc82bb68eddfc8ecf9c1f6a96543d67b
 SHA512:
-  metadata.gz: b1a9416baceffca676810f74519fe64bf55d2b1ec6c131aa99defc4941c9f80d34d4a051f918800f0b7cf28258134acd2df9daa613975e86fbe029cf2ee27725
-  data.tar.gz: 7e5ca689fb5554f023eeacb5695e423f4f25e1a568900fe9d2b69a9488f2fa04b2be5de9194aa4cc4074be2b3ed19309338a6ab85d0bc507077ad1bff80b0eac
+  metadata.gz: c3b8bc10ea59c099b916e8765bedcdef39119bb463dcf09eed8dfe39564ef174a15e6cb3dd98fe0fc2d83c185114c230e3d7d9086149a680a5bee9943e4d62f5
+  data.tar.gz: 2f14b5a1ad5dda7bb1e9fc694ba9bd670cbd51a3ac134c06f999ba2ab8f9f24f1146cc68b629311341ed8d40355119e42f34cd754db9a2e4a3313e7de8a5aad5

data/lib/attentive/duration.rb

@@ -1,18 +1,24 @@
 module Attentive
-  class Duration < Struct.new(:years, :months, :days)
+  class Duration < Struct.new(:years, :months, :days, :hours, :minutes, :seconds)
 
     def initialize(attributes)
       super(
         attributes.fetch(:years, 0),
         attributes.fetch(:months, 0),
-        attributes.fetch(:days, 0))
+        attributes.fetch(:days, 0),
+        attributes.fetch(:hours, 0),
+        attributes.fetch(:minutes, 0),
+        attributes.fetch(:seconds, 0))
     end
 
     def +(other)
       self.class.new(
         years: years + other.years,
         months: months + other.months,
-        days: days + other.days)
+        days: days + other.days,
+        hours: hours + other.hours,
+        minutes: minutes + other.minutes,
+        seconds: seconds + other.seconds)
     end
 
     def inspect
@@ -20,6 +26,9 @@ module Attentive
       phrases.push "#{years} years" if years > 0
       phrases.push "#{months} months" if months > 0
       phrases.push "#{days} days" if days > 0
+      phrases.push "#{hours} hours" if hours > 0
+      phrases.push "#{minutes} minutes" if minutes > 0
+      phrases.push "#{seconds} seconds" if seconds > 0
       "<#{phrases.join(" ")}>"
     end
 

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

@@ -11,7 +11,6 @@ Attentive::Entity.define "core.time",
 
   minutes = 0
 
-  p match
   if match.matched?("hours")
     hours = match["hours"].to_i
     hours += 12 if match.matched?("pm")

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

@@ -20,9 +20,9 @@ Attentive::Entity.define "core.time.duration",
 
   if match.matched?("hours")
     return Attentive::Duration.new(
-      hours: match["hours"],
-      minutes: match["minutes"],
-      seconds: match["seconds"])
+      hours: match["hours"].to_i,
+      minutes: match["minutes"].to_i,
+      seconds: match["seconds"].to_i)
   else
     a = match["a"]
     a += match["b"] if match.matched?("b")

data/lib/attentive/matcher.rb

@@ -4,6 +4,12 @@ module Attentive
   class Matcher
     attr_reader :phrase, :message, :cursor
 
+    def self.match!(phrase, message)
+      phrase = Attentive::Tokenizer.tokenize(phrase, entities: true) unless phrase.is_a?(Attentive::Phrase)
+      message = Attentive::Message.new(message) unless message.is_a?(Attentive::Message)
+      self.new(phrase, Attentive::Cursor.new(message)).match!
+    end
+
     def initialize(phrase, message, params={})
       @phrase = phrase
       @match_start = message.pos

data/lib/attentive/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attentive
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Bob Lail