lita-markov 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b2f398d9caec20fbf37702c662684da7146cdc
-  data.tar.gz: a748f843fd1d732e87f54172a86c4c6c591cb4fb
+  metadata.gz: 7b5c291ff7b19be493ce427ed3ef9d49eac2ba4d
+  data.tar.gz: bec9e862f464c5ed4daeeea15adf946bb22335b7
 SHA512:
-  metadata.gz: 9a0098f7c3791ef925b3c4ca91a9ee27dd241f4dfbae1b98f9c594fb7004a1ef41bb25a44980ba7b1d3fc1cfcb65919df0f2306e9eda5ca8faf98c6b8a3d64c8
-  data.tar.gz: aa74aeb55df9ffa5c5ae47b3d009a49ac779778d08071758967e77c70e201154e6b61afbf2e8e7999f1dbefe0fc942fc4d86cae477e884f370aeb1e1d7386691
+  metadata.gz: 5f82af9abdb8fcd6c6413e6f384cf884034d34b4be5a63a6e6f28357d9465a02b81a215447ea16196730aca584ab7bb229b4e8de03bcdcc4615ab9d94c9ab722
+  data.tar.gz: b7bc2ad646600648117a2013986d56a02ad803cba950e8e81167f429f688742c5fe08625ae53fa294e507c041f9bbb09500a30d9c8ad2f144bf423fd4f0d6ca8

data/lib/lita/handlers/markov/engine.rb

@@ -69,8 +69,10 @@ class Lita::Handlers::Markov
       end
     end
 
-    def random_capitalized_word
-      states = @db[:dictionary].map(:current_state)
+    def random_capitalized_word(user)
+      states = @db[:dictionary]
+        .where(user: user)
+        .map(:current_state)
 
       capitalized_states = states.select do |state|
         /^[A-Z]/ =~ state
@@ -87,9 +89,10 @@ class Lita::Handlers::Markov
       return state.split(' ').first
     end
 
-    def random_second_word(first_word)
+    def random_second_word(user, first_word)
       states = @db[:dictionary]
         .where(Sequel.like(:current_state, first_word+'%'))
+        .where(user: user)
         .map(:current_state)
 
       state = states.sample
@@ -97,7 +100,7 @@ class Lita::Handlers::Markov
     end
 
     def is_punctuation?(string)
-      PUNCTUATION.any? { |p| string.end_with? p }
+      PUNCTUATION.any? { |p| string == p }
     end
 
     def get_next_state(user, current_state)
@@ -114,10 +117,11 @@ class Lita::Handlers::Markov
     end
 
     def generate_sentence_for(user, length = 30)
-      first_word = random_capitalized_word
-      second_word = random_second_word first_word
+      first_word = random_capitalized_word user
+      second_word = random_second_word user, first_word
 
       sentence = [first_word, second_word]
+      ended_with_punctuation = false
 
       while sentence.length < length
         current_state = sentence.slice(sentence.length - @depth, @depth).join ' '
@@ -129,10 +133,17 @@ class Lita::Handlers::Markov
 
         sentence << next_state
 
-        break if is_punctuation? next_state
+        if is_punctuation? next_state
+          ended_with_punctuation = true
+          break
+        end
       end
 
-      sentence.slice(0..-2).join(' ') + sentence.last
+      chain = sentence.slice(0..-2).join(' ')
+      chain << ' ' unless ended_with_punctuation
+      chain << sentence.last
+
+      chain
     end
 
     def separate_string string

data/lib/lita/handlers/markov.rb

@@ -31,10 +31,15 @@ module Lita::Handlers
 
     def generate(chat)
       name = chat.matches[0][0].strip
-      id   = Lita::User.fuzzy_find(name).id
+      user = Lita::User.fuzzy_find name
+
+      if user.nil?
+        chat.reply "Couldn't find the user #{name}. :("
+        return
+      end
 
       begin
-        sentence = engine.generate_sentence_for id
+        sentence = engine.generate_sentence_for user.id
 
         chat.reply sentence
       rescue Engine::EmptyDictionaryError

data/lita-markov.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-markov"
-  spec.version       = "1.0.1"
+  spec.version       = "1.0.2"
   spec.authors       = ["Dirk Gadsden"]
   spec.email         = ["dirk@dirk.to"]
   spec.description   = "Markov chains for Lita."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-markov
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dirk Gadsden