attentive 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 880167573144b1749ba6f538a4922210ff5e087b
-  data.tar.gz: 4b50dad29e7eacdf650c58741230d90c44c75c9b
+  metadata.gz: 0ed20d6d06d7bd6ed7310ce2a21b1845147c85e0
+  data.tar.gz: 5c9d38c8b0d02e2df99e05b0079b61da0d844a97
 SHA512:
-  metadata.gz: b89a7ed8760e5e5acc8104c27f2d059fe82a05983fc29d077efabaf25b8cdc4ded15be16e601b1b9e9f94d902bebe5c30908d4d8d1e6311a8e92b24bf7e6cf16
-  data.tar.gz: d440c72708774dedbecf2117e4838ad97e2aaa13ebebdada905ccee018bebebc47cc1f3e3f7d6c5d15834a28279a709adec3164facb703779be0392c0c7aab0e
+  metadata.gz: e5332983ceaa6b98858a9fb25ad013bea52e446b677030980263fdd0d058d79fb8d6ad0a41c07a1c991787f3dc6f866790a8d854a3d4a9817862bfd4b1af9bf6
+  data.tar.gz: edceb04320ea91fc4b416554d3cbbd03bbce2872f3f0e3387e78480e10fc06b1ef54e88a63a1e3f05469872a90235ed55ca82bdf99816c0774bce24ee3ffaa5a

data/lib/attentive/entities/core/date/future.rb

@@ -7,4 +7,5 @@ require "attentive/entities/core/date/explicit"
 Attentive::CompositeEntity.define "core.date.future",
   "core.date.explicit",
   "core.date.relative.future",
-  "core.date.partial.future"
+  "core.date.partial.future",
+  published: false

data/lib/attentive/entities/core/date/past.rb

@@ -7,4 +7,5 @@ require "attentive/entities/core/date/explicit"
 Attentive::CompositeEntity.define "core.date.past",
   "core.date.explicit",
   "core.date.relative.past",
-  "core.date.partial.past"
+  "core.date.partial.past",
+  published: false

data/lib/attentive/entity.rb

@@ -72,6 +72,10 @@ module Attentive
       super pos
     end
 
+    def name
+      self.class.token_name
+    end
+
     def ==(other)
       self.class == other.class && self.variable_name == other.variable_name
     end

data/lib/attentive/version.rb

@@ -1,3 +1,3 @@
 module Attentive
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/attentive.rb

@@ -23,13 +23,20 @@ module Attentive
     entities = Attentive::Entity.entities.map { |entity| Attentive::Phrase.new([entity.new]) }
     i = 0
     while i < message.tokens.length
-      entities.each do |entity|
+      abstractions = entities.each_with_object({}) do |entity, abstractions|
         match = Attentive::Matcher.new(entity, Cursor.new(message, i)).match!
-        next unless match
+        abstractions[entity[0].name.to_s] = { entity: entity, match: match } if match
+      end
 
-        i = match.replace_with(entity)
-        break
+      # Pick the most abstract entity: if we match both
+      # {{core.date}} and {{core.date.past}}, use {{core.date}}
+      if abstractions.any?
+        keys = abstractions.keys
+        keys.reject! { |key| keys.any? { |other_key| key != other_key && key.start_with?(other_key) } }
+        abstraction = abstractions[keys.first]
+        i = abstraction[:match].replace_with(abstraction[:entity])
       end
+
       i += 1
     end
     message.tokens.to_s

metadata

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