remarkovable 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a053b23cb2c19a987ca6c05a594facc6f0afce85
-  data.tar.gz: 7b3a2136bc305358b559b7f828f2ef90ed205c8f
+  metadata.gz: 328379d1bc17df872005ce1054d8a2a059d2f584
+  data.tar.gz: 385d35193fbe32e3fe5324305ac6d6daa5d1b0ba
 SHA512:
-  metadata.gz: 667fb5bf7381a0d234f1fa836b39dff56e9c95c42ead73038591368a55d1b4dfd70fb35cd8c800702f510c855901a81d606624f737bd3a5ecc4532ae859a64c0
-  data.tar.gz: de52c45c3a3caa9207ea5fb8833929e7336b32804c5b0ed89c4e96e5f6f0347a8efd65fda9e4e4902e46c53d60c890402df2e8fa29d03a2df306e645f455987c
+  metadata.gz: d0156262c4e1cdce770660ef53e634a2a21c26f7059d4ba77318cc43d0ccbe2d387feb0a5fc7723991a8e8fbf92c1c706eed7d67f9870f4dc2b6ccd2d289bba9
+  data.tar.gz: 3535ab92ffe1dfb6c1d199df4db93d88f882b21d09199a8e03302c112c572c4a6e41f02c2244f6d8ae9dd091b811eec19ac8998b70576fb495a9f23706fde232

data/lib/remarkovable.rb

@@ -1,32 +1,14 @@
 class Remarkovable
   attr_accessor :markov_model
 
-  def initialize(string: string, prefix_length: 2)
+  def initialize(string:, prefix_length: 2)
     return if string.nil?
-    @markov_model = Hash.new { |hash, key| hash[key] = [] }
-
-    words = string.split(/([.!?])|\s+/)
-    words.each_with_index do |word, i|
-      key = [word]
-
-      (prefix_length - 1).times do |n|
-        next_word = i + n + 1
-        key << words[next_word]
-      end
-
-      key = key.join(' ')
-      match = words[i + prefix_length]
-      add_triad(key: key, match: match) if i < words.size - prefix_length
-    end
+    build_markov_model(string, prefix_length)
   end
 
   def speak(custom_key: nil)
     return if @markov_model.nil?
-    key = if !custom_key.nil? && @markov_model[custom_key].any?
-      custom_key
-    else
-      @markov_model.keys.sample
-    end
+    key = assign_key(custom_key)
     output = Array(key.capitalize.split(' '))
 
     until (output & %w(. ! ?)).any?
@@ -45,7 +27,32 @@ class Remarkovable
 
   private
 
-  def add_triad(key: key, match: match)
+  def build_markov_model(string, prefix_length)
+    @markov_model = Hash.new { |hash, key| hash[key] = [] }
+    words = string.split(/([.!?])|\s+/)
+    words.each_with_index do |word, i|
+      key = [word]
+
+      (prefix_length - 1).times do |n|
+        next_word = i + n + 1
+        key << words[next_word]
+      end
+
+      key = key.join(' ')
+      match = words[i + prefix_length]
+      add_triad(key: key, match: match) if i < words.size - prefix_length
+    end
+  end
+
+  def assign_key(custom_key)
+    if !custom_key.nil? && @markov_model.include?(custom_key)
+      custom_key
+    else
+      @markov_model.keys.sample
+    end
+  end
+
+  def add_triad(key:, match:)
     @markov_model[key] = {} unless @markov_model[key]
     @markov_model[key] += [match]
   end

data/test/{test_remarkovable.rb → test_markov_model.rb}

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require './lib/remarkovable.rb'
 
-class RemarkovableTest < Minitest::Test
+class TestMarkovModel < Minitest::Test
   def test_add_pair_simple_case
     string = 'we are walking'
     mc = Remarkovable.new(string: string)
@@ -13,9 +13,7 @@ class RemarkovableTest < Minitest::Test
   end
 
   def test_add_pair_nil
-    string = nil
-    mc = Remarkovable.new(string: string)
-    expected_output = nil
+    mc = Remarkovable.new(string: nil)
 
     assert_equal nil, mc.speak
   end
@@ -121,19 +119,4 @@ class RemarkovableTest < Minitest::Test
 
     assert_equal expected_output, mc.markov_model
   end
-
-  def test_custom_key
-    string = "we are walking\n\rwe are talking we are walking."
-    mc = Remarkovable.new(string: string)
-    expected_output = /^We are./
-
-    assert_match expected_output, mc.speak(custom_key: 'we are')
-  end
-
-  def test_custom_key_no_match
-    string = "we are walking\n\rwe are talking we are walking."
-    mc = Remarkovable.new(string: string)
-
-    assert_nil mc.speak(custom_key: 'foo bar') =~ /Foo bar/i
-  end
 end

data/test/test_speak.rb

@@ -0,0 +1,39 @@
+require 'minitest/autorun'
+require './lib/remarkovable.rb'
+
+class TestSpeak < Minitest::Test
+  def test_period_ending
+    string = 'we are walking.'
+    mc = Remarkovable.new(string: string)
+
+    assert_match(/\A.*walking.*\.\z/, mc.speak)
+  end
+
+  def test_bang_ending
+    string = 'we are walking!'
+    mc = Remarkovable.new(string: string)
+
+    assert_match(/\A.*walking.*!\z/, mc.speak)
+  end
+
+  def test_question_mark_ending
+    string = 'we are walking?'
+    mc = Remarkovable.new(string: string)
+
+    assert_match(/\A.*walking.*\?\z/, mc.speak)
+  end
+
+  def test_custom_key
+    string = "we are walking\n\rwe are talking we are walking."
+    mc = Remarkovable.new(string: string)
+
+    assert_match(/^We are./, mc.speak(custom_key: 'we are'))
+  end
+
+  def test_custom_key_no_match
+    string = "we are walking\n\rwe are talking we are walking."
+    mc = Remarkovable.new(string: string)
+
+    assert_nil(mc.speak(custom_key: 'foo bar') =~ /Foo bar/i)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remarkovable
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Jake Worth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies: []
 description: A gem that produces Markov chain output from any text.
 email:
@@ -18,7 +18,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/remarkovable.rb
-- test/test_remarkovable.rb
+- test/test_markov_model.rb
+- test/test_speak.rb
 homepage: https://rubygems.org/gems/remarkovable
 licenses:
 - MIT
@@ -39,9 +40,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Markov chains for all.
 test_files:
-- test/test_remarkovable.rb
+- test/test_speak.rb
+- test/test_markov_model.rb
+has_rdoc: