john-doe 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/default.yml

@@ -26,9 +26,10 @@ knowledge:
 
 # AIML-like tags
 name:
-  patterns: 
+  rank: 10
+  patterns:
     p1: what * your name
-    p2: your name
+    p2: * your name
   responses:
     r1: "bot:name bot:surname"
     r2: "Call me bot:name"
@@ -200,7 +201,16 @@ tellme:
   responses:
     r1: "I am just normal bot:specimen"
     r2: "What do you want to know?"
+
+because:
+  patterns:
+    p1: because
+  responses:
+    r1: "that's good reason"
+    r2: "thanks for explanation ;-)"
+
 specimen:
+  priority: 20
   patterns:
     p1: are you * human
     p2: are you * bot
@@ -350,6 +360,7 @@ asl:
   responses:
     r1: "bot:age bot:sex bot:language"
 orly:
+  priority: 10
   patterns:
     p1: "really?"
     p2: are you sure

data/john-doe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{john-doe}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pawel Mikolajewski"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "default.yml",
+     "john-doe-0.1.0.gem",
      "john-doe.gemspec",
      "lib/john-doe.rb",
      "lib/johndoe/aiml.rb",

data/lib/johndoe/aiml.rb

@@ -29,8 +29,8 @@ module JohnDoe
         responses = collection['responses'].collect{|k,v| v}
         @responses.push(responses)
         emotions = (collection["emotion"].split("|") rescue ["none"])
-        puts emotions.inspect
-        collection['patterns'].each{|k,v| @patterns[normalise_pattern(v)] = { :resp => (@responses.size - 1), :emotions => emotions}}
+        priority = (collection["rank"].to_i rescue 0)
+        collection['patterns'].each{|k,v| @patterns[normalise_pattern(v)] = { :resp => (@responses.size - 1), :emotions => emotions, :priority => priority}}
       end
     end
 

data/lib/johndoe/responser.rb

@@ -13,12 +13,23 @@ module JohnDoe
     end
 
     def response(sentence)
+      max_priority = -1
+      best_v = nil
+      best_k = nil
+
       @data.patterns.each do |k,v|
         if (/^#{k}/i =~ sentence)
-          return Response.new(sub_v(random_quote(@data.responses[v[:resp]], /^#{k}/i.match(sentence).captures)),v[:emotions])
+          next if v[:priority] <= max_priority
+          max_priority = v[:priority]
+          best_v = v
+          best_k = k
         end
       end
-      return Response.new(sub_v(random_quote(@data.default["dontunderstand"])),["none"])
+      unless best_v.nil?
+        return Response.new(sub_v(random_quote(@data.responses[best_v[:resp]], /^#{best_k}/i.match(sentence).captures)),best_v[:emotions])
+      else
+        return Response.new(sub_v(random_quote(@data.default["dontunderstand"])),["none"])
+      end
     end
 
     #substitute variables

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: john-doe
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pawel Mikolajewski
@@ -49,6 +49,7 @@ files:
 - Rakefile
 - VERSION
 - default.yml
+- john-doe-0.1.0.gem
 - john-doe.gemspec
 - lib/john-doe.rb
 - lib/johndoe/aiml.rb