attentive 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed20d6d06d7bd6ed7310ce2a21b1845147c85e0
-  data.tar.gz: 5c9d38c8b0d02e2df99e05b0079b61da0d844a97
+  metadata.gz: ed9424d444fc7b37aa1ad0e003fa687a00fc5aa6
+  data.tar.gz: 031fc365d1be4944cd5c612caa218c7d64cc2e97
 SHA512:
-  metadata.gz: e5332983ceaa6b98858a9fb25ad013bea52e446b677030980263fdd0d058d79fb8d6ad0a41c07a1c991787f3dc6f866790a8d854a3d4a9817862bfd4b1af9bf6
-  data.tar.gz: edceb04320ea91fc4b416554d3cbbd03bbce2872f3f0e3387e78480e10fc06b1ef54e88a63a1e3f05469872a90235ed55ca82bdf99816c0774bce24ee3ffaa5a
+  metadata.gz: 015a425a258acc78e6d0d5b0d99c8af95c0af16ced679de556863219d99a6c59610af1353bf2f92b777b91f69a7fbb727304baa77b7301b5547b842e921d97c1
+  data.tar.gz: 4f4fc07e43650c108b8f01511485716a17f360d6c8a7d6d2e76ba4fbb81379b4bbcfaa79007f2d280aa45b0dc60c6f214c27c6062b8b28da070cf7bc175960da

data/Rakefile

@@ -25,7 +25,7 @@ namespace :compile do
         # the first value is the contraction.
         # the remaining values are possible phrases that match it
         phrases = line.downcase.chomp.split("\t")
-        raise "#{line.inspect} must have exactly two values" unless phrases.length >= 2
+        raise "#{line.inspect} must have at least two values" unless phrases.length >= 2
 
         substitutions[phrases.shift] = phrases
       end

data/lib/attentive/duration.rb

@@ -0,0 +1,35 @@
+module Attentive
+  class Duration < Struct.new(:years, :months, :days)
+
+    def initialize(attributes)
+      super(
+        attributes.fetch(:years, 0),
+        attributes.fetch(:months, 0),
+        attributes.fetch(:days, 0))
+    end
+
+    def +(other)
+      self.class.new(
+        years: years + other.years,
+        months: months + other.months,
+        days: days + other.days)
+    end
+
+    def inspect
+      phrases = []
+      phrases.push "#{years} years" if years > 0
+      phrases.push "#{months} months" if months > 0
+      phrases.push "#{days} days" if days > 0
+      "<#{phrases.join(" ")}>"
+    end
+
+    def after(date)
+      (date >> (years * 12 + months)) + days
+    end
+
+    def before(date)
+      (date >> -(years * 12 + months)) - days
+    end
+
+  end
+end

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

@@ -0,0 +1,29 @@
+require "attentive/entity"
+require "date"
+
+Attentive::Entity.define "core.date.duration.units",
+    "day",
+    "days",
+    "week",
+    "wk",
+    "weeks",
+    "wks",
+    "month",
+    "mo",
+    "months",
+    "mos",
+    "year",
+    "yr",
+    "years",
+    "yrs",
+    published: false do |match|
+
+  case match.phrase
+  when "day", "days" then :days
+  when "week", "wk", "weeks", "wks" then :weeks
+  when "month", "mo", "months", "mos" then :months
+  when "year", "yr", "years", "yrs" then :years
+  else
+    nomatch!
+  end
+end

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

@@ -0,0 +1,25 @@
+require "attentive/entity"
+require "attentive/duration"
+require "attentive/entities/core/date/duration/units"
+
+Attentive::Entity.define "core.date.duration.single",
+    "{{n:core.number.integer.positive}} {{unit:core.date.duration.units}}",
+    published: false do |match|
+
+  unit = match["unit"]
+  n = match["n"]
+  unit, n = [:days, n * 7] if unit == :weeks
+  Attentive::Duration.new(unit => n)
+
+end
+
+Attentive::Entity.define "core.date.duration",
+    "{{a:core.date.duration.single}} {{b:core.date.duration}}",
+    "{{a:core.date.duration.single}} and {{b:core.date.duration}}",
+    "{{a:core.date.duration.single}}" do |match|
+
+  a = match["a"]
+  a += match["b"] if match.matched?("b")
+  a
+
+end

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

@@ -22,7 +22,7 @@ Attentive::Entity.define "core.date.relative.future",
     case match.to_s
     when "today" then today
     when "tomorrow" then today + 1
-    else raise NotImplementedError, "Unrecognized match: #{match.to_s}"
+    else nomatch!
     end
   end
 end

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

@@ -19,7 +19,7 @@ Attentive::Entity.define "core.date.relative.past",
     case match.to_s
     when "today" then today
     when "yesterday" then today - 1
-    else raise NotImplementedError, "Unrecognized match: #{match.to_s}"
+    else nomatch!
     end
   end
 end

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

@@ -1,5 +1,6 @@
 require "attentive/entities/core/date/month"
 require "attentive/entities/core/date/wday"
+require "attentive/entities/core/date/duration"
 require "attentive/entities/core/date/relative"
 require "attentive/entities/core/date/partial"
 require "attentive/entities/core/date/explicit"

data/lib/attentive/entity.rb

@@ -32,7 +32,7 @@ module Attentive
 
         create! entity_name do |entity_klass|
           entity_klass.phrases = phrases.map do |phrase|
-            Attentive::Tokenizer.tokenize(phrase, entities: true, regexps: true, ambiguous: false)
+            Attentive::Tokenizer.tokenize(phrase, entities: true, regexps: true)
           end
           entity_klass.published = options.fetch(:published, true)
           entity_klass.send :define_method, :_value_from_match, &block if block_given?
@@ -50,8 +50,8 @@ module Attentive
         entity_symbol = entity_name.to_sym
         entity_klass = Class.new(self)
         entity_klass.token_name = entity_symbol
-        yield entity_klass
         Entity.register! entity_symbol, entity_klass
+        yield entity_klass
       end
 
       def register!(entity_name, entity_klass)

data/lib/attentive/errors.rb

@@ -1,7 +1,4 @@
 module Attentive
-  class AmbiguousPhraseError < RuntimeError
-  end
-
   class UndefinedEntityError < RuntimeError
   end
 end

data/lib/attentive/listener.rb

@@ -43,7 +43,7 @@ module Attentive
     end
 
     def tokenize_phrase!(phrase)
-      Attentive::Tokenizer.tokenize(phrase, entities: true, regexps: true, ambiguous: false)
+      Attentive::Tokenizer.tokenize(phrase, entities: true, regexps: true)
     end
 
   end

data/lib/attentive/message.rb

@@ -6,6 +6,7 @@ module Attentive
     attr_reader :contexts, :text
 
     def initialize(text, params={})
+      raise ArgumentError, "Message cannot be initialized without 'text'" unless text
       @text = text
       @contexts = Set.new(params.fetch(:contexts, []))
       contexts << :conversation if tokens.grep(Attentive::Tokens::Invocation).any?

data/lib/attentive/tokenizer.rb

@@ -33,10 +33,6 @@ module Attentive
       options.fetch(:substitutions, true)
     end
 
-    def fail_if_ambiguous?
-      !options.fetch(:ambiguous, true)
-    end
-
 
 
     def tokenize
@@ -80,8 +76,6 @@ module Attentive
         end
       end
 
-      fail_if_ambiguous!(message, tokens) if fail_if_ambiguous?
-
       Attentive::Phrase.new(tokens)
     end
 
@@ -132,7 +126,7 @@ module Attentive
     end
 
     def match_whitespace_at(i)
-      whitespace = chars[i]
+      whitespace = chars[i].dup
       while (i += 1) < chars.length
         break unless WHITESPACE === chars[i]
         whitespace << chars[i]
@@ -142,7 +136,7 @@ module Attentive
 
     def match_number_at(i)
       return false if CONDITIONAL_NUMBER_START === chars[i] && !(NUMBER === chars[i + 1])
-      number = chars[i]
+      number = chars[i].dup
       while (i += 1) < chars.length
         break unless NUMBER === chars[i] || (CONDITIONAL_NUMBER === chars[i] && NUMBER === chars[i + 1])
         number << chars[i]
@@ -151,7 +145,7 @@ module Attentive
     end
 
     def match_word_at(i)
-      word = chars[i]
+      word = chars[i].dup
       while (i += 1) < chars.length
         break unless WORD === chars[i]
         word << chars[i]
@@ -207,15 +201,6 @@ module Attentive
       "‘" => "'",
       "’" => "'" }.freeze
 
-    def fail_if_ambiguous!(phrase, tokens)
-      ambiguous_token = tokens.find(&:ambiguous?)
-      return unless ambiguous_token
-
-      raise Attentive::AmbiguousPhraseError.new(
-        "The phrase #{phrase.inspect} is ambiguous. " <<
-        "Please use #{ambiguous_token.possibilities.map(&:inspect).join(" or ")}")
-    end
-
   end
 end
 

data/lib/attentive/tokens/any_of.rb

@@ -18,6 +18,18 @@ module Attentive
         true
       end
 
+      def matches?(cursor)
+        possibilities.each do |phrase|
+          cursor_copy = cursor.new_from_here
+          match = Attentive::Matcher.new(phrase, cursor_copy).match!
+          if match
+            cursor.advance cursor_copy.pos
+            return match.to_h
+          end
+        end
+        false
+      end
+
     end
   end
 end

data/lib/attentive/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attentive
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe
@@ -156,8 +156,11 @@ files:
 - lib/attentive/composite_entity.rb
 - lib/attentive/config.rb
 - lib/attentive/cursor.rb
+- lib/attentive/duration.rb
 - lib/attentive/entities/core.rb
 - lib/attentive/entities/core/date.rb
+- lib/attentive/entities/core/date/duration.rb
+- lib/attentive/entities/core/date/duration/units.rb
 - lib/attentive/entities/core/date/explicit.rb
 - lib/attentive/entities/core/date/future.rb
 - lib/attentive/entities/core/date/month.rb
@@ -220,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for matching messages to natural-language listeners