lita-markov 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c2bed6ab0bed5b885e19baf626242cdc70a7b57
-  data.tar.gz: b0e92d4d149ff726d58f91f9bf189e9a96cbf89e
+  metadata.gz: dbf7aed643189ede40b31e8d9c16ac1640371ed7
+  data.tar.gz: 7d57eadbc324c28c5887b6b7180fe99919051ac7
 SHA512:
-  metadata.gz: 55cd5aaa1b42b657b52cdc765d56872c6fdf02b030060bfb17bf0e48068670db9ae72ec8629ef85cbce17d615bb69cf2c1fbdb19673e27d06ff275539b54f916
-  data.tar.gz: 146947b211fc0c85790a3bf27ece618ad2e6b37eb4eb37d54313678455cf9bc35fdf3b675c5525da26afc857049694051e8b2f78fbc0ed295ae4fc65ed41e86b
+  metadata.gz: 9775fc10de2164232bc389b44d95d5a7fb0a0e51b70781a382a934f02bc80bf04eac6774a7771edd93a3548d37d80f9b0502e9bbd6f200c996fd93f329b436c8
+  data.tar.gz: 563215674afaf190dac06aafbbf63f4d8208880884d0f5dd0cea867e17d48b984840d2447f0197132c46430ec26359c8ed84be7a83ac3eeb8549f920d58c903e

data/README.md

@@ -1,6 +1,6 @@
-# Markov chains for Lita
+# Markov chains for [Lita](https://www.lita.io/)
 
-Listens to your public chat rooms and generates Markov chain databases
+Listens to your public chat rooms and creates Markov chain databases
 for each user.
 
 ## Installation
@@ -18,6 +18,8 @@ communicating with databases):
 ```ruby
 # lita_config.rb
 Lita.configure do |config|
+  # For example, using Heroku and their Postgresql addon, the database can be
+  # configured by simply doing:
   config.handlers.markov.database_url = ENV['DATABASE_URL']
 end
 ```

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

@@ -105,6 +105,19 @@ class Lita::Handlers::Markov
         .select(:next_state, :frequency)
         .all
 
+      sample_states(states)
+    end
+
+    def get_random_next_state(user)
+      states = @db[:dictionary]
+        .where(user: user)
+        .select(:next_state, :frequency)
+        .all
+
+      sample_states states
+    end
+
+    def sample_states(states)
       distribution = states.flat_map do |state|
         Array.new(state[:frequency]) { state[:next_state] }
       end
@@ -112,26 +125,49 @@ class Lita::Handlers::Markov
       distribution.sample
     end
 
-    def generate_sentence_for(user, length = 30)
+    def start_new_sentence(user, sentence)
       first_word = random_capitalized_word user
       second_word = random_second_word user, first_word
 
-      sentence = [first_word, second_word]
+      sentence << first_word
+      sentence << second_word
+    end
+
+    def generate_sentence_for(user, length = 30)
+      sentence               = []
       ended_with_punctuation = false
 
+      start_new_sentence user, sentence
+
       while sentence.length < length
         current_state = sentence.slice(sentence.length - @depth, @depth).join ' '
 
         next_state = get_next_state user, current_state
 
-        # Stop if we failed to find a next state
-        break if next_state.nil?
+        if next_state.nil?
+          if sentence.length > (length / 2)
+            # Stop if we failed to find a next state and it's long enough
+            break
+          else
+            # Otherwise pick a completely random next-state from the user
+            # for the lols
+            next_state = get_random_next_state user
+          end
+        end
 
         sentence << next_state
 
         if next_state == '.'
-          ended_with_punctuation = true
-          break
+          if sentence.length > (length / 2)
+            # If it's long enough then we can end on a period
+            ended_with_punctuation = true
+            break
+          else
+            # Otherwise append a period and start a fresh sentence
+            last = sentence.pop
+            sentence.push(sentence.pop + last)
+            start_new_sentence user, sentence
+          end
         end
       end
 

data/lita-markov.gemspec

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

data/spec/lita/handlers/markov/engine_spec.rb

@@ -7,27 +7,27 @@ describe Lita::Handlers::Markov::Engine do
   end
 
   it 'will sanitize links from a message' do
-    message = 'hello https://www.example.com world!'
+    message = 'hello https://www.example.com world'
 
-    expect(subject.sanitize_string(message)).to eql 'hello  world!'
+    expect(subject.sanitize_string(message)).to eql 'hello world'
   end
 
   it 'will remove code blocks from a message' do
     message = 'I have `code in` me.'
 
-    expect(subject.sanitize_string(message)).to eql 'I have  me.'
+    expect(subject.sanitize_string(message)).to eql 'I have me'
   end
 
   it 'will remove illegal characters from a message' do
     message = 'I have a bad % character.'
 
-    expect(subject.sanitize_string(message)).to eql 'I have a bad  character.'
+    expect(subject.sanitize_string(message)).to eql 'I have a bad character'
   end
 
   it 'will separate a string into words' do
-    string = "I am\n so  totally\tseparated."
+    string = "I am\n so  totally\tseparated"
 
-    expect(subject.separate_string(string)).to eql ['I', 'am', 'so', 'totally', 'separated', '.']
+    expect(subject.separate_string(string)).to eql ['I', 'am', 'so', 'totally', 'separated']
   end
 
   it 'will ingest messages' do
@@ -36,19 +36,19 @@ describe Lita::Handlers::Markov::Engine do
     subject.ingest('user', 'hello big, fun world!')
 
     # Check that the first state made it in and is capitalized
-    expect(dictionary.where(current_state: 'Hello big,').count).to eql 1
+    expect(dictionary.where(current_state: 'Hello big').count).to eql 1
     # Check that the last state made it in
-    expect(dictionary.where(current_state: 'fun world', next_state: '!').count).to eql 1
+    expect(dictionary.where(current_state: 'fun world', next_state: '.').count).to eql 1
 
     subject.ingest('user', 'Hello big, fun planet!')
 
     # Check that the frequency of the "Hello big," -> "fun" state went up
-    expect(dictionary.where(current_state: 'Hello big,', next_state: 'fun').get(:frequency)).to eql 2
+    expect(dictionary.where(current_state: 'Hello big', next_state: 'fun').get(:frequency)).to eql 2
   end
 
   it 'will generate a sentence' do
     subject.ingest('user', 'Hello cruel world.')
 
-    expect(subject.generate_sentence_for 'user').to eql 'Hello cruel world.'
+    expect(subject.generate_sentence_for 'user').to include 'Hello cruel world.'
   end
 end

data/spec/lita/handlers/markov_spec.rb

@@ -21,11 +21,12 @@ describe Lita::Handlers::Markov, lita_handler: true do
 
     expect(replies.count).to eql 1
 
+    reply = replies[0]
     possible_replies = [
-      'I love cookies!',
-      'I love pancakes!'
+      'I love cookies.',
+      'I love pancakes.'
     ]
-    expect(possible_replies).to include replies[0]
+    expect(possible_replies.any? { |r| reply.include?(r) }).to eql true
   end
 
   it "will complain if the user hasn't said anything" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-markov
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Dirk Gadsden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita